@bsv/wallet-toolbox 1.7.11 → 1.7.13

package/src/__tests/WalletPermissionsManager.proxying.test.ts

@@ -107,8 +107,8 @@ describe('WalletPermissionsManager - Regression & Integration with Underlying Wa
       // but we also set them here in case it cross-references them. We'll keep it consistent (2 outputs with total 1000).
       mockTx.outputs = [{ satoshis: 600 }, { satoshis: 400 }]
 
-        // Now override fromAtomicBEEF to return our mockTx:
-        ; (MockedBSV_SDK.Transaction.fromAtomicBEEF as jest.Mock).mockReturnValue(mockTx)
+      // Now override fromAtomicBEEF to return our mockTx:
+      ;(MockedBSV_SDK.Transaction.fromAtomicBEEF as jest.Mock).mockReturnValue(mockTx)
 
       // Attempt to create an action from a non-admin origin
       await manager.createAction(

package/src/storage/methods/createAction.ts

@@ -825,7 +825,7 @@ async function fundNewTransactionSdk(
     })
   }
 
-  const gcr = await generateChangeSdk(params, allocateChangeInput, releaseChangeInput)
+  const gcr = await generateChangeSdk(params, allocateChangeInput, releaseChangeInput, vargs.logger)
 
   const nextRandomVal = (): number => {
     let val = 0

package/src/storage/methods/generateChange.ts

@@ -1,9 +1,10 @@
-import { Validation } from '@bsv/sdk'
+import { Validation, WalletLoggerInterface } from '@bsv/sdk'
 import { WalletError } from '../../sdk/WalletError'
 import { StorageFeeModel } from '../../sdk/WalletStorage.interfaces'
 import { WERR_INSUFFICIENT_FUNDS, WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 import { validateStorageFeeModel } from '../StorageProvider'
 import { transactionSize } from './utils'
+import { Wallet, WalletLogger } from '../../index.client'
 
 /**
  * An output of this satoshis amount will be adjusted to the largest fundable amount.
@@ -38,7 +39,8 @@ export async function generateChangeSdk(
     targetSatoshis: number,
     exactSatoshis?: number
   ) => Promise<GenerateChangeSdkChangeInput | undefined>,
-  releaseChangeInput: (outputId: number) => Promise<void>
+  releaseChangeInput: (outputId: number) => Promise<void>,
+  logger?: WalletLoggerInterface
 ): Promise<GenerateChangeSdkResult> {
   if (params.noLogging === false) logGenerateChangeSdkParams(params)
 
@@ -275,8 +277,10 @@ export async function generateChangeSdk(
      * Trigger an account funding event if we don't have enough to cover this transaction.
      */
     if (feeExcess() < 0) {
+      const werr = new WERR_INSUFFICIENT_FUNDS(spending() + feeTarget(), -feeExcessNow)
+      logger?.error(`throwing WERR_INSUFFICIENT_FUNDS moreSatoshisNeeded ${werr.moreSatoshisNeeded}`)
       await releaseAllocatedChangeInputs()
-      throw new WERR_INSUFFICIENT_FUNDS(spending() + feeTarget(), -feeExcessNow)
+      throw werr
     }
 
     /**

package/src/storage/remoting/StorageServer.ts

@@ -49,7 +49,6 @@ export class StorageServer {
   }
 
   private setupRoutes(): void {
-
     this.app.use(express.json({ limit: '30mb' }))
 
     // This allows the API to be used everywhere when CORS is enforced
@@ -92,7 +91,6 @@ export class StorageServer {
 
     // A single POST endpoint for JSON-RPC:
     this.app.post('/', async (req: Request, res: Response) => {
-
       let { jsonrpc, method, params, id } = req.body
 
       // Basic JSON-RPC protocol checks: