@bsv/wallet-toolbox 1.6.29 → 1.6.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.6.29",
+  "version": "1.6.31",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/services/chaintracker/chaintracks/util/ChaintracksFetch.ts

@@ -1,5 +1,6 @@
 import { defaultHttpClient, HttpClient } from '@bsv/sdk'
 import { ChaintracksFetchApi } from '../Api/ChaintracksFetchApi'
+import { wait } from '../../../../utility/utilityHelpers'
 
 /**
  * This class implements the ChaintracksFetchApi
@@ -34,11 +35,19 @@ export class ChaintracksFetch implements ChaintracksFetchApi {
         Accept: 'application/json'
       }
     }
-    const response = await fetch(url, requestJsonOptions)
-    if (!response.ok) {
-      throw new Error(`Failed to fetch JSON from ${url}: ${response.statusText}`)
+    let json: R
+    for (let retry = 0; ; retry++) {
+      const response = await fetch(url, requestJsonOptions)
+      if (!response.ok) {
+        if (response.statusText === 'Too Many Requests' && retry < 3) {
+          await wait(1000 * (retry + 1))
+          continue
+        }
+        throw new Error(`Failed to fetch JSON from ${url}: ${response.statusText}`)
+      }
+      json = (await response.json()) as R
+      break
     }
-    const json = (await response.json()) as R
     return json
   }
 

package/src/storage/methods/createAction.ts

@@ -8,8 +8,10 @@ import {
   PubKeyHex,
   PublicKey,
   Random,
+  ReviewActionResult,
   Script,
-  Utils
+  Utils,
+  WERR_REVIEW_ACTIONS
 } from '@bsv/sdk'
 import {
   generateChangeSdk,
@@ -224,11 +226,25 @@ async function createNewInputs(
     if (o) {
       await storage.transaction(async trx => {
         const o2 = verifyOne(await storage.findOutputs({ partial: { outputId: o.outputId }, trx }))
-        if (o2.spendable != true || o2.spentBy !== undefined)
+        if (o2.spentBy !== undefined) {
+          const spendingTx = await storage.findTransactionById(verifyId(o2.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()
+            }
+            throw new WERR_REVIEW_ACTIONS([rar], [])
+          }
+        }
+        if (o2.spendable != true) {
           throw new WERR_INVALID_PARAMETER(
             `inputs[${i.vin}]`,
             `spendable output. output ${o.txid}:${o.vout} appears to have been spent.`
           )
+        }
         await storage.updateOutput(
           o.outputId!,
           {

package/src/storage/schema/KnexMigrations.ts

@@ -73,6 +73,19 @@ export class KnexMigrations implements MigrationSource<string> {
       }
     }
 
+    migrations['2025-10-18-002 add proven_tx_reqs txid index'] = {
+      async up(knex) {
+        await knex.schema.alterTable('proven_tx_reqs', table => {
+          table.index('txid')
+        })
+      },
+      async down(knex) {
+        await knex.schema.alterTable('proven_tx_reqs', table => {
+          table.dropIndex('txid')
+        })
+      }
+    }
+
     migrations['2025-10-18-001 add transactions txid index'] = {
       async up(knex) {
         await knex.schema.alterTable('transactions', table => {

package/test/storage/KnexMigrations.test.ts

@@ -61,7 +61,8 @@ describe('KnexMigrations tests', () => {
       const latest = await KnexMigrations.latestMigration()
       await knex.migrate.latest(config)
       const version = await knex.migrate.currentVersion(config)
-      expect(version).toBe(latest)
+
+      expect(version).toBe(latest.split('_')[0])
     }
     done1 = true
   })