@bsv/wallet-toolbox 1.5.21 → 1.6.1

package/src/storage/remoting/StorageMobile.ts

@@ -12,15 +12,38 @@ import {
   AuthFetch
 } from '@bsv/sdk'
 import {
-  sdk,
-  TableCertificateX,
-  TableOutput,
-  TableOutputBasket,
-  TableProvenTxReq,
-  TableSettings,
-  TableSyncState,
-  TableUser
-} from '../../index.mobile'
+  AuthId,
+  FindCertificatesArgs,
+  FindOutputBasketsArgs,
+  FindOutputsArgs,
+  FindProvenTxReqsArgs,
+  ProcessSyncChunkResult,
+  RequestSyncChunkArgs,
+  StorageCreateActionResult,
+  StorageInternalizeActionResult,
+  StorageProcessActionArgs,
+  StorageProcessActionResults,
+  SyncChunk,
+  UpdateProvenTxReqWithNewProvenTxArgs,
+  UpdateProvenTxReqWithNewProvenTxResult,
+  WalletStorageProvider
+} from '../../sdk/WalletStorage.interfaces'
+import { WERR_INVALID_OPERATION } from '../../sdk/WERR_errors'
+import { WalletServices } from '../../sdk/WalletServices.interfaces'
+import {
+  ValidCreateActionArgs,
+  ValidListActionsArgs,
+  ValidListCertificatesArgs,
+  ValidListOutputsArgs
+} from '../../sdk/validationHelpers'
+import { TableSettings } from '../schema/tables/TableSettings'
+import { TableUser } from '../schema/tables/TableUser'
+import { TableSyncState } from '../schema/tables/TableSyncState'
+import { TableCertificateX } from '../schema/tables/TableCertificate'
+import { TableOutputBasket } from '../schema/tables/TableOutputBasket'
+import { TableOutput } from '../schema/tables/TableOutput'
+import { TableProvenTxReq } from '../schema/tables/TableProvenTxReq'
+import { EntityTimeStamp } from '../../sdk/types'
 
 /**
  * `StorageClient` implements the `WalletStorageProvider` interface which allows it to
@@ -36,7 +59,7 @@ import {
  *
  * For details of the API implemented, follow the "See also" link for the `WalletStorageProvider` interface.
  */
-export class StorageClient implements sdk.WalletStorageProvider {
+export class StorageClient implements WalletStorageProvider {
   readonly endpointUrl: string
   private readonly authClient: AuthFetch
   private nextId = 1
@@ -123,7 +146,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    */
   getSettings(): TableSettings {
     if (!this.settings) {
-      throw new sdk.WERR_INVALID_OPERATION('call makeAvailable at least once before getSettings')
+      throw new WERR_INVALID_OPERATION('call makeAvailable at least once before getSettings')
     }
     return this.settings
   }
@@ -170,10 +193,10 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * Remote storage does not offer `Services` to remote clients.
    * @throws WERR_INVALID_OPERATION
    */
-  getServices(): sdk.WalletServices {
+  getServices(): WalletServices {
     // Typically, the client would not store or retrieve "Services" from a remote server.
     // The "services" in local in-memory usage is a no-op or your own approach:
-    throw new sdk.WERR_INVALID_OPERATION(
+    throw new WERR_INVALID_OPERATION(
       'getServices() not implemented in remote client. This method typically is not used remotely.'
     )
   }
@@ -181,7 +204,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
   /**
    * Ignored. Remote storage cannot share `Services` with remote clients.
    */
-  setServices(v: sdk.WalletServices): void {
+  setServices(v: WalletServices): void {
     // Typically no-op for remote client
     // Because "services" are usually local definitions to the Storage.
   }
@@ -195,8 +218,8 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args Original wallet `internalizeAction` arguments.
    * @returns `internalizeAction` results
    */
-  async internalizeAction(auth: sdk.AuthId, args: InternalizeActionArgs): Promise<sdk.StorageInternalizeActionResult> {
-    return this.rpcCall<sdk.StorageInternalizeActionResult>('internalizeAction', [auth, args])
+  async internalizeAction(auth: AuthId, args: InternalizeActionArgs): Promise<StorageInternalizeActionResult> {
+    return this.rpcCall<StorageInternalizeActionResult>('internalizeAction', [auth, args])
   }
 
   /**
@@ -206,8 +229,8 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args Validated extension of original wallet `createAction` arguments.
    * @returns `StorageCreateActionResults` supporting additional wallet processing to yield `createAction` results.
    */
-  async createAction(auth: sdk.AuthId, args: sdk.ValidCreateActionArgs): Promise<sdk.StorageCreateActionResult> {
-    return this.rpcCall<sdk.StorageCreateActionResult>('createAction', [auth, args])
+  async createAction(auth: AuthId, args: ValidCreateActionArgs): Promise<StorageCreateActionResult> {
+    return this.rpcCall<StorageCreateActionResult>('createAction', [auth, args])
   }
 
   /**
@@ -220,8 +243,8 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args `StorageProcessActionArgs` convey completed signed transaction to storage.
    * @returns `StorageProcessActionResults` supporting final wallet processing to yield `createAction` or `signAction` results.
    */
-  async processAction(auth: sdk.AuthId, args: sdk.StorageProcessActionArgs): Promise<sdk.StorageProcessActionResults> {
-    return this.rpcCall<sdk.StorageProcessActionResults>('processAction', [auth, args])
+  async processAction(auth: AuthId, args: StorageProcessActionArgs): Promise<StorageProcessActionResults> {
+    return this.rpcCall<StorageProcessActionResults>('processAction', [auth, args])
   }
 
   /**
@@ -231,7 +254,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args original wallet `abortAction` args.
    * @returns `abortAction` result.
    */
-  async abortAction(auth: sdk.AuthId, args: AbortActionArgs): Promise<AbortActionResult> {
+  async abortAction(auth: AuthId, args: AbortActionArgs): Promise<AbortActionResult> {
     return this.rpcCall<AbortActionResult>('abortAction', [auth, args])
   }
 
@@ -254,7 +277,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @returns `TableSyncState` and whether a new record was created.
    */
   async findOrInsertSyncStateAuth(
-    auth: sdk.AuthId,
+    auth: AuthId,
     storageIdentityKey: string,
     storageName: string
   ): Promise<{ syncState: TableSyncState; isNew: boolean }> {
@@ -274,7 +297,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param certificate the certificate to insert.
    * @returns record Id of the inserted `TableCertificate` record.
    */
-  async insertCertificateAuth(auth: sdk.AuthId, certificate: TableCertificateX): Promise<number> {
+  async insertCertificateAuth(auth: AuthId, certificate: TableCertificateX): Promise<number> {
     const r = await this.rpcCall<number>('insertCertificateAuth', [auth, certificate])
     return r
   }
@@ -286,7 +309,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args Validated extension of original wallet `listActions` arguments.
    * @returns `listActions` results.
    */
-  async listActions(auth: sdk.AuthId, vargs: sdk.ValidListActionsArgs): Promise<ListActionsResult> {
+  async listActions(auth: AuthId, vargs: ValidListActionsArgs): Promise<ListActionsResult> {
     const r = await this.rpcCall<ListActionsResult>('listActions', [auth, vargs])
     return r
   }
@@ -298,7 +321,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args Validated extension of original wallet `listOutputs` arguments.
    * @returns `listOutputs` results.
    */
-  async listOutputs(auth: sdk.AuthId, vargs: sdk.ValidListOutputsArgs): Promise<ListOutputsResult> {
+  async listOutputs(auth: AuthId, vargs: ValidListOutputsArgs): Promise<ListOutputsResult> {
     const r = await this.rpcCall<ListOutputsResult>('listOutputs', [auth, vargs])
     return r
   }
@@ -310,7 +333,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args Validated extension of original wallet `listCertificates` arguments.
    * @returns `listCertificates` results.
    */
-  async listCertificates(auth: sdk.AuthId, vargs: sdk.ValidListCertificatesArgs): Promise<ListCertificatesResult> {
+  async listCertificates(auth: AuthId, vargs: ValidListCertificatesArgs): Promise<ListCertificatesResult> {
     const r = await this.rpcCall<ListCertificatesResult>('listCertificates', [auth, vargs])
     return r
   }
@@ -326,7 +349,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args `FindCertificatesArgs` determines which certificates to retrieve and whether to include fields.
    * @returns array of certificates matching args.
    */
-  async findCertificatesAuth(auth: sdk.AuthId, args: sdk.FindCertificatesArgs): Promise<TableCertificateX[]> {
+  async findCertificatesAuth(auth: AuthId, args: FindCertificatesArgs): Promise<TableCertificateX[]> {
     const r = await this.rpcCall<TableCertificateX[]>('findCertificatesAuth', [auth, args])
     this.validateEntities(r)
     if (args.includeFields) {
@@ -347,7 +370,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args `FindOutputBasketsArgs` determines which baskets to retrieve.
    * @returns array of output baskets matching args.
    */
-  async findOutputBasketsAuth(auth: sdk.AuthId, args: sdk.FindOutputBasketsArgs): Promise<TableOutputBasket[]> {
+  async findOutputBasketsAuth(auth: AuthId, args: FindOutputBasketsArgs): Promise<TableOutputBasket[]> {
     const r = await this.rpcCall<TableOutputBasket[]>('findOutputBaskets', [auth, args])
     this.validateEntities(r)
     return r
@@ -363,7 +386,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args `FindOutputsArgs` determines which outputs to retrieve.
    * @returns array of outputs matching args.
    */
-  async findOutputsAuth(auth: sdk.AuthId, args: sdk.FindOutputsArgs): Promise<TableOutput[]> {
+  async findOutputsAuth(auth: AuthId, args: FindOutputsArgs): Promise<TableOutput[]> {
     const r = await this.rpcCall<TableOutput[]>('findOutputsAuth', [auth, args])
     this.validateEntities(r)
     return r
@@ -379,7 +402,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args `FindProvenTxReqsArgs` determines which proof requests to retrieve.
    * @returns array of proof requests matching args.
    */
-  async findProvenTxReqs(args: sdk.FindProvenTxReqsArgs): Promise<TableProvenTxReq[]> {
+  async findProvenTxReqs(args: FindProvenTxReqsArgs): Promise<TableProvenTxReq[]> {
     const r = await this.rpcCall<TableProvenTxReq[]>('findProvenTxReqs', [args])
     this.validateEntities(r)
     return r
@@ -395,7 +418,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * This must match the `AuthFetch` identity securing the remote conneciton.
    * @param args original wallet `relinquishCertificate` args.
    */
-  async relinquishCertificate(auth: sdk.AuthId, args: RelinquishCertificateArgs): Promise<number> {
+  async relinquishCertificate(auth: AuthId, args: RelinquishCertificateArgs): Promise<number> {
     return this.rpcCall<number>('relinquishCertificate', [auth, args])
   }
 
@@ -408,7 +431,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * This must match the `AuthFetch` identity securing the remote conneciton.
    * @param args original wallet `relinquishOutput` args.
    */
-  async relinquishOutput(auth: sdk.AuthId, args: RelinquishOutputArgs): Promise<number> {
+  async relinquishOutput(auth: AuthId, args: RelinquishOutputArgs): Promise<number> {
     return this.rpcCall<number>('relinquishOutput', [auth, args])
   }
 
@@ -421,8 +444,8 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param chunk the current data chunk to process.
    * @returns whether processing is done, counts of inserts and udpates, and related progress tracking properties.
    */
-  async processSyncChunk(args: sdk.RequestSyncChunkArgs, chunk: sdk.SyncChunk): Promise<sdk.ProcessSyncChunkResult> {
-    const r = await this.rpcCall<sdk.ProcessSyncChunkResult>('processSyncChunk', [args, chunk])
+  async processSyncChunk(args: RequestSyncChunkArgs, chunk: SyncChunk): Promise<ProcessSyncChunkResult> {
+    const r = await this.rpcCall<ProcessSyncChunkResult>('processSyncChunk', [args, chunk])
     return r
   }
 
@@ -435,8 +458,8 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @param args that identify the non-active storage which will receive replication data and constrains the replication process.
    * @returns the next "chunk" of replication data
    */
-  async getSyncChunk(args: sdk.RequestSyncChunkArgs): Promise<sdk.SyncChunk> {
-    const r = await this.rpcCall<sdk.SyncChunk>('getSyncChunk', [args])
+  async getSyncChunk(args: RequestSyncChunkArgs): Promise<SyncChunk> {
+    const r = await this.rpcCall<SyncChunk>('getSyncChunk', [args])
     if (r.certificateFields) r.certificateFields = this.validateEntities(r.certificateFields)
     if (r.certificates) r.certificates = this.validateEntities(r.certificates)
     if (r.commissions) r.commissions = this.validateEntities(r.commissions)
@@ -464,9 +487,9 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * @returns results of updates
    */
   async updateProvenTxReqWithNewProvenTx(
-    args: sdk.UpdateProvenTxReqWithNewProvenTxArgs
-  ): Promise<sdk.UpdateProvenTxReqWithNewProvenTxResult> {
-    const r = await this.rpcCall<sdk.UpdateProvenTxReqWithNewProvenTxResult>('updateProvenTxReqWithNewProvenTx', [args])
+    args: UpdateProvenTxReqWithNewProvenTxArgs
+  ): Promise<UpdateProvenTxReqWithNewProvenTxResult> {
+    const r = await this.rpcCall<UpdateProvenTxReqWithNewProvenTxResult>('updateProvenTxReqWithNewProvenTx', [args])
     return r
   }
 
@@ -479,7 +502,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * This must match the `AuthFetch` identity securing the remote conneciton.
    * @param newActiveStorageIdentityKey which must be a currently configured backup storage provider.
    */
-  async setActive(auth: sdk.AuthId, newActiveStorageIdentityKey: string): Promise<number> {
+  async setActive(auth: AuthId, newActiveStorageIdentityKey: string): Promise<number> {
     return this.rpcCall<number>('setActive', [auth, newActiveStorageIdentityKey])
   }
 
@@ -494,7 +517,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * Helper to force uniform behavior across database engines.
    * Use to process all individual records with time stamps retreived from database.
    */
-  validateEntity<T extends sdk.EntityTimeStamp>(entity: T, dateFields?: string[]): T {
+  validateEntity<T extends EntityTimeStamp>(entity: T, dateFields?: string[]): T {
     entity.created_at = this.validateDate(entity.created_at)
     entity.updated_at = this.validateDate(entity.updated_at)
     if (dateFields) {
@@ -518,7 +541,7 @@ export class StorageClient implements sdk.WalletStorageProvider {
    * Use to process all arrays of records with time stamps retreived from database.
    * @returns input `entities` array with contained values validated.
    */
-  validateEntities<T extends sdk.EntityTimeStamp>(entities: T[], dateFields?: string[]): T[] {
+  validateEntities<T extends EntityTimeStamp>(entities: T[], dateFields?: string[]): T[] {
     for (let i = 0; i < entities.length; i++) {
       entities[i] = this.validateEntity(entities[i], dateFields)
     }

package/src/storage/remoting/StorageServer.ts

@@ -9,7 +9,11 @@ import { WalletInterface } from '@bsv/sdk'
 import express, { Request, Response } from 'express'
 import { AuthMiddlewareOptions, createAuthMiddleware } from '@bsv/auth-express-middleware'
 import { createPaymentMiddleware } from '@bsv/payment-express-middleware'
-import { sdk, Wallet, StorageProvider } from '../../index.all'
+import { Wallet } from '../../Wallet'
+import { StorageProvider } from '../StorageProvider'
+import { WERR_UNAUTHORIZED } from '../../sdk/WERR_errors'
+import { SyncChunk } from '../../sdk/WalletStorage.interfaces'
+import { EntityTimeStamp } from '../../sdk/types'
 
 export interface WalletStorageServerOptions {
   port: number
@@ -101,23 +105,23 @@ export class StorageServer {
             case 'findOrInsertUser':
               {
                 if (params[0] !== req.auth.identityKey)
-                  throw new sdk.WERR_UNAUTHORIZED('function may only access authenticated user.')
+                  throw new WERR_UNAUTHORIZED('function may only access authenticated user.')
               }
               break
             case 'adminStats':
               {
                 // TODO: add check for admin user
                 if (params[0] !== req.auth.identityKey)
-                  throw new sdk.WERR_UNAUTHORIZED('function may only access authenticated admin user.')
+                  throw new WERR_UNAUTHORIZED('function may only access authenticated admin user.')
                 if (!this.adminIdentityKeys || !this.adminIdentityKeys.includes(req.auth.identityKey))
-                  throw new sdk.WERR_UNAUTHORIZED('function may only be accessed by admin user.')
+                  throw new WERR_UNAUTHORIZED('function may only be accessed by admin user.')
               }
               break
             case 'processSyncChunk':
               {
                 await this.validateParam0(params, req)
-                //const args: sdk.RequestSyncChunkArgs = params[0]
-                const r: sdk.SyncChunk = params[1]
+                //const args: RequestSyncChunkArgs = params[0]
+                const r: SyncChunk = params[1]
                 if (r.certificateFields) r.certificateFields = this.validateEntities(r.certificateFields)
                 if (r.certificates) r.certificates = this.validateEntities(r.certificates)
                 if (r.commissions) r.commissions = this.validateEntities(r.commissions)
@@ -175,7 +179,7 @@ export class StorageServer {
       params = [{}]
     }
     if (params[0]['identityKey'] && params[0]['identityKey'] !== req.auth.identityKey)
-      throw new sdk.WERR_UNAUTHORIZED('identityKey does not match authentiation')
+      throw new WERR_UNAUTHORIZED('identityKey does not match authentiation')
     console.log('looking up user with identityKey:', req.auth.identityKey)
     const { user, isNew } = await this.storage.findOrInsertUser(req.auth.identityKey)
     params[0].reqAuthUserId = user.userId
@@ -199,7 +203,7 @@ export class StorageServer {
    * Helper to force uniform behavior across database engines.
    * Use to process all individual records with time stamps retreived from database.
    */
-  validateEntity<T extends sdk.EntityTimeStamp>(entity: T, dateFields?: string[]): T {
+  validateEntity<T extends EntityTimeStamp>(entity: T, dateFields?: string[]): T {
     entity.created_at = this.validateDate(entity.created_at)
     entity.updated_at = this.validateDate(entity.updated_at)
     if (dateFields) {
@@ -223,7 +227,7 @@ export class StorageServer {
    * Use to process all arrays of records with time stamps retreived from database.
    * @returns input `entities` array with contained values validated.
    */
-  validateEntities<T extends sdk.EntityTimeStamp>(entities: T[], dateFields?: string[]): T[] {
+  validateEntities<T extends EntityTimeStamp>(entities: T[], dateFields?: string[]): T[] {
     for (let i = 0; i < entities.length; i++) {
       entities[i] = this.validateEntity(entities[i], dateFields)
     }

package/src/storage/schema/KnexMigrations.ts

@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Knex } from 'knex'
-import { sdk, StorageKnex } from '../../index.all'
 import { DBType } from '../StorageReader'
+import { Chain } from '../../sdk/types'
+import { StorageKnex } from '../StorageKnex'
+import { WalletError } from '../../sdk/WalletError'
+import { WERR_NOT_IMPLEMENTED } from '../../sdk/WERR_errors'
 
 interface Migration {
   up: (knex: Knex) => Promise<void>
@@ -24,7 +27,7 @@ export class KnexMigrations implements MigrationSource<string> {
    * @param maxOutputScriptLength limit for scripts kept in outputs table, longer scripts will be pulled from rawTx
    */
   constructor(
-    public chain: sdk.Chain,
+    public chain: Chain,
     public storageName: string,
     public storageIdentityKey: string,
     public maxOutputScriptLength: number
@@ -100,7 +103,7 @@ export class KnexMigrations implements MigrationSource<string> {
       async up(knex) {
         const storage = new StorageKnex({
           ...StorageKnex.defaultOptions(),
-          chain: <sdk.Chain>chain,
+          chain: <Chain>chain,
           knex
         })
         const settings = await storage.makeAvailable()
@@ -130,7 +133,7 @@ export class KnexMigrations implements MigrationSource<string> {
       async up(knex) {
         const storage = new StorageKnex({
           ...StorageKnex.defaultOptions(),
-          chain: <sdk.Chain>chain,
+          chain: <Chain>chain,
           knex
         })
         const settings = await storage.makeAvailable()
@@ -161,7 +164,7 @@ export class KnexMigrations implements MigrationSource<string> {
 
     migrations['2024-12-26-001 initial migration'] = {
       async up(knex) {
-        const dbtype = await KnexMigrations.dbtype(knex)
+        const dbtype = await determineDBType(knex)
 
         await knex.schema.createTable('proven_txs', table => {
           addTimeStamps(knex, table, dbtype)
@@ -406,30 +409,29 @@ export class KnexMigrations implements MigrationSource<string> {
     }
     return migrations
   }
+}
 
-  /**
-   * @param knex
-   * @returns {DBType} connected database engine variant
-   */
-  static async dbtype(knex: Knex<any, any[]>): Promise<DBType> {
-    try {
-      const q = `SELECT 
-    CASE 
-        WHEN (SELECT VERSION() LIKE '%MariaDB%') = 1 THEN 'Unknown'
-        WHEN (SELECT VERSION()) IS NOT NULL THEN 'MySQL'
-        ELSE 'Unknown'
-    END AS database_type;`
-      let r = await knex.raw(q)
-      if (!r[0]['database_type']) r = r[0]
-      if (r['rows']) r = r.rows
-      const dbtype: 'SQLite' | 'MySQL' | 'Unknown' = r[0].database_type
-      if (dbtype === 'Unknown')
-        throw new sdk.WERR_NOT_IMPLEMENTED(`Attempting to create database on unsuported engine.`)
-      return dbtype
-    } catch (eu: unknown) {
-      const e = sdk.WalletError.fromUnknown(eu)
-      if (e.code === 'SQLITE_ERROR') return 'SQLite'
-      throw new sdk.WERR_NOT_IMPLEMENTED(`Attempting to create database on unsuported engine.`)
-    }
+/**
+ * @param knex
+ * @returns {DBType} connected database engine variant
+ */
+export async function determineDBType(knex: Knex<any, any[]>): Promise<DBType> {
+  try {
+    const q = `SELECT 
+  CASE 
+      WHEN (SELECT VERSION() LIKE '%MariaDB%') = 1 THEN 'Unknown'
+      WHEN (SELECT VERSION()) IS NOT NULL THEN 'MySQL'
+      ELSE 'Unknown'
+  END AS database_type;`
+    let r = await knex.raw(q)
+    if (!r[0]['database_type']) r = r[0]
+    if (r['rows']) r = r.rows
+    const dbtype: 'SQLite' | 'MySQL' | 'Unknown' = r[0].database_type
+    if (dbtype === 'Unknown') throw new WERR_NOT_IMPLEMENTED(`Attempting to create database on unsuported engine.`)
+    return dbtype
+  } catch (eu: unknown) {
+    const e = WalletError.fromUnknown(eu)
+    if (e.code === 'SQLITE_ERROR') return 'SQLite'
+    throw new WERR_NOT_IMPLEMENTED(`Attempting to create database on unsuported engine.`)
   }
 }

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

@@ -1,4 +1,5 @@
-import { sdk, StorageProvider } from '../../../index.client'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { StorageProvider } from '../../StorageProvider'
 
 export type EntityStorage = StorageProvider
 
@@ -53,7 +54,7 @@ export abstract class EntityBase<T> {
    * @param userId local userId
    * @param syncMap
    */
-  abstract mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void>
+  abstract mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: TrxToken): Promise<void>
 
   /**
    * Perform a 'merge' / 'convergent' equality migration of state
@@ -68,7 +69,7 @@ export abstract class EntityBase<T> {
     since: Date | undefined,
     ei: T,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean>
 
   /**

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

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableCertificate, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableCertificate } from '../tables/TableCertificate'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityCertificate extends EntityBase<TableCertificate> {
   constructor(api?: TableCertificate) {
@@ -137,7 +138,7 @@ export class EntityCertificate extends EntityBase<TableCertificate> {
     userId: number,
     ei: TableCertificate,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityCertificate; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findCertificates({
@@ -156,7 +157,7 @@ export class EntityCertificate extends EntityBase<TableCertificate> {
     }
   }
 
-  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.certificateId = 0
     this.certificateId = await storage.insertCertificate(this.toApi(), trx)
@@ -167,7 +168,7 @@ export class EntityCertificate extends EntityBase<TableCertificate> {
     since: Date | undefined,
     ei: TableCertificate,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {

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

@@ -1,6 +1,8 @@
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableCertificateField, 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 { verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableCertificateField } from '../tables/TableCertificateField'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityCertificateField extends EntityBase<TableCertificateField> {
   constructor(api?: TableCertificateField) {
@@ -66,7 +68,7 @@ export class EntityCertificateField extends EntityBase<TableCertificateField> {
   }
 
   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 'certificateField'
@@ -92,7 +94,7 @@ export class EntityCertificateField extends EntityBase<TableCertificateField> {
     userId: number,
     ei: TableCertificateField,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityCertificateField; eiId: number }> {
     const certificateId = syncMap.certificate.idMap[ei.certificateId]
     const ef = verifyOneOrNone(
@@ -108,7 +110,7 @@ export class EntityCertificateField extends EntityBase<TableCertificateField> {
     }
   }
 
-  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.certificateId = syncMap.certificate.idMap[this.certificateId]
     this.userId = userId
     await storage.insertCertificateField(this.toApi(), trx)
@@ -119,7 +121,7 @@ export class EntityCertificateField extends EntityBase<TableCertificateField> {
     since: Date | undefined,
     ei: TableCertificateField,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {

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

@@ -1,7 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, sdk, TableCommission, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { arraysEqual, verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableCommission } from '../tables/TableCommission'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityCommission extends EntityBase<TableCommission> {
   constructor(api?: TableCommission) {
@@ -111,7 +111,7 @@ export class EntityCommission extends EntityBase<TableCommission> {
     userId: number,
     ei: TableCommission,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityCommission; eiId: number }> {
     const transactionId = syncMap.transaction.idMap[ei.transactionId]
     const ef = verifyOneOrNone(await storage.findCommissions({ partial: { transactionId, userId }, trx }))
@@ -122,7 +122,7 @@ export class EntityCommission extends EntityBase<TableCommission> {
     }
   }
 
-  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.transactionId) this.transactionId = syncMap.transaction.idMap[this.transactionId]
     this.userId = userId
     this.commissionId = 0
@@ -134,7 +134,7 @@ export class EntityCommission extends EntityBase<TableCommission> {
     since: Date | undefined,
     ei: TableCommission,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {

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

@@ -1,7 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { MerklePath } from '@bsv/sdk'
-import { arraysEqual, optionalArraysEqual, sdk, TableOutput, verifyId, verifyOneOrNone } from '../../../index.client'
-import { EntityBase, EntityStorage, SyncMap } from '.'
+import { StorageProvidedBy, TrxToken } from '../../../sdk/WalletStorage.interfaces'
+import { optionalArraysEqual, verifyId, verifyOneOrNone } from '../../../utility/utilityHelpers'
+import { TableOutput } from '../tables/TableOutput'
+import { EntityBase, EntityStorage, SyncMap } from './EntityBase'
 
 export class EntityOutput extends EntityBase<TableOutput> {
   constructor(api?: TableOutput) {
@@ -129,7 +129,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
   get providedBy() {
     return this.api.providedBy
   }
-  set providedBy(v: sdk.StorageProvidedBy) {
+  set providedBy(v: StorageProvidedBy) {
     this.api.providedBy = v
   }
   get purpose() {
@@ -233,7 +233,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
     userId: number,
     ei: TableOutput,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<{ found: boolean; eo: EntityOutput; eiId: number }> {
     const transactionId = syncMap.transaction.idMap[ei.transactionId]
     const basketId = ei.basketId ? syncMap.outputBasket.idMap[ei.basketId] : null
@@ -250,7 +250,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
     }
   }
 
-  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.basketId = this.basketId ? syncMap.outputBasket.idMap[this.basketId] : undefined
     this.transactionId = syncMap.transaction.idMap[this.transactionId]
@@ -264,7 +264,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
     since: Date | undefined,
     ei: TableOutput,
     syncMap: SyncMap,
-    trx?: sdk.TrxToken
+    trx?: TrxToken
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {