@bsv/wallet-toolbox 1.5.21 → 1.6.2

package/src/storage/methods/getSyncChunk.ts

@@ -1,20 +1,19 @@
-import {
-  sdk,
-  TableCertificate,
-  TableCertificateField,
-  TableCommission,
-  TableOutput,
-  TableOutputBasket,
-  TableOutputTag,
-  TableOutputTagMap,
-  TableProvenTx,
-  TableProvenTxReq,
-  TableTransaction,
-  TableTxLabel,
-  TableTxLabelMap,
-  verifyTruthy
-} from '../../index.client'
 import { StorageReader } from '../StorageReader'
+import { TableProvenTx } from '../schema/tables/TableProvenTx'
+import { TableProvenTxReq } from '../schema/tables/TableProvenTxReq'
+import { TableCertificate } from '../schema/tables/TableCertificate'
+import { TableCertificateField } from '../schema/tables/TableCertificateField'
+import { TableOutputBasket } from '../schema/tables/TableOutputBasket'
+import { TableTransaction } from '../schema/tables/TableTransaction'
+import { TableOutput } from '../schema/tables/TableOutput'
+import { TableOutputTag } from '../schema/tables/TableOutputTag'
+import { TableOutputTagMap } from '../schema/tables/TableOutputTagMap'
+import { TableTxLabel } from '../schema/tables/TableTxLabel'
+import { TableTxLabelMap } from '../schema/tables/TableTxLabelMap'
+import { TableCommission } from '../schema/tables/TableCommission'
+import { FindForUserSincePagedArgs, RequestSyncChunkArgs, SyncChunk } from '../../sdk/WalletStorage.interfaces'
+import { verifyTruthy } from '../../utility/utilityHelpers'
+import { WERR_INVALID_OPERATION, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 
 /**
  * Gets the next sync chunk of updated data from un-remoted storage (could be using a remote DB connection).
@@ -22,8 +21,8 @@ import { StorageReader } from '../StorageReader'
  * @param args
  * @returns
  */
-export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSyncChunkArgs): Promise<sdk.SyncChunk> {
-  const r: sdk.SyncChunk = {
+export async function getSyncChunk(storage: StorageReader, args: RequestSyncChunkArgs): Promise<SyncChunk> {
+  const r: SyncChunk = {
     fromStorageIdentityKey: args.fromStorageIdentityKey,
     toStorageIdentityKey: args.toStorageIdentityKey,
     userIdentityKey: args.identityKey
@@ -47,7 +46,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableProvenTx) => {
         r.provenTxs!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.getProvenTxsForUser(args)
       }
     },
@@ -60,7 +59,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableOutputBasket) => {
         r.outputBaskets!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findOutputBaskets({
           partial: { userId: args.userId },
           since: args.since,
@@ -77,7 +76,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableOutputTag) => {
         r.outputTags!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findOutputTags({
           partial: { userId: args.userId },
           since: args.since,
@@ -94,7 +93,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableTxLabel) => {
         r.txLabels!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findTxLabels({
           partial: { userId: args.userId },
           since: args.since,
@@ -111,7 +110,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableTransaction) => {
         r.transactions!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findTransactions({
           partial: { userId: args.userId },
           since: args.since,
@@ -128,7 +127,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableOutput) => {
         r.outputs!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findOutputs({
           partial: { userId: args.userId },
           since: args.since,
@@ -145,7 +144,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableTxLabelMap) => {
         r.txLabelMaps!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.getTxLabelMapsForUser(args)
       }
     },
@@ -158,7 +157,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableOutputTagMap) => {
         r.outputTagMaps!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.getOutputTagMapsForUser(args)
       }
     },
@@ -171,7 +170,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableCertificate) => {
         r.certificates!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findCertificates({
           partial: { userId: args.userId },
           since: args.since,
@@ -188,7 +187,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableCertificateField) => {
         r.certificateFields!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findCertificateFields({
           partial: { userId: args.userId },
           since: args.since,
@@ -205,7 +204,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableCommission) => {
         r.commissions!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.findCommissions({
           partial: { userId: args.userId },
           since: args.since,
@@ -222,7 +221,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
       addItem: (i: TableProvenTxReq) => {
         r.provenTxReqs!.push(i)
       },
-      findItems: async (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => {
+      findItems: async (storage: StorageReader, args: FindForUserSincePagedArgs) => {
         return await storage.getProvenTxReqsForUser(args)
       }
     }
@@ -235,7 +234,7 @@ export async function getSyncChunk(storage: StorageReader, args: sdk.RequestSync
     }
     let { offset, name: oname } = args.offsets[i++]
     if (a.name !== oname)
-      throw new sdk.WERR_INVALID_PARAMETER('offsets', `in dependency order. '${a.name}' expected, found ${oname}.`)
+      throw new WERR_INVALID_PARAMETER('offsets', `in dependency order. '${a.name}' expected, found ${oname}.`)
     let preAddCalled = false
     for (; !done; ) {
       const limit = Math.min(itemCount, Math.max(10, args.maxItems / a.maxDivider))
@@ -278,17 +277,17 @@ type ChunkerArgs = {
   maxDivider: number
   preAdd: () => void
   addItem: (i: any) => void
-  findItems: (storage: StorageReader, args: sdk.FindForUserSincePagedArgs) => Promise<any[]>
+  findItems: (storage: StorageReader, args: FindForUserSincePagedArgs) => Promise<any[]>
 }
 
 function checkIsDate(v: any) {
-  if (!(v instanceof Date)) throw new sdk.WERR_INVALID_OPERATION('bad date')
+  if (!(v instanceof Date)) throw new WERR_INVALID_OPERATION('bad date')
 }
 
 function checkEntityValues(es: object[]) {
   for (const e of es) {
     checkIsDate(e['created_at'])
     checkIsDate(e['updated_at'])
-    for (const key of Object.keys(e)) if (e[key] === null) throw new sdk.WERR_INVALID_OPERATION()
+    for (const key of Object.keys(e)) if (e[key] === null) throw new WERR_INVALID_OPERATION()
   }
 }

package/src/storage/methods/internalizeAction.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
 import {
   Transaction as BsvTransaction,
   WalletPayment,
@@ -8,19 +6,17 @@ import {
   TransactionOutput,
   Beef
 } from '@bsv/sdk'
-import {
-  EntityProvenTxReq,
-  randomBytesBase64,
-  sdk,
-  StorageProvider,
-  TableOutput,
-  TableOutputBasket,
-  TableTransaction,
-  verifyId,
-  verifyOne,
-  verifyOneOrNone
-} from '../../index.client'
 import { shareReqsWithWorld } from './processAction'
+import { StorageProvider } from '../StorageProvider'
+import { AuthId, StorageInternalizeActionResult } from '../../sdk/WalletStorage.interfaces'
+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'
+import { EntityProvenTxReq } from '../schema/entities/EntityProvenTxReq'
 
 /**
  * Internalize Action allows a wallet to take ownership of outputs in a pre-existing transaction.
@@ -50,9 +46,9 @@ import { shareReqsWithWorld } from './processAction'
  */
 export async function internalizeAction(
   storage: StorageProvider,
-  auth: sdk.AuthId,
+  auth: AuthId,
   args: InternalizeActionArgs
-): Promise<sdk.StorageInternalizeActionResult> {
+): Promise<StorageInternalizeActionResult> {
   const ctx = new InternalizeActionContext(storage, auth, args)
   await ctx.asyncSetup()
 
@@ -84,7 +80,7 @@ interface WalletPaymentX extends WalletPayment {
 
 class InternalizeActionContext {
   /** result to be returned */
-  r: sdk.StorageInternalizeActionResult
+  r: StorageInternalizeActionResult
   /** the parsed input AtomicBEEF */
   ab: Beef
   /** the incoming transaction extracted from AtomicBEEF */
@@ -102,14 +98,14 @@ class InternalizeActionContext {
   /** all the wallet payments from incoming outputs array */
   walletPayments: WalletPaymentX[]
   userId: number
-  vargs: sdk.ValidInternalizeActionArgs
+  vargs: ValidInternalizeActionArgs
 
   constructor(
     public storage: StorageProvider,
-    public auth: sdk.AuthId,
+    public auth: AuthId,
     public args: InternalizeActionArgs
   ) {
-    this.vargs = sdk.validateInternalizeActionArgs(args)
+    this.vargs = validateInternalizeActionArgs(args)
     this.userId = auth.userId!
     this.r = {
       accepted: true,
@@ -158,7 +154,7 @@ class InternalizeActionContext {
 
     for (const o of this.args.outputs) {
       if (o.outputIndex < 0 || o.outputIndex >= this.tx.outputs.length)
-        throw new sdk.WERR_INVALID_PARAMETER(
+        throw new WERR_INVALID_PARAMETER(
           'outputIndex',
           `a valid output index in range 0 to ${this.tx.outputs.length - 1}`
         )
@@ -167,10 +163,7 @@ class InternalizeActionContext {
         case 'basket insertion':
           {
             if (!o.insertionRemittance || o.paymentRemittance)
-              throw new sdk.WERR_INVALID_PARAMETER(
-                'basket insertion',
-                'valid insertionRemittance and no paymentRemittance'
-              )
+              throw new WERR_INVALID_PARAMETER('basket insertion', 'valid insertionRemittance and no paymentRemittance')
             this.basketInsertions.push({
               ...o.insertionRemittance,
               txo,
@@ -181,10 +174,7 @@ class InternalizeActionContext {
         case 'wallet payment':
           {
             if (o.insertionRemittance || !o.paymentRemittance)
-              throw new sdk.WERR_INVALID_PARAMETER(
-                'wallet payment',
-                'valid paymentRemittance and no insertionRemittance'
-              )
+              throw new WERR_INVALID_PARAMETER('wallet payment', 'valid paymentRemittance and no insertionRemittance')
             this.walletPayments.push({
               ...o.paymentRemittance,
               txo,
@@ -194,7 +184,7 @@ class InternalizeActionContext {
           }
           break
         default:
-          throw new sdk.WERR_INTERNAL(`unexpected protocol ${o.protocol}`)
+          throw new WERR_INTERNAL(`unexpected protocol ${o.protocol}`)
       }
     }
 
@@ -211,7 +201,7 @@ class InternalizeActionContext {
       })
     )
     if (this.etx && !(this.etx.status == 'completed' || this.etx.status === 'unproven' || this.etx.status === 'nosend'))
-      throw new sdk.WERR_INVALID_PARAMETER(
+      throw new WERR_INVALID_PARAMETER(
         'tx',
         `target transaction of internalizeAction has invalid status ${this.etx.status}.`
       )
@@ -224,7 +214,7 @@ class InternalizeActionContext {
       for (const eo of this.eos) {
         const bi = this.basketInsertions.find(b => b.vout === eo.vout)
         const wp = this.walletPayments.find(b => b.vout === eo.vout)
-        if (bi && wp) throw new sdk.WERR_INVALID_PARAMETER('outputs', `unique outputIndex values`)
+        if (bi && wp) throw new WERR_INVALID_PARAMETER('outputs', `unique outputIndex values`)
         if (bi) bi.eo = eo
         if (wp) wp.eo = eo
       }
@@ -265,20 +255,20 @@ class InternalizeActionContext {
   async validateAtomicBeef(atomicBeef: number[]) {
     const ab = Beef.fromBinary(atomicBeef)
     const txValid = await ab.verify(await this.storage.getServices().getChainTracker(), false)
-    if (!txValid || !ab.atomicTxid) throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
+    if (!txValid || !ab.atomicTxid) 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!
 
     /*
     for (const i of tx.inputs) {
       if (!i.sourceTXID)
-        throw new sdk.WERR_INTERNAL('beef Transactions must have sourceTXIDs')
+        throw new WERR_INTERNAL('beef Transactions must have sourceTXIDs')
       if (!i.sourceTransaction) {
         const btx = ab.findTxid(i.sourceTXID)
         if (!btx)
-          throw new sdk.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF and contain input transaction with txid ${i.sourceTXID}`);
+          throw new WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF and contain input transaction with txid ${i.sourceTXID}`);
         i.sourceTransaction = btx.tx
       }
     }
@@ -287,7 +277,7 @@ class InternalizeActionContext {
     return { ab, tx, txid }
   }
 
-  async findOrInsertTargetTransaction(satoshis: number, status: sdk.TransactionStatus): Promise<TableTransaction> {
+  async findOrInsertTargetTransaction(satoshis: number, status: TransactionStatus): Promise<TableTransaction> {
     const now = new Date()
     const newTx: TableTransaction = {
       created_at: now,
@@ -311,10 +301,7 @@ class InternalizeActionContext {
     const tr = await this.storage.findOrInsertTransaction(newTx)
     if (!tr.isNew) {
       if (!this.isMerge)
-        throw new sdk.WERR_INVALID_PARAMETER(
-          'tx',
-          `target transaction of internalizeAction is undergoing active changes.`
-        )
+        throw new WERR_INVALID_PARAMETER('tx', `target transaction of internalizeAction is undergoing active changes.`)
       await this.storage.updateTransaction(tr.tx.transactionId!, {
         satoshis: tr.tx.satoshis + satoshis
       })

package/src/storage/methods/listActionsIdb.ts

@@ -6,16 +6,18 @@ import {
   WalletActionOutput,
   WalletActionInput
 } from '@bsv/sdk'
-import { TableOutputX, TableTransaction, TableTxLabel } from '../index.client'
-import { asString, sdk, verifyOne } from '../../index.client'
-import { isListActionsSpecOp, TransactionStatus } from '../../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'
 
 export async function listActionsIdb(
   storage: StorageIdb,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidListActionsArgs
+  auth: AuthId,
+  vargs: ValidListActionsArgs
 ): Promise<ListActionsResult> {
   const limit = vargs.limit
   const offset = vargs.offset

package/src/storage/methods/listActionsKnex.ts

@@ -6,16 +6,21 @@ import {
   WalletActionOutput,
   WalletActionInput
 } from '@bsv/sdk'
-import { TableOutputX, TableTransaction, TableTxLabel } from '../index.client'
-import { asString, sdk, verifyOne } from '../../index.client'
 import { StorageKnex } from '../StorageKnex'
-import { isListActionsSpecOp } from '../../sdk'
 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'
+import { verifyOne } from '../../utility/utilityHelpers'
+import { TableOutputX } from '../schema/tables/TableOutput'
+import { asString } from '../../utility/utilityHelpers.noBuffer'
 
 export async function listActions(
   storage: StorageKnex,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidListActionsArgs
+  auth: AuthId,
+  vargs: ValidListActionsArgs
 ): Promise<ListActionsResult> {
   const limit = vargs.limit
   const offset = vargs.offset

package/src/storage/methods/listOutputsIdb.ts

@@ -1,14 +1,18 @@
 import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput } from '@bsv/sdk'
-import { TableOutput, TableOutputBasket, TableOutputTag } from '../index.client'
-import { asString, sdk, verifyId, verifyOne } from '../../index.client'
 import { getBasketToSpecOp, ListOutputsSpecOp } from './ListOutputsSpecOp'
 import { StorageIdb } from '../StorageIdb'
-import { TransactionStatus, WERR_NOT_IMPLEMENTED } from '../../sdk'
+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'
+import { TransactionStatus } from '../../sdk/types'
+import { asString } from '../../utility/utilityHelpers.noBuffer'
 
 export async function listOutputsIdb(
   storage: StorageIdb,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidListOutputsArgs,
+  auth: AuthId,
+  vargs: ValidListOutputsArgs,
   originator?: OriginatorDomainNameStringUnder250Bytes
 ): Promise<ListOutputsResult> {
   const userId = verifyId(auth.userId)
@@ -103,7 +107,7 @@ export async function listOutputsIdb(
 
   const stati: TransactionStatus[] = ['completed', 'unproven', 'nosend']
 
-  const args: sdk.FindOutputsArgs = {
+  const args: FindOutputsArgs = {
     partial: {
       userId,
       basketId,

package/src/storage/methods/listOutputsKnex.ts

@@ -1,16 +1,21 @@
 import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput } from '@bsv/sdk'
-import { TableOutput, TableOutputBasket, TableOutputTag } from '../index.client'
-import { asString, sdk, verifyId, verifyInteger, verifyOne } from '../../index.client'
 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'
+import { TableOutput } from '../schema/tables/TableOutput'
+import { asString } from '../../utility/utilityHelpers.noBuffer'
 
 export async function listOutputs(
   dsk: StorageKnex,
-  auth: sdk.AuthId,
-  vargs: sdk.ValidListOutputsArgs,
+  auth: AuthId,
+  vargs: ValidListOutputsArgs,
   originator?: OriginatorDomainNameStringUnder250Bytes
 ): Promise<ListOutputsResult> {
-  const trx: sdk.TrxToken | undefined = undefined
+  const trx: TrxToken | undefined = undefined
   const userId = verifyId(auth.userId)
   const limit = vargs.limit
   let offset = vargs.offset

package/src/storage/methods/processAction.ts

@@ -1,38 +1,42 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Beef, Transaction as BsvTransaction, SendWithResult, SendWithResultStatus } from '@bsv/sdk'
+import { aggregateActionResults } from '../../utility/aggregateResults'
+import { StorageProvider } from '../StorageProvider'
+import {
+  AuthId,
+  ReviewActionResult,
+  StorageProcessActionArgs,
+  StorageProcessActionResults
+} from '../../sdk/WalletStorage.interfaces'
+import { stampLog } from '../../utility/stampLog'
 import {
-  asArray,
-  asString,
-  EntityProvenTxReq,
-  parseTxScriptOffsets,
   randomBytesBase64,
-  sdk,
-  stampLog,
-  StorageProvider,
-  TableCommission,
-  TableOutput,
-  TableProvenTx,
-  TableProvenTxReq,
-  TableTransaction,
-  TxScriptOffsets,
   verifyId,
   verifyInteger,
   verifyOne,
   verifyOneOrNone,
   verifyTruthy
-} from '../../index.client'
-import { ReviewActionResult } from '../../sdk'
-import { aggregateActionResults } from '../../utility/aggregateResults'
+} from '../../utility/utilityHelpers'
+import { EntityProvenTxReq } from '../schema/entities/EntityProvenTxReq'
+import { WERR_INTERNAL, WERR_INVALID_OPERATION } from '../../sdk/WERR_errors'
+import { TableProvenTxReq } from '../schema/tables/TableProvenTxReq'
+import { TableProvenTx } from '../schema/tables/TableProvenTx'
+import { ProvenTxReqStatus, TransactionStatus } from '../../sdk/types'
+import { parseTxScriptOffsets, TxScriptOffsets } from '../../utility/parseTxScriptOffsets'
+import { TableTransaction } from '../schema/tables/TableTransaction'
+import { TableOutput } from '../schema/tables/TableOutput'
+import { TableCommission } from '../schema/tables/TableCommission'
+import { asArray, asString } from '../../utility/utilityHelpers.noBuffer'
 
 export async function processAction(
   storage: StorageProvider,
-  auth: sdk.AuthId,
-  args: sdk.StorageProcessActionArgs
-): Promise<sdk.StorageProcessActionResults> {
+  auth: AuthId,
+  args: StorageProcessActionArgs
+): Promise<StorageProcessActionResults> {
   stampLog(args.log, `start storage processActionSdk`)
 
   const userId = verifyId(auth.userId)
-  const r: sdk.StorageProcessActionResults = {
+  const r: StorageProcessActionResults = {
     sendWithResults: undefined
   }
 
@@ -42,7 +46,7 @@ export async function processAction(
   if (args.isNewTx) {
     const vargs = await validateCommitNewTxToStorageArgs(storage, userId, args)
     ;({ req, log: args.log } = await commitNewTxToStorage(storage, userId, vargs))
-    if (!req) throw new sdk.WERR_INTERNAL()
+    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 {
@@ -142,7 +146,7 @@ export async function shareReqsWithWorld(
     const beefIsValid = await r.beef.verify(await storage.getServices().getChainTracker())
     if (!beefIsValid) {
       console.log(`VERIFY FALSE BEEF: ${r.beef.toLogString()}`)
-      throw new sdk.WERR_INTERNAL(`merged Beef failed validation.`)
+      throw new WERR_INTERNAL(`merged Beef failed validation.`)
     }
   }
 
@@ -180,8 +184,8 @@ export async function shareReqsWithWorld(
 }
 
 interface ReqTxStatus {
-  req: sdk.ProvenTxReqStatus
-  tx: sdk.TransactionStatus
+  req: ProvenTxReqStatus
+  tx: TransactionStatus
 }
 
 interface ValidCommitNewTxToStorageArgs {
@@ -215,20 +219,20 @@ interface ValidCommitNewTxToStorageArgs {
 async function validateCommitNewTxToStorageArgs(
   storage: StorageProvider,
   userId: number,
-  params: sdk.StorageProcessActionArgs
+  params: StorageProcessActionArgs
 ): Promise<ValidCommitNewTxToStorageArgs> {
   if (!params.reference || !params.txid || !params.rawTx)
-    throw new sdk.WERR_INVALID_OPERATION('One or more expected params are undefined.')
+    throw new WERR_INVALID_OPERATION('One or more expected params are undefined.')
   let tx: BsvTransaction
   try {
     tx = BsvTransaction.fromBinary(params.rawTx)
   } catch (e: unknown) {
-    throw new sdk.WERR_INVALID_OPERATION('Parsing serialized transaction failed.')
+    throw new WERR_INVALID_OPERATION('Parsing serialized transaction failed.')
   }
   if (params.txid !== tx.id('hex'))
-    throw new sdk.WERR_INVALID_OPERATION(`Hash of serialized transaction doesn't match expected txid`)
+    throw new WERR_INVALID_OPERATION(`Hash of serialized transaction doesn't match expected txid`)
   if (!(await storage.getServices()).nLockTimeIsFinal(tx)) {
-    throw new sdk.WERR_INVALID_OPERATION(`This transaction is not final.
+    throw new WERR_INVALID_OPERATION(`This transaction is not final.
          Ensure that the transaction meets the rules for being a finalized
          which can be found at https://wiki.bitcoinsv.io/index.php/NLocktime_and_nSequence`)
   }
@@ -238,13 +242,13 @@ async function validateCommitNewTxToStorageArgs(
       partial: { userId, reference: params.reference }
     })
   )
-  if (!transaction.isOutgoing) throw new sdk.WERR_INVALID_OPERATION('isOutgoing is not true')
-  if (!transaction.inputBEEF) throw new sdk.WERR_INVALID_OPERATION()
+  if (!transaction.isOutgoing) throw new WERR_INVALID_OPERATION('isOutgoing is not true')
+  if (!transaction.inputBEEF) throw new WERR_INVALID_OPERATION()
   const beef = Beef.fromBinary(asArray(transaction.inputBEEF))
   // TODO: Could check beef validates transaction inputs...
   // Transaction must have unsigned or unprocessed status
   if (transaction.status !== 'unsigned' && transaction.status !== 'unprocessed')
-    throw new sdk.WERR_INVALID_OPERATION(`invalid transaction status ${transaction.status}`)
+    throw new WERR_INVALID_OPERATION(`invalid transaction status ${transaction.status}`)
   const transactionId = verifyId(transaction.transactionId)
   const outputOutputs = await storage.findOutputs({
     partial: { userId, transactionId }
@@ -256,12 +260,12 @@ async function validateCommitNewTxToStorageArgs(
   const commission = verifyOneOrNone(await storage.findCommissions({ partial: { transactionId, userId } }))
   if (storage.commissionSatoshis > 0) {
     // A commission is required...
-    if (!commission) throw new sdk.WERR_INTERNAL()
+    if (!commission) throw new WERR_INTERNAL()
     const commissionValid = tx.outputs.some(
       x => x.satoshis === commission.satoshis && x.lockingScript.toHex() === asString(commission.lockingScript!)
     )
     if (!commissionValid)
-      throw new sdk.WERR_INVALID_OPERATION('Transaction did not include an output to cover service fee.')
+      throw new WERR_INVALID_OPERATION('Transaction did not include an output to cover service fee.')
   }
 
   const req = EntityProvenTxReq.fromTxid(params.txid, params.rawTx, transaction.inputBEEF)
@@ -286,7 +290,7 @@ async function validateCommitNewTxToStorageArgs(
   else if (!params.isNoSend && !params.isDelayed) {
     status = { req: 'unprocessed', tx: 'unprocessed' }
     postStatus = { req: 'unmined', tx: 'unproven' }
-  } else throw new sdk.WERR_INTERNAL('logic error')
+  } else throw new WERR_INTERNAL('logic error')
 
   req.status = status.req
   const vargs: ValidCommitNewTxToStorageArgs = {
@@ -325,11 +329,11 @@ async function validateCommitNewTxToStorageArgs(
     const offset = vargs.txScriptOffsets.outputs[vout]
     const rawTxScript = asString(vargs.rawTx.slice(offset.offset, offset.offset + offset.length))
     if (o.lockingScript && rawTxScript !== asString(o.lockingScript))
-      throw new sdk.WERR_INVALID_OPERATION(
+      throw new WERR_INVALID_OPERATION(
         `rawTx output locking script for vout ${vout} not equal to expected output script.`
       )
     if (tx.outputs[vout].lockingScript.toHex() !== rawTxScript)
-      throw new sdk.WERR_INVALID_OPERATION(
+      throw new WERR_INVALID_OPERATION(
         `parsed transaction output locking script for vout ${vout} not equal to expected output script.`
       )
     const update: Partial<TableOutput> = {