@bsv/wallet-toolbox 1.6.30 → 1.6.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.6.30",
+  "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

@@ -46,7 +46,7 @@ export class ChaintracksFetch implements ChaintracksFetchApi {
         throw new Error(`Failed to fetch JSON from ${url}: ${response.statusText}`)
       }
       json = (await response.json()) as R
-      break;
+      break
     }
     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!,
           {