@bsv/wallet-toolbox 1.2.45 → 1.2.47

package/package.json

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

package/src/CWIStyleWalletManager.ts

@@ -360,7 +360,11 @@ export class OverlayUMPTokenInteractor implements UMPTokenInteractor {
         description: oldTokenToConsume ? 'Renew UMP token (consume old, create new)' : 'Create new UMP token',
         inputs,
         outputs,
-        inputBEEF: inputToken?.beef
+        inputBEEF: inputToken?.beef,
+        options: {
+          randomizeOutputs: false,
+          acceptDelayedBroadcast: false
+        }
       },
       adminOriginator
     )
@@ -1398,7 +1402,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     const currentActiveId = this.activeProfileId
     let walletToUse: WalletInterface | undefined = this.underlying
 
-    if (currentActiveId.every(x => x === 0)) {
+    if (!currentActiveId.every(x => x === 0)) {
       console.log('Temporarily switching to default profile to update UMP token...')
       await this.switchProfile(DEFAULT_PROFILE_ID) // This rebuilds this.underlying
       walletToUse = this.underlying
@@ -1411,7 +1415,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     // Publish the new token on-chain, consuming the old one
     try {
       newTokenData.currentOutpoint = await this.UMPTokenInteractor.buildAndSend(
-        walletToUse, // Use the (potentially temporarily activated) default profile wallet
+        walletToUse,
         this.adminOriginator,
         newTokenData,
         oldTokenToConsume // Consume the previous token

package/src/Wallet.ts

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

package/src/WalletPermissionsManager.ts

@@ -1289,7 +1289,10 @@ export class WalletPermissionsManager implements WalletInterface {
             basket: basketName,
             tags
           }
-        ]
+        ],
+        options: {
+          acceptDelayedBroadcast: false
+        }
       },
       this.adminOriginator
     )
@@ -1347,7 +1350,10 @@ export class WalletPermissionsManager implements WalletInterface {
             basket: BASKET_MAP[r.type],
             tags
           }
-        ]
+        ],
+        options: {
+          acceptDelayedBroadcast: false
+        }
       },
       this.adminOriginator
     )
@@ -1743,7 +1749,10 @@ export class WalletPermissionsManager implements WalletInterface {
             unlockingScriptLength: 73, // length of signature
             inputDescription: `Consume old permission token`
           }
-        ]
+        ],
+        options: {
+          acceptDelayedBroadcast: false
+        }
       },
       this.adminOriginator
     )

package/src/signer/methods/signAction.ts

@@ -5,6 +5,7 @@ import {
   Beef,
   Transaction as BsvTransaction,
   SendWithResult,
+  SignActionOptions,
   SignActionResult,
   SignActionSpend,
   TXIDHexString
@@ -23,12 +24,15 @@ export interface SignActionResultX extends SignActionResult {
 export async function signAction(
   wallet: Wallet,
   auth: sdk.AuthId,
-  vargs: sdk.ValidSignActionArgs
+  vargs: sdk.ValidSignActionArgs,
+  options: SignActionOptions
 ): Promise<SignActionResultX> {
   const prior = wallet.pendingSignActions[vargs.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)
 
   prior.tx = await completeSignedTransaction(prior, vargs.spends, wallet)
 
@@ -106,3 +110,10 @@ export async function completeSignedTransaction(
 
   return prior.tx
 }
+
+function mergePriorOptions(caVargs: sdk.ValidCreateActionArgs, saVargs: sdk.ValidSignActionArgs, saOptions: SignActionOptions ) {
+  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
+}