@bsv/wallet-toolbox 1.5.21 → 1.6.2

package/src/services/providers/__tests/WhatsOnChain.test.ts

@@ -1,9 +1,12 @@
-import { WhatsOnChainBroadcaster, WhatsOnChainConfig } from '@bsv/sdk'
 import { _tu } from '../../../../test/utils/TestUtilsWalletStorage'
 import { WhatsOnChain } from '../WhatsOnChain'
 import { Services } from '../../Services'
-import { sdk, StorageClient, wait } from '../../../index.client'
-import { Setup, StorageKnex } from '../../../index.all'
+import { Setup } from '../../../Setup'
+import { wait } from '../../../utility/utilityHelpers'
+import { WalletError } from '../../../sdk/WalletError'
+import { StorageKnex } from '../../../storage/StorageKnex'
+import { StorageClient } from '../../../storage/remoting/StorageClient'
+
 describe('whatsonchain tests', () => {
   jest.setTimeout(99999999)
 
@@ -131,7 +134,7 @@ describe('whatsonchain tests', () => {
       try {
         await c.wallet.abortAction({ reference: ref })
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
       }
     }
   })
@@ -178,7 +181,7 @@ describe('whatsonchain tests', () => {
       await woc.postRawTx(c.doubleSpendTx.toHex())
       expect(false)
     } catch (eu: unknown) {
-      const e = sdk.WalletError.fromUnknown(eu)
+      const e = WalletError.fromUnknown(eu)
       expect(
         e.message === 'The rawTx parameter must be valid. unexpected response code 500: 258: txn-mempool-conflict' ||
           'The rawTx parameter must be valid. unexpected response code 500: Missing inputs'
@@ -204,7 +207,7 @@ describe('whatsonchain tests', () => {
         try {
           await c.wallet.abortAction({ reference: ref })
         } catch (eu: unknown) {
-          const e = sdk.WalletError.fromUnknown(eu)
+          const e = WalletError.fromUnknown(eu)
         }
       }
     }

package/src/services/providers/{echangeRates.ts → exchangeRates.ts}

@@ -1,22 +1,23 @@
-import { sdk } from '../../index.client'
+import { FiatExchangeRates, WalletServicesOptions } from '../../sdk/WalletServices.interfaces'
+import { WERR_BAD_REQUEST, WERR_MISSING_PARAMETER } from '../../sdk/WERR_errors'
 
 export async function updateChaintracksFiatExchangeRates(
   targetCurrencies: string[],
-  options: sdk.WalletServicesOptions
-): Promise<sdk.FiatExchangeRates> {
+  options: WalletServicesOptions
+): Promise<FiatExchangeRates> {
   const url = options.chaintracksFiatExchangeRatesUrl
 
-  if (!url) throw new sdk.WERR_MISSING_PARAMETER('options.chaintracksFiatExchangeRatesUrl')
+  if (!url) throw new WERR_MISSING_PARAMETER('options.chaintracksFiatExchangeRatesUrl')
 
   const response = await fetch(url)
   const data = await response.json()
   const r = { status: response.status, data }
 
   if (r.status !== 200 || !r.data || r.data.status != 'success') {
-    throw new sdk.WERR_BAD_REQUEST(`${url} returned status ${r.status}`)
+    throw new WERR_BAD_REQUEST(`${url} returned status ${r.status}`)
   }
 
-  const rates = <sdk.FiatExchangeRates>r.data.value
+  const rates = <FiatExchangeRates>r.data.value
   rates.timestamp = new Date(rates.timestamp)
 
   return rates
@@ -24,18 +25,18 @@ export async function updateChaintracksFiatExchangeRates(
 
 export async function updateExchangeratesapi(
   targetCurrencies: string[],
-  options: sdk.WalletServicesOptions
-): Promise<sdk.FiatExchangeRates> {
-  if (!options.exchangeratesapiKey) throw new sdk.WERR_MISSING_PARAMETER('options.exchangeratesapiKey')
+  options: WalletServicesOptions
+): Promise<FiatExchangeRates> {
+  if (!options.exchangeratesapiKey) throw new WERR_MISSING_PARAMETER('options.exchangeratesapiKey')
 
   const iorates = await getExchangeRatesIo(options.exchangeratesapiKey)
 
-  if (!iorates.success) throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo returned success ${iorates.success}`)
+  if (!iorates.success) throw new WERR_BAD_REQUEST(`getExchangeRatesIo returned success ${iorates.success}`)
 
   if (!iorates.rates['USD'] || !iorates.rates[iorates.base])
-    throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo missing rates for 'USD' or base`)
+    throw new WERR_BAD_REQUEST(`getExchangeRatesIo missing rates for 'USD' or base`)
 
-  const r: sdk.FiatExchangeRates = {
+  const r: FiatExchangeRates = {
     timestamp: new Date(iorates.timestamp * 1000),
     base: 'USD',
     rates: {}
@@ -52,7 +53,7 @@ export async function updateExchangeratesapi(
   }
 
   if (updates !== targetCurrencies.length)
-    throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo failed to update all target currencies`)
+    throw new WERR_BAD_REQUEST(`getExchangeRatesIo failed to update all target currencies`)
 
   //console.log(`new fiat rates=${JSON.stringify(r)}`)
 
@@ -75,7 +76,7 @@ export async function getExchangeRatesIo(key: string): Promise<ExchangeRatesIoAp
   const r = { status: response.status, data }
 
   if (r.status !== 200 || !r.data) {
-    throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo returned status ${r.status}`)
+    throw new WERR_BAD_REQUEST(`getExchangeRatesIo returned status ${r.status}`)
   }
 
   const rates = <ExchangeRatesIoApi>r.data

package/src/signer/WalletSigner.ts

@@ -1,15 +1,15 @@
-import { KeyDeriver, KeyDeriverApi } from '@bsv/sdk'
-import { sdk } from '../index.client'
+import { KeyDeriverApi } from '@bsv/sdk'
 import { WalletStorageManager } from '../storage/WalletStorageManager'
+import { Chain } from '../sdk/types'
 
 export class WalletSigner {
   isWalletSigner: true = true
 
-  chain: sdk.Chain
+  chain: Chain
   keyDeriver: KeyDeriverApi
   storage: WalletStorageManager
 
-  constructor(chain: sdk.Chain, keyDeriver: KeyDeriverApi, storage: WalletStorageManager) {
+  constructor(chain: Chain, keyDeriver: KeyDeriverApi, storage: WalletStorageManager) {
     this.chain = chain
     this.keyDeriver = keyDeriver
     this.storage = storage

package/src/signer/methods/acquireDirectCertificate.ts

@@ -1,10 +1,13 @@
 import { AcquireCertificateResult } from '@bsv/sdk'
-import { sdk, TableCertificateX, Wallet } from '../../index.client'
+import { Wallet } from '../../Wallet'
+import { AuthId } from '../../sdk/WalletStorage.interfaces'
+import { ValidAcquireDirectCertificateArgs } from '../../sdk/validationHelpers'
+import { TableCertificateX } from '../../storage/schema/tables/TableCertificate'
 
 export async function acquireDirectCertificate(
   wallet: Wallet,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidAcquireDirectCertificateArgs
+  auth: AuthId,
+  vargs: ValidAcquireDirectCertificateArgs
 ): Promise<AcquireCertificateResult> {
   const now = new Date()
   const newCert: TableCertificateX = {

package/src/signer/methods/buildSignableTransaction.ts

@@ -1,11 +1,19 @@
 import { Beef, Script, Transaction, TransactionInput, TransactionOutput } from '@bsv/sdk'
-import { asBsvSdkScript, sdk, verifyTruthy } from '../../index.client'
 import { Wallet, PendingStorageInput } from '../../Wallet'
-import { makeChangeLock } from './createAction'
+import {
+  StorageCreateActionResult,
+  StorageCreateTransactionSdkInput,
+  StorageCreateTransactionSdkOutput
+} from '../../sdk/WalletStorage.interfaces'
+import { ValidCreateActionArgs, ValidCreateActionInput } from '../../sdk/validationHelpers'
+import { WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
+import { asBsvSdkScript, verifyTruthy } from '../../utility/utilityHelpers'
+import { KeyPair } from '../../sdk/types'
+import { ScriptTemplateBRC29 } from '../../utility/ScriptTemplateBRC29'
 
 export function buildSignableTransaction(
-  dctr: sdk.StorageCreateActionResult,
-  args: sdk.ValidCreateActionArgs,
+  dctr: StorageCreateActionResult,
+  args: ValidCreateActionArgs,
   wallet: Wallet
 ): {
   tx: Transaction
@@ -29,7 +37,7 @@ export function buildSignableTransaction(
   const voutToIndex = Array<number>(storageOutputs.length)
   for (let vout = 0; vout < storageOutputs.length; vout++) {
     const i = storageOutputs.findIndex(o => o.vout === vout)
-    if (i < 0) throw new sdk.WERR_INVALID_PARAMETER('output.vout', `sequential. ${vout} is missing`)
+    if (i < 0) throw new WERR_INVALID_PARAMETER('output.vout', `sequential. ${vout} is missing`)
     voutToIndex[vout] = i
   }
 
@@ -40,7 +48,7 @@ export function buildSignableTransaction(
     const i = voutToIndex[vout]
     const out = storageOutputs[i]
     if (vout !== out.vout)
-      throw new sdk.WERR_INVALID_PARAMETER('output.vout', `equal to array index. ${out.vout} !== ${vout}`)
+      throw new WERR_INVALID_PARAMETER('output.vout', `equal to array index. ${out.vout} !== ${vout}`)
 
     const change = out.providedBy === 'storage' && out.purpose === 'change'
 
@@ -70,8 +78,8 @@ export function buildSignableTransaction(
   // Merge and sort INPUTS info by vin order.
   /////////////
   const inputs: {
-    argsInput: sdk.ValidCreateActionInput | undefined
-    storageInput: sdk.StorageCreateTransactionSdkInput
+    argsInput: ValidCreateActionInput | undefined
+    storageInput: StorageCreateTransactionSdkInput
   }[] = []
   for (const storageInput of storageInputs) {
     const argsInput =
@@ -111,7 +119,7 @@ export function buildSignableTransaction(
     } else {
       // Type2: SABPPP protocol inputs which are signed using ScriptTemplateBRC29.
       if (storageInput.type !== 'P2PKH')
-        throw new sdk.WERR_INVALID_PARAMETER(
+        throw new WERR_INVALID_PARAMETER(
           'type',
           `vin ${storageInput.vin}, "${storageInput.type}" is not a supported unlocking script type.`
         )
@@ -153,3 +161,24 @@ export function buildSignableTransaction(
     log: ''
   }
 }
+
+/**
+ * Derive a change output locking script
+ */
+export function makeChangeLock(
+  out: StorageCreateTransactionSdkOutput,
+  dctr: StorageCreateActionResult,
+  args: ValidCreateActionArgs,
+  changeKeys: KeyPair,
+  wallet: Wallet
+): Script {
+  const derivationPrefix = dctr.derivationPrefix
+  const derivationSuffix = verifyTruthy(out.derivationSuffix)
+  const sabppp = new ScriptTemplateBRC29({
+    derivationPrefix,
+    derivationSuffix,
+    keyDeriver: wallet.keyDeriver
+  })
+  const lockingScript = sabppp.lock(changeKeys.privateKey, changeKeys.publicKey)
+  return lockingScript
+}

package/src/signer/methods/completeSignedTransaction.ts

@@ -1,7 +1,9 @@
 import { Beef, SignActionResult, SignActionSpend, Spend, Transaction } from '@bsv/sdk'
 import { PendingSignAction, Wallet } from '../../Wallet'
-import { asBsvSdkScript, ScriptTemplateBRC29, sdk } from '../../index.client'
-import { WalletError, WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../sdk'
+import { WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
+import { asBsvSdkScript } from '../../utility/utilityHelpers'
+import { ScriptTemplateBRC29 } from '../../utility/ScriptTemplateBRC29'
+import { WalletError } from '../../sdk/WalletError'
 
 export async function completeSignedTransaction(
   prior: PendingSignAction,
@@ -16,12 +18,12 @@ export async function completeSignedTransaction(
     const createInput = prior.args.inputs[vin]
     const input = prior.tx.inputs[vin]
     if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
-      throw new sdk.WERR_INVALID_PARAMETER(
+      throw new WERR_INVALID_PARAMETER(
         'args',
         `spend does not correspond to prior input with valid unlockingScriptLength.`
       )
     if (spend.unlockingScript.length / 2 > createInput.unlockingScriptLength!)
-      throw new sdk.WERR_INVALID_PARAMETER(
+      throw new WERR_INVALID_PARAMETER(
         'args',
         `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`
       )

package/src/signer/methods/createAction.ts

@@ -5,13 +5,26 @@ import {
   OutpointString,
   SendWithResult,
   SignableTransaction,
-  TXIDHexString
+  TXIDHexString,
+  Script,
+  Transaction
 } from '@bsv/sdk'
-import { Script, Transaction } from '@bsv/sdk'
-import { makeAtomicBeef, PendingSignAction, ScriptTemplateBRC29, sdk, verifyTruthy, Wallet } from '../../index.client'
 import { buildSignableTransaction } from './buildSignableTransaction'
-import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces'
+import {
+  AuthId,
+  ReviewActionResult,
+  StorageCreateActionResult,
+  StorageCreateTransactionSdkOutput,
+  StorageProcessActionArgs,
+  StorageProcessActionResults
+} from '../../sdk/WalletStorage.interfaces'
 import { completeSignedTransaction, verifyUnlockScripts } from './completeSignedTransaction'
+import { PendingSignAction, Wallet } from '../../Wallet'
+import { ValidCreateActionArgs, ValidCreateActionInput, ValidProcessActionArgs } from '../../sdk/validationHelpers'
+import { WERR_INTERNAL } from '../../sdk/WERR_errors'
+import { KeyPair } from '../../sdk/types'
+import { verifyTruthy } from '../../utility/utilityHelpers'
+import { ScriptTemplateBRC29 } from '../../utility/ScriptTemplateBRC29'
 
 export interface CreateActionResultX extends CreateActionResult {
   txid?: TXIDHexString
@@ -24,8 +37,8 @@ export interface CreateActionResultX extends CreateActionResult {
 
 export async function createAction(
   wallet: Wallet,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidCreateActionArgs
+  auth: AuthId,
+  vargs: ValidCreateActionArgs
 ): Promise<CreateActionResultX> {
   const r: CreateActionResultX = {}
 
@@ -59,7 +72,7 @@ export async function createAction(
   return r
 }
 
-async function createNewTx(wallet: Wallet, args: sdk.ValidCreateActionArgs): Promise<PendingSignAction> {
+async function createNewTx(wallet: Wallet, args: ValidCreateActionArgs): Promise<PendingSignAction> {
   const storageArgs = removeUnlockScripts(args)
   const dcr = await wallet.storage.createAction(storageArgs)
 
@@ -75,9 +88,9 @@ async function createNewTx(wallet: Wallet, args: sdk.ValidCreateActionArgs): Pro
 function makeSignableTransactionResult(
   prior: PendingSignAction,
   wallet: Wallet,
-  args: sdk.ValidCreateActionArgs
+  args: ValidCreateActionArgs
 ): CreateActionResult {
-  if (!prior.dcr.inputBeef) throw new sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid')
+  if (!prior.dcr.inputBeef) throw new WERR_INTERNAL('prior.dcr.inputBeef must be valid')
 
   const txid = prior.tx.id('hex')
 
@@ -100,41 +113,20 @@ function makeSignableTransactionBeef(tx: Transaction, inputBEEF: number[]): numb
   const beef = new Beef()
   for (const input of tx.inputs) {
     if (!input.sourceTransaction)
-      throw new sdk.WERR_INTERNAL('Every signableTransaction input must have a sourceTransaction')
+      throw new WERR_INTERNAL('Every signableTransaction input must have a sourceTransaction')
     beef.mergeRawTx(input.sourceTransaction!.toBinary())
   }
   beef.mergeRawTx(tx.toBinary())
   return beef.toBinaryAtomic(tx.id('hex'))
 }
 
-/**
- * Derive a change output locking script
- */
-export function makeChangeLock(
-  out: sdk.StorageCreateTransactionSdkOutput,
-  dctr: sdk.StorageCreateActionResult,
-  args: sdk.ValidCreateActionArgs,
-  changeKeys: sdk.KeyPair,
-  wallet: Wallet
-): Script {
-  const derivationPrefix = dctr.derivationPrefix
-  const derivationSuffix = verifyTruthy(out.derivationSuffix)
-  const sabppp = new ScriptTemplateBRC29({
-    derivationPrefix,
-    derivationSuffix,
-    keyDeriver: wallet.keyDeriver
-  })
-  const lockingScript = sabppp.lock(changeKeys.privateKey, changeKeys.publicKey)
-  return lockingScript
-}
-
-function removeUnlockScripts(args: sdk.ValidCreateActionArgs) {
+function removeUnlockScripts(args: ValidCreateActionArgs) {
   let storageArgs = args
   if (!storageArgs.inputs.every(i => i.unlockingScript === undefined)) {
     // Never send unlocking scripts to storage, all it needs is the script length.
     storageArgs = { ...args, inputs: [] }
     for (const i of args.inputs) {
-      const di: sdk.ValidCreateActionInput = {
+      const di: ValidCreateActionInput = {
         ...i,
         unlockingScriptLength: i.unlockingScript !== undefined ? i.unlockingScript.length : i.unlockingScriptLength
       }
@@ -148,10 +140,10 @@ function removeUnlockScripts(args: sdk.ValidCreateActionArgs) {
 export async function processAction(
   prior: PendingSignAction | undefined,
   wallet: Wallet,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidProcessActionArgs
-): Promise<sdk.StorageProcessActionResults> {
-  const args: sdk.StorageProcessActionArgs = {
+  auth: AuthId,
+  vargs: ValidProcessActionArgs
+): Promise<StorageProcessActionResults> {
+  const args: StorageProcessActionArgs = {
     isNewTx: vargs.isNewTx,
     isSendWith: vargs.isSendWith,
     isNoSend: vargs.isNoSend,
@@ -161,7 +153,7 @@ export async function processAction(
     rawTx: prior ? prior.tx.toBinary() : undefined,
     sendWith: vargs.isSendWith ? vargs.options.sendWith : []
   }
-  const r: sdk.StorageProcessActionResults = await wallet.storage.processAction(args)
+  const r: StorageProcessActionResults = await wallet.storage.processAction(args)
 
   return r
 }

package/src/signer/methods/internalizeAction.ts

@@ -1,12 +1,8 @@
-import {
-  Beef,
-  InternalizeActionArgs,
-  InternalizeActionResult,
-  InternalizeOutput,
-  P2PKH,
-  WalletProtocol
-} from '@bsv/sdk'
-import { sdk, Wallet } from '../../index.client'
+import { Beef, InternalizeActionArgs, InternalizeOutput, P2PKH, WalletProtocol } from '@bsv/sdk'
+import { Wallet } from '../../Wallet'
+import { AuthId, StorageInternalizeActionResult } from '../../sdk/WalletStorage.interfaces'
+import { validateInternalizeActionArgs, ValidInternalizeActionArgs } from '../../sdk/validationHelpers'
+import { WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 
 /**
  * Internalize Action allows a wallet to take ownership of outputs in a pre-existing transaction.
@@ -37,17 +33,17 @@ import { sdk, Wallet } from '../../index.client'
  */
 export async function internalizeAction(
   wallet: Wallet,
-  auth: sdk.AuthId,
+  auth: AuthId,
   args: InternalizeActionArgs
-): Promise<sdk.StorageInternalizeActionResult> {
-  const vargs = sdk.validateInternalizeActionArgs(args)
+): Promise<StorageInternalizeActionResult> {
+  const vargs = validateInternalizeActionArgs(args)
 
   const { ab, tx, txid } = await validateAtomicBeef()
   const brc29ProtocolID: WalletProtocol = [2, '3241645161d8']
 
   for (const o of vargs.outputs) {
     if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length)
-      throw new sdk.WERR_INVALID_PARAMETER('outputIndex', `a valid output index in range 0 to ${tx.outputs.length - 1}`)
+      throw new WERR_INVALID_PARAMETER('outputIndex', `a valid output index in range 0 to ${tx.outputs.length - 1}`)
     switch (o.protocol) {
       case 'basket insertion':
         setupBasketInsertionForOutput(o, vargs)
@@ -56,28 +52,28 @@ export async function internalizeAction(
         setupWalletPaymentForOutput(o, vargs)
         break
       default:
-        throw new sdk.WERR_INTERNAL(`unexpected protocol ${o.protocol}`)
+        throw new WERR_INTERNAL(`unexpected protocol ${o.protocol}`)
     }
   }
 
-  const r: sdk.StorageInternalizeActionResult = await wallet.storage.internalizeAction(args)
+  const r: StorageInternalizeActionResult = await wallet.storage.internalizeAction(args)
 
   return r
 
-  function setupWalletPaymentForOutput(o: InternalizeOutput, dargs: sdk.ValidInternalizeActionArgs) {
+  function setupWalletPaymentForOutput(o: InternalizeOutput, dargs: ValidInternalizeActionArgs) {
     const p = o.paymentRemittance
     const output = tx.outputs[o.outputIndex]
-    if (!p) throw new sdk.WERR_INVALID_PARAMETER('paymentRemitance', `valid for protocol ${o.protocol}`)
+    if (!p) throw new WERR_INVALID_PARAMETER('paymentRemittance', `valid for protocol ${o.protocol}`)
 
     const keyID = `${p.derivationPrefix} ${p.derivationSuffix}`
 
     const privKey = wallet.keyDeriver!.derivePrivateKey(brc29ProtocolID, keyID, p.senderIdentityKey)
     const expectedLockScript = new P2PKH().lock(privKey.toAddress())
     if (output.lockingScript.toHex() !== expectedLockScript.toHex())
-      throw new sdk.WERR_INVALID_PARAMETER('paymentRemitance', `locked by script conforming to BRC-29`)
+      throw new WERR_INVALID_PARAMETER('paymentRemittance', `locked by script conforming to BRC-29`)
   }
 
-  function setupBasketInsertionForOutput(o: InternalizeOutput, dargs: sdk.ValidInternalizeActionArgs) {
+  function setupBasketInsertionForOutput(o: InternalizeOutput, dargs: ValidInternalizeActionArgs) {
     /*
     No additional validations...
     */
@@ -91,11 +87,11 @@ export async function internalizeAction(
     const txValid = await ab.verify(await wallet.getServices().getChainTracker(), false)
     if (!txValid || !ab.atomicTxid) {
       console.log(`internalizeAction beef is invalid: ${ab.toLogString()}`)
-      throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
+      throw new WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
     }
     const txid = ab.atomicTxid
     const btx = ab.findTxid(txid)
-    if (!btx) throw new sdk.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`)
+    if (!btx) throw new WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`)
     const tx = btx.tx!
 
     return { ab, tx, txid }

package/src/signer/methods/proveCertificate.ts

@@ -1,12 +1,15 @@
 import { MasterCertificate, ProveCertificateResult } from '@bsv/sdk'
-import { sdk, Wallet } from '../../index.client'
+import { Wallet } from '../../Wallet'
+import { WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
+import { ValidListCertificatesArgs, ValidProveCertificateArgs } from '../../sdk/validationHelpers'
+import { AuthId } from '../../sdk/WalletStorage.interfaces'
 
 export async function proveCertificate(
   wallet: Wallet,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidProveCertificateArgs
+  auth: AuthId,
+  vargs: ValidProveCertificateArgs
 ): Promise<ProveCertificateResult> {
-  const lcargs: sdk.ValidListCertificatesArgs = {
+  const lcargs: ValidListCertificatesArgs = {
     partial: {
       type: vargs.type,
       serialNumber: vargs.serialNumber,
@@ -23,7 +26,7 @@ export async function proveCertificate(
   }
 
   const lcr = await wallet.storage.listCertificates(lcargs)
-  if (lcr.certificates.length != 1) throw new sdk.WERR_INVALID_PARAMETER('args', `a unique certificate match`)
+  if (lcr.certificates.length != 1) throw new WERR_INVALID_PARAMETER('args', `a unique certificate match`)
   const storageCert = lcr.certificates[0]
   const keyringForVerifier = await MasterCertificate.createKeyringForVerifier(
     wallet,

package/src/signer/methods/signAction.ts

@@ -1,10 +1,10 @@
 import { AtomicBEEF, Beef, SendWithResult, SignActionArgs, SignActionResult, TXIDHexString } from '@bsv/sdk'
-import { sdk, Wallet } from '../../index.client'
 import { processAction } from './createAction'
-import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces'
-import { validateSignActionArgs } from '../../sdk'
+import { AuthId, ReviewActionResult } from '../../sdk/WalletStorage.interfaces'
 import { completeSignedTransaction, verifyUnlockScripts } from './completeSignedTransaction'
-import { makeAtomicBeef } from '../../utility/utilityHelpers'
+import { Wallet } from '../../Wallet'
+import { WERR_INTERNAL, WERR_NOT_IMPLEMENTED } from '../../sdk/WERR_errors'
+import { validateSignActionArgs, ValidCreateActionArgs, ValidSignActionArgs } from '../../sdk/validationHelpers'
 
 export interface SignActionResultX extends SignActionResult {
   txid?: TXIDHexString
@@ -13,11 +13,11 @@ export interface SignActionResultX extends SignActionResult {
   notDelayedResults?: ReviewActionResult[]
 }
 
-export async function signAction(wallet: Wallet, auth: sdk.AuthId, args: SignActionArgs): Promise<SignActionResultX> {
+export async function signAction(wallet: Wallet, auth: AuthId, args: SignActionArgs): Promise<SignActionResultX> {
   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')
+    throw new WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.')
+  if (!prior.dcr.inputBeef) throw new WERR_INTERNAL('prior.dcr.inputBeef must be valid')
 
   const vargs = mergePriorOptions(prior.args, args)
 
@@ -41,7 +41,7 @@ export async function signAction(wallet: Wallet, auth: sdk.AuthId, args: SignAct
   return r
 }
 
-function mergePriorOptions(caVargs: sdk.ValidCreateActionArgs, saArgs: SignActionArgs): sdk.ValidSignActionArgs {
+function mergePriorOptions(caVargs: ValidCreateActionArgs, saArgs: SignActionArgs): ValidSignActionArgs {
   const saOptions = (saArgs.options ||= {})
   if (saOptions.acceptDelayedBroadcast === undefined)
     saOptions.acceptDelayedBroadcast = caVargs.options.acceptDelayedBroadcast