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

package/out/src/storage/StorageIdb.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageIdb = void 0;
 const idb_1 = require("idb");
+const idbHelpers_1 = require("./idbHelpers");
 const utilityHelpers_1 = require("../utility/utilityHelpers");
 const StorageProvider_1 = require("./StorageProvider");
 const listActionsIdb_1 = require("./methods/listActionsIdb");
@@ -9,32 +10,58 @@ const listOutputsIdb_1 = require("./methods/listOutputsIdb");
 const reviewStatusIdb_1 = require("./methods/reviewStatusIdb");
 const purgeDataIdb_1 = require("./methods/purgeDataIdb");
 const WERR_errors_1 = require("../sdk/WERR_errors");
+const managedChange_1 = require("./methods/managedChange");
+const actionPlanning_1 = require("./methods/actionPlanning");
+/**
+ * Shared cursor-scan loop used by all `filterXxx` methods of StorageIdb.
+ *
+ * Walks `cursor` forward, applying `since`, a caller-supplied `matches`
+ * predicate, paging (offset / limit), and an async `accept` callback for
+ * records that pass all filters.  Returns the number of accepted records.
+ *
+ * Implemented as a module-level helper (not a class method) so that
+ * profiling/instrumentation that wraps class-prototype methods cannot
+ * intercept or mutate its `matches` / `accept` callbacks.
+ */
+async function scanCursor(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+cursor, since, offset, limit, matches, accept) {
+    let skipped = 0;
+    let count = 0;
+    for (; cursor != null; cursor = await cursor.continue()) {
+        const r = cursor.value;
+        if (since != null && since > r.updated_at)
+            continue;
+        if (!(await matches(r)))
+            continue;
+        if (skipped < offset) {
+            skipped++;
+            continue;
+        }
+        accept(r);
+        count++;
+        if ((limit ?? 0) > 0 && count >= limit)
+            break;
+    }
+    return count;
+}
 /**
  * This class implements the `StorageProvider` interface using IndexedDB,
  * via the promises wrapper package `idb`.
  */
 class StorageIdb extends StorageProvider_1.StorageProvider {
+    dbName;
+    db;
     constructor(options) {
         super(options);
-        this.allStores = [
-            'certificates',
-            'certificate_fields',
-            'commissions',
-            'monitor_events',
-            'outputs',
-            'output_baskets',
-            'output_tags',
-            'output_tags_map',
-            'proven_txs',
-            'proven_tx_reqs',
-            'sync_states',
-            'transactions',
-            'tx_labels',
-            'tx_labels_map',
-            'users'
-        ];
         this.dbName = `wallet-toolbox-${this.chain}net`;
     }
+    supportsActionBatchPersistence() {
+        return true;
+    }
+    requiresActionBatchCleanupBeforeCreateAction() {
+        return false;
+    }
     /**
      * This method must be called at least once before any other method accesses the database,
      * and each time the schema may have updated.
@@ -61,7 +88,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      * @returns
      */
     async verifyDB(storageName, storageIdentityKey) {
-        if (this.db)
+        if (this.db != null)
             return this.db;
         this.db = await this.initDB(storageName, storageIdentityKey);
         this._settings = (await this.db.getAll('settings'))[0];
@@ -73,15 +100,15 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      * or a Knex.Transaction as appropriate.
      */
     toDbTrx(stores, mode, trx) {
-        if (trx) {
+        if (trx != null) {
             const t = trx;
             return t;
         }
         else {
-            if (!this.db)
+            if (this.db == null)
                 throw new Error('not initialized');
             const db = this.db;
-            const trx = db.transaction(stores || this.allStores, mode || 'readwrite');
+            const trx = db.transaction(stores.length > 0 ? stores : this.allStores, mode);
             this.whenLastAccess = new Date();
             return trx;
         }
@@ -95,158 +122,29 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      *
      * @param trx
      */
-    async readSettings(trx) {
+    async readSettings(_trx) {
         await this.verifyDB();
         return this._settings;
     }
     async initDB(storageName, storageIdentityKey) {
         const chain = this.chain;
         const maxOutputScript = 1024;
-        const db = await (0, idb_1.openDB)(this.dbName, 1, {
-            upgrade(db, oldVersion, newVersion, transaction) {
-                if (!db.objectStoreNames.contains('proven_txs')) {
-                    // proven_txs object store
-                    const provenTxsStore = db.createObjectStore('proven_txs', {
-                        keyPath: 'provenTxId',
-                        autoIncrement: true
-                    });
-                    provenTxsStore.createIndex('txid', 'txid', { unique: true });
-                }
-                if (!db.objectStoreNames.contains('proven_tx_reqs')) {
-                    // proven_tx_reqs object store
-                    const provenTxReqsStore = db.createObjectStore('proven_tx_reqs', {
-                        keyPath: 'provenTxReqId',
-                        autoIncrement: true
-                    });
-                    provenTxReqsStore.createIndex('provenTxId', 'provenTxId');
-                    provenTxReqsStore.createIndex('txid', 'txid', { unique: true });
-                    provenTxReqsStore.createIndex('status', 'status');
-                    provenTxReqsStore.createIndex('batch', 'batch');
-                }
-                if (!db.objectStoreNames.contains('users')) {
-                    const users = db.createObjectStore('users', {
-                        keyPath: 'userId',
-                        autoIncrement: true
-                    });
-                    users.createIndex('identityKey', 'identityKey', { unique: true });
-                }
-                if (!db.objectStoreNames.contains('certificates')) {
-                    // certificates object store
-                    const certificatesStore = db.createObjectStore('certificates', {
-                        keyPath: 'certificateId',
-                        autoIncrement: true
-                    });
-                    certificatesStore.createIndex('userId', 'userId');
-                    certificatesStore.createIndex('userId_type_certifier_serialNumber', ['userId', 'type', 'certifier', 'serialNumber'], { unique: true });
-                }
-                if (!db.objectStoreNames.contains('certificate_fields')) {
-                    // certificate_fields object store
-                    const certificateFieldsStore = db.createObjectStore('certificate_fields', {
-                        keyPath: ['certificateId', 'fieldName'] // Composite key
-                    });
-                    certificateFieldsStore.createIndex('userId', 'userId');
-                    certificateFieldsStore.createIndex('certificateId', 'certificateId');
-                }
-                if (!db.objectStoreNames.contains('output_baskets')) {
-                    // output_baskets object store
-                    const outputBasketsStore = db.createObjectStore('output_baskets', {
-                        keyPath: 'basketId',
-                        autoIncrement: true
-                    });
-                    outputBasketsStore.createIndex('userId', 'userId');
-                    outputBasketsStore.createIndex('name_userId', ['name', 'userId'], { unique: true });
-                }
-                if (!db.objectStoreNames.contains('transactions')) {
-                    // transactions object store
-                    const transactionsStore = db.createObjectStore('transactions', {
-                        keyPath: 'transactionId',
-                        autoIncrement: true
-                    });
-                    transactionsStore.createIndex('userId', 'userId');
-                    transactionsStore.createIndex('status', 'status');
-                    transactionsStore.createIndex('status_userId', ['status', 'userId']);
-                    transactionsStore.createIndex('provenTxId', 'provenTxId');
-                    transactionsStore.createIndex('reference', 'reference', { unique: true });
-                }
-                if (!db.objectStoreNames.contains('commissions')) {
-                    // commissions object store
-                    const commissionsStore = db.createObjectStore('commissions', {
-                        keyPath: 'commissionId',
-                        autoIncrement: true
-                    });
-                    commissionsStore.createIndex('userId', 'userId');
-                    commissionsStore.createIndex('transactionId', 'transactionId', { unique: true });
-                }
-                if (!db.objectStoreNames.contains('outputs')) {
-                    // outputs object store
-                    const outputsStore = db.createObjectStore('outputs', {
-                        keyPath: 'outputId',
-                        autoIncrement: true
-                    });
-                    outputsStore.createIndex('userId', 'userId');
-                    outputsStore.createIndex('transactionId', 'transactionId');
-                    outputsStore.createIndex('basketId', 'basketId');
-                    outputsStore.createIndex('spentBy', 'spentBy');
-                    outputsStore.createIndex('transactionId_vout_userId', ['transactionId', 'vout', 'userId'], { unique: true });
-                }
-                if (!db.objectStoreNames.contains('output_tags')) {
-                    // output_tags object store
-                    const outputTagsStore = db.createObjectStore('output_tags', {
-                        keyPath: 'outputTagId',
-                        autoIncrement: true
-                    });
-                    outputTagsStore.createIndex('userId', 'userId');
-                    outputTagsStore.createIndex('tag_userId', ['tag', 'userId'], { unique: true });
-                }
-                if (!db.objectStoreNames.contains('output_tags_map')) {
-                    // output_tags_map object store
-                    const outputTagsMapStore = db.createObjectStore('output_tags_map', {
-                        keyPath: ['outputTagId', 'outputId']
-                    });
-                    outputTagsMapStore.createIndex('outputTagId', 'outputTagId');
-                    outputTagsMapStore.createIndex('outputId', 'outputId');
-                }
-                if (!db.objectStoreNames.contains('tx_labels')) {
-                    // tx_labels object store
-                    const txLabelsStore = db.createObjectStore('tx_labels', {
-                        keyPath: 'txLabelId',
-                        autoIncrement: true
-                    });
-                    txLabelsStore.createIndex('userId', 'userId');
-                    txLabelsStore.createIndex('label_userId', ['label', 'userId'], { unique: true });
+        const db = await (0, idb_1.openDB)(this.dbName, 3, {
+            upgrade(db, _oldVersion, _newVersion, transaction) {
+                (0, idbHelpers_1.upgradeAllStoresV1)(db);
+                (0, idbHelpers_1.upgradeActionBatchStoresV2)(db);
+                const outputs = transaction.objectStore('outputs');
+                if (!outputs.indexNames.contains('userId_basketId')) {
+                    outputs.createIndex('userId_basketId', ['userId', 'basketId']);
                 }
-                if (!db.objectStoreNames.contains('tx_labels_map')) {
-                    // tx_labels_map object store
-                    const txLabelsMapStore = db.createObjectStore('tx_labels_map', {
-                        keyPath: ['txLabelId', 'transactionId']
-                    });
-                    txLabelsMapStore.createIndex('txLabelId', 'txLabelId');
-                    txLabelsMapStore.createIndex('transactionId', 'transactionId');
-                }
-                if (!db.objectStoreNames.contains('monitor_events')) {
-                    // monitor_events object store
-                    const monitorEventsStore = db.createObjectStore('monitor_events', {
-                        keyPath: 'id',
-                        autoIncrement: true
-                    });
-                }
-                if (!db.objectStoreNames.contains('sync_states')) {
-                    // sync_states object store
-                    const syncStatesStore = db.createObjectStore('sync_states', {
-                        keyPath: 'syncStateId',
-                        autoIncrement: true
-                    });
-                    syncStatesStore.createIndex('userId', 'userId');
-                    syncStatesStore.createIndex('refNum', 'refNum', { unique: true });
-                    syncStatesStore.createIndex('status', 'status');
+                if (!outputs.indexNames.contains('txid_vout_userId')) {
+                    outputs.createIndex('txid_vout_userId', ['txid', 'vout', 'userId'], { unique: true });
                 }
                 if (!db.objectStoreNames.contains('settings')) {
-                    if (!storageName || !storageIdentityKey) {
+                    if (storageName == null || storageName === '' || storageIdentityKey == null || storageIdentityKey === '') {
                         throw new WERR_errors_1.WERR_INVALID_OPERATION('migrate must be called before first access');
                     }
-                    const settings = db.createObjectStore('settings', {
-                        keyPath: 'storageIdentityKey'
-                    });
+                    const settings = db.createObjectStore('settings', { keyPath: 'storageIdentityKey' });
                     const s = {
                         created_at: new Date(),
                         updated_at: new Date(),
@@ -256,7 +154,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                         dbtype: 'IndexedDB',
                         maxOutputScript
                     };
-                    settings.put(s);
+                    void settings.put(s);
                 }
             }
         });
@@ -278,7 +176,8 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      * 3. Find an output that comes as close to funding as possible (targetSatoshis).
      * 4. Return undefined if no output is found.
      *
-     * Outputs must belong to userId and basketId and have spendable true.
+     * Outputs must belong to userId and basketId and satisfy the wallet-managed
+     * BRC-29 change policy.
      * Their corresponding transaction must have status of 'completed', 'unproven', or 'sending' (if excludeSending is false).
      *
      * @param userId
@@ -290,13 +189,13 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      * @returns next funding output to add to transaction or undefined if there are none.
      */
     async allocateChangeInput(userId, basketId, targetSatoshis, exactSatoshis, excludeSending, transactionId) {
-        const dbTrx = this.toDbTrx(['outputs', 'transactions', 'proven_txs', 'proven_tx_reqs'], 'readwrite');
+        const dbTrx = this.toDbTrx(['outputs', 'transactions', 'proven_txs', 'proven_tx_reqs', 'action_batch_outputs'], 'readwrite');
         try {
             const txStatus = ['completed', 'unproven'];
             if (!excludeSending)
                 txStatus.push('sending');
             const args = {
-                partial: { userId, basketId, spendable: true },
+                partial: { userId, basketId, spendable: true, ...managedChange_1.managedChangeOutputFields },
                 txStatus,
                 // Skip per-output script hydration during the candidate scan — we only need
                 // the locking script for the one we actually pick below. Matches Knex's
@@ -304,36 +203,16 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 noScript: true,
                 trx: dbTrx
             };
-            const outputs = await this.findOutputs(args);
-            let output;
-            let scores = [];
-            for (const o of outputs) {
-                if (exactSatoshis && o.satoshis === exactSatoshis) {
-                    output = o;
-                    break;
-                }
-                const score = o.satoshis - targetSatoshis;
-                scores.push({ output: o, score });
-            }
-            if (!output) {
-                // sort scores increasing by score property
-                scores = scores.sort((a, b) => a.score - b.score);
-                // find the first score that is greater than or equal to 0
-                const o = scores.find(s => s.score >= 0);
-                if (o) {
-                    // stage 2 satisfied (minimally funded)
-                    output = o.output;
-                }
-                else if (scores.length > 0) {
-                    // stage 3 satisfied (minimally under-funded)
-                    output = scores.slice(-1)[0].output;
-                }
-                else {
-                    // no available funding outputs
-                    output = undefined;
-                }
-            }
-            if (output) {
+            const reservationStore = dbTrx.objectStore('action_batch_outputs');
+            if (reservationStore.get == null)
+                throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_outputs store does not support get');
+            const outputs = [];
+            for (const candidate of (await this.findOutputs(args)).filter(managedChange_1.isAutoSpendableChangeOutput)) {
+                if ((await reservationStore.get(candidate.outputId)) == null)
+                    outputs.push(candidate);
+            }
+            const output = (0, actionPlanning_1.selectCanonicalChange)(outputs, targetSatoshis, exactSatoshis);
+            if (output != null) {
                 // mark output as spent by transactionId
                 await this.updateOutput(output.outputId, { spendable: false, spentBy: transactionId }, dbTrx);
                 // Hydrate the locking script for the chosen output. Identical to Knex canon at
@@ -353,50 +232,76 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             rawTx: undefined,
             inputBEEF: undefined
         };
-        r.proven = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxs({ partial: { txid: txid }, trx }));
-        if (!r.proven) {
-            const req = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxReqs({ partial: { txid: txid }, trx }));
-            if (req && ['unsent', 'unmined', 'unconfirmed', 'sending', 'nosend', 'completed'].includes(req.status)) {
+        r.proven = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxs({ partial: { txid }, trx }));
+        if (r.proven == null) {
+            const req = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxReqs({ partial: { txid }, trx }));
+            if (req != null && ['unsent', 'unmined', 'unconfirmed', 'sending', 'nosend', 'completed'].includes(req.status)) {
                 r.rawTx = req.rawTx;
                 r.inputBEEF = req.inputBEEF;
             }
         }
         return r;
     }
+    async getProvenOrRawTxs(txids, trx) {
+        const results = new Map();
+        const unique = [...new Set(txids)];
+        if (unique.length === 0)
+            return results;
+        const dbTrx = this.toDbTrx(['proven_txs', 'proven_tx_reqs'], 'readonly', trx);
+        const provenIndex = dbTrx.objectStore('proven_txs').index('txid');
+        const requestIndex = dbTrx.objectStore('proven_tx_reqs').index('txid');
+        const usableStatuses = new Set(['unsent', 'unmined', 'unconfirmed', 'sending', 'nosend', 'completed']);
+        await Promise.all(unique.map(async (txid) => {
+            const proven = await provenIndex.get(txid);
+            if (proven != null) {
+                results.set(txid, { proven: this.validateEntity(proven), rawTx: undefined, inputBEEF: undefined });
+                return;
+            }
+            const request = await requestIndex.get(txid);
+            if (request != null && usableStatuses.has(request.status)) {
+                const validated = this.validateEntity(request);
+                results.set(txid, {
+                    proven: undefined,
+                    rawTx: Array.from(validated.rawTx),
+                    inputBEEF: validated.inputBEEF == null ? undefined : Array.from(validated.inputBEEF)
+                });
+                return;
+            }
+            results.set(txid, { proven: undefined, rawTx: undefined, inputBEEF: undefined });
+        }));
+        if (trx == null)
+            await dbTrx.done;
+        return results;
+    }
     async getRawTxOfKnownValidTransaction(txid, offset, length, trx) {
-        if (!txid)
+        if (txid == null || txid === '')
             return undefined;
         if (!this.isAvailable())
             await this.makeAvailable();
-        let rawTx = undefined;
         const sliceRequested = offset !== undefined && length !== undefined && Number.isInteger(offset) && Number.isInteger(length);
         // Slice path uses an extended status set that includes 'unfail' — matches Knex
         // canon at StorageKnex.ts:131. The non-slice path continues to delegate to
         // getProvenOrRawTx which uses the narrower set.
-        if (sliceRequested) {
-            const proven = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxs({ partial: { txid }, trx }));
-            if (proven) {
-                rawTx = proven.rawTx;
-            }
-            else {
-                const req = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxReqs({ partial: { txid }, trx }));
-                if (req && ['unsent', 'nosend', 'sending', 'unmined', 'completed', 'unfail'].includes(req.status)) {
-                    rawTx = req.rawTx;
-                }
-            }
-        }
-        else {
-            const r = await this.getProvenOrRawTx(txid, trx);
-            if (r.proven)
-                rawTx = r.proven.rawTx;
-            else
-                rawTx = r.rawTx;
-        }
-        if (rawTx && sliceRequested) {
-            rawTx = rawTx.slice(offset, offset + length);
+        const rawTx = sliceRequested ? await this.getRawTxForSlice(txid, trx) : await this.getRawTxFull(txid, trx);
+        if (rawTx != null && sliceRequested) {
+            return rawTx.slice(offset, offset + length);
         }
         return rawTx;
     }
+    async getRawTxForSlice(txid, trx) {
+        const proven = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxs({ partial: { txid }, trx }));
+        if (proven != null)
+            return proven.rawTx;
+        const req = (0, utilityHelpers_1.verifyOneOrNone)(await this.findProvenTxReqs({ partial: { txid }, trx }));
+        const validStatuses = ['unsent', 'nosend', 'sending', 'unmined', 'completed', 'unfail'];
+        if (req != null && validStatuses.includes(req.status))
+            return req.rawTx;
+        return undefined;
+    }
+    async getRawTxFull(txid, trx) {
+        const r = await this.getProvenOrRawTx(txid, trx);
+        return r.proven != null ? r.proven.rawTx : r.rawTx;
+    }
     async getLabelsForTransactionId(transactionId, trx) {
         const maps = await this.findTxLabelMaps({ partial: { transactionId, isDeleted: false }, trx });
         const labelIds = maps.map(m => m.txLabelId);
@@ -406,10 +311,12 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             // Knex/Bun drop it via JOIN; we must do the same silently or we'd break the whole
             // listActions response. Skip + log so persistent orphans still produce a signal.
             const label = (0, utilityHelpers_1.verifyOneOrNone)(await this.findTxLabels({ partial: { txLabelId, isDeleted: false }, trx }));
-            if (label)
+            if (label != null) {
                 labels.push(label);
-            else
-                console.debug(`[StorageIdb] orphan tx_labels_map row skipped: transactionId=${transactionId} txLabelId=${txLabelId}`);
+            }
+            else {
+                console.debug(`[StorageIdb] orphan tx_labels_map row skipped: transactionId=${String(transactionId)} txLabelId=${txLabelId}`);
+            }
         }
         return labels;
     }
@@ -419,20 +326,22 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         const tags = [];
         for (const outputTagId of tagIds) {
             const tag = (0, utilityHelpers_1.verifyOneOrNone)(await this.findOutputTags({ partial: { outputTagId, isDeleted: false }, trx }));
-            if (tag)
+            if (tag != null) {
                 tags.push(tag);
-            else
+            }
+            else {
                 console.debug(`[StorageIdb] orphan output_tags_map row skipped: outputId=${outputId} outputTagId=${outputTagId}`);
+            }
         }
         return tags;
     }
     async listActions(auth, vargs) {
-        if (!auth.userId)
+        if (auth.userId == null)
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         return await (0, listActionsIdb_1.listActionsIdb)(this, auth, vargs);
     }
     async listOutputs(auth, vargs) {
-        if (!auth.userId)
+        if (auth.userId == null)
             throw new WERR_errors_1.WERR_UNAUTHORIZED();
         return await (0, listOutputsIdb_1.listOutputsIdb)(this, auth, vargs);
     }
@@ -440,33 +349,83 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         const txStatus = ['completed', 'unproven'];
         if (!excludeSending)
             txStatus.push('sending');
-        const args = { partial: { userId, basketId }, txStatus };
-        let count = 0;
+        const args = {
+            partial: { userId, basketId, spendable: true, ...managedChange_1.managedChangeOutputFields },
+            txStatus,
+            noScript: true
+        };
+        const outputIds = [];
         await this.filterOutputs(args, r => {
-            count++;
+            if ((0, managedChange_1.isAutoSpendableChangeOutput)(r))
+                outputIds.push(r.outputId);
         });
-        return count;
+        const reserved = await this.findReservedActionBatchOutputIds(outputIds);
+        return outputIds.length - reserved.length;
+    }
+    async findTransactionStatusesByIds(userId, transactionIds, trx) {
+        const statuses = new Map();
+        if (transactionIds.length === 0)
+            return statuses;
+        const dbTrx = this.toDbTrx(['transactions'], 'readonly', trx);
+        const store = dbTrx.objectStore('transactions');
+        for (const transactionId of new Set(transactionIds)) {
+            const transaction = await store.get(transactionId);
+            if (transaction?.userId === userId)
+                statuses.set(transactionId, transaction.status);
+        }
+        if (trx == null)
+            await dbTrx.done;
+        return statuses;
+    }
+    async findOutputsByOutpointsInternal(userId, outpoints, trx, noScript = false) {
+        const byOutpoint = {};
+        if (outpoints.length === 0)
+            return byOutpoint;
+        const dbTrx = this.toDbTrx(noScript ? ['outputs'] : ['outputs', 'proven_txs', 'proven_tx_reqs'], 'readonly', trx);
+        const index = dbTrx.objectStore('outputs').index('txid_vout_userId');
+        const unique = [...new Map(outpoints.map(outpoint => [`${outpoint.txid}.${outpoint.vout}`, outpoint])).values()];
+        const rows = await Promise.all(unique.map(async (outpoint) => await index.get([outpoint.txid, outpoint.vout, userId])));
+        for (const row of rows) {
+            if (row == null)
+                continue;
+            if (!noScript)
+                await this.validateOutputScript(row, dbTrx);
+            byOutpoint[`${String(row.txid)}.${row.vout}`] = this.validateEntity(row);
+        }
+        if (trx == null)
+            await dbTrx.done;
+        return byOutpoint;
+    }
+    async findOutputsByOutpoints(userId, outpoints, trx) {
+        return await this.findOutputsByOutpointsInternal(userId, outpoints, trx);
+    }
+    async findOutputsByOutpointsForUpdate(userId, outpoints, trx, noScript = false) {
+        return await this.findOutputsByOutpointsInternal(userId, outpoints, trx, noScript);
     }
     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);
     }
     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);
@@ -485,70 +444,45 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      * you need IS NULL semantics (only meaningful for nullable columns).
      */
     assertNoUndefinedInPartial(partial) {
-        if (!partial)
+        if (partial == null)
             return;
         for (const k of Object.keys(partial)) {
             if (partial[k] === undefined) {
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`args.partial.${k}`, `not undefined. Passing undefined as a filter value is not supported — omit the key to skip filtering. Matches Knex semantics.`);
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`args.partial.${k}`, 'not undefined. Passing undefined as a filter value is not supported — omit the key to skip filtering. Matches Knex semantics.');
             }
         }
     }
     async filterOutputTagMaps(args, filtered, userId) {
-        var _a, _b, _c, _d;
         this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['output_tags_map', 'output_tags'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('output_tags_map');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.outputTagId) !== undefined) {
-            cursor = await dbTrx.objectStore('output_tags_map').index('outputTagId').openCursor(args.partial.outputTagId);
+        if (args.partial?.outputTagId !== undefined) {
+            cursor = await store.index('outputTagId').openCursor(args.partial.outputTagId);
         }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.outputId) !== undefined) {
-            cursor = await dbTrx.objectStore('output_tags_map').index('outputId').openCursor(args.partial.outputId);
+        else if (args.partial?.outputId !== undefined) {
+            cursor = await store.index('outputId').openCursor(args.partial.outputId);
         }
         else {
-            cursor = await dbTrx.objectStore('output_tags_map').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.tagIds && !args.tagIds.includes(r.outputTagId))
-                continue;
-            if (args.partial) {
-                if (args.partial.outputTagId !== undefined && r.outputTagId !== args.partial.outputTagId)
-                    continue;
-                if (args.partial.outputId !== undefined && r.outputId !== args.partial.outputId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted)
-                    continue;
-            }
+            cursor = await store.openCursor();
+        }
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
+            if (args.tagIds != null && !args.tagIds.includes(r.outputTagId))
+                return false;
+            if (!(0, idbHelpers_1.matchesOutputTagMapPartial)(r, args.partial))
+                return false;
             if (userId !== undefined) {
-                const tagsForUser = await this.countOutputTags({ partial: { userId, outputTagId: r.outputTagId }, trx: dbTrx });
+                const tagsForUser = await this.countOutputTags({
+                    partial: { userId, outputTagId: r.outputTagId },
+                    trx: dbTrx
+                });
                 if (tagsForUser === 0)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+                    return false;
             }
-            filtered(r);
-            count++;
-            if (((_d = args.paged) === null || _d === void 0 ? void 0 : _d.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+            return true;
+        }, filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findOutputTagMaps(args) {
@@ -558,93 +492,53 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         });
         return results;
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async openProvenTxReqsCursor(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    store, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    partial, direction
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
+        if (partial?.provenTxReqId != null && partial.provenTxReqId !== 0)
+            return store.openCursor(partial.provenTxReqId, direction);
+        if (partial?.provenTxId !== undefined)
+            return store.index('provenTxId').openCursor(partial.provenTxId, direction);
+        if (partial?.txid !== undefined)
+            return store.index('txid').openCursor(partial.txid, direction);
+        if (partial?.status !== undefined)
+            return store.index('status').openCursor(partial.status, direction);
+        if (partial?.batch !== undefined)
+            return store.index('batch').openCursor(partial.batch, direction);
+        return store.openCursor(null, direction);
+    }
     async filterProvenTxReqs(args, filtered, userId) {
-        var _a, _b, _c, _d, _e, _f, _g;
         this.assertNoUndefinedInPartial(args.partial);
-        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.`);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
-        const dbTrx = this.toDbTrx(['proven_tx_reqs', 'transactions'], 'readonly', args.trx);
-        const direction = args.orderDescending ? 'prev' : 'next';
-        let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.provenTxReqId) {
-            cursor = await dbTrx.objectStore('proven_tx_reqs').openCursor(args.partial.provenTxReqId, direction);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.provenTxId) !== undefined) {
-            cursor = await dbTrx
-                .objectStore('proven_tx_reqs')
-                .index('provenTxId')
-                .openCursor(args.partial.provenTxId, direction);
+        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.');
         }
-        else if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.txid) !== undefined) {
-            cursor = await dbTrx.objectStore('proven_tx_reqs').index('txid').openCursor(args.partial.txid, direction);
+        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.');
         }
-        else if (((_e = args.partial) === null || _e === void 0 ? void 0 : _e.status) !== undefined) {
-            cursor = await dbTrx.objectStore('proven_tx_reqs').index('status').openCursor(args.partial.status, direction);
-        }
-        else if (((_f = args.partial) === null || _f === void 0 ? void 0 : _f.batch) !== undefined) {
-            cursor = await dbTrx.objectStore('proven_tx_reqs').index('batch').openCursor(args.partial.batch, direction);
-        }
-        else {
-            cursor = await dbTrx.objectStore('proven_tx_reqs').openCursor(null, direction);
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.provenTxReqId !== undefined && r.provenTxReqId !== args.partial.provenTxReqId)
-                    continue;
-                if (args.partial.provenTxId !== undefined && r.provenTxId !== args.partial.provenTxId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.status !== undefined && r.status !== args.partial.status)
-                    continue;
-                if (args.partial.attempts !== undefined && r.attempts !== args.partial.attempts)
-                    continue;
-                if (args.partial.notified !== undefined && r.notified !== args.partial.notified)
-                    continue;
-                if (args.partial.txid !== undefined && r.txid !== args.partial.txid)
-                    continue;
-                if (args.partial.batch !== undefined && r.batch !== args.partial.batch)
-                    continue;
-                if (args.partial.history !== undefined && r.history !== args.partial.history)
-                    continue;
-                if (args.partial.notify !== undefined && r.notify !== args.partial.notify)
-                    continue;
-            }
-            if (args.status && args.status.length > 0 && !args.status.includes(r.status))
-                continue;
-            if (args.txids && args.txids.length > 0 && !args.txids.includes(r.txid))
-                continue;
+        const dbTrx = this.toDbTrx(['proven_tx_reqs', 'transactions'], 'readonly', args.trx);
+        const direction = args.orderDescending === true ? 'prev' : 'next';
+        const store = dbTrx.objectStore('proven_tx_reqs');
+        const cursor = await this.openProvenTxReqsCursor(store, args.partial, direction);
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
+            if (!(0, idbHelpers_1.matchesProvenTxReqPartial)(r, args.partial))
+                return false;
+            if (args.status != null && args.status.length > 0 && !args.status.includes(r.status))
+                return false;
+            if (args.txids != null && args.txids.length > 0 && !args.txids.includes(r.txid))
+                return false;
             if (userId !== undefined) {
                 const txsForUser = await this.countTransactions({ partial: { userId, txid: r.txid }, trx: dbTrx });
                 if (txsForUser === 0)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+                    return false;
             }
-            filtered(r);
-            count++;
-            if (((_g = args.paged) === null || _g === void 0 ? void 0 : _g.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+            return true;
+        }, filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findProvenTxReqs(args) {
@@ -655,70 +549,40 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return results;
     }
     async filterProvenTxs(args, filtered, userId) {
-        var _a, _b, _c, _d;
         this.assertNoUndefinedInPartial(args.partial);
-        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.`);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
+        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 dbTrx = this.toDbTrx(['proven_txs', 'transactions'], 'readonly', args.trx);
-        const direction = args.orderDescending ? 'prev' : 'next';
+        const direction = args.orderDescending === true ? 'prev' : 'next';
+        const store = dbTrx.objectStore('proven_txs');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.provenTxId) {
-            cursor = await dbTrx.objectStore('proven_txs').openCursor(args.partial.provenTxId, direction);
+        if (args.partial?.provenTxId != null && args.partial.provenTxId > 0) {
+            cursor = await store.openCursor(args.partial.provenTxId, direction);
         }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.txid) !== undefined) {
-            cursor = await dbTrx.objectStore('proven_txs').index('txid').openCursor(args.partial.txid, direction);
+        else if (args.partial?.txid !== undefined) {
+            cursor = await store.index('txid').openCursor(args.partial.txid, direction);
         }
         else {
-            cursor = await dbTrx.objectStore('proven_txs').openCursor(null, direction);
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.provenTxId !== undefined && r.provenTxId !== args.partial.provenTxId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.txid !== undefined && r.txid !== args.partial.txid)
-                    continue;
-                if (args.partial.height !== undefined && r.height !== args.partial.height)
-                    continue;
-                if (args.partial.index !== undefined && r.index !== args.partial.index)
-                    continue;
-                if (args.partial.blockHash !== undefined && r.blockHash !== args.partial.blockHash)
-                    continue;
-                if (args.partial.merkleRoot !== undefined && r.merkleRoot !== args.partial.merkleRoot)
-                    continue;
-            }
+            cursor = await store.openCursor(null, direction);
+        }
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
+            if (!(0, idbHelpers_1.matchesProvenTxPartial)(r, args.partial))
+                return false;
+            if (args.txids != null && args.txids.length > 0 && !args.txids.includes(r.txid))
+                return false;
             if (userId !== undefined) {
-                const count = await this.countTransactions({ partial: { userId, provenTxId: r.provenTxId }, trx: dbTrx });
-                if (count === 0)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+                const txCount = await this.countTransactions({ partial: { userId, provenTxId: r.provenTxId }, trx: dbTrx });
+                if (txCount === 0)
+                    return false;
             }
-            filtered(r);
-            count++;
-            if (((_d = args.paged) === null || _d === void 0 ? void 0 : _d.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+            return true;
+        }, filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findProvenTxs(args) {
@@ -729,59 +593,31 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return results;
     }
     async filterTxLabelMaps(args, filtered, userId) {
-        var _a, _b, _c, _d;
         this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['tx_labels_map', 'tx_labels'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('tx_labels_map');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.transactionId) !== undefined) {
-            cursor = await dbTrx.objectStore('tx_labels_map').index('transactionId').openCursor(args.partial.transactionId);
+        if (args.partial?.transactionId !== undefined) {
+            cursor = await store.index('transactionId').openCursor(args.partial.transactionId);
         }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.txLabelId) !== undefined) {
-            cursor = await dbTrx.objectStore('tx_labels_map').index('txLabelId').openCursor(args.partial.txLabelId);
+        else if (args.partial?.txLabelId !== undefined) {
+            cursor = await store.index('txLabelId').openCursor(args.partial.txLabelId);
         }
         else {
-            cursor = await dbTrx.objectStore('tx_labels_map').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.txLabelId !== undefined && r.txLabelId !== args.partial.txLabelId)
-                    continue;
-                if (args.partial.transactionId !== undefined && r.transactionId !== args.partial.transactionId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted)
-                    continue;
-            }
+            cursor = await store.openCursor();
+        }
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
+            if (!(0, idbHelpers_1.matchesTxLabelMapPartial)(r, args.partial))
+                return false;
             if (userId !== undefined) {
-                const count = await this.countTxLabels({ partial: { userId, txLabelId: r.txLabelId }, trx: dbTrx });
-                if (count === 0)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+                const labelCount = await this.countTxLabels({ partial: { userId, txLabelId: r.txLabelId }, trx: dbTrx });
+                if (labelCount === 0)
+                    return false;
             }
-            filtered(r);
-            count++;
-            if (((_d = args.paged) === null || _d === void 0 ? void 0 : _d.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+            return true;
+        }, filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findTxLabelMaps(args) {
@@ -822,10 +658,10 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
     async insertCertificate(certificate, trx) {
         const e = await this.validateEntityForInsert(certificate, trx, undefined, ['isDeleted']);
         // Strip non-schema runtime fields before insert. Matches Knex canon.
-        if (e.logger)
+        if (e.logger != null)
             delete e.logger;
         const fields = e.fields;
-        if (e.fields)
+        if (e.fields != null)
             delete e.fields;
         if (e.certificateId === 0)
             delete e.certificateId;
@@ -834,7 +670,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         try {
             const id = Number(await store.add(e));
             certificate.certificateId = id;
-            if (fields) {
+            if (fields != null) {
                 for (const field of fields) {
                     field.certificateId = certificate.certificateId;
                     field.userId = certificate.userId;
@@ -843,7 +679,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             }
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return certificate.certificateId;
@@ -856,7 +692,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             await store.add(e);
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
     }
@@ -871,7 +707,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             commission.commissionId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return commission.commissionId;
@@ -887,7 +723,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             event.id = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return event.id;
@@ -903,7 +739,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             output.outputId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return output.outputId;
@@ -919,7 +755,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             basket.basketId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return basket.basketId;
@@ -935,7 +771,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tag.outputTagId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tag.outputTagId;
@@ -948,7 +784,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             await store.add(e);
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
     }
@@ -963,7 +799,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tx.provenTxId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tx.provenTxId;
@@ -979,7 +815,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tx.provenTxReqId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tx.provenTxReqId;
@@ -995,7 +831,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             syncState.syncStateId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return syncState.syncStateId;
@@ -1011,7 +847,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tx.transactionId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tx.transactionId;
@@ -1027,7 +863,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             label.txLabelId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return label.txLabelId;
@@ -1040,7 +876,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             await store.add(e);
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
     }
@@ -1055,14 +891,15 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             user.userId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return user.userId;
     }
     async updateIdb(id, update, keyProp, storeName, trx) {
-        if (update[keyProp] !== undefined && (Array.isArray(id) || update[keyProp] !== id)) {
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`update.${keyProp}`, `undefined`);
+        const indexedUpdate = update;
+        if (indexedUpdate[keyProp] !== undefined && (Array.isArray(id) || indexedUpdate[keyProp] !== id)) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`update.${keyProp}`, 'undefined');
         }
         const u = this.validatePartialForUpdate(update);
         const dbTrx = this.toDbTrx([storeName], 'readwrite', trx);
@@ -1074,30 +911,34 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 const e = await store.get(i);
                 // Match Knex/Bun semantics: missing rows produce a 0-row result, not an error.
                 // Caller receives the true updated count and can decide how to react.
-                if (!e)
+                if (e == null)
                     continue;
                 const v = {
                     ...e,
                     ...u
                 };
                 const uid = await store.put(v);
-                if (uid !== i)
-                    throw new WERR_errors_1.WERR_INTERNAL(`updated id ${uid} does not match original ${id}`);
+                if (uid !== i) {
+                    const uidText = typeof uid === 'object' ? JSON.stringify(uid) : String(uid);
+                    throw new WERR_errors_1.WERR_INTERNAL(`updated id ${uidText} does not match original ${String(id)}`);
+                }
                 updated++;
             }
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return updated;
     }
     async updateIdbKey(key, update, keyProps, storeName, trx) {
-        if (key.length !== keyProps.length)
+        const indexedUpdate = update;
+        if (key.length !== keyProps.length) {
             throw new WERR_errors_1.WERR_INTERNAL(`key.length ${key.length} !== keyProps.length ${keyProps.length}`);
+        }
         for (let i = 0; i < key.length; i++) {
-            if (update[keyProps[i]] !== undefined && update[keyProps[i]] !== key[i]) {
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`update.${keyProps[i]}`, `undefined`);
+            if (indexedUpdate[keyProps[i]] !== undefined && indexedUpdate[keyProps[i]] !== key[i]) {
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`update.${keyProps[i]}`, 'undefined');
             }
         }
         const u = this.validatePartialForUpdate(update);
@@ -1105,8 +946,9 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         const store = dbTrx.objectStore(storeName);
         try {
             const e = await store.get(key);
-            if (!e)
+            if (e == null) {
                 throw new WERR_errors_1.WERR_INVALID_PARAMETER('key', `an existing record to update ${keyProps.join(',')} ${key.join(',')} not found`);
+            }
             const v = {
                 ...e,
                 ...u
@@ -1114,77 +956,281 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             const uid = await store.put(v);
             for (let i = 0; i < key.length; i++) {
                 if (uid[i] !== key[i])
-                    throw new WERR_errors_1.WERR_INTERNAL(`updated key ${uid[i]} does not match original ${key[i]}`);
+                    throw new WERR_errors_1.WERR_INTERNAL(`updated key ${String(uid[i])} does not match original ${String(key[i])}`);
             }
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return 1;
     }
     async updateCertificate(id, update, trx) {
-        return this.updateIdb(id, update, 'certificateId', 'certificates', trx);
+        return await this.updateIdb(id, update, 'certificateId', 'certificates', trx);
     }
     async updateCertificateField(certificateId, fieldName, update, trx) {
-        return this.updateIdbKey([certificateId, fieldName], update, ['certificateId', 'fieldName'], 'certificate_fields', trx);
+        return await this.updateIdbKey([certificateId, fieldName], update, ['certificateId', 'fieldName'], 'certificate_fields', trx);
     }
     async updateCommission(id, update, trx) {
-        return this.updateIdb(id, update, 'commissionId', 'commissions', trx);
+        return await this.updateIdb(id, update, 'commissionId', 'commissions', trx);
     }
     async updateMonitorEvent(id, update, trx) {
-        return this.updateIdb(id, update, 'id', 'monitor_events', trx);
+        return await this.updateIdb(id, update, 'id', 'monitor_events', trx);
     }
     async updateOutput(id, update, trx) {
-        return this.updateIdb(id, update, 'outputId', 'outputs', trx);
+        return await this.updateIdb(id, update, 'outputId', 'outputs', trx);
     }
     async updateOutputBasket(id, update, trx) {
-        return this.updateIdb(id, update, 'basketId', 'output_baskets', trx);
+        return await this.updateIdb(id, update, 'basketId', 'output_baskets', trx);
     }
     async updateOutputTag(id, update, trx) {
-        return this.updateIdb(id, update, 'outputTagId', 'output_tags', trx);
+        return await this.updateIdb(id, update, 'outputTagId', 'output_tags', trx);
     }
     async updateProvenTx(id, update, trx) {
-        return this.updateIdb(id, update, 'provenTxId', 'proven_txs', trx);
+        return await this.updateIdb(id, update, 'provenTxId', 'proven_txs', trx);
     }
     async updateProvenTxReq(id, update, trx) {
-        return this.updateIdb(id, update, 'provenTxReqId', 'proven_tx_reqs', trx);
+        return await this.updateIdb(id, update, 'provenTxReqId', 'proven_tx_reqs', trx);
     }
     async updateSyncState(id, update, trx) {
-        return this.updateIdb(id, update, 'syncStateId', 'sync_states', trx);
+        return await this.updateIdb(id, update, 'syncStateId', 'sync_states', trx);
     }
     async updateTransaction(id, update, trx) {
-        return this.updateIdb(id, update, 'transactionId', 'transactions', trx);
+        return await this.updateIdb(id, update, 'transactionId', 'transactions', trx);
     }
     async updateTxLabel(id, update, trx) {
-        return this.updateIdb(id, update, 'txLabelId', 'tx_labels', trx);
+        return await this.updateIdb(id, update, 'txLabelId', 'tx_labels', trx);
     }
     async updateUser(id, update, trx) {
-        return this.updateIdb(id, update, 'userId', 'users', trx);
+        return await this.updateIdb(id, update, 'userId', 'users', trx);
     }
     async updateOutputTagMap(outputId, tagId, update, trx) {
-        return this.updateIdbKey([tagId, outputId], update, ['outputTagId', 'outputId'], 'output_tags_map', trx);
+        return await this.updateIdbKey([tagId, outputId], update, ['outputTagId', 'outputId'], 'output_tags_map', trx);
     }
     async updateTxLabelMap(transactionId, txLabelId, update, trx) {
-        return this.updateIdbKey([txLabelId, transactionId], update, ['txLabelId', 'transactionId'], 'tx_labels_map', trx);
+        return await this.updateIdbKey([txLabelId, transactionId], update, ['txLabelId', 'transactionId'], 'tx_labels_map', trx);
     }
     //
     // StorageReader abstract methods
     //
     async destroy() {
-        if (this.db) {
+        if (this.db != null) {
             this.db.close();
         }
         this.db = undefined;
         this._settings = undefined;
     }
+    allStores = [
+        'action_batches',
+        'action_batch_outputs',
+        'action_batch_blobs',
+        'certificates',
+        'certificate_fields',
+        'commissions',
+        'monitor_events',
+        'outputs',
+        'output_baskets',
+        'output_tags',
+        'output_tags_map',
+        'proven_txs',
+        'proven_tx_reqs',
+        'sync_states',
+        'transactions',
+        'tx_labels',
+        'tx_labels_map',
+        'users'
+    ];
+    async insertActionBatch(batch, trx) {
+        const tx = this.toDbTrx(['action_batches'], 'readwrite', trx);
+        const { actionBatchId: _actionBatchId, ...withoutId } = batch;
+        const entity = batch.actionBatchId === 0 ? withoutId : batch;
+        const store = tx.objectStore('action_batches');
+        if (store.add == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batches store does not support add');
+        const id = await store.add(entity);
+        batch.actionBatchId = Number(id);
+        if (trx == null)
+            await tx.done;
+        return Number(id);
+    }
+    async findActionBatch(userId, batchId, trx) {
+        const tx = this.toDbTrx(['action_batches'], 'readonly', trx);
+        const index = tx.objectStore('action_batches').index('userId_batchId');
+        if (index.get == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batches userId_batchId index does not support get');
+        const batch = await index.get([userId, batchId]);
+        if (trx == null)
+            await tx.done;
+        return batch;
+    }
+    async findExpiredActionBatches(now, trx) {
+        const tx = this.toDbTrx(['action_batches'], 'readonly', trx);
+        const store = tx.objectStore('action_batches');
+        if (store.getAll == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batches store does not support getAll');
+        const rows = await store.getAll();
+        if (trx == null)
+            await tx.done;
+        return rows.filter(r => (r.status === 'active' || r.status === 'prepared') &&
+            (r.expiresAt.getTime() <= now.getTime() || r.hardExpiresAt.getTime() <= now.getTime()));
+    }
+    async updateActionBatch(actionBatchId, update, trx) {
+        const tx = this.toDbTrx(['action_batches'], 'readwrite', trx);
+        const store = tx.objectStore('action_batches');
+        if (store.get == null || store.put == null) {
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batches store does not support get and put');
+        }
+        const batch = await store.get(actionBatchId);
+        if (batch == null) {
+            if (trx == null)
+                await tx.done;
+            return 0;
+        }
+        await store.put({ ...batch, ...update, updated_at: new Date() });
+        if (trx == null)
+            await tx.done;
+        return 1;
+    }
+    async deleteActionBatch(actionBatchId, trx) {
+        const tx = this.toDbTrx(['action_batches'], 'readwrite', trx);
+        const store = tx.objectStore('action_batches');
+        if (store.delete == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batches store does not support delete');
+        await store.delete(actionBatchId);
+        if (trx == null)
+            await tx.done;
+    }
+    async reserveActionBatchOutputs(reservations, trx) {
+        if (reservations.length === 0)
+            return;
+        const tx = this.toDbTrx(['action_batch_outputs'], 'readwrite', trx);
+        const store = tx.objectStore('action_batch_outputs');
+        if (store.add == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_outputs store does not support add');
+        for (const reservation of reservations)
+            await store.add(reservation);
+        if (trx == null)
+            await tx.done;
+    }
+    async findActionBatchOutputIds(actionBatchId, trx) {
+        const tx = this.toDbTrx(['action_batch_outputs'], 'readonly', trx);
+        const index = tx.objectStore('action_batch_outputs').index('actionBatchId');
+        if (index.getAll == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_outputs index does not support getAll');
+        const rows = await index.getAll(actionBatchId);
+        if (trx == null)
+            await tx.done;
+        return rows.map(r => r.outputId);
+    }
+    async findReservedActionBatchOutputIds(outputIds, trx) {
+        const tx = this.toDbTrx(['action_batch_outputs', 'action_batches'], 'readonly', trx);
+        const store = tx.objectStore('action_batch_outputs');
+        const batchStore = tx.objectStore('action_batches');
+        if (store.get == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_outputs store does not support get');
+        const reserved = [];
+        const now = Date.now();
+        for (const outputId of outputIds) {
+            const reservation = await store.get(outputId);
+            if (reservation == null)
+                continue;
+            const batch = await batchStore.get(reservation.actionBatchId);
+            if (batch != null &&
+                (batch.status === 'active' || batch.status === 'prepared') &&
+                batch.expiresAt.getTime() > now &&
+                batch.hardExpiresAt.getTime() > now)
+                reserved.push(outputId);
+        }
+        if (trx == null)
+            await tx.done;
+        return reserved;
+    }
+    async deleteActionBatchOutputReservations(actionBatchId, trx) {
+        const tx = this.toDbTrx(['action_batch_outputs'], 'readwrite', trx);
+        const store = tx.objectStore('action_batch_outputs');
+        const index = store.index('actionBatchId');
+        if (index.getAllKeys == null || store.delete == null) {
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_outputs store does not support indexed deletion');
+        }
+        const keys = await index.getAllKeys(actionBatchId);
+        for (const key of keys)
+            await store.delete(key);
+        if (trx == null)
+            await tx.done;
+    }
+    async putActionBatchBlobRecord(blob, trx) {
+        const tx = this.toDbTrx(['action_batch_blobs'], 'readwrite', trx);
+        const store = tx.objectStore('action_batch_blobs');
+        if (store.put == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_blobs store does not support put');
+        await store.put({
+            ...blob,
+            bytes: blob.bytes instanceof Uint8Array ? blob.bytes : Uint8Array.from(blob.bytes)
+        });
+        if (trx == null)
+            await tx.done;
+    }
+    async findActionBatchBlobRecord(actionBatchId, digest, trx) {
+        const tx = this.toDbTrx(['action_batch_blobs'], 'readonly', trx);
+        const store = tx.objectStore('action_batch_blobs');
+        if (store.get == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_blobs store does not support get');
+        const blob = await store.get([actionBatchId, digest]);
+        if (trx == null)
+            await tx.done;
+        return blob;
+    }
+    async findActionBatchBlobRecords(actionBatchId, digests, trx) {
+        const tx = this.toDbTrx(['action_batch_blobs'], 'readonly', trx);
+        const store = tx.objectStore('action_batch_blobs');
+        if (store.get == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_blobs store does not support get');
+        const blobs = [];
+        for (const digest of new Set(digests)) {
+            const blob = await store.get([actionBatchId, digest]);
+            if (blob != null)
+                blobs.push(blob);
+        }
+        if (trx == null)
+            await tx.done;
+        return blobs;
+    }
+    async putActionBatchBlobRecords(blobs, trx) {
+        if (blobs.length === 0)
+            return;
+        const tx = this.toDbTrx(['action_batch_blobs'], 'readwrite', trx);
+        const store = tx.objectStore('action_batch_blobs');
+        if (store.put == null)
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_blobs store does not support put');
+        for (const blob of blobs) {
+            await store.put({
+                ...blob,
+                bytes: blob.bytes instanceof Uint8Array ? blob.bytes : Uint8Array.from(blob.bytes)
+            });
+        }
+        if (trx == null)
+            await tx.done;
+    }
+    async deleteActionBatchBlobRecords(actionBatchId, trx) {
+        const tx = this.toDbTrx(['action_batch_blobs'], 'readwrite', trx);
+        const store = tx.objectStore('action_batch_blobs');
+        const index = store.index('actionBatchId');
+        if (index.getAllKeys == null || store.delete == null) {
+            throw new WERR_errors_1.WERR_INTERNAL('IndexedDB action_batch_blobs store does not support indexed deletion');
+        }
+        const keys = await index.getAllKeys(actionBatchId);
+        for (const key of keys)
+            await store.delete(key);
+        if (trx == null)
+            await tx.done;
+    }
     /**
      * @param scope
      * @param trx
      * @returns
      */
     async transaction(scope, trx) {
-        if (trx)
+        if (trx != null)
             return await scope(trx);
         const stores = this.allStores;
         const db = await this.verifyDB();
@@ -1201,61 +1247,22 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         }
     }
     async filterCertificateFields(args, filtered) {
-        var _a, _b, _c, _d;
         this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['certificate_fields'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('certificate_fields');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.certificateId) !== undefined) {
-            cursor = await dbTrx
-                .objectStore('certificate_fields')
-                .index('certificateId')
-                .openCursor(args.partial.certificateId);
+        if (args.partial?.certificateId !== undefined) {
+            cursor = await store.index('certificateId').openCursor(args.partial.certificateId);
         }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            cursor = await dbTrx.objectStore('certificate_fields').index('userId').openCursor(args.partial.userId);
+        else if (args.partial?.userId !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
         }
         else {
-            cursor = await dbTrx.objectStore('certificate_fields').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.certificateId !== undefined && r.certificateId !== args.partial.certificateId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.fieldName !== undefined && r.fieldName !== args.partial.fieldName)
-                    continue;
-                if (args.partial.fieldValue !== undefined && r.fieldValue !== args.partial.fieldValue)
-                    continue;
-                if (args.partial.masterKey !== undefined && r.masterKey !== args.partial.masterKey)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_d = args.paged) === null || _d === void 0 ? void 0 : _d.limit) && count >= args.paged.limit)
-                break;
+            cursor = await store.openCursor();
         }
-        if (!args.trx)
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesCertificateFieldPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findCertificateFields(args) {
@@ -1265,81 +1272,39 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         });
         return result;
     }
-    async filterCertificates(args, filtered) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
-        const dbTrx = this.toDbTrx(['certificates'], 'readonly', args.trx);
-        let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.certificateId) {
-            cursor = await dbTrx.objectStore('certificates').openCursor(args.partial.certificateId);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.type) && ((_e = args.partial) === null || _e === void 0 ? void 0 : _e.certifier) && ((_f = args.partial) === null || _f === void 0 ? void 0 : _f.serialNumber)) {
-                cursor = await dbTrx
-                    .objectStore('certificates')
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async openCertificatesCursor(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    store, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    partial
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
+        if (partial?.certificateId != null && partial.certificateId !== 0)
+            return store.openCursor(partial.certificateId);
+        if (partial?.userId !== undefined) {
+            if (partial?.type != null && partial?.certifier != null && partial?.serialNumber != null) {
+                return store
                     .index('userId_type_certifier_serialNumber')
-                    .openCursor([args.partial.userId, args.partial.type, args.partial.certifier, args.partial.serialNumber]);
-            }
-            else {
-                cursor = await dbTrx.objectStore('certificates').index('userId').openCursor(args.partial.userId);
-            }
-        }
-        else {
-            cursor = await dbTrx.objectStore('certificates').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.certifiers && !args.certifiers.includes(r.certifier))
-                continue;
-            if (args.types && !args.types.includes(r.type))
-                continue;
-            if (args.partial) {
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.certificateId !== undefined && r.certificateId !== args.partial.certificateId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.type !== undefined && r.type !== args.partial.type)
-                    continue;
-                if (args.partial.serialNumber !== undefined && r.serialNumber !== args.partial.serialNumber)
-                    continue;
-                if (args.partial.certifier !== undefined && r.certifier !== args.partial.certifier)
-                    continue;
-                if (args.partial.subject !== undefined && r.subject !== args.partial.subject)
-                    continue;
-                if (args.partial.verifier !== undefined && r.verifier !== args.partial.verifier)
-                    continue;
-                if (args.partial.revocationOutpoint !== undefined && r.revocationOutpoint !== args.partial.revocationOutpoint)
-                    continue;
-                if (args.partial.signature !== undefined && r.signature !== args.partial.signature)
-                    continue;
-                if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+                    .openCursor([partial.userId, partial.type, partial.certifier, partial.serialNumber]);
             }
-            filtered(r);
-            count++;
-            if (((_g = args.paged) === null || _g === void 0 ? void 0 : _g.limit) && count >= args.paged.limit)
-                break;
+            return store.index('userId').openCursor(partial.userId);
         }
-        if (!args.trx)
+        return store.openCursor();
+    }
+    async filterCertificates(args, filtered) {
+        this.assertNoUndefinedInPartial(args.partial);
+        const dbTrx = this.toDbTrx(['certificates'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('certificates');
+        const cursor = await this.openCertificatesCursor(store, args.partial);
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => {
+            if (args.certifiers != null && !args.certifiers.includes(r.certifier))
+                return false;
+            if (args.types != null && !args.types.includes(r.type))
+                return false;
+            return (0, idbHelpers_1.matchesCertificatePartial)(r, args.partial);
+        }, filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findCertificates(args) {
@@ -1347,7 +1312,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         await this.filterCertificates(args, r => {
             result.push(this.validateEntity(r));
         });
-        if (args.includeFields) {
+        if (args.includeFields === true) {
             for (const c of result) {
                 const fields = await this.findCertificateFields({ partial: { certificateId: c.certificateId }, trx: args.trx });
                 c.fields = fields;
@@ -1356,65 +1321,28 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return result;
     }
     async filterCommissions(args, filtered) {
-        var _a, _b, _c, _d, _e;
         this.assertNoUndefinedInPartial(args.partial);
-        if (args.partial.lockingScript)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('partial.lockingScript', `undefined. Commissions may not be found by lockingScript value.`);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
+        if (args.partial.lockingScript != null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('partial.lockingScript', 'undefined. Commissions may not be found by lockingScript value.');
+        }
         const dbTrx = this.toDbTrx(['commissions'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('commissions');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.commissionId) {
-            cursor = await dbTrx.objectStore('commissions').openCursor(args.partial.commissionId);
+        if (args.partial?.commissionId != null && args.partial.commissionId !== 0) {
+            cursor = await store.openCursor(args.partial.commissionId);
         }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            cursor = await dbTrx.objectStore('commissions').index('userId').openCursor(args.partial.userId);
+        else if (args.partial?.userId !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
         }
-        else if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.transactionId) !== undefined) {
-            cursor = await dbTrx.objectStore('commissions').index('transactionId').openCursor(args.partial.transactionId);
+        else if (args.partial?.transactionId !== undefined) {
+            cursor = await store.index('transactionId').openCursor(args.partial.transactionId);
         }
         else {
-            cursor = await dbTrx.objectStore('commissions').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.commissionId !== undefined && r.commissionId !== args.partial.commissionId)
-                    continue;
-                if (args.partial.transactionId !== undefined && r.transactionId !== args.partial.transactionId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.satoshis !== undefined && r.satoshis !== args.partial.satoshis)
-                    continue;
-                if (args.partial.keyOffset !== undefined && r.keyOffset !== args.partial.keyOffset)
-                    continue;
-                if (args.partial.isRedeemed !== undefined && r.isRedeemed !== args.partial.isRedeemed)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_e = args.paged) === null || _e === void 0 ? void 0 : _e.limit) && count >= args.paged.limit)
-                break;
+            cursor = await store.openCursor();
         }
-        if (!args.trx)
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesCommissionPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findCommissions(args) {
@@ -1425,352 +1353,186 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return result;
     }
     async filterMonitorEvents(args, filtered) {
-        var _a, _b, _c;
         this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['monitor_events'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('monitor_events');
+        const cursor = args.partial?.id != null && args.partial.id !== 0
+            ? await store.openCursor(args.partial.id)
+            : await store.openCursor();
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesMonitorEventPartial)(r, args.partial), filtered);
+        if (args.trx == null)
+            await dbTrx.done;
+    }
+    async findMonitorEvents(args) {
+        const result = [];
+        await this.filterMonitorEvents(args, r => {
+            result.push(this.validateEntity(r));
+        });
+        return result;
+    }
+    async filterOutputBaskets(args, filtered) {
+        this.assertNoUndefinedInPartial(args.partial);
+        const dbTrx = this.toDbTrx(['output_baskets'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('output_baskets');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.id) {
-            cursor = await dbTrx.objectStore('monitor_events').openCursor(args.partial.id);
+        if (args.partial?.basketId != null && args.partial.basketId !== 0) {
+            cursor = await store.openCursor(args.partial.basketId);
         }
-        else {
-            cursor = await dbTrx.objectStore('monitor_events').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.id !== undefined && r.id !== args.partial.id)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.event !== undefined && r.event !== args.partial.event)
-                    continue;
-                if (args.partial.details !== undefined && r.details !== args.partial.details)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_c = args.paged) === null || _c === void 0 ? void 0 : _c.limit) && count >= args.paged.limit)
-                break;
+        else if (args.partial?.userId !== undefined && args.partial?.name !== undefined) {
+            cursor = await store.index('name_userId').openCursor([args.partial.name, args.partial.userId]);
+        }
+        else if (args.partial?.userId !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
+        }
+        else {
+            cursor = await store.openCursor();
         }
-        if (!args.trx)
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesOutputBasketPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
-    async findMonitorEvents(args) {
+    async findOutputBaskets(args) {
         const result = [];
-        await this.filterMonitorEvents(args, r => {
+        await this.filterOutputBaskets(args, r => {
             result.push(this.validateEntity(r));
         });
         return result;
     }
-    async filterOutputBaskets(args, filtered) {
-        var _a, _b, _c, _d, _e;
-        this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
-        const dbTrx = this.toDbTrx(['output_baskets'], 'readonly', args.trx);
-        let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.basketId) {
-            cursor = await dbTrx.objectStore('output_baskets').openCursor(args.partial.basketId);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.name) !== undefined) {
-                cursor = await dbTrx
-                    .objectStore('output_baskets')
-                    .index('name_userId')
-                    .openCursor([args.partial.name, args.partial.userId]);
-            }
-            else {
-                cursor = await dbTrx.objectStore('output_baskets').index('userId').openCursor(args.partial.userId);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async openOutputsCursor(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    store, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    partial, direction
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
+        if (partial?.outputId != null && partial.outputId !== 0)
+            return store.openCursor(partial.outputId, direction);
+        if (partial?.userId !== undefined) {
+            if (partial?.transactionId != null && partial.transactionId !== 0 && partial?.vout !== undefined) {
+                return store
+                    .index('transactionId_vout_userId')
+                    .openCursor([partial.transactionId, partial.vout, partial.userId], direction);
             }
-        }
-        else {
-            cursor = await dbTrx.objectStore('output_baskets').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.basketId !== undefined && r.basketId !== args.partial.basketId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.name !== undefined && r.name !== args.partial.name)
-                    continue;
-                if (args.partial.numberOfDesiredUTXOs !== undefined &&
-                    r.numberOfDesiredUTXOs !== args.partial.numberOfDesiredUTXOs)
-                    continue;
-                if (args.partial.minimumDesiredUTXOValue !== undefined &&
-                    r.numberOfDesiredSatoshis !== args.partial.minimumDesiredUTXOValue)
-                    continue;
-                if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted)
-                    continue;
+            if (partial?.txid != null && partial.txid !== '' && partial?.vout !== undefined) {
+                return store
+                    .index('txid_vout_userId')
+                    .openCursor([partial.txid, partial.vout, partial.userId], direction);
             }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+            if (partial?.basketId !== undefined) {
+                return store.index('userId_basketId').openCursor([partial.userId, partial.basketId], direction);
             }
-            filtered(r);
-            count++;
-            if (((_e = args.paged) === null || _e === void 0 ? void 0 : _e.limit) && count >= args.paged.limit)
-                break;
+            return store.index('userId').openCursor(partial.userId, direction);
         }
-        if (!args.trx)
-            await dbTrx.done;
+        if (partial?.transactionId !== undefined)
+            return store.index('transactionId').openCursor(partial.transactionId, direction);
+        if (partial?.basketId !== undefined)
+            return store.index('basketId').openCursor(partial.basketId, direction);
+        if (partial?.spentBy !== undefined)
+            return store.index('spentBy').openCursor(partial.spentBy, direction);
+        return store.openCursor(null, direction);
     }
-    async findOutputBaskets(args) {
-        const result = [];
-        await this.filterOutputBaskets(args, r => {
-            result.push(this.validateEntity(r));
-        });
-        return result;
+    async eligibleOutputTransactionIds(args, dbTrx) {
+        if (args.txStatus == null)
+            return undefined;
+        const validTransactionIds = new Set();
+        const transactions = dbTrx.objectStore('transactions');
+        for (const status of args.txStatus) {
+            const index = args.partial.userId === undefined
+                ? transactions.index('status')
+                : transactions.index('status_userId');
+            const key = args.partial.userId === undefined ? status : [status, args.partial.userId];
+            for (const transactionId of await index.getAllKeys(key))
+                validTransactionIds.add(Number(transactionId));
+        }
+        return validTransactionIds;
     }
     async filterOutputs(args, filtered, tagIds, isQueryModeAll) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.assertNoUndefinedInPartial(args.partial);
-        // args.txStatus
-        // args.noScript
-        if (args.partial.lockingScript)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.lockingScript', `undefined. Outputs may not be found by lockingScript value.`);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
+        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 stores = ['outputs'];
-        if (tagIds && tagIds.length > 0) {
+        if (tagIds != null && tagIds.length > 0)
             stores.push('output_tags_map');
-        }
-        if (args.txStatus) {
+        if (args.txStatus != null)
             stores.push('transactions');
-        }
         const dbTrx = this.toDbTrx(stores, 'readonly', args.trx);
-        const direction = args.orderDescending ? 'prev' : 'next';
-        let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.outputId) {
-            cursor = await dbTrx.objectStore('outputs').openCursor(args.partial.outputId, direction);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.transactionId) && ((_e = args.partial) === null || _e === void 0 ? void 0 : _e.vout) !== undefined) {
-                cursor = await dbTrx
-                    .objectStore('outputs')
-                    .index('transactionId_vout_userId')
-                    .openCursor([args.partial.transactionId, args.partial.vout, args.partial.userId], direction);
-            }
-            else {
-                cursor = await dbTrx.objectStore('outputs').index('userId').openCursor(args.partial.userId, direction);
-            }
-        }
-        else if (((_f = args.partial) === null || _f === void 0 ? void 0 : _f.transactionId) !== undefined) {
-            cursor = await dbTrx.objectStore('outputs').index('transactionId').openCursor(args.partial.transactionId, direction);
-        }
-        else if (((_g = args.partial) === null || _g === void 0 ? void 0 : _g.basketId) !== undefined) {
-            cursor = await dbTrx.objectStore('outputs').index('basketId').openCursor(args.partial.basketId, direction);
-        }
-        else if (((_h = args.partial) === null || _h === void 0 ? void 0 : _h.spentBy) !== undefined) {
-            cursor = await dbTrx.objectStore('outputs').index('spentBy').openCursor(args.partial.spentBy, direction);
-        }
-        else {
-            cursor = await dbTrx.objectStore('outputs').openCursor(null, direction);
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.outputId !== undefined && r.outputId !== args.partial.outputId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.transactionId !== undefined && r.transactionId !== args.partial.transactionId)
-                    continue;
-                if (args.partial.basketId !== undefined && r.basketId !== args.partial.basketId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.spendable !== undefined && r.spendable !== args.partial.spendable)
-                    continue;
-                if (args.partial.change !== undefined && r.change !== args.partial.change)
-                    continue;
-                if (args.partial.outputDescription !== undefined && r.outputDescription !== args.partial.outputDescription)
-                    continue;
-                if (args.partial.vout !== undefined && r.vout !== args.partial.vout)
-                    continue;
-                if (args.partial.satoshis !== undefined && r.satoshis !== args.partial.satoshis)
-                    continue;
-                if (args.partial.providedBy !== undefined && r.providedBy !== args.partial.providedBy)
-                    continue;
-                if (args.partial.purpose !== undefined && r.purpose !== args.partial.purpose)
-                    continue;
-                if (args.partial.type !== undefined && r.type !== args.partial.type)
-                    continue;
-                if (args.partial.txid !== undefined && r.txid !== args.partial.txid)
-                    continue;
-                if (args.partial.senderIdentityKey !== undefined && r.senderIdentityKey !== args.partial.senderIdentityKey)
-                    continue;
-                if (args.partial.derivationPrefix !== undefined && r.derivationPrefix !== args.partial.derivationPrefix)
-                    continue;
-                if (args.partial.derivationSuffix !== undefined && r.derivationSuffix !== args.partial.derivationSuffix)
-                    continue;
-                if (args.partial.customInstructions !== undefined && r.customInstructions !== args.partial.customInstructions)
-                    continue;
-                if (args.partial.spentBy !== undefined && r.spentBy !== args.partial.spentBy)
-                    continue;
-                if (args.partial.sequenceNumber !== undefined && r.sequenceNumber !== args.partial.sequenceNumber)
-                    continue;
-                if (args.partial.scriptLength !== undefined && r.scriptLength !== args.partial.scriptLength)
-                    continue;
-                if (args.partial.scriptOffset !== undefined && r.scriptOffset !== args.partial.scriptOffset)
-                    continue;
-            }
-            if (args.txStatus !== undefined && args.txStatus.length > 0) {
-                const count = await this.countTransactions({
-                    partial: { transactionId: r.transactionId },
-                    status: args.txStatus,
-                    trx: dbTrx
-                });
-                if (count === 0)
-                    continue;
-            }
-            if (tagIds && tagIds.length > 0) {
-                let ids = [...tagIds];
-                await this.filterOutputTagMaps({ partial: { outputId: r.outputId }, trx: dbTrx }, tm => {
-                    if (ids.length > 0) {
-                        const i = ids.indexOf(tm.outputTagId);
-                        if (i >= 0) {
-                            if (isQueryModeAll) {
-                                ids.splice(i, 1);
-                            }
-                            else {
-                                ids = [];
-                            }
-                        }
-                    }
-                });
-                if (ids.length > 0)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            if (args.noScript === true) {
+        const direction = args.orderDescending === true ? 'prev' : 'next';
+        const store = dbTrx.objectStore('outputs');
+        const validTransactionIds = await this.eligibleOutputTransactionIds(args, dbTrx);
+        const cursor = await this.openOutputsCursor(store, args.partial, direction);
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
+            if (!(0, idbHelpers_1.matchesOutputPartial)(r, args.partial))
+                return false;
+            if (validTransactionIds != null && !validTransactionIds.has(r.transactionId))
+                return false;
+            if (tagIds != null &&
+                tagIds.length > 0 &&
+                !(await this.outputMatchesTags(r.outputId, tagIds, isQueryModeAll, dbTrx)))
+                return false;
+            return true;
+        }, r => {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            if (args.noScript === true)
                 r.script = undefined;
-            }
             filtered(r);
-            count++;
-            if (((_j = args.paged) === null || _j === void 0 ? void 0 : _j.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+        });
+        if (args.trx == null)
             await dbTrx.done;
     }
+    async outputMatchesTags(outputId, tagIds, isQueryModeAll, dbTrx) {
+        let ids = [...tagIds];
+        await this.filterOutputTagMaps({ partial: { outputId }, trx: dbTrx }, tm => {
+            if (ids.length > 0) {
+                const i = ids.indexOf(tm.outputTagId);
+                if (i >= 0) {
+                    if (isQueryModeAll === true) {
+                        ids.splice(i, 1);
+                    }
+                    else {
+                        ids = [];
+                    }
+                }
+            }
+        });
+        return ids.length === 0;
+    }
     async findOutputs(args, tagIds, isQueryModeAll) {
         const results = [];
         await this.filterOutputs(args, r => {
             results.push(this.validateEntity(r));
         }, tagIds, isQueryModeAll);
         for (const o of results) {
-            // noScript skips the rawTx-slice re-hydration but does not wipe script already
-            // on the row — parity with Knex/Bun, which simply don't SELECT the column.
-            if (!args.noScript)
+            if (args.noScript === true) {
+                o.lockingScript = undefined;
+            }
+            else {
                 await this.validateOutputScript(o, args.trx);
+            }
         }
         return results;
     }
     async filterOutputTags(args, filtered) {
-        var _a, _b, _c, _d, _e;
-        this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['output_tags'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('output_tags');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.outputTagId) {
-            cursor = await dbTrx.objectStore('output_tags').openCursor(args.partial.outputTagId);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.tag) !== undefined) {
-                cursor = await dbTrx
-                    .objectStore('output_tags')
-                    .index('tag_userId')
-                    .openCursor([args.partial.tag, args.partial.userId]);
-            }
-            else {
-                cursor = await dbTrx.objectStore('output_tags').index('userId').openCursor(args.partial.userId);
-            }
+        if (args.partial?.outputTagId != null && args.partial.outputTagId !== 0) {
+            cursor = await store.openCursor(args.partial.outputTagId);
+        }
+        else if (args.partial?.userId !== undefined && args.partial?.tag !== undefined) {
+            cursor = await store.index('tag_userId').openCursor([args.partial.tag, args.partial.userId]);
+        }
+        else if (args.partial?.userId !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
         }
         else {
-            cursor = await dbTrx.objectStore('output_tags').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.outputTagId !== undefined && r.outputTagId !== args.partial.outputTagId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.tag !== undefined && r.tag !== args.partial.tag)
-                    continue;
-                if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_e = args.paged) === null || _e === void 0 ? void 0 : _e.limit) && count >= args.paged.limit)
-                break;
+            cursor = await store.openCursor();
         }
-        if (!args.trx)
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesOutputTagPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findOutputTags(args) {
@@ -1781,78 +1543,30 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return result;
     }
     async filterSyncStates(args, filtered) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        this.assertNoUndefinedInPartial(args.partial);
-        if (args.partial.syncMap)
-            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.syncMap', `undefined. SyncStates may not be found by syncMap value.`);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
+        if (args.partial.syncMap != null && args.partial.syncMap !== '') {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args.partial.syncMap', 'undefined. SyncStates may not be found by syncMap value.');
+        }
         const dbTrx = this.toDbTrx(['sync_states'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('sync_states');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.syncStateId) {
-            cursor = await dbTrx.objectStore('sync_states').openCursor(args.partial.syncStateId);
+        if (args.partial?.syncStateId != null && args.partial.syncStateId !== 0) {
+            cursor = await store.openCursor(args.partial.syncStateId);
         }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            cursor = await dbTrx.objectStore('sync_states').index('userId').openCursor(args.partial.userId);
+        else if (args.partial?.userId !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
         }
-        else if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.refNum) !== undefined) {
-            cursor = await dbTrx.objectStore('sync_states').index('refNum').openCursor(args.partial.refNum);
+        else if (args.partial?.refNum !== undefined) {
+            cursor = await store.index('refNum').openCursor(args.partial.refNum);
         }
-        else if (((_e = args.partial) === null || _e === void 0 ? void 0 : _e.status) !== undefined) {
-            cursor = await dbTrx.objectStore('sync_states').index('status').openCursor(args.partial.status);
+        else if (args.partial?.status !== undefined) {
+            cursor = await store.index('status').openCursor(args.partial.status);
         }
         else {
-            cursor = await dbTrx.objectStore('sync_states').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.syncStateId !== undefined && r.syncStateId !== args.partial.syncStateId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.storageIdentityKey !== undefined && r.storageIdentityKey !== args.partial.storageIdentityKey)
-                    continue;
-                if (args.partial.storageName !== undefined && r.storageName !== args.partial.storageName)
-                    continue;
-                if (args.partial.status !== undefined && r.status !== args.partial.status)
-                    continue;
-                if (args.partial.init !== undefined && r.init !== args.partial.init)
-                    continue;
-                if (args.partial.refNum !== undefined && r.refNum !== args.partial.refNum)
-                    continue;
-                if (args.partial.when !== undefined && ((_f = r.when) === null || _f === void 0 ? void 0 : _f.getTime()) !== args.partial.when.getTime())
-                    continue;
-                if (args.partial.satoshis !== undefined && r.satoshis !== args.partial.satoshis)
-                    continue;
-                if (args.partial.errorLocal !== undefined && r.errorLocale !== args.partial.errorLocal)
-                    continue;
-                if (args.partial.errorOther !== undefined && r.errorOther !== args.partial.errorOther)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_g = args.paged) === null || _g === void 0 ? void 0 : _g.limit) && count >= args.paged.limit)
-                break;
+            cursor = await store.openCursor();
         }
-        if (!args.trx)
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesSyncStatePartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findSyncStates(args) {
@@ -1862,125 +1576,78 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         });
         return result;
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async openTransactionsCursor(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    store, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    partial, direction
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
+        if (partial?.transactionId != null && partial.transactionId !== 0)
+            return store.openCursor(partial.transactionId, direction);
+        if (partial?.userId !== undefined) {
+            if (partial?.status !== undefined) {
+                return store.index('status_userId').openCursor([partial.status, partial.userId], direction);
+            }
+            return store.index('userId').openCursor(partial.userId, direction);
+        }
+        if (partial?.status !== undefined)
+            return store.index('status').openCursor(partial.status, direction);
+        if (partial?.provenTxId !== undefined)
+            return store.index('provenTxId').openCursor(partial.provenTxId, direction);
+        if (partial?.reference !== undefined)
+            return store.index('reference').openCursor(partial.reference, direction);
+        return store.openCursor(null, direction);
+    }
     async filterTransactions(args, filtered, labelIds, isQueryModeAll) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        this.assertNoUndefinedInPartial(args.partial);
-        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.`);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
+        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 stores = ['transactions'];
-        if (labelIds && labelIds.length > 0) {
+        if (labelIds != null && labelIds.length > 0)
             stores.push('tx_labels_map');
-        }
         const dbTrx = this.toDbTrx(stores, 'readonly', args.trx);
-        const direction = args.orderDescending ? 'prev' : 'next';
-        let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.transactionId) {
-            cursor = await dbTrx.objectStore('transactions').openCursor(args.partial.transactionId, direction);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.status) !== undefined) {
-                cursor = await dbTrx
-                    .objectStore('transactions')
-                    .index('status_userId')
-                    .openCursor([args.partial.status, args.partial.userId], direction);
-            }
-            else {
-                cursor = await dbTrx.objectStore('transactions').index('userId').openCursor(args.partial.userId, direction);
-            }
-        }
-        else if (((_e = args.partial) === null || _e === void 0 ? void 0 : _e.status) !== undefined) {
-            cursor = await dbTrx.objectStore('transactions').index('status').openCursor(args.partial.status, direction);
-        }
-        else if (((_f = args.partial) === null || _f === void 0 ? void 0 : _f.provenTxId) !== undefined) {
-            cursor = await dbTrx
-                .objectStore('transactions')
-                .index('provenTxId')
-                .openCursor(args.partial.provenTxId, direction);
-        }
-        else if (((_g = args.partial) === null || _g === void 0 ? void 0 : _g.reference) !== undefined) {
-            cursor = await dbTrx.objectStore('transactions').index('reference').openCursor(args.partial.reference, direction);
-        }
-        else {
-            cursor = await dbTrx.objectStore('transactions').openCursor(null, direction);
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.from && r.created_at.getTime() < args.from.getTime())
-                continue;
-            if (args.to && r.created_at.getTime() >= args.to.getTime())
-                continue;
-            if (args.status && args.status.length > 0 && !args.status.includes(r.status))
-                continue;
-            if (args.partial) {
-                if (args.partial.transactionId !== undefined && r.transactionId !== args.partial.transactionId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.provenTxId !== undefined && r.provenTxId !== args.partial.provenTxId)
-                    continue;
-                if (args.partial.status !== undefined && r.status !== args.partial.status)
-                    continue;
-                if (args.partial.reference !== undefined && r.reference !== args.partial.reference)
-                    continue;
-                if (args.partial.isOutgoing !== undefined && r.isOutgoing !== args.partial.isOutgoing)
-                    continue;
-                if (args.partial.satoshis !== undefined && r.satoshis !== args.partial.satoshis)
-                    continue;
-                if (args.partial.description !== undefined && r.description !== args.partial.description)
-                    continue;
-                if (args.partial.version !== undefined && r.version !== args.partial.version)
-                    continue;
-                if (args.partial.lockTime !== undefined && r.lockTime !== args.partial.lockTime)
-                    continue;
-                if (args.partial.txid !== undefined && r.txid !== args.partial.txid)
-                    continue;
-            }
-            if (labelIds && labelIds.length > 0) {
-                let ids = [...labelIds];
-                await this.filterTxLabelMaps({ partial: { transactionId: r.transactionId }, trx: dbTrx }, lm => {
-                    if (ids.length > 0) {
-                        const i = ids.indexOf(lm.txLabelId);
-                        if (i >= 0) {
-                            if (isQueryModeAll) {
-                                ids.splice(i, 1);
-                            }
-                            else {
-                                ids = [];
-                            }
-                        }
+        const direction = args.orderDescending === true ? 'prev' : 'next';
+        const store = dbTrx.objectStore('transactions');
+        const cursor = await this.openTransactionsCursor(store, args.partial, direction);
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, async (r) => {
+            if (args.from != null && r.created_at.getTime() < args.from.getTime())
+                return false;
+            if (args.to != null && r.created_at.getTime() >= args.to.getTime())
+                return false;
+            if (args.status != null && !args.status.includes(r.status))
+                return false;
+            if (!(0, idbHelpers_1.matchesTransactionPartial)(r, args.partial))
+                return false;
+            if (labelIds != null &&
+                labelIds.length > 0 &&
+                !(await this.transactionMatchesLabels(r.transactionId, labelIds, isQueryModeAll, dbTrx)))
+                return false;
+            return true;
+        }, filtered);
+        if (args.trx == null)
+            await dbTrx.done;
+    }
+    async transactionMatchesLabels(transactionId, labelIds, isQueryModeAll, dbTrx) {
+        let ids = [...labelIds];
+        await this.filterTxLabelMaps({ partial: { transactionId }, trx: dbTrx }, lm => {
+            if (ids.length > 0) {
+                const i = ids.indexOf(lm.txLabelId);
+                if (i >= 0) {
+                    if (isQueryModeAll === true) {
+                        ids.splice(i, 1);
                     }
-                });
-                if (ids.length > 0)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
+                    else {
+                        ids = [];
+                    }
+                }
             }
-            filtered(r);
-            count++;
-            if (((_h = args.paged) === null || _h === void 0 ? void 0 : _h.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
-            await dbTrx.done;
+        });
+        return ids.length === 0;
     }
     async findTransactions(args, labelIds, isQueryModeAll) {
         const results = [];
@@ -1988,75 +1655,35 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             results.push(this.validateEntity(r));
         }, labelIds, isQueryModeAll);
         for (const t of results) {
-            // noRawTx skips rawTx re-hydration but does not wipe inputBEEF — Knex's
-            // transactionColumnsWithoutRawTx only strips rawTx, and callers such as
-            // getReqsAndBeefToShareWithWorld legitimately need inputBEEF when noRawTx is set.
-            if (!args.noRawTx)
-                await this.validateRawTransaction(t, args.trx);
-            else
+            if (args.noRawTx === true) {
                 t.rawTx = undefined;
+                t.inputBEEF = undefined;
+            }
+            else {
+                await this.validateRawTransaction(t, args.trx);
+            }
         }
         return results;
     }
     async filterTxLabels(args, filtered) {
-        var _a, _b, _c, _d, _e;
-        this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['tx_labels'], 'readonly', args.trx);
+        const store = dbTrx.objectStore('tx_labels');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.txLabelId) {
-            cursor = await dbTrx.objectStore('tx_labels').openCursor(args.partial.txLabelId);
-        }
-        else if (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.userId) !== undefined) {
-            if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.label) !== undefined) {
-                cursor = await dbTrx
-                    .objectStore('tx_labels')
-                    .index('label_userId')
-                    .openCursor([args.partial.label, args.partial.userId]);
-            }
-            else {
-                cursor = await dbTrx.objectStore('tx_labels').index('userId').openCursor(args.partial.userId);
-            }
+        if (args.partial?.txLabelId != null && args.partial.txLabelId !== 0) {
+            cursor = await store.openCursor(args.partial.txLabelId);
+        }
+        else if (args.partial?.userId !== undefined && args.partial?.label !== undefined) {
+            cursor = await store.index('label_userId').openCursor([args.partial.label, args.partial.userId]);
+        }
+        else if (args.partial?.userId !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
         }
         else {
-            cursor = await dbTrx.objectStore('tx_labels').openCursor();
-        }
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.txLabelId !== undefined && r.txLabelId !== args.partial.txLabelId)
-                    continue;
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.label !== undefined && r.label !== args.partial.label)
-                    continue;
-                if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_e = args.paged) === null || _e === void 0 ? void 0 : _e.limit) && count >= args.paged.limit)
-                break;
+            cursor = await store.openCursor();
         }
-        if (!args.trx)
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => (0, idbHelpers_1.matchesTxLabelPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findTxLabels(args) {
@@ -2066,46 +1693,26 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         });
         return result;
     }
+    matchesUserPartial(r, partial) {
+        if (partial == null)
+            return true;
+        if (partial.userId != null && partial.userId !== 0 && r.userId !== partial.userId)
+            return false;
+        if (partial.created_at != null && r.created_at.getTime() !== partial.created_at.getTime())
+            return false;
+        if (partial.updated_at != null && r.updated_at.getTime() !== partial.updated_at.getTime())
+            return false;
+        if (partial.identityKey != null && partial.identityKey !== '' && r.identityKey !== partial.identityKey)
+            return false;
+        if (partial.activeStorage != null && partial.activeStorage !== '' && r.activeStorage !== partial.activeStorage)
+            return false;
+        return true;
+    }
     async filterUsers(args, filtered) {
-        var _a, _b;
-        this.assertNoUndefinedInPartial(args.partial);
-        const offset = ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0;
-        let skipped = 0;
-        let count = 0;
         const dbTrx = this.toDbTrx(['users'], 'readonly', args.trx);
-        let cursor = await dbTrx.objectStore('users').openCursor();
-        let firstTime = true;
-        while (cursor) {
-            if (!firstTime)
-                cursor = await cursor.continue();
-            if (!cursor)
-                break;
-            firstTime = false;
-            const r = cursor.value;
-            if (args.since && args.since > r.updated_at)
-                continue;
-            if (args.partial) {
-                if (args.partial.userId !== undefined && r.userId !== args.partial.userId)
-                    continue;
-                if (args.partial.created_at !== undefined && r.created_at.getTime() !== args.partial.created_at.getTime())
-                    continue;
-                if (args.partial.updated_at !== undefined && r.updated_at.getTime() !== args.partial.updated_at.getTime())
-                    continue;
-                if (args.partial.identityKey !== undefined && r.identityKey !== args.partial.identityKey)
-                    continue;
-                if (args.partial.activeStorage !== undefined && r.activeStorage !== args.partial.activeStorage)
-                    continue;
-            }
-            if (skipped < offset) {
-                skipped++;
-                continue;
-            }
-            filtered(r);
-            count++;
-            if (((_b = args.paged) === null || _b === void 0 ? void 0 : _b.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+        const cursor = await dbTrx.objectStore('users').openCursor();
+        await scanCursor(cursor, args.since, args.paged?.offset ?? 0, args.paged?.limit, r => this.matchesUserPartial(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findUsers(args) {
@@ -2244,10 +1851,8 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         }, args.userId);
         return results;
     }
-    async verifyReadyForDatabaseAccess(trx) {
-        if (!this._settings) {
-            this._settings = await this.readSettings();
-        }
+    async verifyReadyForDatabaseAccess(_trx) {
+        this._settings ??= await this.readSettings();
         return this._settings.dbtype;
     }
     /**
@@ -2257,18 +1862,30 @@ class StorageIdb 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) {
-            for (const df of dateFields) {
-                if (entity[df])
-                    entity[df] = this.validateDate(entity[df]);
-            }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const e = entity;
+        this.applyDateFields(e, dateFields);
+        this.applyBooleanFields(e, booleanFields);
+        this.normalizeEntityValues(e);
+        return entity;
+    }
+    applyDateFields(entity, dateFields) {
+        if (dateFields == null)
+            return;
+        for (const df of dateFields) {
+            if (entity[df] != null)
+                entity[df] = this.validateDate(entity[df]);
         }
-        if (booleanFields) {
-            for (const df of booleanFields) {
-                if (entity[df] !== undefined)
-                    entity[df] = !!entity[df];
-            }
+    }
+    applyBooleanFields(entity, booleanFields) {
+        if (booleanFields == null)
+            return;
+        for (const df of booleanFields) {
+            if (entity[df] !== undefined)
+                entity[df] = entity[df] !== 0 && entity[df] != null && entity[df] !== false;
         }
+    }
+    normalizeEntityValues(entity) {
         for (const key of Object.keys(entity)) {
             const val = entity[key];
             if (val === null) {
@@ -2278,7 +1895,6 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 entity[key] = Array.from(val);
             }
         }
-        return entity;
     }
     /**
      * Helper to force uniform behavior across database engines.
@@ -2296,29 +1912,38 @@ class StorageIdb 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');
         const v = { ...update };
-        if (v.created_at)
-            v.created_at = this.validateEntityDate(v.created_at);
-        if (v.updated_at)
-            v.updated_at = this.validateEntityDate(v.updated_at);
-        if (!v.created_at)
+        v.created_at = v.created_at != null ? this.validateEntityDate(v.created_at) : undefined;
+        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]);
-            }
+        v.updated_at = v.updated_at != null ? this.validateEntityDate(v.updated_at) : this.validateEntityDate(new Date());
+        this.applyOptionalDateFields(v, dateFields);
+        this.applyIntegerBooleanFields(update, booleanFields);
+        this.normalizeForStorage(v);
+        this.isDirty = true;
+        return v;
+    }
+    applyOptionalDateFields(v, dateFields) {
+        if (dateFields == null)
+            return;
+        for (const df of dateFields) {
+            if (v[df] != null)
+                v[df] = this.validateOptionalEntityDate(v[df]);
         }
-        if (booleanFields) {
-            for (const df of booleanFields) {
-                if (update[df] !== undefined)
-                    update[df] = !!update[df] ? 1 : 0;
-            }
+    }
+    applyIntegerBooleanFields(update, booleanFields) {
+        if (booleanFields == null)
+            return;
+        for (const df of booleanFields) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const u = update;
+            if (u[df] !== undefined)
+                u[df] = u[df] != null && u[df] !== false ? 1 : 0;
         }
+    }
+    normalizeForStorage(v) {
         for (const key of Object.keys(v)) {
             const val = v[key];
             if (Array.isArray(val) && (val.length === 0 || Number.isInteger(val[0]))) {
@@ -2328,8 +1953,6 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 v[key] = undefined;
             }
         }
-        this.isDirty = true;
-        return v;
     }
     /**
      * Helper to force uniform behavior across database engines.
@@ -2338,47 +1961,29 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
     async validateEntityForInsert(entity, trx, dateFields, booleanFields) {
         await this.verifyReadyForDatabaseAccess(trx);
         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 || Number.isInteger(val[0]))) {
-                v[key] = Uint8Array.from(val);
-            }
-            else if (val === null) {
-                v[key] = undefined;
-            }
-        }
+        this.applyOptionalDateFields(v, dateFields);
+        this.applyIntegerBooleanFields(entity, booleanFields);
+        this.normalizeForStorage(v);
         this.isDirty = true;
         return v;
     }
     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;
     }
-    async adminStats(adminIdentityKey) {
+    async adminStats(_adminIdentityKey) {
         throw new Error('Method intentionally not implemented for personal storage.');
     }
 }