@bsv/wallet-toolbox 2.1.25 → 2.1.27

package/out/src/storage/StorageKnex.js

@@ -14,7 +14,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     constructor(options) {
         super(options);
         this._verifiedReadyForDatabaseAccess = false;
-        if (!options.knex)
+        if (options.knex == null)
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('options.knex', 'valid');
         this.knex = options.knex;
     }
@@ -34,7 +34,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                 .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);
             }
@@ -43,8 +43,8 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     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')
@@ -62,27 +62,28 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return (req === null || req === void 0 ? void 0 : 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();
         if (Number.isInteger(offset) && Number.isInteger(length)) {
-            return this.getRawTxSlice(txid, offset, length, trx);
+            return await this.getRawTxSlice(txid, offset, length, trx);
         }
         const r = await this.getProvenOrRawTx(txid, trx);
         return r.proven != null ? r.proven.rawTx : r.rawTx;
     }
     getProvenTxsForUserQuery(args) {
+        var _a;
         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 != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset((_a = args.paged.offset) !== null && _a !== void 0 ? _a : 0);
         }
         if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
@@ -94,16 +95,17 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return this.validateEntities(rs);
     }
     getProvenTxReqsForUserQuery(args) {
+        var _a;
         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 != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset((_a = args.paged.offset) !== null && _a !== void 0 ? _a : 0);
         }
         if (args.since != null)
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
@@ -115,6 +117,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return this.validateEntities(rs, undefined, ['notified']);
     }
     getTxLabelMapsForUserQuery(args) {
+        var _a;
         const k = this.toDb(args.trx);
         let q = k('tx_labels_map').whereExists(k
             .select('*')
@@ -124,7 +127,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         if (args.paged != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset((_a = args.paged.offset) !== null && _a !== void 0 ? _a : 0);
         }
         return q;
     }
@@ -134,6 +137,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return this.validateEntities(rs, undefined, ['isDeleted']);
     }
     getOutputTagMapsForUserQuery(args) {
+        var _a;
         const k = this.toDb(args.trx);
         let q = k('output_tags_map').whereExists(k
             .select('*')
@@ -143,7 +147,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             q = q.where('updated_at', '>=', this.validateDateForWhere(args.since));
         if (args.paged != null) {
             q = q.limit(args.paged.limit);
-            q = q.offset(args.paged.offset || 0);
+            q = q.offset((_a = args.paged.offset) !== null && _a !== void 0 ? _a : 0);
         }
         return q;
     }
@@ -153,12 +157,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);
     }
@@ -187,7 +191,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);
@@ -196,14 +200,14 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         const e = await this.validateEntityForInsert(certificate, trx, undefined, ['isDeleted']);
         if (e.certificateId === 0)
             delete e.certificateId;
-        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;
@@ -241,17 +245,12 @@ 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 insertOutputTag(tag, trx) {
         const e = await this.validateEntityForInsert(tag, trx, undefined, ['isDeleted']);
@@ -406,12 +405,13 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .update(this.validatePartialForUpdate(update));
     }
     setupQuery(table, args) {
+        var _a;
         const q = this.toDb(args.trx)(table);
-        if (args.partial && Object.keys(args.partial).length > 0)
-            q.where(args.partial);
+        if (args.partial != null && Object.keys(args.partial).length > 0)
+            void q.where(args.partial);
         if (args.since != null)
-            q.where('updated_at', '>=', this.validateDateForWhere(args.since));
-        if (args.orderDescending) {
+            void q.where('updated_at', '>=', this.validateDateForWhere(args.since));
+        if (args.orderDescending === true) {
             let sortColumn = '';
             switch (table) {
                 case 'certificates':
@@ -454,12 +454,12 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
                     break;
             }
             if (sortColumn !== '') {
-                q.orderBy(sortColumn, 'desc');
+                void q.orderBy(sortColumn, 'desc');
             }
         }
         if (args.paged != null) {
-            q.limit(args.paged.limit);
-            q.offset(args.paged.offset || 0);
+            void q.limit(args.paged.limit);
+            void q.offset((_a = args.paged.offset) !== null && _a !== void 0 ? _a : 0);
         }
         return q;
     }
@@ -469,9 +469,9 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     findCertificatesQuery(args) {
         const q = this.setupQuery('certificates', args);
         if ((args.certifiers != null) && args.certifiers.length > 0)
-            q.whereIn('certifier', args.certifiers);
+            void q.whereIn('certifier', args.certifiers);
         if ((args.types != null) && args.types.length > 0)
-            q.whereIn('type', args.types);
+            void q.whereIn('type', args.types);
         return q;
     }
     findCommissionsQuery(args) {
@@ -489,18 +489,18 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         }
         const q = this.setupQuery('outputs', args);
         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(',')})`);
+            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 != null) && args.tagIds.length > 0)
-            q.whereIn('outputTagId', args.tagIds);
+            void q.whereIn('outputTagId', args.tagIds);
         return q;
     }
     findOutputTagsQuery(args) {
@@ -515,11 +515,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         }
         const q = this.setupQuery('proven_tx_reqs', args);
         if ((args.status != null) && args.status.length > 0)
-            q.whereIn('status', args.status);
+            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;
     }
@@ -534,10 +534,10 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     findStaleMerkleRootsQuery(args) {
         const q = this.toDb(args.trx)('proven_txs');
-        q.where('height', '=', args.height);
-        q.where('merkleRoot', '!=', args.merkleRoot);
-        q.select('merkleRoot');
-        q.distinct('merkleRoot');
+        void q.where('height', '=', args.height);
+        void q.where('merkleRoot', '!=', args.merkleRoot);
+        void q.select('merkleRoot');
+        void q.distinct('merkleRoot');
         return q;
     }
     findSyncStatesQuery(args) {
@@ -552,21 +552,21 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         }
         const q = this.setupQuery('transactions', args);
         if ((args.status != null) && args.status.length > 0)
-            q.whereIn('status', args.status);
+            void q.whereIn('status', args.status);
         if (args.from != null)
-            q.where('created_at', '>=', this.validateDateForWhere(args.from));
+            void q.where('created_at', '>=', this.validateDateForWhere(args.from));
         if (args.to != null)
-            q.where('created_at', '<', this.validateDateForWhere(args.to));
-        if (args.noRawTx && !count) {
+            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 != null) && args.labelIds.length > 0)
-            q.whereIn('txLabelId', args.labelIds);
+            void q.whereIn('txLabelId', args.labelIds);
         return q;
     }
     findTxLabelsQuery(args) {
@@ -579,19 +579,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 +603,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 +626,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);
             }
@@ -666,7 +666,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);
             }
@@ -708,7 +708,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return this.validateEntities(r, ['when'], undefined);
     }
     async getCount(q) {
-        q.count();
+        void q.count();
         const r = await q;
         return r[0]['count(*)'];
     }
@@ -762,9 +762,9 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         await ((_a = this.knex) === null || _a === void 0 ? void 0 : _a.destroy());
     }
     async migrate(storageName, storageIdentityKey) {
-        var _a;
+        var _a, _b;
         // 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 = (_b = (_a = this.knex.client.config) === null || _a === void 0 ? void 0 : _a.client) !== null && _b !== void 0 ? _b : '';
         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 +786,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         return version;
     }
     async dropAllData() {
-        var _a;
+        var _a, _b;
         // 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 = (_b = (_a = this.knex.client.config) === null || _a === void 0 ? void 0 : _a.client) !== null && _b !== void 0 ? _b : '';
         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,7 +809,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         for (let i = 0; i < count; i++) {
             try {
                 const r = await this.knex.migrate.down(config);
-                if (!r) {
+                if (r == null) {
                     console.error('Migration returned falsy result await this.knex.migrate.down(config)');
                     break;
                 }
@@ -838,6 +838,7 @@ 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 == null) ? this.knex : trx;
@@ -846,7 +847,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     }
     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);
@@ -894,7 +895,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         if (dateFields == null)
             return;
         for (const df of dateFields) {
-            if (v[df])
+            if (v[df] != null)
                 v[df] = this.validateOptionalEntityDate(v[df]);
         }
     }
@@ -905,7 +906,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             return;
         for (const df of booleanFields) {
             if (v[df] !== undefined)
-                v[df] = v[df] ? 1 : 0;
+                v[df] = v[df] != null && v[df] !== false ? 1 : 0;
         }
     }
     /**
@@ -913,17 +914,17 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
      * 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)
+        if (v.updated_at == null)
             v.updated_at = this.validateEntityDate(new Date());
         this.coerceDateFields(v, dateFields);
         this.coerceBooleanFields(update, booleanFields);
@@ -938,14 +939,15 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
     async validateEntityForInsert(entity, trx, dateFields, booleanFields
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ) {
+        var _a, _b;
         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 = (_a = this.validateOptionalEntityDate(v.created_at, true)) !== null && _a !== void 0 ? _a : new Date();
+        v.updated_at = (_b = this.validateOptionalEntityDate(v.updated_at, true)) !== null && _b !== void 0 ? _b : new Date();
+        if (v.created_at == null)
             delete v.created_at;
-        if (!v.updated_at)
+        if (v.updated_at == null)
             delete v.updated_at;
         this.coerceDateFields(v, dateFields);
         this.coerceBooleanFields(entity, booleanFields);
@@ -1023,11 +1025,11 @@ 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;
     }
@@ -1046,7 +1048,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             byName[basket.name] = basket;
         }
         for (const name of uniqueNames) {
-            if (!byName[name])
+            if (byName[name] == null)
                 byName[name] = await this.findOrInsertOutputBasket(userId, name, trx);
         }
         return byName;
@@ -1066,7 +1068,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             byTag[outputTag.tag] = outputTag;
         }
         for (const tag of uniqueTags) {
-            if (!byTag[tag])
+            if (byTag[tag] == null)
                 byTag[tag] = await this.findOrInsertOutputTag(userId, tag, trx);
         }
         return byTag;
@@ -1081,7 +1083,8 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             .whereIn('t.status', status)
             .sum({ totalSatoshis: 'o.satoshis' })
             .first();
-        return Number(((row != null) && row.totalSatoshis) || 0);
+        const total = (row != null) ? row.totalSatoshis : undefined;
+        return Number(total !== null && total !== void 0 ? total : 0);
     }
     /**
      *  Finds closest matching available change output to use as input for new transaction.
@@ -1156,7 +1159,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         if (dateFields != null) {
             for (const df of dateFields) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                if (entity[df])
+                if (entity[df] != null)
                     entity[df] = this.validateDate(entity[df]);
             }
         }
@@ -1164,7 +1167,7 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
             for (const df of booleanFields) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (entity[df] !== undefined)
-                    entity[df] = !!entity[df];
+                    entity[df] = entity[df] !== 0 && entity[df] != null && entity[df] !== false;
             }
         }
         this.deserialiseFromKnex(entity);
@@ -1191,79 +1194,79 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
         }));
         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(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 > '${one_day_ago}') 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 > '${one_week_ago}') 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 > '${one_month_ago}') 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 > '${one_day_ago}') 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 > '${one_week_ago}') 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 > '${one_month_ago}') 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 > '${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,