@bsv/wallet-toolbox-client 2.1.24 → 3.0.0-alpha.0

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,6 +10,39 @@ 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");
+/**
+ * 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 && count >= limit)
+            break;
+    }
+    return count;
+}
 /**
  * This class implements the `StorageProvider` interface using IndexedDB,
  * via the promises wrapper package `idb`.
@@ -35,6 +69,9 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         ];
         this.dbName = `wallet-toolbox-${this.chain}net`;
     }
+    // TODO(new-schema-idb): StorageIdb does not yet support the the new schema.
+    // getTransactionService() inherits the default `return undefined` from StorageProvider.
+    // A future implementation would wrap an IndexedDB-backed the transaction service here.
     /**
      * 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 +98,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,12 +110,12 @@ 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');
@@ -103,150 +140,13 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         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 });
-                }
-                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');
-                }
+            upgrade(db) {
+                (0, idbHelpers_1.upgradeAllStoresV1)(db);
                 if (!db.objectStoreNames.contains('settings')) {
                     if (!storageName || !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(),
@@ -315,25 +215,25 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 const score = o.satoshis - targetSatoshis;
                 scores.push({ output: o, score });
             }
-            if (!output) {
+            if (output == null) {
                 // 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) {
+                if (o != null) {
                     // 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;
+                    output = scores.at(-1).output;
                 }
                 else {
                     // no available funding outputs
                     output = undefined;
                 }
             }
-            if (output) {
+            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,10 +253,10 @@ 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;
             }
@@ -368,35 +268,32 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             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 +303,11 @@ 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
+            else {
                 console.debug(`[StorageIdb] orphan tx_labels_map row skipped: transactionId=${transactionId} txLabelId=${txLabelId}`);
+            }
         }
         return labels;
     }
@@ -419,10 +317,11 @@ 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;
     }
@@ -485,70 +384,43 @@ 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 (((_a = args.partial) === null || _a === void 0 ? void 0 : _a.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 (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.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, ((_c = args.paged) === null || _c === void 0 ? void 0 : _c.offset) || 0, (_d = args.paged) === null || _d === void 0 ? void 0 : _d.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 });
                 if (tagsForUser === 0)
-                    continue;
+                    return false;
             }
-            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;
-        }
-        if (!args.trx)
+            return true;
+        }, filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findOutputTagMaps(args) {
@@ -558,93 +430,54 @@ 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 === null || partial === void 0 ? void 0 : partial.provenTxReqId)
+            return store.openCursor(partial.provenTxReqId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.provenTxId) !== undefined)
+            return store.index('provenTxId').openCursor(partial.provenTxId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.txid) !== undefined)
+            return store.index('txid').openCursor(partial.txid, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.status) !== undefined)
+            return store.index('status').openCursor(partial.status, direction);
+        if ((partial === null || partial === void 0 ? void 0 : 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;
+        var _a, _b;
         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 ? 'prev' : 'next';
+        const store = dbTrx.objectStore('proven_tx_reqs');
+        const cursor = await this.openProvenTxReqsCursor(store, args.partial, direction);
+        await scanCursor(cursor, args.since, ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0, (_b = args.paged) === null || _b === void 0 ? void 0 : _b.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) {
@@ -657,68 +490,37 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
     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 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 ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.provenTxId) {
+            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 (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.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, ((_c = args.paged) === null || _c === void 0 ? void 0 : _c.offset) || 0, (_d = args.paged) === null || _d === void 0 ? void 0 : _d.limit, async (r) => {
+            if (!(0, idbHelpers_1.matchesProvenTxPartial)(r, args.partial))
+                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) {
@@ -731,57 +533,30 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
     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 (((_a = args.partial) === null || _a === void 0 ? void 0 : _a.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 (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.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, ((_c = args.paged) === null || _c === void 0 ? void 0 : _c.offset) || 0, (_d = args.paged) === null || _d === void 0 ? void 0 : _d.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) {
@@ -843,7 +618,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             }
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return certificate.certificateId;
@@ -856,7 +631,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             await store.add(e);
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
     }
@@ -871,7 +646,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             commission.commissionId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return commission.commissionId;
@@ -887,7 +662,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             event.id = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return event.id;
@@ -903,7 +678,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             output.outputId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return output.outputId;
@@ -919,7 +694,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             basket.basketId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return basket.basketId;
@@ -935,7 +710,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tag.outputTagId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tag.outputTagId;
@@ -948,7 +723,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             await store.add(e);
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
     }
@@ -963,7 +738,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tx.provenTxId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tx.provenTxId;
@@ -979,7 +754,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tx.provenTxReqId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tx.provenTxReqId;
@@ -995,7 +770,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             syncState.syncStateId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return syncState.syncStateId;
@@ -1011,7 +786,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             tx.transactionId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return tx.transactionId;
@@ -1027,7 +802,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             label.txLabelId = id;
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
         return label.txLabelId;
@@ -1040,7 +815,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             await store.add(e);
         }
         finally {
-            if (!trx)
+            if (trx == null)
                 await dbTrx.done;
         }
     }
@@ -1055,14 +830,14 @@ 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`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`update.${keyProp}`, 'undefined');
         }
         const u = this.validatePartialForUpdate(update);
         const dbTrx = this.toDbTrx([storeName], 'readwrite', trx);
@@ -1082,22 +857,23 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 };
                 const uid = await store.put(v);
                 if (uid !== i)
-                    throw new WERR_errors_1.WERR_INTERNAL(`updated id ${uid} does not match original ${id}`);
+                    throw new WERR_errors_1.WERR_INTERNAL(`updated id ${String(uid)} 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)
+        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`);
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`update.${keyProps[i]}`, 'undefined');
             }
         }
         const u = this.validatePartialForUpdate(update);
@@ -1105,8 +881,9 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         const store = dbTrx.objectStore(storeName);
         try {
             const e = await store.get(key);
-            if (!e)
+            if (!e) {
                 throw new WERR_errors_1.WERR_INVALID_PARAMETER('key', `an existing record to update ${keyProps.join(',')} ${key.join(',')} not found`);
+            }
             const v = {
                 ...e,
                 ...u
@@ -1118,61 +895,61 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             }
         }
         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;
@@ -1184,7 +961,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
      * @returns
      */
     async transaction(scope, trx) {
-        if (trx)
+        if (trx != null)
             return await scope(trx);
         const stores = this.allStores;
         const db = await this.verifyDB();
@@ -1203,59 +980,21 @@ 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 (((_a = args.partial) === null || _a === void 0 ? void 0 : _a.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 (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.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, ((_c = args.paged) === null || _c === void 0 ? void 0 : _c.offset) || 0, (_d = args.paged) === null || _d === void 0 ? void 0 : _d.limit, r => (0, idbHelpers_1.matchesCertificateFieldPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findCertificateFields(args) {
@@ -1265,81 +1004,40 @@ 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 === null || partial === void 0 ? void 0 : partial.certificateId)
+            return store.openCursor(partial.certificateId);
+        if ((partial === null || partial === void 0 ? void 0 : partial.userId) !== undefined) {
+            if ((partial === null || partial === void 0 ? void 0 : partial.type) && (partial === null || partial === void 0 ? void 0 : partial.certifier) && (partial === null || partial === void 0 ? void 0 : partial.serialNumber)) {
+                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);
+                    .openCursor([partial.userId, partial.type, partial.certifier, partial.serialNumber]);
             }
+            return store.index('userId').openCursor(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;
-            }
-            filtered(r);
-            count++;
-            if (((_g = args.paged) === null || _g === void 0 ? void 0 : _g.limit) && count >= args.paged.limit)
-                break;
-        }
-        if (!args.trx)
+        return store.openCursor();
+    }
+    async filterCertificates(args, filtered) {
+        var _a, _b;
+        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, ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0, (_b = args.paged) === null || _b === void 0 ? void 0 : _b.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) {
@@ -1358,63 +1056,27 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
     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 ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.commissionId) {
+            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 (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.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 (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.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, ((_d = args.paged) === null || _d === void 0 ? void 0 : _d.offset) || 0, (_e = args.paged) === null || _e === void 0 ? void 0 : _e.limit, r => (0, idbHelpers_1.matchesCommissionPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findCommissions(args) {
@@ -1427,49 +1089,11 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
     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);
-        let cursor;
-        if ((_b = args.partial) === null || _b === void 0 ? void 0 : _b.id) {
-            cursor = await dbTrx.objectStore('monitor_events').openCursor(args.partial.id);
-        }
-        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;
-        }
-        if (!args.trx)
+        const store = dbTrx.objectStore('monitor_events');
+        const cursor = ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.id) ? await store.openCursor(args.partial.id) : await store.openCursor();
+        await scanCursor(cursor, args.since, ((_b = args.paged) === null || _b === void 0 ? void 0 : _b.offset) || 0, (_c = args.paged) === null || _c === void 0 ? void 0 : _c.limit, r => (0, idbHelpers_1.matchesMonitorEventPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findMonitorEvents(args) {
@@ -1480,70 +1104,26 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return result;
     }
     async filterOutputBaskets(args, filtered) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         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);
+        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.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);
-            }
+        if ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.basketId) {
+            cursor = await store.openCursor(args.partial.basketId);
+        }
+        else if (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.userId) !== undefined && ((_c = args.partial) === null || _c === void 0 ? void 0 : _c.name) !== undefined) {
+            cursor = await store.index('name_userId').openCursor([args.partial.name, args.partial.userId]);
+        }
+        else if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.userId) !== undefined) {
+            cursor = await store.index('userId').openCursor(args.partial.userId);
         }
         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 (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, ((_e = args.paged) === null || _e === void 0 ? void 0 : _e.offset) || 0, (_f = args.paged) === null || _f === void 0 ? void 0 : _f.limit, r => (0, idbHelpers_1.matchesOutputBasketPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findOutputBaskets(args) {
@@ -1553,227 +1133,121 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         });
         return result;
     }
+    // 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 === null || partial === void 0 ? void 0 : partial.outputId)
+            return store.openCursor(partial.outputId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.userId) !== undefined) {
+            if ((partial === null || partial === void 0 ? void 0 : partial.transactionId) && (partial === null || partial === void 0 ? void 0 : partial.vout) !== undefined) {
+                return store.index('transactionId_vout_userId').openCursor([partial.transactionId, partial.vout, partial.userId], direction);
+            }
+            return store.index('userId').openCursor(partial.userId, direction);
+        }
+        if ((partial === null || partial === void 0 ? void 0 : partial.transactionId) !== undefined)
+            return store.index('transactionId').openCursor(partial.transactionId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.basketId) !== undefined)
+            return store.index('basketId').openCursor(partial.basketId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.spentBy) !== undefined)
+            return store.index('spentBy').openCursor(partial.spentBy, direction);
+        return store.openCursor(null, direction);
+    }
     async filterOutputs(args, filtered, tagIds, isQueryModeAll) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b;
         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({
+        const store = dbTrx.objectStore('outputs');
+        const cursor = await this.openOutputsCursor(store, args.partial, direction);
+        await scanCursor(cursor, args.since, ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0, (_b = args.paged) === null || _b === void 0 ? void 0 : _b.limit, async (r) => {
+            if (!(0, idbHelpers_1.matchesOutputPartial)(r, args.partial))
+                return false;
+            if (args.txStatus !== undefined) {
+                const txCount = 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) {
+                if (txCount === 0)
+                    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) {
+                        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) {
+                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;
+        var _a, _b, _c, _d, _e, _f;
         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 ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.outputTagId) {
+            cursor = await store.openCursor(args.partial.outputTagId);
+        }
+        else if (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.userId) !== undefined && ((_c = args.partial) === null || _c === void 0 ? void 0 : _c.tag) !== undefined) {
+            cursor = await store.index('tag_userId').openCursor([args.partial.tag, args.partial.userId]);
+        }
+        else if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.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, ((_e = args.paged) === null || _e === void 0 ? void 0 : _e.offset) || 0, (_f = args.paged) === null || _f === void 0 ? void 0 : _f.limit, r => (0, idbHelpers_1.matchesOutputTagPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findOutputTags(args) {
@@ -1784,78 +1258,31 @@ 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;
+        var _a, _b, _c, _d, _e, _f;
+        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 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 ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.syncStateId) {
+            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 (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.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 (((_c = args.partial) === null || _c === void 0 ? void 0 : _c.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 (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.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, ((_e = args.paged) === null || _e === void 0 ? void 0 : _e.offset) || 0, (_f = args.paged) === null || _f === void 0 ? void 0 : _f.limit, r => (0, idbHelpers_1.matchesSyncStatePartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findSyncStates(args) {
@@ -1865,125 +1292,77 @@ 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 === null || partial === void 0 ? void 0 : partial.transactionId)
+            return store.openCursor(partial.transactionId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.userId) !== undefined) {
+            if ((partial === null || partial === void 0 ? void 0 : partial.status) !== undefined) {
+                return store.index('status_userId').openCursor([partial.status, partial.userId], direction);
+            }
+            return store.index('userId').openCursor(partial.userId, direction);
+        }
+        if ((partial === null || partial === void 0 ? void 0 : partial.status) !== undefined)
+            return store.index('status').openCursor(partial.status, direction);
+        if ((partial === null || partial === void 0 ? void 0 : partial.provenTxId) !== undefined)
+            return store.index('provenTxId').openCursor(partial.provenTxId, direction);
+        if ((partial === null || partial === void 0 ? void 0 : 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;
+        var _a, _b;
+        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 store = dbTrx.objectStore('transactions');
+        const cursor = await this.openTransactionsCursor(store, args.partial, direction);
+        await scanCursor(cursor, args.since, ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0, (_b = args.paged) === null || _b === void 0 ? void 0 : _b.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) {
+                        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 = [];
@@ -1991,75 +1370,36 @@ 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) {
                 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;
+        var _a, _b, _c, _d, _e, _f;
         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 ((_a = args.partial) === null || _a === void 0 ? void 0 : _a.txLabelId) {
+            cursor = await store.openCursor(args.partial.txLabelId);
+        }
+        else if (((_b = args.partial) === null || _b === void 0 ? void 0 : _b.userId) !== undefined && ((_c = args.partial) === null || _c === void 0 ? void 0 : _c.label) !== undefined) {
+            cursor = await store.index('label_userId').openCursor([args.partial.label, args.partial.userId]);
+        }
+        else if (((_d = args.partial) === null || _d === void 0 ? void 0 : _d.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, ((_e = args.paged) === null || _e === void 0 ? void 0 : _e.offset) || 0, (_f = args.paged) === null || _f === void 0 ? void 0 : _f.limit, r => (0, idbHelpers_1.matchesTxLabelPartial)(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findTxLabels(args) {
@@ -2069,46 +1409,27 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         });
         return result;
     }
+    matchesUserPartial(r, partial) {
+        if (!partial)
+            return true;
+        if (partial.userId && 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 && r.identityKey !== partial.identityKey)
+            return false;
+        if (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, ((_a = args.paged) === null || _a === void 0 ? void 0 : _a.offset) || 0, (_b = args.paged) === null || _b === void 0 ? void 0 : _b.limit, r => this.matchesUserPartial(r, args.partial), filtered);
+        if (args.trx == null)
             await dbTrx.done;
     }
     async findUsers(args) {
@@ -2248,9 +1569,8 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         return results;
     }
     async verifyReadyForDatabaseAccess(trx) {
-        if (!this._settings) {
-            this._settings = await this.readSettings();
-        }
+        var _a;
+        (_a = this._settings) !== null && _a !== void 0 ? _a : (this._settings = await this.readSettings());
         return this._settings.dbtype;
     }
     /**
@@ -2260,18 +1580,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])
+                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] = Boolean(entity[df]);
         }
+    }
+    normalizeEntityValues(entity) {
         for (const key of Object.keys(entity)) {
             const val = entity[key];
             if (val === null) {
@@ -2281,7 +1613,6 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 entity[key] = Array.from(val);
             }
         }
-        return entity;
     }
     /**
      * Helper to force uniform behavior across database engines.
@@ -2302,26 +1633,35 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
         if (!this.dbtype)
             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);
+        v.created_at = v.created_at ? this.validateEntityDate(v.created_at) : undefined;
         if (!v.created_at)
             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 ? 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])
+                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] ? 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]))) {
@@ -2331,8 +1671,6 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
                 v[key] = undefined;
             }
         }
-        this.isDirty = true;
-        return v;
     }
     /**
      * Helper to force uniform behavior across database engines.
@@ -2347,27 +1685,9 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             delete v.created_at;
         if (!v.updated_at)
             delete v.updated_at;
-        if (dateFields) {
-            for (const df of dateFields) {
-                if (v[df])
-                    v[df] = this.validateOptionalEntityDate(v[df]);
-            }
-        }
-        if (booleanFields) {
-            for (const df of booleanFields) {
-                if (entity[df] !== undefined)
-                    entity[df] = !!entity[df] ? 1 : 0;
-            }
-        }
-        for (const key of Object.keys(v)) {
-            const val = v[key];
-            if (Array.isArray(val) && (val.length === 0 || 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;
     }
@@ -2377,7 +1697,7 @@ class StorageIdb extends StorageProvider_1.StorageProvider {
             return;
         // rawTransaction is missing, see if we moved it ...
         const rawTx = await this.getRawTxOfKnownValidTransaction(t.txid, undefined, undefined, trx);
-        if (!rawTx)
+        if (rawTx == null)
             return;
         t.rawTx = rawTx;
     }