@bopen-io/wallet-toolbox 1.7.19 → 1.7.20-idb-fix.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bopen-io/wallet-toolbox",
-  "version": "1.7.19",
+  "version": "1.7.20-idb-fix.1",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@bsv/auth-express-middleware": "^1.2.3",
     "@bsv/payment-express-middleware": "^1.2.3",
-    "@bsv/sdk": "^1.9.29",
+    "@bsv/sdk": "^1.10.1",
     "express": "^4.21.2",
     "idb": "^8.0.2",
     "knex": "^3.1.0",

package/src/storage/StorageIdb.ts

@@ -114,6 +114,17 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
   ): IDBPTransaction<StorageIdbSchema, string[], 'readwrite' | 'readonly'> {
     if (trx) {
       const t = trx as IDBPTransaction<StorageIdbSchema, string[], 'readwrite' | 'readonly'>
+      // Check if the transaction is still active by trying to access an object store
+      try {
+        const storeToCheck = stores[0] || this.allStores[0]
+        t.objectStore(storeToCheck)
+      } catch (e) {
+        console.error(
+          `[StorageIdb.toDbTrx] Passed transaction already finished! stores=${stores.join(',')}, mode=${mode}`
+        )
+        console.error('[StorageIdb.toDbTrx] Stack trace:', new Error().stack)
+        throw e
+      }
       return t
     } else {
       if (!this.db) throw new Error('not initialized')
@@ -357,7 +368,8 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
     excludeSending: boolean,
     transactionId: number
   ): Promise<TableOutput | undefined> {
-    const dbTrx = this.toDbTrx(['outputs', 'transactions'], 'readwrite')
+    // Include proven_txs in store list since findOutputs -> validateOutputScript needs it
+    const dbTrx = this.toDbTrx(['outputs', 'transactions', 'proven_txs'], 'readwrite')
     try {
       const txStatus: TransactionStatus[] = ['completed', 'unproven']
       if (!excludeSending) txStatus.push('sending')
@@ -519,6 +531,17 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
     filtered: (v: TableOutputTagMap) => void,
     userId?: number
   ): Promise<void> {
+    // Pre-compute outputTagIds for this user BEFORE opening cursor.
+    // This avoids nested queries inside the cursor loop which cause IDB transaction timeouts.
+    let userOutputTagIds: Set<number> | undefined
+    if (userId !== undefined) {
+      userOutputTagIds = new Set<number>()
+      const userTags = await this.findOutputTags({ partial: { userId } })
+      for (const tag of userTags) {
+        userOutputTagIds.add(tag.outputTagId)
+      }
+    }
+
     const offset = args.paged?.offset || 0
     let skipped = 0
     let count = 0
@@ -550,9 +573,8 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
         if (args.partial.updated_at && r.updated_at.getTime() !== args.partial.updated_at.getTime()) continue
         if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted) continue
       }
-      if (userId !== undefined && r.txid) {
-        const count = await this.countOutputTags({ partial: { userId, outputTagId: r.outputTagId }, trx: args.trx })
-        if (count === 0) continue
+      if (userOutputTagIds !== undefined && !userOutputTagIds.has(r.outputTagId)) {
+        continue
       }
       if (skipped < offset) {
         skipped++
@@ -585,6 +607,20 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
         'args.partial.inputBEEF',
         `undefined. ProvenTxReqs may not be found by inputBEEF value.`
       )
+
+    // Pre-compute txids for this user's transactions BEFORE opening cursor.
+    // This avoids nested queries inside the cursor loop which cause IDB transaction timeouts.
+    let userTxIds: Set<string> | undefined
+    if (userId !== undefined) {
+      userTxIds = new Set<string>()
+      const userTxs = await this.findTransactions({ partial: { userId }, noRawTx: true })
+      for (const tx of userTxs) {
+        if (tx.txid) {
+          userTxIds.add(tx.txid)
+        }
+      }
+    }
+
     const offset = args.paged?.offset || 0
     let skipped = 0
     let count = 0
@@ -629,9 +665,8 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
         if (args.partial.history && r.history !== args.partial.history) continue
         if (args.partial.notify && r.notify !== args.partial.notify) continue
       }
-      if (userId !== undefined && r.txid) {
-        const count = await this.countTransactions({ partial: { userId, txid: r.txid }, trx: args.trx })
-        if (count === 0) continue
+      if (userTxIds !== undefined && r.txid && !userTxIds.has(r.txid)) {
+        continue
       }
       if (skipped < offset) {
         skipped++
@@ -660,6 +695,20 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
         'args.partial.merklePath',
         `undefined. ProvenTxs may not be found by merklePath value.`
       )
+
+    // Pre-compute provenTxIds for this user's transactions BEFORE opening cursor.
+    // This avoids nested queries inside the cursor loop which cause IDB transaction timeouts.
+    let userProvenTxIds: Set<number> | undefined
+    if (userId !== undefined) {
+      userProvenTxIds = new Set<number>()
+      const userTxs = await this.findTransactions({ partial: { userId }, noRawTx: true })
+      for (const tx of userTxs) {
+        if (tx.provenTxId !== undefined) {
+          userProvenTxIds.add(tx.provenTxId)
+        }
+      }
+    }
+
     const offset = args.paged?.offset || 0
     let skipped = 0
     let count = 0
@@ -692,9 +741,8 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
         if (args.partial.blockHash && r.blockHash !== args.partial.blockHash) continue
         if (args.partial.merkleRoot && r.merkleRoot !== args.partial.merkleRoot) continue
       }
-      if (userId !== undefined) {
-        const count = await this.countTransactions({ partial: { userId, provenTxId: r.provenTxId }, trx: args.trx })
-        if (count === 0) continue
+      if (userProvenTxIds !== undefined && !userProvenTxIds.has(r.provenTxId)) {
+        continue
       }
       if (skipped < offset) {
         skipped++
@@ -720,6 +768,17 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
     filtered: (v: TableTxLabelMap) => void,
     userId?: number
   ): Promise<void> {
+    // Pre-compute txLabelIds for this user BEFORE opening cursor.
+    // This avoids nested queries inside the cursor loop which cause IDB transaction timeouts.
+    let userTxLabelIds: Set<number> | undefined
+    if (userId !== undefined) {
+      userTxLabelIds = new Set<number>()
+      const userLabels = await this.findTxLabels({ partial: { userId } })
+      for (const label of userLabels) {
+        userTxLabelIds.add(label.txLabelId)
+      }
+    }
+
     const offset = args.paged?.offset || 0
     let skipped = 0
     let count = 0
@@ -750,9 +809,8 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
         if (args.partial.updated_at && r.updated_at.getTime() !== args.partial.updated_at.getTime()) continue
         if (args.partial.isDeleted !== undefined && r.isDeleted !== args.partial.isDeleted) continue
       }
-      if (userId !== undefined) {
-        const count = await this.countTxLabels({ partial: { userId, txLabelId: r.txLabelId }, trx: args.trx })
-        if (count === 0) continue
+      if (userTxLabelIds !== undefined && !userTxLabelIds.has(r.txLabelId)) {
+        continue
       }
       if (skipped < offset) {
         skipped++
@@ -1014,7 +1072,16 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
     }
     const u = this.validatePartialForUpdate(update)
     const dbTrx = this.toDbTrx([storeName], 'readwrite', trx)
-    const store = dbTrx.objectStore(storeName)
+    let store: any
+    try {
+      store = dbTrx.objectStore(storeName)
+    } catch (e) {
+      console.error(
+        `[StorageIdb.updateIdb] objectStore('${storeName}') failed for id=${JSON.stringify(id)}, trx=${!!trx}:`,
+        e
+      )
+      throw e
+    }
     const ids = Array.isArray(id) ? id : [id]
     try {
       for (const i of ids) {
@@ -1189,7 +1256,13 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
       await tx.done
       return r
     } catch (err) {
-      tx.abort()
+      // Log more detail about transaction errors to help debug IDB issues
+      console.error('[StorageIdb] Transaction error:', err instanceof Error ? err.message : err)
+      try {
+        tx.abort()
+      } catch (abortErr) {
+        console.error('[StorageIdb] Error aborting transaction:', abortErr)
+      }
       await tx.done
       throw err
     }
@@ -1649,7 +1722,9 @@ export class StorageIdb extends StorageProvider implements WalletStorageProvider
     )
     for (const o of results) {
       if (!args.noScript) {
-        await this.validateOutputScript(o)
+        // Pass the transaction to avoid creating separate IDB operations
+        // that would cause a passed transaction to auto-commit
+        await this.validateOutputScript(o, args.trx)
       } else {
         o.lockingScript = undefined
       }

package/src/storage/methods/createAction.ts

@@ -229,25 +229,41 @@ async function createNewInputs(
     const o = i.output
     newInputs.push({ i, o })
     if (o) {
+      // IndexedDB transactions auto-commit when there are no pending IDB operations.
+      // Network calls (like getBeefForTransaction) create async gaps that cause the
+      // transaction to commit prematurely, making subsequent IDB operations fail.
+      // We do an initial read + potential network calls outside the transaction,
+      // then re-read inside the transaction to verify state hasn't changed.
+      const o2 = verifyOne(await storage.findOutputs({ partial: { outputId: o.outputId } }))
+      let competingBeef: number[] | undefined
+      if (o2.spentBy !== undefined) {
+        const spendingTx = await storage.findTransactionById(verifyId(o2.spentBy))
+        if (spendingTx && spendingTx.txid) {
+          // Fetch beef outside transaction (may involve network calls)
+          const beef = await storage.getBeefForTransaction(spendingTx.txid, {})
+          competingBeef = beef.toBinary()
+        }
+      }
+
+      // Transaction contains only IDB operations: re-read to verify state, then write
       await storage.transaction(async trx => {
-        const o2 = verifyOne(await storage.findOutputs({ partial: { outputId: o.outputId }, trx }))
-        if (o2.spentBy !== undefined) {
-          const spendingTx = await storage.findTransactionById(verifyId(o2.spentBy), trx)
+        const o3 = verifyOne(await storage.findOutputs({ partial: { outputId: o.outputId }, trx }))
+        if (o3.spentBy !== undefined) {
+          const spendingTx = await storage.findTransactionById(verifyId(o3.spentBy), trx)
           if (spendingTx && spendingTx.txid) {
-            const beef = await storage.getBeefForTransaction(spendingTx.txid, {})
             const rar: ReviewActionResult = {
               txid: '',
               status: 'doubleSpend',
               competingTxs: [spendingTx.txid!],
-              competingBeef: beef.toBinary()
+              competingBeef: competingBeef
             }
             throw new WERR_REVIEW_ACTIONS([rar], [])
           }
         }
-        if (o2.spendable != true) {
+        if (o3.spendable != true) {
           throw new WERR_INVALID_PARAMETER(
             `inputs[${i.vin}]`,
-            `spendable output. output ${o.txid}:${o.vout} appears to have been spent (spendable=${o2.spendable}).`
+            `spendable output. output ${o.txid}:${o.vout} appears to have been spent (spendable=${o3.spendable}).`
           )
         }
         await storage.updateOutput(

package/.claude/settings.local.json

@@ -1,14 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(cat:*)",
-      "Bash(git -C /Users/satchmo/wallet-toolbox log --oneline -20 --all -- mobile/package.json)",
-      "Bash(git -C /Users/satchmo/wallet-toolbox log --oneline -5 --all -- \"*.npmignore\")",
-      "Bash(git -C /Users/satchmo/wallet-toolbox log --oneline)",
-      "Bash(npm run build:*)",
-      "Bash(git add:*)",
-      "Bash(git commit:*)",
-      "Bash(git push:*)"
-    ]
-  }
-}