@bsv/wallet-toolbox 1.5.21 → 1.6.1

package/src/storage/schema/entities/EntityOutputBasket.ts

@@ -1,6 +1,7 @@
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableOutputBasket, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableOutputBasket } from '../tables/TableOutputBasket'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityOutputBasket extends EntityBase<TableOutputBasket> {
   constructor(api?: TableOutputBasket) {
@@ -106,7 +107,7 @@ export class EntityOutputBasket extends EntityBase<TableOutputBasket> {
     userId: number,
     ei: TableOutputBasket,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityOutputBasket; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findOutputBaskets({
@@ -122,7 +123,7 @@ export class EntityOutputBasket extends EntityBase<TableOutputBasket> {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     this.userId = userId
     this.name ||= 'default'
     this.basketId = 0
@@ -135,7 +136,7 @@ export class EntityOutputBasket extends EntityBase<TableOutputBasket> {
     since: Date | undefined,
     ei: TableOutputBasket,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {

package/src/storage/schema/entities/EntityOutputTag.ts

@@ -1,7 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableOutputTag, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableOutputTag } from '../tables/TableOutputTag'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityOutputTag extends EntityBase<TableOutputTag> {
   constructor(api?: TableOutputTag) {
@@ -86,7 +86,7 @@ export class EntityOutputTag extends EntityBase<TableOutputTag> {
     userId: number,
     ei: TableOutputTag,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityOutputTag; eiId: number }> {
     const ef = verifyOneOrNone(await storage.findOutputTags({ partial: { tag: ei.tag, userId }, trx }))
     return {
@@ -96,7 +96,7 @@ export class EntityOutputTag extends EntityBase<TableOutputTag> {
     }
   }
 
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     this.userId = userId
     this.outputTagId = 0
     this.outputTagId = await storage.insertOutputTag(this.toApi(), trx)
@@ -107,7 +107,7 @@ export class EntityOutputTag extends EntityBase<TableOutputTag> {
     since: Date | undefined,
     ei: TableOutputTag,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {

package/src/storage/schema/entities/EntityOutputTagMap.ts

@@ -1,7 +1,8 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableOutputTagMap, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { WERR_INVALID_OPERATION } from '../../../sdk/WERR_errors'
+import { verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableOutputTagMap } from '../tables/TableOutputTagMap'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityOutputTagMap extends EntityBase<TableOutputTagMap> {
   constructor(api?: TableOutputTagMap) {
@@ -53,7 +54,7 @@ export class EntityOutputTagMap extends EntityBase<TableOutputTagMap> {
   }
 
   override get id(): number {
-    throw new sdk.WERR_INVALID_OPERATION('entity has no "id" value')
+    throw new WERR_INVALID_OPERATION('entity has no "id" value')
   }
   override get entityName(): string {
     return 'outputTagMap'
@@ -80,7 +81,7 @@ export class EntityOutputTagMap extends EntityBase<TableOutputTagMap> {
     userId: number,
     ei: TableOutputTagMap,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityOutputTagMap; eiId: number }> {
     const outputId = syncMap.output.idMap[ei.outputId]
     const outputTagId = syncMap.outputTag.idMap[ei.outputTagId]
@@ -97,7 +98,7 @@ export class EntityOutputTagMap extends EntityBase<TableOutputTagMap> {
     }
   }
 
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     this.outputId = syncMap.output.idMap[this.outputId]
     this.outputTagId = syncMap.outputTag.idMap[this.outputTagId]
     await storage.insertOutputTagMap(this.toApi(), trx)
@@ -108,7 +109,7 @@ export class EntityOutputTagMap extends EntityBase<TableOutputTagMap> {
     since: Date | undefined,
     ei: TableOutputTagMap,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {

package/src/storage/schema/entities/EntityProvenTx.ts

@@ -1,6 +1,12 @@
+import { GetMerklePathResult, WalletServices } from '../../../sdk/WalletServices.interfaces'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { arraysEqual, verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableProvenTx } from '../tables/TableProvenTx'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableProvenTx, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityProvenTxReq, EntityStorage, SyncMap } from '.'
+import { EntityProvenTxReq } from './EntityProvenTxReq'
+import { WERR_INTERNAL, WERR_MISSING_PARAMETER } from '../../../sdk/WERR_errors'
+import { WalletError } from '../../../sdk/WalletError'
 
 export class EntityProvenTx extends EntityBase<TableProvenTx> {
   /**
@@ -19,7 +25,7 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
    * @param rawTx
    * @returns
    */
-  static async fromTxid(txid: string, services: sdk.WalletServices, rawTx?: number[]): Promise<ProvenTxFromTxidResult> {
+  static async fromTxid(txid: string, services: WalletServices, rawTx?: number[]): Promise<ProvenTxFromTxidResult> {
     const r: ProvenTxFromTxidResult = { proven: undefined, rawTx }
 
     const chain = services.chain
@@ -188,7 +194,7 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
     userId: number,
     ei: TableProvenTx,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityProvenTx; eiId: number }> {
     const ef = verifyOneOrNone(await storage.findProvenTxs({ partial: { txid: ei.txid }, trx }))
     return {
@@ -198,7 +204,7 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
     }
   }
 
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     this.provenTxId = 0
     // TODO: Since these records are a shared resource, the record must be validated before accepting it...
     this.provenTxId = await storage.insertProvenTx(this.toApi(), trx)
@@ -209,7 +215,7 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
     since: Date | undefined,
     ei: TableProvenTx,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     // ProvenTxs are never updated.
     return false
@@ -236,13 +242,13 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
    */
   static async fromReq(
     req: EntityProvenTxReq,
-    gmpResult: sdk.GetMerklePathResult,
+    gmpResult: GetMerklePathResult,
     countsAsAttempt: boolean
   ): Promise<EntityProvenTx | undefined> {
-    if (!req.txid) throw new sdk.WERR_MISSING_PARAMETER('req.txid')
-    if (!req.rawTx) throw new sdk.WERR_MISSING_PARAMETER('req.rawTx')
+    if (!req.txid) throw new WERR_MISSING_PARAMETER('req.txid')
+    if (!req.rawTx) throw new WERR_MISSING_PARAMETER('req.rawTx')
 
-    if (!req.rawTx) throw new sdk.WERR_INTERNAL('rawTx must be valid')
+    if (!req.rawTx) throw new WERR_INTERNAL('rawTx must be valid')
 
     for (const note of gmpResult.notes || []) {
       req.addHistoryNote(note, true)
@@ -281,7 +287,7 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
         const leaf = proof.path[0].find(leaf => leaf.txid === true && leaf.hash === req.txid)
         if (!leaf) {
           req.addHistoryNote({ what: 'getMerklePathTxidNotFound' }, true)
-          throw new sdk.WERR_INTERNAL('merkle path does not contain leaf for txid')
+          throw new WERR_INTERNAL('merkle path does not contain leaf for txid')
         }
 
         const proven = new EntityProvenTx({
@@ -299,7 +305,7 @@ export class EntityProvenTx extends EntityBase<TableProvenTx> {
 
         return proven
       } catch (eu: unknown) {
-        const { code, description } = sdk.WalletError.fromUnknown(eu)
+        const { code, description } = WalletError.fromUnknown(eu)
         const { attempts } = req
         req.addHistoryNote({ what: 'getMerklePathProvenError', attempts, code, description }, true)
       }

package/src/storage/schema/entities/EntityProvenTxReq.ts

@@ -1,35 +1,26 @@
-import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  asString,
-  sdk,
-  StorageProvider,
-  TableProvenTxReq,
-  TableProvenTxReqDynamics,
-  verifyId,
-  verifyOne,
-  verifyOneOrNone,
-  verifyTruthy,
-  WalletStorageManager
-} from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
-
-import { StorageProcessActionArgs } from '../../../sdk'
+import { ProvenTxReqStatus, ProvenTxReqTerminalStatus, ReqHistoryNote } from '../../../sdk/types'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../../sdk/WERR_errors'
+import { arraysEqual, verifyId, verifyOne, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { StorageProvider } from '../../StorageProvider'
+import { WalletStorageManager } from '../../WalletStorageManager'
+import { TableProvenTxReq, TableProvenTxReqDynamics } from '../tables/TableProvenTxReq'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
   static async fromStorageTxid(
     storage: EntityStorage,
     txid: string,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<EntityProvenTxReq | undefined> {
     const reqApi = verifyOneOrNone(await storage.findProvenTxReqs({ partial: { txid }, trx }))
     if (!reqApi) return undefined
     return new EntityProvenTxReq(reqApi)
   }
 
-  static async fromStorageId(storage: EntityStorage, id: number, trx?: sdk.TrxToken): Promise<EntityProvenTxReq> {
+  static async fromStorageId(storage: EntityStorage, id: number, trx?: TrxToken): Promise<EntityProvenTxReq> {
     const reqApi = verifyOneOrNone(await storage.findProvenTxReqs({ partial: { provenTxReqId: id }, trx }))
-    if (!reqApi) throw new sdk.WERR_INTERNAL(`proven_tx_reqs with id ${id} is missing.`)
+    if (!reqApi) throw new WERR_INTERNAL(`proven_tx_reqs with id ${id} is missing.`)
     return new EntityProvenTxReq(reqApi)
   }
 
@@ -103,7 +94,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     }
   }
 
-  async refreshFromStorage(storage: EntityStorage | WalletStorageManager, trx?: sdk.TrxToken): Promise<void> {
+  async refreshFromStorage(storage: EntityStorage | WalletStorageManager, trx?: TrxToken): Promise<void> {
     const newApi = verifyOne(await storage.findProvenTxReqs({ partial: { provenTxReqId: this.id }, trx }))
     this.api = newApi
     this.unpackApi()
@@ -155,7 +146,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     return log
   }
 
-  prettyNote(note: sdk.ReqHistoryNote): string {
+  prettyNote(note: ReqHistoryNote): string {
     let log = `${note.when}: ${note.what}`
     for (const [key, val] of Object.entries(note)) {
       if (key !== 'when' && key !== 'what') {
@@ -184,7 +175,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     return summary
   }
 
-  parseHistoryNote(note: sdk.ReqHistoryNote, summary?: ProvenTxReqHistorySummaryApi): string {
+  parseHistoryNote(note: ReqHistoryNote, summary?: ProvenTxReqHistorySummaryApi): string {
     const c = summary || {
       setToCompleted: false,
       setToUnmined: false,
@@ -198,7 +189,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
       switch (note.what) {
         case 'status':
           {
-            const status = <sdk.ProvenTxReqStatus>note.status_now
+            const status = <ProvenTxReqStatus>note.status_now
             switch (status) {
               case 'completed':
                 c.setToCompleted = true
@@ -233,7 +224,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
   }
 
   addNotifyTransactionId(id: number) {
-    if (!Number.isInteger(id)) throw new sdk.WERR_INVALID_PARAMETER('id', 'integer')
+    if (!Number.isInteger(id)) throw new WERR_INVALID_PARAMETER('id', 'integer')
     const s = new Set(this.notify.transactionIds || [])
     s.add(id)
     this.notify.transactionIds = [...s].sort((a, b) => (a > b ? 1 : a < b ? -1 : 0))
@@ -246,7 +237,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
    * @param note Note to add
    * @param noDupes if true, only newest note with same `what` value is retained.
    */
-  addHistoryNote(note: sdk.ReqHistoryNote, noDupes?: boolean) {
+  addHistoryNote(note: ReqHistoryNote, noDupes?: boolean) {
     if (!this.history.notes) this.history.notes = []
     if (!note.when) note.when = new Date().toISOString()
     if (noDupes) {
@@ -266,8 +257,8 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
       if (!addNote) break
     }
     if (addNote) {
-      this.history.notes.push(note as sdk.ReqHistoryNote)
-      const k = (n: sdk.ReqHistoryNote): string => {
+      this.history.notes.push(note as ReqHistoryNote)
+      const k = (n: ReqHistoryNote): string => {
         return `${n.when} ${n.what}`
       }
       this.history.notes.sort((a, b) => (k(a) < k(b) ? -1 : k(a) > k(b) ? 1 : 0))
@@ -280,7 +271,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
      * @param storage 
      * @param trx 
      */
-  async updateStorage(storage: EntityStorage, trx?: sdk.TrxToken) {
+  async updateStorage(storage: EntityStorage, trx?: TrxToken) {
     this.updated_at = new Date()
     this.updateApi()
     if (this.id === 0) {
@@ -304,7 +295,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
    * @param storage
    * @param trx
    */
-  async updateStorageDynamicProperties(storage: WalletStorageManager | StorageProvider, trx?: sdk.TrxToken) {
+  async updateStorageDynamicProperties(storage: WalletStorageManager | StorageProvider, trx?: TrxToken) {
     this.updated_at = new Date()
     this.updateApi()
     const update: Partial<TableProvenTxReqDynamics> = {
@@ -328,7 +319,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     }
   }
 
-  async insertOrMerge(storage: EntityStorage, trx?: sdk.TrxToken): Promise<EntityProvenTxReq> {
+  async insertOrMerge(storage: EntityStorage, trx?: TrxToken): Promise<EntityProvenTxReq> {
     const req = await storage.transaction<EntityProvenTxReq>(async trx => {
       let reqApi0 = this.toApi()
       const { req: reqApi1, isNew } = await storage.findOrInsertProvenTxReq(reqApi0, trx)
@@ -351,7 +342,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
   get status() {
     return this.api.status
   }
-  set status(v: sdk.ProvenTxReqStatus) {
+  set status(v: ProvenTxReqStatus) {
     if (v !== this.api.status) {
       this.addHistoryNote({ what: 'status', status_was: this.api.status, status_now: v })
       this.api.status = v
@@ -478,7 +469,7 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     userId: number,
     ei: TableProvenTxReq,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityProvenTxReq; eiId: number }> {
     const ef = verifyOneOrNone(await storage.findProvenTxReqs({ partial: { txid: ei.txid }, trx }))
     return {
@@ -524,11 +515,11 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     }
   }
 
-  static isTerminalStatus(status: sdk.ProvenTxReqStatus): boolean {
-    return sdk.ProvenTxReqTerminalStatus.some(s => s === status)
+  static isTerminalStatus(status: ProvenTxReqStatus): boolean {
+    return ProvenTxReqTerminalStatus.some(s => s === status)
   }
 
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     if (this.provenTxId) this.provenTxId = syncMap.provenTx.idMap[this.provenTxId]
     this.mapNotifyTransactionIds(syncMap)
     this.provenTxReqId = 0
@@ -552,11 +543,11 @@ export class EntityProvenTxReq extends EntityBase<TableProvenTxReq> {
     since: Date | undefined,
     ei: TableProvenTxReq,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     if (!this.batch && ei.batch) this.batch = ei.batch
     else if (this.batch && ei.batch && this.batch !== ei.batch)
-      throw new sdk.WERR_INTERNAL('ProvenTxReq merge batch not equal.')
+      throw new WERR_INTERNAL('ProvenTxReq merge batch not equal.')
 
     this.mergeHistory(ei, syncMap, true)
     this.mergeNotifyTransactionIds(ei, syncMap)
@@ -581,7 +572,7 @@ export interface ProvenTxReqHistory {
    * Keys are Date().toISOString()
    * Values are a description of what happened.
    */
-  notes?: sdk.ReqHistoryNote[]
+  notes?: ReqHistoryNote[]
 }
 
 export interface ProvenTxReqNotify {

package/src/storage/schema/entities/EntitySyncState.ts

@@ -1,35 +1,29 @@
 import {
-  createSyncMap,
-  EntityBase,
-  EntityCertificate,
-  EntityCertificateField,
-  EntityCommission,
-  EntityOutput,
-  EntityOutputBasket,
-  EntityOutputTag,
-  EntityOutputTagMap,
-  EntityProvenTx,
-  EntityProvenTxReq,
-  EntityStorage,
-  EntitySyncMap,
-  EntityTransaction,
-  EntityTxLabel,
-  EntityTxLabelMap,
-  EntityUser,
-  MergeEntity,
-  SyncError,
-  SyncMap
-} from '.'
-import {
-  maxDate,
-  sdk,
-  TableSettings,
-  TableSyncState,
-  verifyId,
-  verifyOne,
-  verifyOneOrNone,
-  verifyTruthy
-} from '../../../index.client'
+  RequestSyncChunkArgs,
+  SyncChunk,
+  SyncStatus,
+  TrxToken,
+  WalletStorageSync
+} from '../../../sdk/WalletStorage.interfaces'
+import { WERR_INVALID_PARAMETER } from '../../../sdk/WERR_errors'
+import { maxDate, verifyId, verifyTruthy } from '../../../utility/utilityHelpers'
+import { TableSettings } from '../tables/TableSettings'
+import { TableSyncState } from '../tables/TableSyncState'
+import { createSyncMap, EntityBase, EntityStorage, EntitySyncMap, SyncError, SyncMap } from './EntityBase'
+import { EntityCertificate } from './EntityCertificate'
+import { EntityCertificateField } from './EntityCertificateField'
+import { EntityCommission } from './EntityCommission'
+import { EntityOutput } from './EntityOutput'
+import { EntityOutputBasket } from './EntityOutputBasket'
+import { EntityOutputTag } from './EntityOutputTag'
+import { EntityOutputTagMap } from './EntityOutputTagMap'
+import { EntityProvenTx } from './EntityProvenTx'
+import { EntityProvenTxReq } from './EntityProvenTxReq'
+import { EntityTransaction } from './EntityTransaction'
+import { EntityTxLabel } from './EntityTxLabel'
+import { EntityTxLabelMap } from './EntityTxLabelMap'
+import { EntityUser } from './EntityUser'
+import { MergeEntity } from './MergeEntity'
 
 export class EntitySyncState extends EntityBase<TableSyncState> {
   constructor(api?: TableSyncState) {
@@ -66,7 +60,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
   }
 
   static async fromStorage(
-    storage: sdk.WalletStorageSync,
+    storage: WalletStorageSync,
     userIdentityKey: string,
     remoteSettings: TableSettings
   ): Promise<EntitySyncState> {
@@ -89,7 +83,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
    * @param notSyncMap if not new and true, excludes updating syncMap in storage.
    * @param trx
    */
-  async updateStorage(storage: EntityStorage, notSyncMap?: boolean, trx?: sdk.TrxToken) {
+  async updateStorage(storage: EntityStorage, notSyncMap?: boolean, trx?: TrxToken) {
     this.updated_at = new Date()
     this.updateApi(notSyncMap && this.id > 0)
     if (this.id === 0) {
@@ -151,10 +145,10 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
   get refNum() {
     return this.api.refNum
   }
-  set status(v: sdk.SyncStatus) {
+  set status(v: SyncStatus) {
     this.api.status = v
   }
-  get status(): sdk.SyncStatus {
+  get status(): SyncStatus {
     return this.api.status
   }
   set when(v: Date | undefined) {
@@ -198,7 +192,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
       const fromValue = fromMap[key]
       const toValue = toMap[key]
       if (toValue !== undefined && toValue !== fromValue)
-        throw new sdk.WERR_INVALID_PARAMETER(
+        throw new WERR_INVALID_PARAMETER(
           'syncMap',
           `an unmapped id or the same mapped id. ${key} maps to ${toValue} not equal to ${fromValue}`
         )
@@ -244,19 +238,14 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
     return false
   }
 
-  override async mergeNew(
-    storage: EntityStorage,
-    userId: number,
-    syncMap: SyncMap,
-    trx?: sdk.TrxToken
-  ): Promise<void> {}
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {}
 
   override async mergeExisting(
     storage: EntityStorage,
     since: Date | undefined,
     ei: TableSyncState,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     return false
   }
@@ -266,8 +255,8 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
     forStorageIdentityKey: string,
     maxRoughSize?: number,
     maxItems?: number
-  ): sdk.RequestSyncChunkArgs {
-    const a: sdk.RequestSyncChunkArgs = {
+  ): RequestSyncChunkArgs {
+    const a: RequestSyncChunkArgs = {
       identityKey: forIdentityKey,
       maxRoughSize: maxRoughSize || 10000000,
       maxItems: maxItems || 1000,
@@ -296,7 +285,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
     return a
   }
 
-  static syncChunkSummary(c: sdk.SyncChunk): string {
+  static syncChunkSummary(c: SyncChunk): string {
     let log = ''
     log += `SYNC CHUNK SUMMARY
   from storage: ${c.fromStorageIdentityKey}
@@ -333,8 +322,8 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
 
   async processSyncChunk(
     writer: EntityStorage,
-    args: sdk.RequestSyncChunkArgs,
-    chunk: sdk.SyncChunk
+    args: RequestSyncChunkArgs,
+    chunk: SyncChunk
   ): Promise<{
     done: boolean
     maxUpdated_at: Date | undefined

package/src/storage/schema/entities/EntityTransaction.ts

@@ -1,14 +1,11 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
+import { TransactionStatus } from '../../../sdk/types'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { optionalArraysEqual, verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableOutput } from '../tables/TableOutput'
+import { TableTransaction } from '../tables/TableTransaction'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
+import { EntityProvenTx } from './EntityProvenTx'
 import { Transaction as BsvTransaction, TransactionInput } from '@bsv/sdk'
-import {
-  optionalArraysEqual,
-  sdk,
-  TableOutput,
-  TableTransaction,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
-import { EntityBase, EntityProvenTx, EntityStorage, SyncMap } from '.'
 
 export class EntityTransaction extends EntityBase<TableTransaction> {
   /**
@@ -35,7 +32,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
    * Uses both spentBy and rawTx inputs (if available) to locate inputs from among user's outputs.
    * Not all transaction inputs correspond to prior storage outputs.
    */
-  async getInputs(storage: EntityStorage, trx?: sdk.TrxToken): Promise<TableOutput[]> {
+  async getInputs(storage: EntityStorage, trx?: TrxToken): Promise<TableOutput[]> {
     const inputs = await storage.findOutputs({
       partial: { userId: this.userId, spentBy: this.id },
       trx
@@ -127,7 +124,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
   get status() {
     return this.api.status
   }
-  set status(v: sdk.TransactionStatus) {
+  set status(v: TransactionStatus) {
     this.api.status = v
   }
 
@@ -241,7 +238,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
     userId: number,
     ei: TableTransaction,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityTransaction; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findTransactions({
@@ -256,7 +253,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
     }
   }
 
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     if (this.provenTxId) this.provenTxId = syncMap.provenTx.idMap[this.provenTxId]
     this.userId = userId
     this.transactionId = 0
@@ -268,7 +265,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
     since: Date | undefined,
     ei: TableTransaction,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {
@@ -295,7 +292,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
     return wasMerged
   }
 
-  async getProvenTx(storage: EntityStorage, trx?: sdk.TrxToken): Promise<EntityProvenTx | undefined> {
+  async getProvenTx(storage: EntityStorage, trx?: TrxToken): Promise<EntityProvenTx | undefined> {
     if (!this.provenTxId) return undefined
     const p = verifyOneOrNone(
       await storage.findProvenTxs({

package/src/storage/schema/entities/EntityTxLabel.ts

@@ -1,7 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableTxLabel, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
+import { TableTxLabel } from '../tables/TableTxLabel'
 
 export class EntityTxLabel extends EntityBase<TableTxLabel> {
   constructor(api?: TableTxLabel) {
@@ -86,7 +86,7 @@ export class EntityTxLabel extends EntityBase<TableTxLabel> {
     userId: number,
     ei: TableTxLabel,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityTxLabel; eiId: number }> {
     const ef = verifyOneOrNone(await storage.findTxLabels({ partial: { label: ei.label, userId }, trx }))
     return {
@@ -96,7 +96,7 @@ export class EntityTxLabel extends EntityBase<TableTxLabel> {
     }
   }
 
-  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void> {
     this.userId = userId
     this.txLabelId = 0
     this.txLabelId = await storage.insertTxLabel(this.toApi(), trx)
@@ -107,7 +107,7 @@ export class EntityTxLabel extends EntityBase<TableTxLabel> {
     since: Date | undefined,
     ei: TableTxLabel,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {