@bsv/wallet-toolbox 1.7.1 → 1.7.2

package/src/storage/methods/createAction.ts

@@ -1,4 +1,12 @@
-import { Beef, OriginatorDomainNameStringUnder250Bytes, Random, ReviewActionResult, Script, Utils } from '@bsv/sdk'
+import {
+  Beef,
+  OriginatorDomainNameStringUnder250Bytes,
+  Random,
+  ReviewActionResult,
+  Script,
+  Utils,
+  Validation
+} from '@bsv/sdk'
 import {
   generateChangeSdk,
   GenerateChangeSdkChangeInput,
@@ -15,12 +23,6 @@ import {
   StorageGetBeefOptions,
   StorageProvidedBy
 } from '../../sdk/WalletStorage.interfaces'
-import {
-  ValidCreateActionArgs,
-  ValidCreateActionInput,
-  ValidCreateActionOutput,
-  validateSatoshis
-} from '../../sdk/validationHelpers'
 import { WERR_INTERNAL, WERR_INVALID_PARAMETER, WERR_REVIEW_ACTIONS } from '../../sdk/WERR_errors'
 import {
   randomBytesBase64,
@@ -48,9 +50,11 @@ export function setDisableDoubleSpendCheckForTest(v: boolean) {
 export async function createAction(
   storage: StorageProvider,
   auth: AuthId,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   originator?: OriginatorDomainNameStringUnder250Bytes
 ): Promise<StorageCreateActionResult> {
+  const logger = vargs.logger
+  logger?.group(`storage createAction`)
   //stampLog(vargs, `start storage createTransactionSdk`)
 
   if (vargs.isTestWerrReviewActions) throwDummyReviewActions()
@@ -77,7 +81,9 @@ export async function createAction(
 
   const userId = auth.userId!
   const { storageBeef, beef, xinputs } = await validateRequiredInputs(storage, userId, vargs)
+  logger?.log('validated required inputs')
   const xoutputs = validateRequiredOutputs(storage, userId, vargs)
+  logger?.log('validated required outputs')
 
   const changeBasketName = 'default'
   const changeBasket = verifyOne(
@@ -86,14 +92,19 @@ export async function createAction(
     }),
     `Invalid outputGeneration basket "${changeBasketName}"`
   )
+  logger?.log('found change basket')
 
   const noSendChangeIn = await validateNoSendChange(storage, userId, vargs, changeBasket)
+  logger?.log('validated noSendChange')
 
   const availableChangeCount = await storage.countChangeInputs(userId, changeBasket.basketId, !vargs.isDelayed)
+  logger?.log(`counted change inputs ${availableChangeCount}`)
 
   const feeModel = validateStorageFeeModel(storage.feeModel)
+  logger?.log(`validated fee model ${JSON.stringify(feeModel)}`)
 
   const newTx = await createNewTxRecord(storage, userId, vargs, storageBeef)
+  logger?.log(`created new transaction record`)
 
   const ctx: CreateTransactionSdkContext = {
     xinputs,
@@ -107,11 +118,13 @@ export async function createAction(
 
   const { allocatedChange, changeOutputs, derivationPrefix, maxPossibleSatoshisAdjustment } =
     await fundNewTransactionSdk(storage, userId, vargs, ctx)
+  logger?.log(`funded new transaction`)
 
   if (maxPossibleSatoshisAdjustment) {
     const a = maxPossibleSatoshisAdjustment
     if (ctx.xoutputs[a.fixedOutputIndex].satoshis !== maxPossibleSatoshis) throw new WERR_INTERNAL()
     ctx.xoutputs[a.fixedOutputIndex].satoshis = a.satoshis
+    logger?.log(`adjusted change outputs to max possible`)
   }
 
   // The satoshis of the transaction is the satoshis we get back in change minus the satoshis we spend.
@@ -120,10 +133,13 @@ export async function createAction(
   await storage.updateTransaction(newTx.transactionId!, { satoshis })
 
   const { outputs, changeVouts } = await createNewOutputs(storage, userId, vargs, ctx, changeOutputs)
+  logger?.log(`created new output records`)
 
   const inputBeef = await mergeAllocatedChangeBeefs(storage, userId, vargs, allocatedChange, beef)
+  logger?.log(`merged allocated change beefs`)
 
   const inputs = await createNewInputs(storage, userId, vargs, ctx, allocatedChange)
+  logger?.log(`created new inputs`)
 
   const r: StorageCreateActionResult = {
     reference: newTx.reference!,
@@ -136,7 +152,7 @@ export async function createAction(
     noSendChangeOutputVouts: vargs.isNoSend ? changeVouts : undefined
   }
 
-  //stampLog(vargs, `end storage createTransactionSdk`)
+  logger?.groupEnd()
   return r
 }
 
@@ -150,14 +166,14 @@ interface CreateTransactionSdkContext {
   transactionId: number
 }
 
-interface XValidCreateActionInput extends ValidCreateActionInput {
+interface XValidCreateActionInput extends Validation.ValidCreateActionInput {
   vin: number
   lockingScript: Script
   satoshis: number
   output?: TableOutput
 }
 
-export interface XValidCreateActionOutput extends ValidCreateActionOutput {
+export interface XValidCreateActionOutput extends Validation.ValidCreateActionOutput {
   vout: number
   providedBy: StorageProvidedBy
   purpose?: string
@@ -198,7 +214,7 @@ function makeDefaultOutput(userId: number, transactionId: number, satoshis: numb
 async function createNewInputs(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   ctx: CreateTransactionSdkContext,
   allocatedChange: TableOutput[]
 ): Promise<StorageCreateTransactionSdkInput[]> {
@@ -302,7 +318,7 @@ async function createNewInputs(
 async function createNewOutputs(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   ctx: CreateTransactionSdkContext,
   changeOutputs: TableOutput[]
 ): Promise<{
@@ -427,7 +443,7 @@ async function createNewOutputs(
 
     const ro: StorageCreateTransactionSdkOutput = {
       vout: verifyInteger(o.vout),
-      satoshis: validateSatoshis(o.satoshis, 'o.satoshis'),
+      satoshis: Validation.validateSatoshis(o.satoshis, 'o.satoshis'),
       lockingScript: !o.lockingScript ? '' : asString(o.lockingScript),
       providedBy: verifyTruthy(o.providedBy) as StorageProvidedBy,
       purpose: o.purpose || undefined,
@@ -446,7 +462,7 @@ async function createNewOutputs(
 async function createNewTxRecord(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   storageBeef: Beef
 ): Promise<TableTransaction> {
   const now = new Date()
@@ -501,7 +517,7 @@ async function createNewTxRecord(
 function validateRequiredOutputs(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs
+  vargs: Validation.ValidCreateActionArgs
 ): XValidCreateActionOutput[] {
   const xoutputs: XValidCreateActionOutput[] = []
   let vout = -1
@@ -562,7 +578,7 @@ function validateRequiredOutputs(
 async function validateRequiredInputs(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs
+  vargs: Validation.ValidCreateActionArgs
 ): Promise<{
   storageBeef: Beef
   beef: Beef
@@ -640,7 +656,7 @@ async function validateRequiredInputs(
       if (!disableDoubleSpendCheckForTest && !output.spendable && !vargs.isNoSend)
         throw new WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'spendable output unless noSend is true')
       // input is spending an existing user output which has an lockingScript
-      input.satoshis = validateSatoshis(output.satoshis, 'output.satoshis')
+      input.satoshis = Validation.validateSatoshis(output.satoshis, 'output.satoshis')
       input.lockingScript = Script.fromBinary(asArray(output.lockingScript!))
     } else {
       let btx = beef.findTxid(txid)!
@@ -654,7 +670,7 @@ async function validateRequiredInputs(
       // btx is valid has parsed transaction data.
       if (vout >= btx.tx!.outputs.length) throw new WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'valid outpoint')
       const so = btx.tx!.outputs[vout]
-      input.satoshis = validateSatoshis(so.satoshis, 'so.satoshis')
+      input.satoshis = Validation.validateSatoshis(so.satoshis, 'so.satoshis')
       input.lockingScript = so.lockingScript
     }
   }
@@ -685,7 +701,7 @@ async function verifyBeefFixOrhpans(beef: Beef, storage: StorageProvider): Promi
 async function validateNoSendChange(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   changeBasket: TableOutputBasket
 ): Promise<TableOutput[]> {
   const r: TableOutput[] = []
@@ -725,7 +741,7 @@ async function validateNoSendChange(
 async function fundNewTransactionSdk(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   ctx: CreateTransactionSdkContext
 ): Promise<{
   allocatedChange: TableOutput[]
@@ -897,7 +913,7 @@ async function fundNewTransactionSdk(
  * in the `beef` to txidOnly.
  * @returns undefined if `vargs.options.returnTXIDOnly` or trimmed `Beef`
  */
-function trimInputBeef(beef: Beef, vargs: ValidCreateActionArgs): number[] | undefined {
+function trimInputBeef(beef: Beef, vargs: Validation.ValidCreateActionArgs): number[] | undefined {
   if (vargs.options.returnTXIDOnly) return undefined
   const knownTxids: Record<string, boolean> = {}
   for (const txid of vargs.options.knownTxids) knownTxids[txid] = true
@@ -908,7 +924,7 @@ function trimInputBeef(beef: Beef, vargs: ValidCreateActionArgs): number[] | und
 async function mergeAllocatedChangeBeefs(
   storage: StorageProvider,
   userId: number,
-  vargs: ValidCreateActionArgs,
+  vargs: Validation.ValidCreateActionArgs,
   allocatedChange: TableOutput[],
   beef: Beef
 ): Promise<number[] | undefined> {

package/src/storage/methods/generateChange.ts

@@ -1,4 +1,4 @@
-import { validateInteger, validateOptionalInteger, validateSatoshis } from '../../sdk/validationHelpers'
+import { Validation } 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'
@@ -445,14 +445,14 @@ export function validateGenerateChangeSdkParams(
   const r: ValidateGenerateChangeSdkParamsResult = {}
 
   params.fixedInputs.forEach((x, i) => {
-    validateSatoshis(x.satoshis, `fixedInputs[${i}].satoshis`)
-    validateInteger(x.unlockingScriptLength, `fixedInputs[${i}].unlockingScriptLength`, undefined, 0)
+    Validation.validateSatoshis(x.satoshis, `fixedInputs[${i}].satoshis`)
+    Validation.validateInteger(x.unlockingScriptLength, `fixedInputs[${i}].unlockingScriptLength`, undefined, 0)
   })
 
   if (!Array.isArray(params.fixedOutputs)) throw new WERR_INVALID_PARAMETER('fixedOutputs', 'an array of objects')
   params.fixedOutputs.forEach((x, i) => {
-    validateSatoshis(x.satoshis, `fixedOutputs[${i}].satoshis`)
-    validateInteger(x.lockingScriptLength, `fixedOutputs[${i}].lockingScriptLength`, undefined, 0)
+    Validation.validateSatoshis(x.satoshis, `fixedOutputs[${i}].satoshis`)
+    Validation.validateInteger(x.lockingScriptLength, `fixedOutputs[${i}].lockingScriptLength`, undefined, 0)
     if (x.satoshis === maxPossibleSatoshis) {
       if (r.hasMaxPossibleOutput !== undefined)
         throw new WERR_INVALID_PARAMETER(
@@ -466,13 +466,13 @@ export function validateGenerateChangeSdkParams(
   params.feeModel = validateStorageFeeModel(params.feeModel)
   if (params.feeModel.model !== 'sat/kb') throw new WERR_INVALID_PARAMETER('feeModel.model', `'sat/kb'`)
 
-  validateOptionalInteger(params.targetNetCount, `targetNetCount`)
+  Validation.validateOptionalInteger(params.targetNetCount, `targetNetCount`)
 
-  validateSatoshis(params.changeFirstSatoshis, 'changeFirstSatoshis', 1)
-  validateSatoshis(params.changeInitialSatoshis, 'changeInitialSatoshis', 1)
+  Validation.validateSatoshis(params.changeFirstSatoshis, 'changeFirstSatoshis', 1)
+  Validation.validateSatoshis(params.changeInitialSatoshis, 'changeInitialSatoshis', 1)
 
-  validateInteger(params.changeLockingScriptLength, `changeLockingScriptLength`)
-  validateInteger(params.changeUnlockingScriptLength, `changeUnlockingScriptLength`)
+  Validation.validateInteger(params.changeLockingScriptLength, `changeLockingScriptLength`)
+  Validation.validateInteger(params.changeUnlockingScriptLength, `changeUnlockingScriptLength`)
 
   return r
 }

package/src/storage/methods/internalizeAction.ts

@@ -4,7 +4,8 @@ import {
   BasketInsertion,
   InternalizeActionArgs,
   TransactionOutput,
-  Beef
+  Beef,
+  Validation
 } from '@bsv/sdk'
 import { GetReqsAndBeefResult, shareReqsWithWorld } from './processAction'
 import { StorageProvider } from '../StorageProvider'
@@ -12,7 +13,6 @@ import { AuthId, StorageInternalizeActionResult, StorageProvenOrReq } from '../.
 import { TableOutput } from '../schema/tables/TableOutput'
 import { TableOutputBasket } from '../schema/tables/TableOutputBasket'
 import { TableTransaction } from '../schema/tables/TableTransaction'
-import { validateInternalizeActionArgs, ValidInternalizeActionArgs } from '../../sdk/validationHelpers'
 import { WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 import { randomBytesBase64, verifyId, verifyOne, verifyOneOrNone } from '../../utility/utilityHelpers'
 import { TransactionStatus } from '../../sdk/types'
@@ -100,14 +100,14 @@ class InternalizeActionContext {
   /** all the wallet payments from incoming outputs array */
   walletPayments: WalletPaymentX[]
   userId: number
-  vargs: ValidInternalizeActionArgs
+  vargs: Validation.ValidInternalizeActionArgs
 
   constructor(
     public storage: StorageProvider,
     public auth: AuthId,
     public args: InternalizeActionArgs
   ) {
-    this.vargs = validateInternalizeActionArgs(args)
+    this.vargs = Validation.validateInternalizeActionArgs(args)
     this.userId = auth.userId!
     this.r = {
       accepted: true,

package/src/storage/methods/listActionsIdb.ts

@@ -4,12 +4,12 @@ import {
   ListActionsResult,
   WalletAction,
   WalletActionOutput,
-  WalletActionInput
+  WalletActionInput,
+  Validation
 } from '@bsv/sdk'
 import { StorageIdb } from '../StorageIdb'
 import { getLabelToSpecOp, ListActionsSpecOp } from './ListActionsSpecOp'
 import { AuthId } from '../../sdk/WalletStorage.interfaces'
-import { ValidListActionsArgs } from '../../sdk/validationHelpers'
 import { isListActionsSpecOp, TransactionStatus } from '../../sdk/types'
 import { TableOutputX } from '../schema/tables/TableOutput'
 import { asString } from '../../utility/utilityHelpers.noBuffer'
@@ -17,7 +17,7 @@ import { asString } from '../../utility/utilityHelpers.noBuffer'
 export async function listActionsIdb(
   storage: StorageIdb,
   auth: AuthId,
-  vargs: ValidListActionsArgs
+  vargs: Validation.ValidListActionsArgs
 ): Promise<ListActionsResult> {
   const limit = vargs.limit
   const offset = vargs.offset

package/src/storage/methods/listActionsKnex.ts

@@ -4,12 +4,12 @@ import {
   ListActionsResult,
   WalletAction,
   WalletActionOutput,
-  WalletActionInput
+  WalletActionInput,
+  Validation
 } from '@bsv/sdk'
 import { StorageKnex } from '../StorageKnex'
 import { getLabelToSpecOp, ListActionsSpecOp } from './ListActionsSpecOp'
 import { AuthId } from '../../sdk/WalletStorage.interfaces'
-import { ValidListActionsArgs } from '../../sdk/validationHelpers'
 import { isListActionsSpecOp } from '../../sdk/types'
 import { TableTxLabel } from '../schema/tables/TableTxLabel'
 import { TableTransaction } from '../schema/tables/TableTransaction'
@@ -20,7 +20,7 @@ import { asString } from '../../utility/utilityHelpers.noBuffer'
 export async function listActions(
   storage: StorageKnex,
   auth: AuthId,
-  vargs: ValidListActionsArgs
+  vargs: Validation.ValidListActionsArgs
 ): Promise<ListActionsResult> {
   const limit = vargs.limit
   const offset = vargs.offset

package/src/storage/methods/listCertificates.ts

@@ -1,14 +1,15 @@
-import { ListCertificatesResult, OriginatorDomainNameStringUnder250Bytes } from '@bsv/sdk'
+import { ListCertificatesResult, OriginatorDomainNameStringUnder250Bytes, Validation } from '@bsv/sdk'
 import { StorageProvider, TableCertificate } from '../index.client'
-import { sdk } from '../../index.client'
+import { AuthId, FindCertificatesArgs } from '../../sdk/WalletStorage.interfaces'
+import { Paged } from '../../sdk/types'
 
 export async function listCertificates(
   storage: StorageProvider,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidListCertificatesArgs,
+  auth: AuthId,
+  vargs: Validation.ValidListCertificatesArgs,
   originator?: OriginatorDomainNameStringUnder250Bytes
 ): Promise<ListCertificatesResult> {
-  const paged: sdk.Paged = { limit: vargs.limit, offset: vargs.offset }
+  const paged: Paged = { limit: vargs.limit, offset: vargs.offset }
 
   const partial: Partial<TableCertificate> = {
     userId: auth.userId,
@@ -26,7 +27,7 @@ export async function listCertificates(
   }
 
   const r = await storage.transaction(async trx => {
-    const findCertsArgs: sdk.FindCertificatesArgs = {
+    const findCertsArgs: FindCertificatesArgs = {
       partial,
       certifiers: vargs.certifiers,
       types: vargs.types,

package/src/storage/methods/listOutputsIdb.ts

@@ -1,8 +1,7 @@
-import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput } from '@bsv/sdk'
+import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput, Validation } from '@bsv/sdk'
 import { getBasketToSpecOp, ListOutputsSpecOp } from './ListOutputsSpecOp'
 import { StorageIdb } from '../StorageIdb'
 import { AuthId, FindOutputsArgs } from '../../sdk/WalletStorage.interfaces'
-import { ValidListOutputsArgs } from '../../sdk/validationHelpers'
 import { verifyId } from '../../utility/utilityHelpers'
 import { WERR_NOT_IMPLEMENTED } from '../../sdk/WERR_errors'
 import { TableOutputBasket } from '../schema/tables/TableOutputBasket'
@@ -12,7 +11,7 @@ import { asString } from '../../utility/utilityHelpers.noBuffer'
 export async function listOutputsIdb(
   storage: StorageIdb,
   auth: AuthId,
-  vargs: ValidListOutputsArgs,
+  vargs: Validation.ValidListOutputsArgs,
   originator?: OriginatorDomainNameStringUnder250Bytes
 ): Promise<ListOutputsResult> {
   const userId = verifyId(auth.userId)

package/src/storage/methods/listOutputsKnex.ts

@@ -1,8 +1,7 @@
-import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput } from '@bsv/sdk'
+import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput, Validation } from '@bsv/sdk'
 import { StorageKnex } from '../StorageKnex'
 import { getBasketToSpecOp, ListOutputsSpecOp } from './ListOutputsSpecOp'
 import { AuthId, TrxToken } from '../../sdk/WalletStorage.interfaces'
-import { ValidListOutputsArgs } from '../../sdk/validationHelpers'
 import { verifyId, verifyOne } from '../../utility/utilityHelpers'
 import { TableOutputBasket } from '../schema/tables/TableOutputBasket'
 import { TableOutputTag } from '../schema/tables/TableOutputTag'
@@ -12,7 +11,7 @@ import { asString } from '../../utility/utilityHelpers.noBuffer'
 export async function listOutputs(
   dsk: StorageKnex,
   auth: AuthId,
-  vargs: ValidListOutputsArgs,
+  vargs: Validation.ValidListOutputsArgs,
   originator?: OriginatorDomainNameStringUnder250Bytes
 ): Promise<ListOutputsResult> {
   const trx: TrxToken | undefined = undefined

package/src/storage/methods/processAction.ts

@@ -1,5 +1,11 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Beef, Transaction as BsvTransaction, SendWithResult, SendWithResultStatus } from '@bsv/sdk'
+import {
+  Beef,
+  Transaction as BsvTransaction,
+  SendWithResult,
+  SendWithResultStatus,
+  WalletLoggerInterface
+} from '@bsv/sdk'
 import { aggregateActionResults } from '../../utility/aggregateResults'
 import { StorageProvider } from '../StorageProvider'
 import {
@@ -33,7 +39,8 @@ export async function processAction(
   auth: AuthId,
   args: StorageProcessActionArgs
 ): Promise<StorageProcessActionResults> {
-  stampLog(args.log, `start storage processActionSdk`)
+  const logger = args.logger
+  logger?.group('storage processAction')
 
   const userId = verifyId(auth.userId)
   const r: StorageProcessActionResults = {
@@ -45,22 +52,32 @@ export async function processAction(
 
   if (args.isNewTx) {
     const vargs = await validateCommitNewTxToStorageArgs(storage, userId, args)
-    ;({ req, log: args.log } = await commitNewTxToStorage(storage, userId, vargs))
+    logger?.log(`validated new tx updates to storage`)
+    ;({ req } = await commitNewTxToStorage(storage, userId, vargs))
+    logger?.log(`committed new tx updates to storage `)
     if (!req) throw new WERR_INTERNAL()
     // Add the new txid to sendWith unless there are no others to send and the noSend option is set.
-    if (args.isNoSend && !args.isSendWith) stampLog(args.log, `... storage processActionSdk newTx committed noSend`)
-    else {
+    if (args.isNoSend && !args.isSendWith) {
+      logger?.log(`noSend txid ${req.txid}`)
+    } else {
       txidsOfReqsToShareWithWorld.push(req.txid)
-      stampLog(args.log, `... storage processActionSdk newTx committed sendWith ${req.txid}`)
+      logger?.log(`sending txid ${req.txid}`)
     }
   }
 
-  const { swr, ndr } = await shareReqsWithWorld(storage, userId, txidsOfReqsToShareWithWorld, args.isDelayed)
+  const { swr, ndr } = await shareReqsWithWorld(
+    storage,
+    userId,
+    txidsOfReqsToShareWithWorld,
+    args.isDelayed,
+    undefined,
+    logger
+  )
 
   r.sendWithResults = swr
   r.notDelayedResults = ndr
 
-  stampLog(args.log, `end storage processActionSdk`)
+  logger?.groupEnd()
 
   return r
 }
@@ -114,7 +131,8 @@ export async function shareReqsWithWorld(
   userId: number,
   txids: string[],
   isDelayed: boolean,
-  r?: GetReqsAndBeefResult
+  r?: GetReqsAndBeefResult,
+  logger?: WalletLoggerInterface
 ): Promise<{ swr: SendWithResult[]; ndr: ReviewActionResult[] | undefined }> {
   let swr: SendWithResult[] = []
   let ndr: ReviewActionResult[] | undefined = undefined
@@ -147,9 +165,10 @@ export async function shareReqsWithWorld(
   if (readyToSendReqs.length > 0) {
     const beefIsValid = await r.beef.verify(await storage.getServices().getChainTracker())
     if (!beefIsValid) {
-      console.log(`VERIFY FALSE BEEF: ${r.beef.toLogString()}`)
+      logger?.error(`VERIFY FALSE BEEF: ${r.beef.toLogString()}`)
       throw new WERR_INTERNAL(`merged Beef failed validation.`)
     }
+    logger?.log(`beef is valid`)
   }
 
   // Set req batch property for the reqs being sent
@@ -179,7 +198,7 @@ export async function shareReqsWithWorld(
   //
   // Handle the NON-DELAYED-SEND-NOW case
   //
-  const prtn = await storage.attemptToPostReqsToNetwork(readyToSendReqs)
+  const prtn = await storage.attemptToPostReqsToNetwork(readyToSendReqs, undefined, logger)
 
   const { swr: swrRes, rar } = await aggregateActionResults(storage, swr, prtn)
   return { swr: swrRes, ndr: rar }

package/src/storage/remoting/StorageClient.ts

@@ -2,14 +2,15 @@ import {
   AbortActionArgs,
   AbortActionResult,
   InternalizeActionArgs,
-  InternalizeActionResult,
   ListActionsResult,
   ListCertificatesResult,
   ListOutputsResult,
   RelinquishCertificateArgs,
   RelinquishOutputArgs,
   WalletInterface,
-  AuthFetch
+  AuthFetch,
+  Validation,
+  WalletLoggerInterface
 } from '@bsv/sdk'
 import {
   AuthId,
@@ -31,12 +32,6 @@ import {
 import { TableSettings } from '../schema/tables/TableSettings'
 import { WERR_INVALID_OPERATION } from '../../sdk/WERR_errors'
 import { WalletServices } from '../../sdk/WalletServices.interfaces'
-import {
-  ValidCreateActionArgs,
-  ValidListActionsArgs,
-  ValidListCertificatesArgs,
-  ValidListOutputsArgs
-} from '../../sdk/validationHelpers'
 import { TableUser } from '../schema/tables/TableUser'
 import { TableSyncState } from '../schema/tables/TableSyncState'
 import { TableCertificateX } from '../schema/tables/TableCertificate'
@@ -46,6 +41,7 @@ import { TableProvenTxReq } from '../schema/tables/TableProvenTxReq'
 import { EntityTimeStamp } from '../../sdk/types'
 import { WalletError } from '../../sdk/WalletError'
 import { WalletErrorFromJson } from '../../sdk/WalletErrorFromJson'
+import { logWalletError } from '../../WalletLogger'
 
 /**
  * `StorageClient` implements the `WalletStorageProvider` interface which allows it to
@@ -94,8 +90,17 @@ export class StorageClient implements WalletStorageProvider {
    * @param params The array of parameters to pass to the method in order.
    */
   private async rpcCall<T>(method: string, params: unknown[]): Promise<T> {
+    let logger: WalletLoggerInterface | undefined = params[1]?.['logger']
+
     try {
       const id = this.nextId++
+
+      if (logger) {
+        // Replace logger object with seed json object to continue logging on request server.
+        logger.group(`StorageClient ${method}`)
+        params[1]!['logger'] = { indent: logger.indent || 0 }
+      }
+
       const body = {
         jsonrpc: '2.0',
         method,
@@ -111,6 +116,7 @@ export class StorageClient implements WalletStorageProvider {
           body: JSON.stringify(body)
         })
       } catch (eu: unknown) {
+        logWalletError(eu, logger, 'error requesting remote service')
         throw eu
       }
 
@@ -120,13 +126,26 @@ export class StorageClient implements WalletStorageProvider {
 
       const json = await response.json()
       if (json.error) {
+        logWalletError(json.error, logger, 'error from remote service')
         const werr = WalletErrorFromJson(json.error)
         throw werr
       }
 
+      if (logger) {
+        // merge log data from request processing
+        logger.merge?.(json.result?.['log'])
+        logger.groupEnd()
+      }
+
       return json.result
     } catch (eu: unknown) {
+      logWalletError(eu, logger, 'error setting up request to remote service')
       throw eu
+    } finally {
+      if (logger) {
+        // Restore original logger in params
+        params[1]!['logger'] = logger
+      }
     }
   }
 
@@ -227,7 +246,7 @@ export class StorageClient implements WalletStorageProvider {
    * @param args Validated extension of original wallet `createAction` arguments.
    * @returns `StorageCreateActionResults` supporting additional wallet processing to yield `createAction` results.
    */
-  async createAction(auth: AuthId, args: ValidCreateActionArgs): Promise<StorageCreateActionResult> {
+  async createAction(auth: AuthId, args: Validation.ValidCreateActionArgs): Promise<StorageCreateActionResult> {
     return this.rpcCall<StorageCreateActionResult>('createAction', [auth, args])
   }
 
@@ -307,7 +326,7 @@ export class StorageClient implements WalletStorageProvider {
    * @param args Validated extension of original wallet `listActions` arguments.
    * @returns `listActions` results.
    */
-  async listActions(auth: AuthId, vargs: ValidListActionsArgs): Promise<ListActionsResult> {
+  async listActions(auth: AuthId, vargs: Validation.ValidListActionsArgs): Promise<ListActionsResult> {
     const r = await this.rpcCall<ListActionsResult>('listActions', [auth, vargs])
     return r
   }
@@ -319,7 +338,7 @@ export class StorageClient implements WalletStorageProvider {
    * @param args Validated extension of original wallet `listOutputs` arguments.
    * @returns `listOutputs` results.
    */
-  async listOutputs(auth: AuthId, vargs: ValidListOutputsArgs): Promise<ListOutputsResult> {
+  async listOutputs(auth: AuthId, vargs: Validation.ValidListOutputsArgs): Promise<ListOutputsResult> {
     const r = await this.rpcCall<ListOutputsResult>('listOutputs', [auth, vargs])
     return r
   }
@@ -331,7 +350,7 @@ export class StorageClient implements WalletStorageProvider {
    * @param args Validated extension of original wallet `listCertificates` arguments.
    * @returns `listCertificates` results.
    */
-  async listCertificates(auth: AuthId, vargs: ValidListCertificatesArgs): Promise<ListCertificatesResult> {
+  async listCertificates(auth: AuthId, vargs: Validation.ValidListCertificatesArgs): Promise<ListCertificatesResult> {
     const r = await this.rpcCall<ListCertificatesResult>('listCertificates', [auth, vargs])
     return r
   }