@bsv/wallet-toolbox 1.2.47 → 1.2.49

package/package.json

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

@@ -708,7 +708,8 @@ export class Wallet implements WalletInterface, ProtoWallet {
     sdk.validateOriginator(originator)
 
     const { auth, vargs } = this.validateAuthAndArgs(args, sdk.validateSignActionArgs)
-    const r = await signAction(this, auth, vargs, args.options || {})
+    // createAction options are merged with undefined signAction options before validation...
+    const r = await signAction(this, auth, args)
 
     if (!vargs.isDelayed) throwIfAnyUnsuccessfulSignActions(r)
 

package/src/signer/methods/signAction.ts

@@ -5,6 +5,7 @@ import {
   Beef,
   Transaction as BsvTransaction,
   SendWithResult,
+  SignActionArgs,
   SignActionOptions,
   SignActionResult,
   SignActionSpend,
@@ -13,6 +14,7 @@ import {
 import { asBsvSdkScript, PendingSignAction, ScriptTemplateBRC29, sdk, Wallet } from '../../index.client'
 import { processAction } from './createAction'
 import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces'
+import { validateSignActionArgs } from '../../sdk'
 
 export interface SignActionResultX extends SignActionResult {
   txid?: TXIDHexString
@@ -24,15 +26,14 @@ export interface SignActionResultX extends SignActionResult {
 export async function signAction(
   wallet: Wallet,
   auth: sdk.AuthId,
-  vargs: sdk.ValidSignActionArgs,
-  options: SignActionOptions
+  args: SignActionArgs
 ): Promise<SignActionResultX> {
-  const prior = wallet.pendingSignActions[vargs.reference]
+  const prior = wallet.pendingSignActions[args.reference]
   if (!prior)
     throw new sdk.WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.')
   if (!prior.dcr.inputBeef) throw new sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid')
   
-  mergePriorOptions(prior.args, vargs, options)
+  const vargs = mergePriorOptions(prior.args, args)
 
   prior.tx = await completeSignedTransaction(prior, vargs.spends, wallet)
 
@@ -111,9 +112,11 @@ export async function completeSignedTransaction(
   return prior.tx
 }
 
-function mergePriorOptions(caVargs: sdk.ValidCreateActionArgs, saVargs: sdk.ValidSignActionArgs, saOptions: SignActionOptions ) {
+function mergePriorOptions(caVargs: sdk.ValidCreateActionArgs, saArgs: SignActionArgs) : sdk.ValidSignActionArgs {
+  const saOptions = saArgs.options ||= {}
   if (saOptions.acceptDelayedBroadcast === undefined) saOptions.acceptDelayedBroadcast = caVargs.options.acceptDelayedBroadcast
   if (saOptions.returnTXIDOnly === undefined) saOptions.returnTXIDOnly = caVargs.options.returnTXIDOnly
   if (saOptions.noSend === undefined) saOptions.noSend = caVargs.options.noSend
   if (saOptions.sendWith === undefined) saOptions.sendWith = caVargs.options.sendWith
+  return validateSignActionArgs(saArgs)
 }

package/test/Wallet/local/localWallet2.man.test.ts

@@ -40,7 +40,7 @@ describe('localWallet2 tests', () => {
 
   test('1 recover 1 sat outputs', async () => {
     const setup = await createSetup(chain, options)
-    await recoverOneSatTestOutputs(setup)
+    await recoverOneSatTestOutputs(setup, 1)
     await setup.wallet.destroy()
   })
 

package/test/utils/localWalletMethods.ts

@@ -184,19 +184,24 @@ export async function createOneSatTestOutput(
   return car
 }
 
-export async function recoverOneSatTestOutputs(setup: LocalTestWalletSetup): Promise<void> {
+export async function recoverOneSatTestOutputs(setup: LocalTestWalletSetup, testOptionsMode?: 1): Promise<void> {
   const outputs = await setup.wallet.listOutputs({
     basket: 'test-output',
     include: 'entire transactions',
     limit: 1000
   })
 
-  if (outputs.outputs.length > 8) {
+  if (outputs.outputs.length > 0) {
     const args: CreateActionArgs = {
       inputBEEF: outputs.BEEF!,
       inputs: [],
       description: 'recover test output'
     }
+    if (testOptionsMode === 1) {
+      args.options = {
+        acceptDelayedBroadcast: false
+      }
+    }
     const p2pkh = new P2PKH()
     for (const o of outputs.outputs) {
       args.inputs!.push({