@bsv/wallet-toolbox 2.1.24 → 2.1.25

package/out/src/storage/StorageKnex.js

@@ -15,7 +15,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         super(options);
         this._verifiedReadyForDatabaseAccess = false;
         if (!options.knex)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('options.knex', `valid`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('options.knex', 'valid');
         this.knex = options.knex;
     }
     async readSettings() {
@@ -28,8 +28,8 @@ 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 } }));
+        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'])
@@ -46,38 +46,31 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             return `substring(${source} from ${fromOffset} for ${forLength})`;
         return `substr(${source}, ${fromOffset}, ${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 === null || proven === void 0 ? void 0 : 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 === null || req === void 0 ? void 0 : req.rawTx) != null ? Array.from(req.rawTx) : undefined;
+    }
     async getRawTxOfKnownValidTransaction(txid, offset, length, trx) {
         if (!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 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);
@@ -87,11 +80,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                 .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);
         }
-        if (args.since)
+        if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         return q;
     }
@@ -108,11 +101,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                 .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);
         }
-        if (args.since)
+        if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         return q;
     }
@@ -127,9 +120,9 @@ 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);
         }
@@ -146,9 +139,9 @@ 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);
         }
@@ -203,7 +196,6 @@ 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)
             delete e.logger;
         const fields = e.fields;
@@ -271,7 +263,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 +275,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 +371,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,10 +406,10 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .update(this.validatePartialForUpdate(update));
     }
     setupQuery(table, args) {
-        let q = this.toDb(args.trx)(table);
+        const q = this.toDb(args.trx)(table);
         if (args.partial && Object.keys(args.partial).length > 0)
             q.where(args.partial);
-        if (args.since)
+        if (args.since != null)
             q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         if (args.orderDescending) {
             let sortColumn = '';
@@ -465,7 +457,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                 q.orderBy(sortColumn, 'desc');
             }
         }
-        if (args.paged) {
+        if (args.paged != null) {
             q.limit(args.paged.limit);
             q.offset(args.paged.offset || 0);
         }
@@ -476,26 +468,28 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     findCertificatesQuery(args) {
         const q = this.setupQuery('certificates', args);
-        if (args.certifiers && args.certifiers.length > 0)
+        if ((args.certifiers != null) && args.certifiers.length > 0)
             q.whereIn('certifier', args.certifiers);
-        if (args.types && args.types.length > 0)
+        if ((args.types != null) && args.types.length > 0)
             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) {
+            q.whereRaw(`(select status from transactions where transactions.transactionId = outputs.transactionId) in (${args.txStatus.map(s => "'" + s + "'").join(',')})`);
         }
         if (args.noScript && !count) {
             const columns = tables_1.outputColumnsWithoutLockingScript.map(c => `outputs.${c}`);
@@ -505,7 +499,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     findOutputTagMapsQuery(args) {
         const q = this.setupQuery('output_tags_map', args);
-        if (args.tagIds && args.tagIds.length > 0)
+        if ((args.tagIds != null) && args.tagIds.length > 0)
             q.whereIn('outputTagId', args.tagIds);
         return q;
     }
@@ -513,14 +507,16 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         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)
+        if ((args.status != null) && args.status.length > 0)
             q.whereIn('status', args.status);
-        if (args.txids) {
+        if (args.txids != null) {
             const txids = args.txids.filter(txid => txid !== undefined);
             if (txids.length > 0)
                 q.whereIn('txid', txids);
@@ -528,14 +524,16 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         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.`);
+        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.');
+        }
         return this.setupQuery('proven_txs', args);
     }
     findStaleMerkleRootsQuery(args) {
-        let q = this.toDb(args.trx)('proven_txs');
+        const q = this.toDb(args.trx)('proven_txs');
         q.where('height', '=', args.height);
         q.where('merkleRoot', '!=', args.merkleRoot);
         q.select('merkleRoot');
@@ -546,16 +544,18 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         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)
+        if ((args.status != null) && args.status.length > 0)
             q.whereIn('status', args.status);
-        if (args.from)
+        if (args.from != null)
             q.where('created_at', '>=', this.validateDateForWhere(args.from));
-        if (args.to)
+        if (args.to != null)
             q.where('created_at', '<', this.validateDateForWhere(args.to));
         if (args.noRawTx && !count) {
             const columns = tables_1.transactionColumnsWithoutRawTx.map(c => `transactions.${c}`);
@@ -565,7 +565,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     findTxLabelMapsQuery(args) {
         const q = this.setupQuery('tx_labels_map', args);
-        if (args.labelIds && args.labelIds.length > 0)
+        if ((args.labelIds != null) && args.labelIds.length > 0)
             q.whereIn('txLabelId', args.labelIds);
         return q;
     }
@@ -646,7 +646,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);
@@ -810,11 +810,14 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             try {
                 const r = await this.knex.migrate.down(config);
                 if (!r) {
-                    console.error(`Migration returned falsy result await this.knex.migrate.down(config)`);
+                    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 +827,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;
@@ -837,7 +840,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
      */
     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;
     }
@@ -847,7 +850,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             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;
     }
@@ -860,9 +863,8 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
      * @param trx
      */
     async verifyReadyForDatabaseAccess(trx) {
-        if (!this._settings) {
-            this._settings = await this.readSettings();
-        }
+        var _a;
+        (_a = this._settings) !== null && _a !== void 0 ? _a : (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,6 +875,39 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         this._verifiedReadyForDatabaseAccess = true;
         return this._settings.dbtype;
     }
+    /** Convert every number-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 === 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])
+                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] ? 1 : 0;
+        }
+    }
     /**
      * Helper to force uniform behavior across database engines.
      * Use to process the update template for entities being updated.
@@ -880,6 +915,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     validatePartialForUpdate(update, dateFields, booleanFields) {
         if (!this.dbtype)
             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)
             v.created_at = this.validateEntityDate(v.created_at);
@@ -889,27 +925,9 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             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;
-            }
-        }
+        this.coerceDateFields(v, dateFields);
+        this.coerceBooleanFields(update, booleanFields);
+        this.serialiseForKnex(v);
         this.isDirty = true;
         return v;
     }
@@ -917,8 +935,11 @@ 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);
@@ -926,27 +947,9 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             delete v.created_at;
         if (!v.updated_at)
             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;
     }
@@ -1078,7 +1081,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .whereIn('t.status', status)
             .sum({ totalSatoshis: 'o.satoshis' })
             .first();
-        return Number((row && row['totalSatoshis']) || 0);
+        return Number(((row != null) && row.totalSatoshis) || 0);
     }
     /**
      *  Finds closest matching available change output to use as input for new transaction.
@@ -1101,21 +1104,17 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             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 !== null && output !== void 0 ? output : (output = await baseQuery()
+                .where('o.satoshis', '>=', targetSatoshis)
+                .orderBy('o.satoshis', 'asc')
+                .orderBy('o.outputId', 'asc')
+                .first());
+            output !== null && output !== void 0 ? output : (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 +1129,23 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         });
         return r;
     }
+    /** 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 +1153,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) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (entity[df])
                     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);
-            }
-        }
+        this.deserialiseFromKnex(entity);
         return entity;
     }
     /**
@@ -1179,7 +1189,7 @@ 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();