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

package/out/src/storage/StorageKnex.js

@@ -10,16 +10,67 @@ const listOutputsKnex_1 = require("./methods/listOutputsKnex");
 const reviewStatus_1 = require("./methods/reviewStatus");
 const WERR_errors_1 = require("../sdk/WERR_errors");
 const utilityHelpers_1 = require("../utility/utilityHelpers");
+const managedChange_1 = require("./methods/managedChange");
+// Keep bulk statements below conservative SQLite/MySQL bind-parameter
+// ceilings. The surrounding transaction still makes a complete pack atomic.
+const ACTION_BATCH_BLOB_SQL_CHUNK = 500;
+const OUTPUT_INSERT_SQL_CHUNK = 500;
 class StorageKnex extends StorageProvider_1.StorageProvider {
+    knex;
+    querySpans = new Map();
+    onQuery = (query) => {
+        if (!this.telemetry.enabled || query.__knexQueryUid == null)
+            return;
+        const span = this.telemetry.startSpan('wallet.storage.db.query', {
+            component: 'wallet-storage-knex',
+            kind: 'client',
+            attributes: {
+                'db.system': this.databaseSystem(),
+                'db.operation': query.method ?? 'unknown'
+            }
+        });
+        this.querySpans.set(query.__knexQueryUid, span);
+    };
+    onQueryResponse = (_response, query) => {
+        this.endQuerySpan(query);
+    };
+    onQueryError = (error, query) => {
+        this.endQuerySpan(query, error);
+    };
     constructor(options) {
         super(options);
-        this._verifiedReadyForDatabaseAccess = false;
-        if (!options.knex)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('options.knex', `valid`);
+        if (options.knex == null)
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('options.knex', 'valid');
         this.knex = options.knex;
+        if (this.telemetry.enabled) {
+            this.knex.on('query', this.onQuery);
+            this.knex.on('query-response', this.onQueryResponse);
+            this.knex.on('query-error', this.onQueryError);
+        }
     }
+    databaseSystem() {
+        const clientName = this.knex.client.config?.client ?? '';
+        if (clientName.includes('sqlite'))
+            return 'sqlite';
+        if (clientName.includes('mysql'))
+            return 'mysql';
+        if (clientName.includes('pg') || clientName.includes('postgres'))
+            return 'postgresql';
+        return 'unknown';
+    }
+    endQuerySpan(query, error) {
+        if (query.__knexQueryUid == null)
+            return;
+        const span = this.querySpans.get(query.__knexQueryUid);
+        if (span == null)
+            return;
+        this.querySpans.delete(query.__knexQueryUid);
+        span.end(error == null ? {} : { status: 'error', error });
+    }
+    supportsActionBatchPersistence() { return true; }
+    requiresActionBatchCleanupBeforeCreateAction() { return false; }
     async readSettings() {
-        return this.validateEntity((0, utilityHelpers_1.verifyOne)(await this.toDb(undefined)('settings')));
+        return this.validateEntity((0, utilityHelpers_1.verifyOne)(await this.toDb()('settings')));
     }
     async getProvenOrRawTx(txid, trx) {
         const k = this.toDb(trx);
@@ -28,70 +79,95 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             rawTx: undefined,
             inputBEEF: undefined
         };
-        r.proven = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxs({ partial: { txid: txid } }));
-        if (!r.proven) {
+        r.proven = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxs({ partial: { txid }, trx }));
+        if (r.proven == null) {
             const reqRawTx = (0, utilityHelpers_1.verifyOneOrNone)(await k('proven_tx_reqs')
                 .where('txid', txid)
                 .whereIn('status', ['unsent', 'unmined', 'unconfirmed', 'sending', 'nosend', 'completed'])
                 .select('rawTx', 'inputBEEF'));
-            if (reqRawTx) {
+            if (reqRawTx != null) {
                 r.rawTx = Array.from(reqRawTx.rawTx);
                 r.inputBEEF = Array.from(reqRawTx.inputBEEF);
             }
         }
         return r;
     }
+    async getProvenOrRawTxs(txids, trx) {
+        const unique = [...new Set(txids)];
+        const results = new Map();
+        if (unique.length === 0)
+            return results;
+        const proven = await this.findProvenTxs({ partial: {}, txids: unique, trx });
+        const provenTxids = new Set(proven.map(transaction => transaction.txid));
+        for (const transaction of proven) {
+            results.set(transaction.txid, { proven: transaction, rawTx: undefined, inputBEEF: undefined });
+        }
+        const unresolved = unique.filter(txid => !provenTxids.has(txid));
+        if (unresolved.length > 0) {
+            const requests = await this.findProvenTxReqs({
+                partial: {},
+                txids: unresolved,
+                status: ['unsent', 'unmined', 'unconfirmed', 'sending', 'nosend', 'completed'],
+                trx
+            });
+            for (const request of requests) {
+                results.set(request.txid, {
+                    proven: undefined,
+                    rawTx: Array.from(request.rawTx),
+                    inputBEEF: request.inputBEEF == null ? undefined : Array.from(request.inputBEEF)
+                });
+            }
+        }
+        for (const txid of unique) {
+            if (!results.has(txid))
+                results.set(txid, { proven: undefined, rawTx: undefined, inputBEEF: undefined });
+        }
+        return results;
+    }
     dbTypeSubstring(source, fromOffset, forLength) {
         if (this.dbtype === 'MySQL')
-            return `substring(${source} from ${fromOffset} for ${forLength})`;
-        return `substr(${source}, ${fromOffset}, ${forLength})`;
+            return `substring(${source} from ${fromOffset} for ${String(forLength)})`;
+        return `substr(${source}, ${fromOffset}, ${String(forLength)})`;
+    }
+    normaliseKnexRawResult(rs) {
+        if (this.dbtype === 'MySQL')
+            return rs[0];
+        return rs;
+    }
+    async getRawTxSlice(txid, offset, length, trx) {
+        const sub = this.dbTypeSubstring('rawTx', offset + 1, length);
+        let rs = await this.toDb(trx).raw(`select ${sub} as rawTx from proven_txs where txid = '${txid}'`);
+        const proven = (0, utilityHelpers_1.verifyOneOrNone)(this.normaliseKnexRawResult(rs));
+        if (proven?.rawTx != null)
+            return Array.from(proven.rawTx);
+        rs = await this.toDb(trx).raw(`select ${sub} as rawTx from proven_tx_reqs where txid = '${txid}' and status in ('unsent', 'nosend', 'sending', 'unmined', 'completed', 'unfail')`);
+        const req = (0, utilityHelpers_1.verifyOneOrNone)(this.normaliseKnexRawResult(rs));
+        return req?.rawTx != null ? Array.from(req.rawTx) : undefined;
     }
     async getRawTxOfKnownValidTransaction(txid, offset, length, trx) {
-        if (!txid)
+        if (txid == null || txid === '')
             return undefined;
         if (!this.isAvailable())
             await this.makeAvailable();
-        let rawTx = undefined;
         if (Number.isInteger(offset) && Number.isInteger(length)) {
-            let rs = await this.toDb(trx).raw(`select ${this.dbTypeSubstring('rawTx', offset + 1, length)} as rawTx from proven_txs where txid = '${txid}'`);
-            if (this.dbtype === 'MySQL')
-                rs = rs[0];
-            const r = (0, utilityHelpers_1.verifyOneOrNone)(rs);
-            if (r && r.rawTx) {
-                rawTx = Array.from(r.rawTx);
-            }
-            else {
-                let rs = await this.toDb(trx).raw(`select ${this.dbTypeSubstring('rawTx', offset + 1, length)} as rawTx from proven_tx_reqs where txid = '${txid}' and status in ('unsent', 'nosend', 'sending', 'unmined', 'completed', 'unfail')`);
-                if (this.dbtype === 'MySQL')
-                    rs = rs[0];
-                const r = (0, utilityHelpers_1.verifyOneOrNone)(rs);
-                if (r && r.rawTx) {
-                    rawTx = Array.from(r.rawTx);
-                }
-            }
-        }
-        else {
-            const r = await this.getProvenOrRawTx(txid, trx);
-            if (r.proven)
-                rawTx = r.proven.rawTx;
-            else
-                rawTx = r.rawTx;
+            return await this.getRawTxSlice(txid, offset, length, trx);
         }
-        return rawTx;
+        const r = await this.getProvenOrRawTx(txid, trx);
+        return r.proven != null ? r.proven.rawTx : r.rawTx;
     }
     getProvenTxsForUserQuery(args) {
         const k = this.toDb(args.trx);
         let q = k('proven_txs').where(function () {
-            this.whereExists(k
+            void this.whereExists(k
                 .select('*')
                 .from('transactions')
                 .whereRaw(`proven_txs.provenTxId = transactions.provenTxId and transactions.userId = ${args.userId}`));
         });
-        if (args.paged) {
+        if (args.paged != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset(args.paged.offset ?? 0);
         }
-        if (args.since)
+        if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         return q;
     }
@@ -103,16 +179,16 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     getProvenTxReqsForUserQuery(args) {
         const k = this.toDb(args.trx);
         let q = k('proven_tx_reqs').where(function () {
-            this.whereExists(k
+            void this.whereExists(k
                 .select('*')
                 .from('transactions')
                 .whereRaw(`proven_tx_reqs.txid = transactions.txid and transactions.userId = ${args.userId}`));
         });
-        if (args.paged) {
+        if (args.paged != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset(args.paged.offset ?? 0);
         }
-        if (args.since)
+        if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         return q;
     }
@@ -127,11 +203,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .select('*')
             .from('tx_labels')
             .whereRaw(`tx_labels.txLabelId = tx_labels_map.txLabelId and tx_labels.userId = ${args.userId}`));
-        if (args.since)
+        if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
-        if (args.paged) {
+        if (args.paged != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset(args.paged.offset ?? 0);
         }
         return q;
     }
@@ -146,11 +222,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .select('*')
             .from('output_tags')
             .whereRaw(`output_tags.outputTagId = output_tags_map.outputTagId and output_tags.userId = ${args.userId}`));
-        if (args.since)
+        if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
-        if (args.paged) {
+        if (args.paged != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset(args.paged.offset ?? 0);
         }
         return q;
     }
@@ -160,12 +236,12 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return this.validateEntities(rs, undefined, ['isDeleted']);
     }
     async listActions(auth, vargs) {
-        if (!auth.userId)
+        if (auth.userId == null)
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         return await (0, listActionsKnex_1.listActions)(this, auth, vargs);
     }
     async listOutputs(auth, vargs) {
-        if (!auth.userId)
+        if (auth.userId == null)
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         return await (0, listOutputsKnex_1.listOutputs)(this, auth, vargs);
     }
@@ -177,6 +253,129 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         tx.provenTxId = id;
         return tx.provenTxId;
     }
+    async insertActionBatch(batch, trx) {
+        const e = await this.validateEntityForInsert(batch, trx, ['expiresAt', 'hardExpiresAt']);
+        if (e.actionBatchId === 0)
+            delete e.actionBatchId;
+        const [id] = await this.toDb(trx)('action_batches').insert(e);
+        batch.actionBatchId = id;
+        return id;
+    }
+    async findActionBatch(userId, batchId, trx) {
+        const row = await this.toDb(trx)('action_batches').where({ userId, batchId }).first();
+        return row == null ? undefined : this.validateEntity(row, ['expiresAt', 'hardExpiresAt']);
+    }
+    async findActionBatchForUpdate(userId, batchId, trx) {
+        const row = await this.toDb(trx)('action_batches')
+            .where({ userId, batchId })
+            .forUpdate()
+            .first();
+        return row == null ? undefined : this.validateEntity(row, ['expiresAt', 'hardExpiresAt']);
+    }
+    async findExpiredActionBatches(now, trx) {
+        const rows = await this.toDb(trx)('action_batches')
+            .whereIn('status', ['active', 'prepared'])
+            .andWhere(builder => {
+            void builder
+                .where('expiresAt', '<=', this.validateDateForWhere(now))
+                .orWhere('hardExpiresAt', '<=', this.validateDateForWhere(now));
+        });
+        return this.validateEntities(rows, ['expiresAt', 'hardExpiresAt']);
+    }
+    async updateActionBatch(actionBatchId, update, trx) {
+        return await this.toDb(trx)('action_batches')
+            .where({ actionBatchId })
+            .update(this.validatePartialForUpdate(update, ['expiresAt', 'hardExpiresAt']));
+    }
+    async deleteActionBatch(actionBatchId, trx) {
+        await this.toDb(trx)('action_batches').where({ actionBatchId }).delete();
+    }
+    async reserveActionBatchOutputs(reservations, trx) {
+        if (reservations.length === 0)
+            return;
+        const rows = await Promise.all(reservations.map(async (r) => await this.validateEntityForInsert(r, trx)));
+        await this.toDb(trx)('action_batch_outputs').insert(rows);
+    }
+    async findActionBatchOutputIds(actionBatchId, trx) {
+        const rows = await this.toDb(trx)('action_batch_outputs')
+            .where({ actionBatchId })
+            .select('outputId');
+        return rows.map(r => r.outputId);
+    }
+    async findReservedActionBatchOutputIds(outputIds, trx) {
+        if (outputIds.length === 0)
+            return [];
+        const now = new Date();
+        const rows = await this.toDb(trx)('action_batch_outputs')
+            .join('action_batches', 'action_batch_outputs.actionBatchId', 'action_batches.actionBatchId')
+            .whereIn('outputId', outputIds)
+            .whereIn('action_batches.status', ['active', 'prepared'])
+            .where('action_batches.expiresAt', '>', now)
+            .where('action_batches.hardExpiresAt', '>', now)
+            .select('action_batch_outputs.outputId');
+        return rows.map(r => r.outputId);
+    }
+    async deleteActionBatchOutputReservations(actionBatchId, trx) {
+        await this.toDb(trx)('action_batch_outputs').where({ actionBatchId }).delete();
+    }
+    async putActionBatchBlobRecord(blob, trx) {
+        const e = await this.validateEntityForInsert(blob, trx);
+        if (e.actionBatchBlobId === 0)
+            delete e.actionBatchBlobId;
+        await this.toDb(trx)('action_batch_blobs')
+            .insert(e)
+            .onConflict(['actionBatchId', 'digest'])
+            .ignore();
+    }
+    async findActionBatchBlobRecord(actionBatchId, digest, trx) {
+        const row = await this.toDb(trx)('action_batch_blobs')
+            .where({ actionBatchId, digest })
+            .first();
+        if (row == null)
+            return undefined;
+        if (Buffer.isBuffer(row.bytes)) {
+            row.bytes = new Uint8Array(row.bytes.buffer, row.bytes.byteOffset, row.bytes.byteLength);
+        }
+        this.deserialiseFromKnex(row);
+        return this.validateEntity(row);
+    }
+    async findActionBatchBlobRecords(actionBatchId, digests, trx) {
+        if (digests.length === 0)
+            return [];
+        const rows = [];
+        const uniqueDigests = [...new Set(digests)];
+        for (let offset = 0; offset < uniqueDigests.length; offset += ACTION_BATCH_BLOB_SQL_CHUNK) {
+            rows.push(...await this.toDb(trx)('action_batch_blobs')
+                .where({ actionBatchId })
+                .whereIn('digest', uniqueDigests.slice(offset, offset + ACTION_BATCH_BLOB_SQL_CHUNK)));
+        }
+        for (const row of rows) {
+            if (Buffer.isBuffer(row.bytes)) {
+                row.bytes = new Uint8Array(row.bytes.buffer, row.bytes.byteOffset, row.bytes.byteLength);
+            }
+            this.deserialiseFromKnex(row);
+        }
+        return this.validateEntities(rows);
+    }
+    async putActionBatchBlobRecords(blobs, trx) {
+        if (blobs.length === 0)
+            return;
+        const rows = await Promise.all(blobs.map(async (blob) => {
+            const row = await this.validateEntityForInsert(blob, trx);
+            if (row.actionBatchBlobId === 0)
+                delete row.actionBatchBlobId;
+            return row;
+        }));
+        for (let offset = 0; offset < rows.length; offset += ACTION_BATCH_BLOB_SQL_CHUNK) {
+            await this.toDb(trx)('action_batch_blobs')
+                .insert(rows.slice(offset, offset + ACTION_BATCH_BLOB_SQL_CHUNK))
+                .onConflict(['actionBatchId', 'digest'])
+                .ignore();
+        }
+    }
+    async deleteActionBatchBlobRecords(actionBatchId, trx) {
+        await this.toDb(trx)('action_batch_blobs').where({ actionBatchId }).delete();
+    }
     async insertProvenTxReq(tx, trx) {
         const e = await this.validateEntityForInsert(tx, trx);
         if (e.provenTxReqId === 0)
@@ -194,7 +393,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return user.userId;
     }
     async insertCertificateAuth(auth, certificate) {
-        if (!auth.userId || (certificate.userId && certificate.userId !== auth.userId))
+        if (auth.userId == null || (certificate.userId != null && certificate.userId !== 0 && certificate.userId !== auth.userId))
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         certificate.userId = auth.userId;
         return await this.insertCertificate(certificate);
@@ -203,15 +402,14 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         const e = await this.validateEntityForInsert(certificate, trx, undefined, ['isDeleted']);
         if (e.certificateId === 0)
             delete e.certificateId;
-        const logger = e.logger;
-        if (e.logger)
+        if (e.logger != null)
             delete e.logger;
         const fields = e.fields;
-        if (e.fields)
+        if (e.fields != null)
             delete e.fields;
         const [id] = await this.toDb(trx)('certificates').insert(e);
         certificate.certificateId = id;
-        if (fields) {
+        if (fields != null) {
             for (const field of fields) {
                 field.certificateId = id;
                 field.userId = certificate.userId;
@@ -249,16 +447,24 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return commission.commissionId;
     }
     async insertOutput(output, trx) {
-        try {
-            const e = await this.validateEntityForInsert(output, trx);
-            if (e.outputId === 0)
-                delete e.outputId;
-            const [id] = await this.toDb(trx)('outputs').insert(e);
-            output.outputId = id;
-            return output.outputId;
-        }
-        catch (e) {
-            throw e;
+        const e = await this.validateEntityForInsert(output, trx);
+        if (e.outputId === 0)
+            delete e.outputId;
+        const [id] = await this.toDb(trx)('outputs').insert(e);
+        output.outputId = id;
+        return output.outputId;
+    }
+    async insertOutputs(outputs, trx) {
+        if (outputs.length === 0)
+            return;
+        const rows = await Promise.all(outputs.map(async (output) => {
+            const row = await this.validateEntityForInsert(output, trx);
+            if (row.outputId === 0)
+                delete row.outputId;
+            return row;
+        }));
+        for (let offset = 0; offset < rows.length; offset += OUTPUT_INSERT_SQL_CHUNK) {
+            await this.toDb(trx)('outputs').insert(rows.slice(offset, offset + OUTPUT_INSERT_SQL_CHUNK));
         }
     }
     async insertOutputTag(tag, trx) {
@@ -271,7 +477,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     async insertOutputTagMap(tagMap, trx) {
         const e = await this.validateEntityForInsert(tagMap, trx, undefined, ['isDeleted']);
-        const [id] = await this.toDb(trx)('output_tags_map').insert(e);
+        await this.toDb(trx)('output_tags_map').insert(e);
     }
     async insertTxLabel(label, trx) {
         const e = await this.validateEntityForInsert(label, trx, undefined, ['isDeleted']);
@@ -283,7 +489,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     async insertTxLabelMap(labelMap, trx) {
         const e = await this.validateEntityForInsert(labelMap, trx, undefined, ['isDeleted']);
-        const [id] = await this.toDb(trx)('tx_labels_map').insert(e);
+        await this.toDb(trx)('tx_labels_map').insert(e);
     }
     async insertMonitorEvent(event, trx) {
         const e = await this.validateEntityForInsert(event, trx);
@@ -379,12 +585,12 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         if (Array.isArray(id)) {
             r = await this.toDb(trx)('transactions')
                 .whereIn('transactionId', id)
-                .update(await this.validatePartialForUpdate(update));
+                .update(this.validatePartialForUpdate(update));
         }
         else if (Number.isInteger(id)) {
             r = await this.toDb(trx)('transactions')
                 .where({ transactionId: id })
-                .update(await this.validatePartialForUpdate(update));
+                .update(this.validatePartialForUpdate(update));
         }
         else {
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('id', 'transactionId or array of transactionId');
@@ -414,12 +620,12 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .update(this.validatePartialForUpdate(update));
     }
     setupQuery(table, args) {
-        let q = this.toDb(args.trx)(table);
-        if (args.partial && Object.keys(args.partial).length > 0)
-            q.where(args.partial);
-        if (args.since)
-            q.where('updated_at', '>=', this.validateDateForWhere(args.since));
-        if (args.orderDescending) {
+        const q = this.toDb(args.trx)(table);
+        if (args.partial != null && Object.keys(args.partial).length > 0)
+            void q.where(args.partial);
+        if (args.since != null)
+            void q.where('updated_at', '>=', this.validateDateForWhere(args.since));
+        if (args.orderDescending === true) {
             let sortColumn = '';
             switch (table) {
                 case 'certificates':
@@ -462,12 +668,12 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                     break;
             }
             if (sortColumn !== '') {
-                q.orderBy(sortColumn, 'desc');
+                void q.orderBy(sortColumn, 'desc');
             }
         }
-        if (args.paged) {
-            q.limit(args.paged.limit);
-            q.offset(args.paged.offset || 0);
+        if (args.paged != null) {
+            void q.limit(args.paged.limit);
+            void q.offset(args.paged.offset ?? 0);
         }
         return q;
     }
@@ -476,97 +682,111 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     findCertificatesQuery(args) {
         const q = this.setupQuery('certificates', args);
-        if (args.certifiers && args.certifiers.length > 0)
-            q.whereIn('certifier', args.certifiers);
-        if (args.types && args.types.length > 0)
-            q.whereIn('type', args.types);
+        if ((args.certifiers != null) && args.certifiers.length > 0)
+            void q.whereIn('certifier', args.certifiers);
+        if ((args.types != null) && args.types.length > 0)
+            void q.whereIn('type', args.types);
         return q;
     }
     findCommissionsQuery(args) {
-        if (args.partial.lockingScript)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('partial.lockingScript', `undefined. Commissions may not be found by lockingScript value.`);
+        if (args.partial.lockingScript != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('partial.lockingScript', 'undefined. Commissions may not be found by lockingScript value.');
+        }
         return this.setupQuery('commissions', args);
     }
     findOutputBasketsQuery(args) {
         return this.setupQuery('output_baskets', args);
     }
     findOutputsQuery(args, count) {
-        if (args.partial.lockingScript)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.lockingScript', `undefined. Outputs may not be found by lockingScript value.`);
+        if (args.partial.lockingScript != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.lockingScript', 'undefined. Outputs may not be found by lockingScript value.');
+        }
         const q = this.setupQuery('outputs', args);
-        if (args.txStatus && args.txStatus.length > 0) {
-            q.whereRaw(`(select status from transactions where transactions.transactionId = outputs.transactionId) in (${args.txStatus.map(s => `'${s}'`).join(',')})`);
+        if ((args.txStatus != null) && args.txStatus.length > 0) {
+            void q.whereRaw(`(select status from transactions where transactions.transactionId = outputs.transactionId) in (${args.txStatus.map(s => "'" + s + "'").join(',')})`);
         }
-        if (args.noScript && !count) {
+        if ((args.noScript === true) && count !== true) {
             const columns = tables_1.outputColumnsWithoutLockingScript.map(c => `outputs.${c}`);
-            q.select(columns);
+            void q.select(columns);
         }
         return q;
     }
     findOutputTagMapsQuery(args) {
         const q = this.setupQuery('output_tags_map', args);
-        if (args.tagIds && args.tagIds.length > 0)
-            q.whereIn('outputTagId', args.tagIds);
+        if ((args.tagIds != null) && args.tagIds.length > 0)
+            void q.whereIn('outputTagId', args.tagIds);
         return q;
     }
     findOutputTagsQuery(args) {
         return this.setupQuery('output_tags', args);
     }
     findProvenTxReqsQuery(args) {
-        if (args.partial.rawTx)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.rawTx', `undefined. ProvenTxReqs may not be found by rawTx value.`);
-        if (args.partial.inputBEEF)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.inputBEEF', `undefined. ProvenTxReqs may not be found by inputBEEF value.`);
+        if (args.partial.rawTx != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.rawTx', 'undefined. ProvenTxReqs may not be found by rawTx value.');
+        }
+        if (args.partial.inputBEEF != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.inputBEEF', 'undefined. ProvenTxReqs may not be found by inputBEEF value.');
+        }
         const q = this.setupQuery('proven_tx_reqs', args);
-        if (args.status && args.status.length > 0)
-            q.whereIn('status', args.status);
-        if (args.txids) {
+        if ((args.status != null) && args.status.length > 0)
+            void q.whereIn('status', args.status);
+        if (args.txids != null) {
             const txids = args.txids.filter(txid => txid !== undefined);
             if (txids.length > 0)
-                q.whereIn('txid', txids);
+                void q.whereIn('txid', txids);
         }
         return q;
     }
     findProvenTxsQuery(args) {
-        if (args.partial.rawTx)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.rawTx', `undefined. ProvenTxs may not be found by rawTx value.`);
-        if (args.partial.merklePath)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.merklePath', `undefined. ProvenTxs may not be found by merklePath value.`);
-        return this.setupQuery('proven_txs', args);
+        if (args.partial.rawTx != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.rawTx', 'undefined. ProvenTxs may not be found by rawTx value.');
+        }
+        if (args.partial.merklePath != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.merklePath', 'undefined. ProvenTxs may not be found by merklePath value.');
+        }
+        const q = this.setupQuery('proven_txs', args);
+        if (args.txids != null) {
+            const txids = [...new Set(args.txids.filter(txid => txid !== undefined))];
+            if (txids.length > 0)
+                void q.whereIn('txid', txids);
+        }
+        return q;
     }
     findStaleMerkleRootsQuery(args) {
-        let q = this.toDb(args.trx)('proven_txs');
-        q.where('height', '=', args.height);
-        q.where('merkleRoot', '!=', args.merkleRoot);
-        q.select('merkleRoot');
-        q.distinct('merkleRoot');
+        const q = this.toDb(args.trx)('proven_txs');
+        void q.where('height', '=', args.height);
+        void q.where('merkleRoot', '!=', args.merkleRoot);
+        void q.select('merkleRoot');
+        void q.distinct('merkleRoot');
         return q;
     }
     findSyncStatesQuery(args) {
         return this.setupQuery('sync_states', args);
     }
     findTransactionsQuery(args, count) {
-        if (args.partial.rawTx)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.rawTx', `undefined. Transactions may not be found by rawTx value.`);
-        if (args.partial.inputBEEF)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.inputBEEF', `undefined. Transactions may not be found by inputBEEF value.`);
+        if (args.partial.rawTx != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.rawTx', 'undefined. Transactions may not be found by rawTx value.');
+        }
+        if (args.partial.inputBEEF != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.inputBEEF', 'undefined. Transactions may not be found by inputBEEF value.');
+        }
         const q = this.setupQuery('transactions', args);
-        if (args.status && args.status.length > 0)
-            q.whereIn('status', args.status);
-        if (args.from)
-            q.where('created_at', '>=', this.validateDateForWhere(args.from));
-        if (args.to)
-            q.where('created_at', '<', this.validateDateForWhere(args.to));
-        if (args.noRawTx && !count) {
+        if ((args.status != null) && args.status.length > 0)
+            void q.whereIn('status', args.status);
+        if (args.from != null)
+            void q.where('created_at', '>=', this.validateDateForWhere(args.from));
+        if (args.to != null)
+            void q.where('created_at', '<', this.validateDateForWhere(args.to));
+        if ((args.noRawTx === true) && count !== true) {
             const columns = tables_1.transactionColumnsWithoutRawTx.map(c => `transactions.${c}`);
-            q.select(columns);
+            void q.select(columns);
         }
         return q;
     }
     findTxLabelMapsQuery(args) {
         const q = this.setupQuery('tx_labels_map', args);
-        if (args.labelIds && args.labelIds.length > 0)
-            q.whereIn('txLabelId', args.labelIds);
+        if ((args.labelIds != null) && args.labelIds.length > 0)
+            void q.whereIn('txLabelId', args.labelIds);
         return q;
     }
     findTxLabelsQuery(args) {
@@ -579,19 +799,19 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return this.setupQuery('monitor_events', args);
     }
     async findCertificatesAuth(auth, args) {
-        if (!auth.userId || (args.partial.userId && args.partial.userId !== auth.userId))
+        if (auth.userId == null || (args.partial.userId != null && args.partial.userId !== 0 && args.partial.userId !== auth.userId))
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         args.partial.userId = auth.userId;
         return await this.findCertificates(args);
     }
     async findOutputBasketsAuth(auth, args) {
-        if (!auth.userId || (args.partial.userId && args.partial.userId !== auth.userId))
+        if (auth.userId == null || (args.partial.userId != null && args.partial.userId !== 0 && args.partial.userId !== auth.userId))
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         args.partial.userId = auth.userId;
         return await this.findOutputBaskets(args);
     }
     async findOutputsAuth(auth, args) {
-        if (!auth.userId || (args.partial.userId && args.partial.userId !== auth.userId))
+        if (auth.userId == null || (args.partial.userId != null && args.partial.userId !== 0 && args.partial.userId !== auth.userId))
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         args.partial.userId = auth.userId;
         return await this.findOutputs(args);
@@ -603,7 +823,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         const q = this.findCertificatesQuery(args);
         let r = await q;
         r = this.validateEntities(r, undefined, ['isDeleted']);
-        if (args.includeFields) {
+        if (args.includeFields === true) {
             for (const c of r) {
                 c.fields = this.validateEntities(await this.findCertificateFields({
                     partial: { certificateId: c.certificateId, userId: c.userId },
@@ -626,7 +846,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     async findOutputs(args) {
         const q = this.findOutputsQuery(args);
         const r = await q;
-        if (!args.noScript) {
+        if (args.noScript !== true) {
             for (const o of r) {
                 await this.validateOutputScript(o, args.trx);
             }
@@ -646,7 +866,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     async findProvenTxReqs(args) {
         const q = this.findProvenTxReqsQuery(args);
         const r = await q;
-        return this.validateEntities(r, undefined, ['notified']);
+        return this.validateEntities(r, undefined, ['notified', 'wasBroadcast']);
     }
     async findProvenTxs(args) {
         const q = this.findProvenTxsQuery(args);
@@ -666,7 +886,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     async findTransactions(args) {
         const q = this.findTransactionsQuery(args);
         const r = await q;
-        if (!args.noRawTx) {
+        if (args.noRawTx !== true) {
             for (const t of r) {
                 await this.validateRawTransaction(t, args.trx);
             }
@@ -705,10 +925,10 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     async findMonitorEvents(args) {
         const q = this.findMonitorEventsQuery(args);
         const r = await q;
-        return this.validateEntities(r, ['when'], undefined);
+        return this.validateEntities(r, ['when']);
     }
     async getCount(q) {
-        q.count();
+        void q.count();
         const r = await q;
         return r[0]['count(*)'];
     }
@@ -758,13 +978,17 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return await this.getCount(this.findMonitorEventsQuery(args));
     }
     async destroy() {
-        var _a;
-        await ((_a = this.knex) === null || _a === void 0 ? void 0 : _a.destroy());
+        this.knex.off('query', this.onQuery);
+        this.knex.off('query-response', this.onQueryResponse);
+        this.knex.off('query-error', this.onQueryError);
+        for (const span of this.querySpans.values())
+            span.end({ status: 'cancelled' });
+        this.querySpans.clear();
+        await this.knex?.destroy();
     }
     async migrate(storageName, storageIdentityKey) {
-        var _a;
         // Check if this is a SQLite database by looking at the Knex client config
-        const clientName = ((_a = this.knex.client.config) === null || _a === void 0 ? void 0 : _a.client) || '';
+        const clientName = this.knex.client.config?.client ?? '';
         const isSQLite = clientName.includes('sqlite');
         // For SQLite, disable transactions during migrations and turn off foreign keys.
         // PRAGMA foreign_keys is silently ignored inside transactions, so we must
@@ -786,11 +1010,10 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return version;
     }
     async dropAllData() {
-        var _a;
         // Only using migrations to migrate down, don't need valid properties for settings table.
         const migrationSource = new KnexMigrations_1.KnexMigrations('test', '', '', 1024);
         // Check if this is a SQLite database by looking at the Knex client config
-        const clientName = ((_a = this.knex.client.config) === null || _a === void 0 ? void 0 : _a.client) || '';
+        const clientName = this.knex.client.config?.client ?? '';
         const isSQLite = clientName.includes('sqlite');
         // For SQLite, disable transactions during migrations and turn off foreign keys.
         // PRAGMA foreign_keys is silently ignored inside transactions, so we must
@@ -809,12 +1032,15 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         for (let i = 0; i < count; i++) {
             try {
                 const r = await this.knex.migrate.down(config);
-                if (!r) {
-                    console.error(`Migration returned falsy result await this.knex.migrate.down(config)`);
+                if (r == null) {
+                    console.error('Migration returned falsy result await this.knex.migrate.down(config)');
                     break;
                 }
             }
-            catch (eu) {
+            catch (migrationError) {
+                // migrate.down throws when there are no more migrations to roll back — this is
+                // the expected terminal condition, so we stop iterating rather than propagating.
+                console.debug('migrate.down stopped (no more migrations or error):', migrationError);
                 break;
             }
         }
@@ -824,7 +1050,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         }
     }
     async transaction(scope, trx) {
-        if (trx)
+        if (trx != null)
             return await scope(trx);
         return await this.knex.transaction(async (knextrx) => {
             const trx = knextrx;
@@ -835,22 +1061,24 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
      * Convert the standard optional `TrxToken` parameter into either a direct knex database instance,
      * or a Knex.Transaction as appropriate.
      */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     toDb(trx) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const db = !trx ? this.knex : trx;
+        const db = (trx == null) ? this.knex : trx;
         this.whenLastAccess = new Date();
         return db;
     }
     async validateRawTransaction(t, trx) {
         // if there is no txid or there is a rawTransaction return what we have.
-        if (t.rawTx || !t.txid)
+        if (t.rawTx != null || t.txid == null || t.txid === '')
             return;
         // rawTransaction is missing, see if we moved it ...
         const rawTx = await this.getRawTxOfKnownValidTransaction(t.txid, undefined, undefined, trx);
-        if (!rawTx)
+        if (rawTx == null)
             return;
         t.rawTx = rawTx;
     }
+    _verifiedReadyForDatabaseAccess = false;
     /**
      * Make sure database is ready for access:
      *
@@ -860,9 +1088,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
      * @param trx
      */
     async verifyReadyForDatabaseAccess(trx) {
-        if (!this._settings) {
-            this._settings = await this.readSettings();
-        }
+        this._settings ??= await this.readSettings();
         // Always run the PRAGMA for SQLite to ensure foreign key constraints are enabled.
         // This is necessary because PRAGMA foreign_keys is a per-connection setting,
         // and connection pools may create new connections that don't have it set.
@@ -873,43 +1099,61 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         this._verifiedReadyForDatabaseAccess = true;
         return this._settings.dbtype;
     }
+    /** Convert every byte-array value to a Buffer and every undefined to null on an arbitrary object. */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    serialiseForKnex(v) {
+        for (const key of Object.keys(v)) {
+            const val = v[key];
+            if (Array.isArray(val) && (val.length === 0 || typeof val[0] === 'number')) {
+                v[key] = Buffer.from(val);
+            }
+            else if (val instanceof Uint8Array) {
+                v[key] = Buffer.from(val.buffer, val.byteOffset, val.byteLength);
+            }
+            else if (val === undefined) {
+                v[key] = null;
+            }
+        }
+    }
+    /** Apply optional date-field coercion list in-place. */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    coerceDateFields(v, dateFields) {
+        if (dateFields == null)
+            return;
+        for (const df of dateFields) {
+            if (v[df] != null)
+                v[df] = this.validateOptionalEntityDate(v[df]);
+        }
+    }
+    /** Apply optional boolean-field coercion list in-place. */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    coerceBooleanFields(v, booleanFields) {
+        if (booleanFields == null)
+            return;
+        for (const df of booleanFields) {
+            if (v[df] !== undefined)
+                v[df] = v[df] != null && v[df] !== false ? 1 : 0;
+        }
+    }
     /**
      * Helper to force uniform behavior across database engines.
      * Use to process the update template for entities being updated.
      */
     validatePartialForUpdate(update, dateFields, booleanFields) {
-        if (!this.dbtype)
+        if (this.dbtype == null)
             throw new WERR_errors_1.WERR_INTERNAL('must call verifyReadyForDatabaseAccess first');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const v = update;
-        if (v.created_at)
+        if (v.created_at != null)
             v.created_at = this.validateEntityDate(v.created_at);
-        if (v.updated_at)
+        if (v.updated_at != null)
             v.updated_at = this.validateEntityDate(v.updated_at);
-        if (!v.created_at)
+        if (v.created_at == null)
             delete v.created_at;
-        if (!v.updated_at)
-            v.updated_at = this.validateEntityDate(new Date());
-        if (dateFields) {
-            for (const df of dateFields) {
-                if (v[df])
-                    v[df] = this.validateOptionalEntityDate(v[df]);
-            }
-        }
-        if (booleanFields) {
-            for (const df of booleanFields) {
-                if (update[df] !== undefined)
-                    update[df] = !!update[df] ? 1 : 0;
-            }
-        }
-        for (const key of Object.keys(v)) {
-            const val = v[key];
-            if (Array.isArray(val) && (val.length === 0 || typeof val[0] === 'number')) {
-                v[key] = Buffer.from(val);
-            }
-            else if (val === undefined) {
-                v[key] = null;
-            }
-        }
+        v.updated_at ??= this.validateEntityDate(new Date());
+        this.coerceDateFields(v, dateFields);
+        this.coerceBooleanFields(update, booleanFields);
+        this.serialiseForKnex(v);
         this.isDirty = true;
         return v;
     }
@@ -917,36 +1161,21 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
      * Helper to force uniform behavior across database engines.
      * Use to process new entities being inserted into the database.
      */
-    async validateEntityForInsert(entity, trx, dateFields, booleanFields) {
+    async validateEntityForInsert(entity, trx, dateFields, booleanFields
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
         await this.verifyReadyForDatabaseAccess(trx);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const v = { ...entity };
-        v.created_at = this.validateOptionalEntityDate(v.created_at, true);
-        v.updated_at = this.validateOptionalEntityDate(v.updated_at, true);
-        if (!v.created_at)
+        v.created_at = this.validateOptionalEntityDate(v.created_at, true) ?? new Date();
+        v.updated_at = this.validateOptionalEntityDate(v.updated_at, true) ?? new Date();
+        if (v.created_at == null)
             delete v.created_at;
-        if (!v.updated_at)
+        if (v.updated_at == null)
             delete v.updated_at;
-        if (dateFields) {
-            for (const df of dateFields) {
-                if (v[df])
-                    v[df] = this.validateOptionalEntityDate(v[df]);
-            }
-        }
-        if (booleanFields) {
-            for (const df of booleanFields) {
-                if (entity[df] !== undefined)
-                    entity[df] = !!entity[df] ? 1 : 0;
-            }
-        }
-        for (const key of Object.keys(v)) {
-            const val = v[key];
-            if (Array.isArray(val) && (val.length === 0 || typeof val[0] === 'number')) {
-                v[key] = Buffer.from(val);
-            }
-            else if (val === undefined) {
-                v[key] = null;
-            }
-        }
+        this.coerceDateFields(v, dateFields);
+        this.coerceBooleanFields(entity, booleanFields);
+        this.serialiseForKnex(v);
         this.isDirty = true;
         return v;
     }
@@ -975,7 +1204,8 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return await (0, reviewStatus_1.reviewStatus)(this, args);
     }
     /**
-     * Counts the outputs for userId in basketId that are spendable: true
+     * Counts wallet-managed BRC-29 change outputs for userId in basketId that
+     * are currently eligible for automatic allocation
      * AND whose transaction status is one of:
      * - completed
      * - unproven
@@ -985,13 +1215,103 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         const status = ['completed', 'unproven'];
         if (!excludeSending)
             status.push('sending');
+        const now = new Date();
         const q = this.knex('outputs as o')
             .join('transactions as t', 'o.transactionId', 't.transactionId')
-            .where({ 'o.userId': userId, 'o.spendable': true, 'o.basketId': basketId })
+            .where({
+            'o.userId': userId,
+            'o.spendable': true,
+            'o.basketId': basketId,
+            'o.type': managedChange_1.managedChangeOutputFields.type,
+            'o.change': managedChange_1.managedChangeOutputFields.change,
+            'o.providedBy': managedChange_1.managedChangeOutputFields.providedBy,
+            'o.purpose': managedChange_1.managedChangeOutputFields.purpose
+        })
+            .whereNull('o.spentBy')
+            .whereNotNull('o.derivationPrefix')
+            .whereNot('o.derivationPrefix', '')
+            .whereNotNull('o.derivationSuffix')
+            .whereNot('o.derivationSuffix', '')
+            .whereNotExists(function () {
+            void this.select(1)
+                .from('action_batch_outputs as abo')
+                .join('action_batches as ab', 'abo.actionBatchId', 'ab.actionBatchId')
+                .whereRaw('abo.outputId = o.outputId')
+                .whereIn('ab.status', ['active', 'prepared'])
+                .where('ab.expiresAt', '>', now)
+                .where('ab.hardExpiresAt', '>', now);
+        })
             .whereIn('t.status', status);
         const count = await this.getCount(q);
         return count;
     }
+    async findAvailableManagedChangeInputs(userId, basketId, excludeSending, trx) {
+        const statuses = ['completed', 'unproven'];
+        if (!excludeSending)
+            statuses.push('sending');
+        const now = new Date();
+        const rows = await this.toDb(trx)('outputs as o')
+            .join('transactions as t', 'o.transactionId', 't.transactionId')
+            .where({
+            'o.userId': userId,
+            'o.basketId': basketId,
+            'o.spendable': true,
+            'o.type': managedChange_1.managedChangeOutputFields.type,
+            'o.change': managedChange_1.managedChangeOutputFields.change,
+            'o.providedBy': managedChange_1.managedChangeOutputFields.providedBy,
+            'o.purpose': managedChange_1.managedChangeOutputFields.purpose
+        })
+            .whereNull('o.spentBy')
+            .whereNotNull('o.derivationPrefix')
+            .whereNot('o.derivationPrefix', '')
+            .whereNotNull('o.derivationSuffix')
+            .whereNot('o.derivationSuffix', '')
+            .whereNotExists(function () {
+            void this.select(1)
+                .from('action_batch_outputs as abo')
+                .join('action_batches as ab', 'abo.actionBatchId', 'ab.actionBatchId')
+                .whereRaw('abo.outputId = o.outputId')
+                .whereIn('ab.status', ['active', 'prepared'])
+                .where('ab.expiresAt', '>', now)
+                .where('ab.hardExpiresAt', '>', now);
+        })
+            .whereIn('t.status', statuses)
+            .select(tables_1.outputColumnsWithoutLockingScript.map(column => `o.${column}`));
+        return this.validateEntities(rows, undefined, ['spendable', 'change']);
+    }
+    async findAvailableManagedChangeInputCandidates(userId, basketId, excludeSending, trx) {
+        const statuses = ['completed', 'unproven'];
+        if (!excludeSending)
+            statuses.push('sending');
+        const now = new Date();
+        return await this.toDb(trx)('outputs as o')
+            .join('transactions as t', 'o.transactionId', 't.transactionId')
+            .where({
+            'o.userId': userId,
+            'o.basketId': basketId,
+            'o.spendable': true,
+            'o.type': managedChange_1.managedChangeOutputFields.type,
+            'o.change': managedChange_1.managedChangeOutputFields.change,
+            'o.providedBy': managedChange_1.managedChangeOutputFields.providedBy,
+            'o.purpose': managedChange_1.managedChangeOutputFields.purpose
+        })
+            .whereNull('o.spentBy')
+            .whereNotNull('o.derivationPrefix')
+            .whereNot('o.derivationPrefix', '')
+            .whereNotNull('o.derivationSuffix')
+            .whereNot('o.derivationSuffix', '')
+            .whereNotExists(function () {
+            void this.select(1)
+                .from('action_batch_outputs as abo')
+                .join('action_batches as ab', 'abo.actionBatchId', 'ab.actionBatchId')
+                .whereRaw('abo.outputId = o.outputId')
+                .whereIn('ab.status', ['active', 'prepared'])
+                .where('ab.expiresAt', '>', now)
+                .where('ab.hardExpiresAt', '>', now);
+        })
+            .whereIn('t.status', statuses)
+            .select('o.outputId', 'o.transactionId', 'o.satoshis', 'o.txid', 'o.vout');
+    }
     async findOutputsByIds(outputIds, trx) {
         const byId = {};
         if (outputIds.length < 1)
@@ -1020,14 +1340,79 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .whereIn('vout', vouts)
             .select('*');
         // Only return requested outpoints, vouts of one txid may end up matching another txid that was not requested.
-        const filteredRows = rows.filter(r => outpointSet.has(`${r.txid}.${r.vout}`));
+        const filteredRows = rows.filter(r => outpointSet.has(`${String(r.txid)}.${String(r.vout)}`));
         const vrows = this.validateEntities(filteredRows, undefined, ['spendable', 'change']);
         for (const row of vrows) {
             await this.validateOutputScript(row, trx);
-            byOutpoint[`${row.txid}.${row.vout}`] = row;
+            byOutpoint[`${String(row.txid)}.${String(row.vout)}`] = row;
+        }
+        return byOutpoint;
+    }
+    async findOutputsByOutpointsForUpdate(userId, outpoints, trx, noScript = false) {
+        const byOutpoint = {};
+        if (outpoints.length < 1)
+            return byOutpoint;
+        const outpointSet = new Set(outpoints.map(o => `${o.txid}.${o.vout}`));
+        const rows = await this.toDb(trx)('outputs')
+            .where('userId', userId)
+            .whereIn('txid', [...new Set(outpoints.map(o => o.txid))])
+            .whereIn('vout', [...new Set(outpoints.map(o => o.vout))])
+            .select('*')
+            .forUpdate();
+        const filteredRows = rows.filter(r => outpointSet.has(`${String(r.txid)}.${String(r.vout)}`));
+        for (const row of this.validateEntities(filteredRows, undefined, ['spendable', 'change'])) {
+            if (!noScript)
+                await this.validateOutputScript(row, trx);
+            byOutpoint[`${String(row.txid)}.${String(row.vout)}`] = row;
         }
         return byOutpoint;
     }
+    async findTransactionStatusesByIds(userId, transactionIds, trx) {
+        const statuses = new Map();
+        if (transactionIds.length === 0)
+            return statuses;
+        const rows = await this.toDb(trx)('transactions')
+            .where('userId', userId)
+            .whereIn('transactionId', [...new Set(transactionIds)])
+            .select('transactionId', 'status');
+        for (const row of rows)
+            statuses.set(row.transactionId, row.status);
+        return statuses;
+    }
+    async findFundingOutputsForUpdate(userId, outputIds, statuses, trx) {
+        const byId = {};
+        if (outputIds.length === 0)
+            return byId;
+        const uniqueOutputIds = [...new Set(outputIds)].sort((a, b) => a - b);
+        // Lock source outputs through their primary key first. A single joined
+        // SELECT ... FOR UPDATE caused PXC to lock one joined row at a time and
+        // turned a 150-input claim into a ~220 ms statement. Transaction status
+        // and action-batch reservations are then checked under the same database
+        // transaction; action-batch reservation follows the same output-first lock
+        // order, so a concurrent reserver cannot pass after this claim commits.
+        const rows = await this.toDb(trx)('outputs as o')
+            .where('o.userId', userId)
+            .whereIn('o.outputId', uniqueOutputIds)
+            .select('o.*')
+            .forUpdate();
+        const transactionIds = [...new Set(rows.map(output => output.transactionId))].sort((a, b) => a - b);
+        const validTransactions = transactionIds.length === 0
+            ? []
+            : await this.toDb(trx)('transactions')
+                .where('userId', userId)
+                .whereIn('transactionId', transactionIds)
+                .whereIn('status', statuses)
+                .select('transactionId')
+                .forShare();
+        const validTransactionIds = new Set(validTransactions.map(transaction => transaction.transactionId));
+        const reservedOutputIds = new Set(await this.findReservedActionBatchOutputIds(uniqueOutputIds, trx));
+        for (const output of this.validateEntities(rows, undefined, ['spendable', 'change'])) {
+            if (!validTransactionIds.has(output.transactionId) || reservedOutputIds.has(output.outputId))
+                continue;
+            byId[output.outputId] = output;
+        }
+        return byId;
+    }
     async findOrInsertOutputBasketsBulk(userId, names, trx) {
         const byName = {};
         if (names.length < 1)
@@ -1043,8 +1428,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             byName[basket.name] = basket;
         }
         for (const name of uniqueNames) {
-            if (!byName[name])
-                byName[name] = await this.findOrInsertOutputBasket(userId, name, trx);
+            byName[name] ??= await this.findOrInsertOutputBasket(userId, name, trx);
         }
         return byName;
     }
@@ -1063,11 +1447,29 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             byTag[outputTag.tag] = outputTag;
         }
         for (const tag of uniqueTags) {
-            if (!byTag[tag])
-                byTag[tag] = await this.findOrInsertOutputTag(userId, tag, trx);
+            byTag[tag] ??= await this.findOrInsertOutputTag(userId, tag, trx);
         }
         return byTag;
     }
+    async findOrInsertTxLabelsBulk(userId, labels, trx) {
+        const byLabel = {};
+        if (labels.length < 1)
+            return byLabel;
+        const uniqueLabels = [...new Set(labels)];
+        const existing = await this.toDb(trx)('tx_labels')
+            .where('userId', userId)
+            .whereIn('label', uniqueLabels)
+            .select('*');
+        for (const label of existing) {
+            if (label.isDeleted)
+                await this.updateTxLabel((0, utilityHelpers_1.verifyId)(label.txLabelId), { isDeleted: false }, trx);
+            byLabel[label.label] = label;
+        }
+        for (const label of uniqueLabels) {
+            byLabel[label] ??= await this.findOrInsertTxLabel(userId, label, trx);
+        }
+        return byLabel;
+    }
     async sumSpendableSatoshisInBasket(userId, basketId, excludeSending, trx) {
         const status = ['completed', 'unproven'];
         if (!excludeSending)
@@ -1075,10 +1477,12 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         const row = await this.toDb(trx)('outputs as o')
             .join('transactions as t', 'o.transactionId', 't.transactionId')
             .where({ 'o.userId': userId, 'o.spendable': true, 'o.basketId': basketId })
+            .whereNull('o.spentBy')
             .whereIn('t.status', status)
             .sum({ totalSatoshis: 'o.satoshis' })
             .first();
-        return Number((row && row['totalSatoshis']) || 0);
+        const total = (row != null) ? row.totalSatoshis : undefined;
+        return Number(total ?? 0);
     }
     /**
      *  Finds closest matching available change output to use as input for new transaction.
@@ -1095,27 +1499,40 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                 .where('o.userId', userId)
                 .where('o.spendable', true)
                 .where('o.basketId', basketId)
+                .where({
+                'o.type': managedChange_1.managedChangeOutputFields.type,
+                'o.change': managedChange_1.managedChangeOutputFields.change,
+                'o.providedBy': managedChange_1.managedChangeOutputFields.providedBy,
+                'o.purpose': managedChange_1.managedChangeOutputFields.purpose
+            })
+                .whereNotNull('o.derivationPrefix')
+                .whereNot('o.derivationPrefix', '')
+                .whereNotNull('o.derivationSuffix')
+                .whereNot('o.derivationSuffix', '')
+                .whereNull('o.spentBy')
+                .whereNotExists(function () {
+                void this.select(1)
+                    .from('action_batch_outputs as abo')
+                    .whereRaw('abo.outputId = o.outputId');
+            })
                 .whereIn('t.status', status)
-                .select('o.*');
+                .select('o.*')
+                .forUpdate();
             let output;
             if (exactSatoshis !== undefined) {
                 output = await baseQuery().where('o.satoshis', exactSatoshis).orderBy('o.outputId', 'asc').first();
             }
-            if (!output) {
-                output = await baseQuery()
-                    .where('o.satoshis', '>=', targetSatoshis)
-                    .orderBy('o.satoshis', 'asc')
-                    .orderBy('o.outputId', 'asc')
-                    .first();
-            }
-            if (!output) {
-                output = await baseQuery()
-                    .where('o.satoshis', '<', targetSatoshis)
-                    .orderBy('o.satoshis', 'desc')
-                    .orderBy('o.outputId', 'desc')
-                    .first();
-            }
-            if (!output)
+            output ??= await baseQuery()
+                .where('o.satoshis', '>=', targetSatoshis)
+                .orderBy('o.satoshis', 'asc')
+                .orderBy('o.outputId', 'asc')
+                .first();
+            output ??= await baseQuery()
+                .where('o.satoshis', '<', targetSatoshis)
+                .orderBy('o.satoshis', 'desc')
+                .orderBy('o.outputId', 'desc')
+                .first();
+            if (output == null)
                 return undefined;
             await this.updateOutput(output.outputId, {
                 spendable: false,
@@ -1130,6 +1547,32 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         });
         return r;
     }
+    async markChangeInputsSpent(outputIds, transactionId, trx) {
+        if (outputIds.length === 0)
+            return 0;
+        return await this.toDb(trx)('outputs')
+            .whereIn('outputId', outputIds)
+            .where('spendable', true)
+            .whereNull('spentBy')
+            .update({ spendable: false, spentBy: transactionId });
+    }
+    /** Convert null→undefined and Buffer→number[] on a retrieved entity in-place. */
+    deserialiseFromKnex(entity) {
+        for (const key of Object.keys(entity)) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const val = entity[key];
+            if (val === null) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                ;
+                entity[key] = undefined;
+            }
+            else if (Buffer.isBuffer(val)) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                ;
+                entity[key] = Array.from(val);
+            }
+        }
+    }
     /**
      * Helper to force uniform behavior across database engines.
      * Use to process all individual records with time stamps retreived from database.
@@ -1137,27 +1580,21 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     validateEntity(entity, dateFields, booleanFields) {
         entity.created_at = this.validateDate(entity.created_at);
         entity.updated_at = this.validateDate(entity.updated_at);
-        if (dateFields) {
+        if (dateFields != null) {
             for (const df of dateFields) {
-                if (entity[df])
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if (entity[df] != null)
                     entity[df] = this.validateDate(entity[df]);
             }
         }
-        if (booleanFields) {
+        if (booleanFields != null) {
             for (const df of booleanFields) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (entity[df] !== undefined)
-                    entity[df] = !!entity[df];
-            }
-        }
-        for (const key of Object.keys(entity)) {
-            const val = entity[key];
-            if (val === null) {
-                entity[key] = undefined;
-            }
-            else if (Buffer.isBuffer(val)) {
-                entity[key] = Array.from(val);
+                    entity[df] = entity[df] !== 0 && entity[df] != null && entity[df] !== false;
             }
         }
+        this.deserialiseFromKnex(entity);
         return entity;
     }
     /**
@@ -1179,81 +1616,81 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             orderDescending: true,
             paged: { limit: 1 }
         }));
-        const monitorStats = monitorEvent ? JSON.parse(monitorEvent.details) : undefined;
+        const monitorStats = (monitorEvent != null) ? JSON.parse(monitorEvent.details) : undefined;
         const servicesStats = this.getServices().getServicesCallHistory(true);
-        const one_day_ago = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
-        const one_week_ago = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
-        const one_month_ago = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000).toISOString();
+        const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
+        const oneWeekAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
+        const oneMonthAgo = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000).toISOString();
         const [[{ usersDay, usersMonth, usersWeek, usersTotal, transactionsDay, transactionsMonth, transactionsWeek, transactionsTotal, txCompletedDay, txCompletedMonth, txCompletedWeek, txCompletedTotal, txFailedDay, txFailedMonth, txFailedWeek, txFailedTotal, txAbandonedDay, txAbandonedMonth, txAbandonedWeek, txAbandonedTotal, txUnprocessedDay, txUnprocessedMonth, txUnprocessedWeek, txUnprocessedTotal, txSendingDay, txSendingMonth, txSendingWeek, txSendingTotal, txUnprovenDay, txUnprovenMonth, txUnprovenWeek, txUnprovenTotal, txUnsignedDay, txUnsignedMonth, txUnsignedWeek, txUnsignedTotal, txNosendDay, txNosendMonth, txNosendWeek, txNosendTotal, txNonfinalDay, txNonfinalMonth, txNonfinalWeek, txNonfinalTotal, txUnfailDay, txUnfailMonth, txUnfailWeek, txUnfailTotal, satoshisDefaultDay, satoshisDefaultMonth, satoshisDefaultWeek, satoshisDefaultTotal, satoshisOtherDay, satoshisOtherMonth, satoshisOtherWeek, satoshisOtherTotal, basketsDay, basketsMonth, basketsWeek, basketsTotal, labelsDay, labelsMonth, labelsWeek, labelsTotal, tagsDay, tagsMonth, tagsWeek, tagsTotal }]] = await this.knex.raw(`
 select
-    (select count(*) from users where created_at > '${one_day_ago}') as usersDay,
-    (select count(*) from users where created_at > '${one_week_ago}') as usersWeek,
-    (select count(*) from users where created_at > '${one_month_ago}') as usersMonth,
-	  (select count(*) from users) as usersTotal,
-    (select count(*) from transactions where created_at > '${one_day_ago}') as transactionsDay,
-    (select count(*) from transactions where created_at > '${one_week_ago}') as transactionsWeek,
-    (select count(*) from transactions where created_at > '${one_month_ago}') as transactionsMonth,
-	  (select count(*) from transactions) as transactionsTotal,
-    (select count(*) from transactions where status = 'completed' and created_at > '${one_day_ago}') as txCompletedDay,
-    (select count(*) from transactions where status = 'completed' and created_at > '${one_week_ago}') as txCompletedWeek,
-    (select count(*) from transactions where status = 'completed' and created_at > '${one_month_ago}') as txCompletedMonth,
-	  (select count(*) from transactions where status = 'completed') as txCompletedTotal,
-    (select count(*) from transactions where status = 'failed' and not txid is null and created_at > '${one_day_ago}') as txFailedDay,
-    (select count(*) from transactions where status = 'failed' and not txid is null and created_at > '${one_week_ago}') as txFailedWeek,
-    (select count(*) from transactions where status = 'failed' and not txid is null and created_at > '${one_month_ago}') as txFailedMonth,
-	  (select count(*) from transactions where status = 'failed' and not txid is null) as txFailedTotal,
-    (select count(*) from transactions where status = 'failed' and txid is null and created_at > '${one_day_ago}') as txAbandonedDay,
-    (select count(*) from transactions where status = 'failed' and txid is null and created_at > '${one_week_ago}') as txAbandonedWeek,
-    (select count(*) from transactions where status = 'failed' and txid is null and created_at > '${one_month_ago}') as txAbandonedMonth,
-	  (select count(*) from transactions where status = 'failed' and txid is null) as txAbandonedTotal,
-    (select count(*) from transactions where status = 'unprocessed' and created_at > '${one_day_ago}') as txUnprocessedDay,
-    (select count(*) from transactions where status = 'unprocessed' and created_at > '${one_week_ago}') as txUnprocessedWeek,
-    (select count(*) from transactions where status = 'unprocessed' and created_at > '${one_month_ago}') as txUnprocessedMonth,
-	  (select count(*) from transactions where status = 'unprocessed') as txUnprocessedTotal,
-    (select count(*) from transactions where status = 'sending' and created_at > '${one_day_ago}') as txSendingDay,
-    (select count(*) from transactions where status = 'sending' and created_at > '${one_week_ago}') as txSendingWeek,
-    (select count(*) from transactions where status = 'sending' and created_at > '${one_month_ago}') as txSendingMonth,
-	  (select count(*) from transactions where status = 'sending') as txSendingTotal,
-    (select count(*) from transactions where status = 'unproven' and created_at > '${one_day_ago}') as txUnprovenDay,
-    (select count(*) from transactions where status = 'unproven' and created_at > '${one_week_ago}') as txUnprovenWeek,
-    (select count(*) from transactions where status = 'unproven' and created_at > '${one_month_ago}') as txUnprovenMonth,
-	  (select count(*) from transactions where status = 'unproven') as txUnprovenTotal,
-    (select count(*) from transactions where status = 'unsigned' and created_at > '${one_day_ago}') as txUnsignedDay,
-    (select count(*) from transactions where status = 'unsigned' and created_at > '${one_week_ago}') as txUnsignedWeek,
-    (select count(*) from transactions where status = 'unsigned' and created_at > '${one_month_ago}') as txUnsignedMonth,
-	  (select count(*) from transactions where status = 'unsigned') as txUnsignedTotal,
-    (select count(*) from transactions where status = 'nosend' and created_at > '${one_day_ago}') as txNosendDay,
-    (select count(*) from transactions where status = 'nosend' and created_at > '${one_week_ago}') as txNosendWeek,
-    (select count(*) from transactions where status = 'nosend' and created_at > '${one_month_ago}') as txNosendMonth,
-	  (select count(*) from transactions where status = 'nosend') as txNosendTotal,
-    (select count(*) from transactions where status = 'nonfinal' and created_at > '${one_day_ago}') as txNonfinalDay,
-    (select count(*) from transactions where status = 'nonfinal' and created_at > '${one_week_ago}') as txNonfinalWeek,
-    (select count(*) from transactions where status = 'nonfinal' and created_at > '${one_month_ago}') as txNonfinalMonth,
-	  (select count(*) from transactions where status = 'nonfinal') as txNonfinalTotal,
-    (select count(*) from transactions where status = 'unfail' and created_at > '${one_day_ago}') as txUnfailDay,
-    (select count(*) from transactions where status = 'unfail' and created_at > '${one_week_ago}') as txUnfailWeek,
-    (select count(*) from transactions where status = 'unfail' and created_at > '${one_month_ago}') as txUnfailMonth,
-	  (select count(*) from transactions where status = 'unfail') as txUnfailTotal,
-    (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 1 and created_at > '${one_day_ago}') as satoshisDefaultDay,
-    (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 1 and created_at > '${one_week_ago}') as satoshisDefaultWeek,
-    (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 1 and created_at > '${one_month_ago}') as satoshisDefaultMonth,
-	  (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 1) as satoshisDefaultTotal,
-    (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 0 and not basketId is null and created_at > '${one_day_ago}') as satoshisOtherDay,
-    (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 0 and not basketId is null and created_at > '${one_week_ago}') as satoshisOtherWeek,
-    (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 0 and not basketId is null and created_at > '${one_month_ago}') as satoshisOtherMonth,
-	  (select sum(satoshis) from outputs where spendable = 1 and \`change\` = 0 and not basketId is null) as satoshisOtherTotal,
-    (select count(*) from output_baskets where created_at > '${one_day_ago}') as basketsDay,
-    (select count(*) from output_baskets where created_at > '${one_week_ago}') as basketsWeek,
-    (select count(*) from output_baskets where created_at > '${one_month_ago}') as basketsMonth,
-	  (select count(*) from output_baskets) as basketsTotal,
-    (select count(*) from tx_labels where created_at > '${one_day_ago}') as labelsDay,
-    (select count(*) from tx_labels where created_at > '${one_week_ago}') as labelsWeek,
-    (select count(*) from tx_labels where created_at > '${one_month_ago}') as labelsMonth,
-	  (select count(*) from tx_labels) as labelsTotal,
-    (select count(*) from output_tags where created_at > '${one_day_ago}') as tagsDay,
-    (select count(*) from output_tags where created_at > '${one_week_ago}') as tagsWeek,
-    (select count(*) from output_tags where created_at > '${one_month_ago}') as tagsMonth,
-	  (select count(*) from output_tags) as tagsTotal
+    (select count(*) from users where created_at > '${oneDayAgo}') as usersDay,
+    (select count(*) from users where created_at > '${oneWeekAgo}') as usersWeek,
+    (select count(*) from users where created_at > '${oneMonthAgo}') as usersMonth,
+    (select count(*) from users) as usersTotal,
+    (select count(*) from transactions where created_at > '${oneDayAgo}') as transactionsDay,
+    (select count(*) from transactions where created_at > '${oneWeekAgo}') as transactionsWeek,
+    (select count(*) from transactions where created_at > '${oneMonthAgo}') as transactionsMonth,
+    (select count(*) from transactions) as transactionsTotal,
+    (select count(*) from transactions where status = 'completed' and created_at > '${oneDayAgo}') as txCompletedDay,
+    (select count(*) from transactions where status = 'completed' and created_at > '${oneWeekAgo}') as txCompletedWeek,
+    (select count(*) from transactions where status = 'completed' and created_at > '${oneMonthAgo}') as txCompletedMonth,
+    (select count(*) from transactions where status = 'completed') as txCompletedTotal,
+    (select count(*) from transactions where status = 'failed' and not txid is null and created_at > '${oneDayAgo}') as txFailedDay,
+    (select count(*) from transactions where status = 'failed' and not txid is null and created_at > '${oneWeekAgo}') as txFailedWeek,
+    (select count(*) from transactions where status = 'failed' and not txid is null and created_at > '${oneMonthAgo}') as txFailedMonth,
+    (select count(*) from transactions where status = 'failed' and not txid is null) as txFailedTotal,
+    (select count(*) from transactions where status = 'failed' and txid is null and created_at > '${oneDayAgo}') as txAbandonedDay,
+    (select count(*) from transactions where status = 'failed' and txid is null and created_at > '${oneWeekAgo}') as txAbandonedWeek,
+    (select count(*) from transactions where status = 'failed' and txid is null and created_at > '${oneMonthAgo}') as txAbandonedMonth,
+    (select count(*) from transactions where status = 'failed' and txid is null) as txAbandonedTotal,
+    (select count(*) from transactions where status = 'unprocessed' and created_at > '${oneDayAgo}') as txUnprocessedDay,
+    (select count(*) from transactions where status = 'unprocessed' and created_at > '${oneWeekAgo}') as txUnprocessedWeek,
+    (select count(*) from transactions where status = 'unprocessed' and created_at > '${oneMonthAgo}') as txUnprocessedMonth,
+    (select count(*) from transactions where status = 'unprocessed') as txUnprocessedTotal,
+    (select count(*) from transactions where status = 'sending' and created_at > '${oneDayAgo}') as txSendingDay,
+    (select count(*) from transactions where status = 'sending' and created_at > '${oneWeekAgo}') as txSendingWeek,
+    (select count(*) from transactions where status = 'sending' and created_at > '${oneMonthAgo}') as txSendingMonth,
+    (select count(*) from transactions where status = 'sending') as txSendingTotal,
+    (select count(*) from transactions where status = 'unproven' and created_at > '${oneDayAgo}') as txUnprovenDay,
+    (select count(*) from transactions where status = 'unproven' and created_at > '${oneWeekAgo}') as txUnprovenWeek,
+    (select count(*) from transactions where status = 'unproven' and created_at > '${oneMonthAgo}') as txUnprovenMonth,
+    (select count(*) from transactions where status = 'unproven') as txUnprovenTotal,
+    (select count(*) from transactions where status = 'unsigned' and created_at > '${oneDayAgo}') as txUnsignedDay,
+    (select count(*) from transactions where status = 'unsigned' and created_at > '${oneWeekAgo}') as txUnsignedWeek,
+    (select count(*) from transactions where status = 'unsigned' and created_at > '${oneMonthAgo}') as txUnsignedMonth,
+    (select count(*) from transactions where status = 'unsigned') as txUnsignedTotal,
+    (select count(*) from transactions where status = 'nosend' and created_at > '${oneDayAgo}') as txNosendDay,
+    (select count(*) from transactions where status = 'nosend' and created_at > '${oneWeekAgo}') as txNosendWeek,
+    (select count(*) from transactions where status = 'nosend' and created_at > '${oneMonthAgo}') as txNosendMonth,
+    (select count(*) from transactions where status = 'nosend') as txNosendTotal,
+    (select count(*) from transactions where status = 'nonfinal' and created_at > '${oneDayAgo}') as txNonfinalDay,
+    (select count(*) from transactions where status = 'nonfinal' and created_at > '${oneWeekAgo}') as txNonfinalWeek,
+    (select count(*) from transactions where status = 'nonfinal' and created_at > '${oneMonthAgo}') as txNonfinalMonth,
+    (select count(*) from transactions where status = 'nonfinal') as txNonfinalTotal,
+    (select count(*) from transactions where status = 'unfail' and created_at > '${oneDayAgo}') as txUnfailDay,
+    (select count(*) from transactions where status = 'unfail' and created_at > '${oneWeekAgo}') as txUnfailWeek,
+    (select count(*) from transactions where status = 'unfail' and created_at > '${oneMonthAgo}') as txUnfailMonth,
+    (select count(*) from transactions where status = 'unfail') as txUnfailTotal,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 1 and o.created_at > '${oneDayAgo}') as satoshisDefaultDay,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 1 and o.created_at > '${oneWeekAgo}') as satoshisDefaultWeek,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 1 and o.created_at > '${oneMonthAgo}') as satoshisDefaultMonth,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 1) as satoshisDefaultTotal,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 0 and not o.basketId is null and o.created_at > '${oneDayAgo}') as satoshisOtherDay,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 0 and not o.basketId is null and o.created_at > '${oneWeekAgo}') as satoshisOtherWeek,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 0 and not o.basketId is null and o.created_at > '${oneMonthAgo}') as satoshisOtherMonth,
+    (select sum(o.satoshis) from outputs o, transactions t where o.transactionId = t.transactionId and t.status = 'completed' and o.spendable = 1 and o.change = 0 and not o.basketId is null) as satoshisOtherTotal,
+    (select count(*) from output_baskets where created_at > '${oneDayAgo}') as basketsDay,
+    (select count(*) from output_baskets where created_at > '${oneWeekAgo}') as basketsWeek,
+    (select count(*) from output_baskets where created_at > '${oneMonthAgo}') as basketsMonth,
+    (select count(*) from output_baskets) as basketsTotal,
+    (select count(*) from tx_labels where created_at > '${oneDayAgo}') as labelsDay,
+    (select count(*) from tx_labels where created_at > '${oneWeekAgo}') as labelsWeek,
+    (select count(*) from tx_labels where created_at > '${oneMonthAgo}') as labelsMonth,
+    (select count(*) from tx_labels) as labelsTotal,
+    (select count(*) from output_tags where created_at > '${oneDayAgo}') as tagsDay,
+    (select count(*) from output_tags where created_at > '${oneWeekAgo}') as tagsWeek,
+    (select count(*) from output_tags where created_at > '${oneMonthAgo}') as tagsMonth,
+    (select count(*) from output_tags) as tagsTotal
       `);
         const r = {
             monitorStats,