@bsv/wallet-toolbox 1.1.16 → 1.1.18

package/package.json

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

package/src/Wallet.ts

@@ -663,6 +663,14 @@ export class Wallet implements WalletInterface, ProtoWallet {
       this.beef.mergeBeefFromParty(this.storageParty, r.tx)
     }
 
+    if (
+      !vargs.options.acceptDelayedBroadcast &&
+      r.sendWithResults &&
+      r.sendWithResults.length === 1 &&
+      r.sendWithResults[0].status === 'failed'
+    )
+      throw new sdk.WERR_BROADCAST_UNAVAILABLE()
+
     return r
   }
 
@@ -677,6 +685,15 @@ export class Wallet implements WalletInterface, ProtoWallet {
       sdk.validateSignActionArgs
     )
     const r = await signAction(this, auth, vargs)
+
+    if (
+      !vargs.options.acceptDelayedBroadcast &&
+      r.sendWithResults &&
+      r.sendWithResults.length === 1 &&
+      r.sendWithResults[0].status === 'failed'
+    )
+      throw new sdk.WERR_BROADCAST_UNAVAILABLE()
+
     return r
   }
 

package/src/sdk/WERR_errors.ts

@@ -35,6 +35,18 @@ export class WERR_INVALID_OPERATION extends WalletError {
   }
 }
 
+/**
+ * Unable to broadcast transaction at this time.
+ */
+export class WERR_BROADCAST_UNAVAILABLE extends WalletError {
+  constructor(message?: string) {
+    super(
+      'WERR_BROADCAST_UNAVAILABLE',
+      `Unable to broadcast transaction at this time.`
+    )
+  }
+}
+
 /**
  * The ${parameter} parameter is invalid.
  *

package/src/storage/StorageProvider.ts

@@ -12,7 +12,8 @@ import {
   ListCertificatesResult,
   TrustSelf,
   RelinquishCertificateArgs,
-  RelinquishOutputArgs
+  RelinquishOutputArgs,
+  AbortActionArgs
 } from '@bsv/sdk'
 import {
   asArray,
@@ -177,12 +178,29 @@ export abstract class StorageProvider
 
   async abortAction(
     auth: sdk.AuthId,
-    args: Partial<TableTransaction>
+    args: AbortActionArgs
   ): Promise<AbortActionResult> {
+    if (!auth.userId)
+      throw new sdk.WERR_INVALID_PARAMETER('auth.userId', 'valid')
+
     const r = await this.transaction(async trx => {
-      const tx = verifyOneOrNone(
-        await this.findTransactions({ partial: args, noRawTx: true, trx })
+      let tx = verifyOneOrNone(
+        await this.findTransactions({
+          partial: { reference: args.reference, userId: auth.userId },
+          noRawTx: true,
+          trx
+        })
       )
+      if (!tx && args.reference.length === 64) {
+        // reference may also be a txid
+        tx = verifyOneOrNone(
+          await this.findTransactions({
+            partial: { txid: args.reference, userId: auth.userId },
+            noRawTx: true,
+            trx
+          })
+        )
+      }
       const unAbortableStatus: sdk.TransactionStatus[] = [
         'completed',
         'failed',