@bsv/wallet-toolbox 1.1.6 → 1.1.8

package/src/storage/StorageReaderWriter.ts

@@ -1,8 +1,21 @@
 import {
-  entity,
   randomBytesBase64,
   sdk,
-  table,
+  TableCertificate,
+  TableCertificateField,
+  TableCommission,
+  TableMonitorEvent,
+  TableOutput,
+  TableOutputBasket,
+  TableOutputTag,
+  TableOutputTagMap,
+  TableProvenTx,
+  TableProvenTxReq,
+  TableSyncState,
+  TableTransaction,
+  TableTxLabel,
+  TableTxLabelMap,
+  TableUser,
   verifyId,
   verifyOne,
   verifyOneOrNone,
@@ -24,14 +37,14 @@ export abstract class StorageReaderWriter extends StorageReader {
 
   abstract findOutputTagMaps(
     args: sdk.FindOutputTagMapsArgs
-  ): Promise<table.OutputTagMap[]>
+  ): Promise<TableOutputTagMap[]>
   abstract findProvenTxReqs(
     args: sdk.FindProvenTxReqsArgs
-  ): Promise<table.ProvenTxReq[]>
-  abstract findProvenTxs(args: sdk.FindProvenTxsArgs): Promise<table.ProvenTx[]>
+  ): Promise<TableProvenTxReq[]>
+  abstract findProvenTxs(args: sdk.FindProvenTxsArgs): Promise<TableProvenTx[]>
   abstract findTxLabelMaps(
     args: sdk.FindTxLabelMapsArgs
-  ): Promise<table.TxLabelMap[]>
+  ): Promise<TableTxLabelMap[]>
 
   abstract countOutputTagMaps(args: sdk.FindOutputTagMapsArgs): Promise<number>
   abstract countProvenTxReqs(args: sdk.FindProvenTxReqsArgs): Promise<number>
@@ -39,139 +52,139 @@ export abstract class StorageReaderWriter extends StorageReader {
   abstract countTxLabelMaps(args: sdk.FindTxLabelMapsArgs): Promise<number>
 
   abstract insertCertificate(
-    certificate: table.Certificate,
+    certificate: TableCertificate,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertCertificateField(
-    certificateField: table.CertificateField,
+    certificateField: TableCertificateField,
     trx?: sdk.TrxToken
   ): Promise<void>
   abstract insertCommission(
-    commission: table.Commission,
+    commission: TableCommission,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertMonitorEvent(
-    event: table.MonitorEvent,
+    event: TableMonitorEvent,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertOutput(
-    output: table.Output,
+    output: TableOutput,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertOutputBasket(
-    basket: table.OutputBasket,
+    basket: TableOutputBasket,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertOutputTag(
-    tag: table.OutputTag,
+    tag: TableOutputTag,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertOutputTagMap(
-    tagMap: table.OutputTagMap,
+    tagMap: TableOutputTagMap,
     trx?: sdk.TrxToken
   ): Promise<void>
   abstract insertProvenTx(
-    tx: table.ProvenTx,
+    tx: TableProvenTx,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertProvenTxReq(
-    tx: table.ProvenTxReq,
+    tx: TableProvenTxReq,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertSyncState(
-    syncState: table.SyncState,
+    syncState: TableSyncState,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertTransaction(
-    tx: table.Transaction,
+    tx: TableTransaction,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertTxLabel(
-    label: table.TxLabel,
+    label: TableTxLabel,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract insertTxLabelMap(
-    labelMap: table.TxLabelMap,
+    labelMap: TableTxLabelMap,
     trx?: sdk.TrxToken
   ): Promise<void>
-  abstract insertUser(user: table.User, trx?: sdk.TrxToken): Promise<number>
+  abstract insertUser(user: TableUser, trx?: sdk.TrxToken): Promise<number>
 
   abstract updateCertificate(
     id: number,
-    update: Partial<table.Certificate>,
+    update: Partial<TableCertificate>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateCertificateField(
     certificateId: number,
     fieldName: string,
-    update: Partial<table.CertificateField>,
+    update: Partial<TableCertificateField>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateCommission(
     id: number,
-    update: Partial<table.Commission>,
+    update: Partial<TableCommission>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateMonitorEvent(
     id: number,
-    update: Partial<table.MonitorEvent>,
+    update: Partial<TableMonitorEvent>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateOutput(
     id: number,
-    update: Partial<table.Output>,
+    update: Partial<TableOutput>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateOutputBasket(
     id: number,
-    update: Partial<table.OutputBasket>,
+    update: Partial<TableOutputBasket>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateOutputTag(
     id: number,
-    update: Partial<table.OutputTag>,
+    update: Partial<TableOutputTag>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateOutputTagMap(
     outputId: number,
     tagId: number,
-    update: Partial<table.OutputTagMap>,
+    update: Partial<TableOutputTagMap>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateProvenTx(
     id: number,
-    update: Partial<table.ProvenTx>,
+    update: Partial<TableProvenTx>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateProvenTxReq(
     id: number | number[],
-    update: Partial<table.ProvenTxReq>,
+    update: Partial<TableProvenTxReq>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateSyncState(
     id: number,
-    update: Partial<table.SyncState>,
+    update: Partial<TableSyncState>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateTransaction(
     id: number | number[],
-    update: Partial<table.Transaction>,
+    update: Partial<TableTransaction>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateTxLabel(
     id: number,
-    update: Partial<table.TxLabel>,
+    update: Partial<TableTxLabel>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateTxLabelMap(
     transactionId: number,
     txLabelId: number,
-    update: Partial<table.TxLabelMap>,
+    update: Partial<TableTxLabelMap>,
     trx?: sdk.TrxToken
   ): Promise<number>
   abstract updateUser(
     id: number,
-    update: Partial<table.User>,
+    update: Partial<TableUser>,
     trx?: sdk.TrxToken
   ): Promise<number>
 
@@ -187,7 +200,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findCertificateById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.Certificate | undefined> {
+  ): Promise<TableCertificate | undefined> {
     return verifyOneOrNone(
       await this.findCertificates({ partial: { certificateId: id }, trx })
     )
@@ -195,7 +208,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findCommissionById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.Commission | undefined> {
+  ): Promise<TableCommission | undefined> {
     return verifyOneOrNone(
       await this.findCommissions({ partial: { commissionId: id }, trx })
     )
@@ -204,7 +217,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     id: number,
     trx?: sdk.TrxToken,
     noScript?: boolean
-  ): Promise<table.Output | undefined> {
+  ): Promise<TableOutput | undefined> {
     return verifyOneOrNone(
       await this.findOutputs({ partial: { outputId: id }, noScript, trx })
     )
@@ -212,7 +225,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findOutputBasketById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.OutputBasket | undefined> {
+  ): Promise<TableOutputBasket | undefined> {
     return verifyOneOrNone(
       await this.findOutputBaskets({ partial: { basketId: id }, trx })
     )
@@ -220,7 +233,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findProvenTxById(
     id: number,
     trx?: sdk.TrxToken | undefined
-  ): Promise<table.ProvenTx | undefined> {
+  ): Promise<TableProvenTx | undefined> {
     return verifyOneOrNone(
       await this.findProvenTxs({ partial: { provenTxId: id }, trx })
     )
@@ -228,7 +241,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findProvenTxReqById(
     id: number,
     trx?: sdk.TrxToken | undefined
-  ): Promise<table.ProvenTxReq | undefined> {
+  ): Promise<TableProvenTxReq | undefined> {
     return verifyOneOrNone(
       await this.findProvenTxReqs({ partial: { provenTxReqId: id }, trx })
     )
@@ -236,7 +249,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findSyncStateById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.SyncState | undefined> {
+  ): Promise<TableSyncState | undefined> {
     return verifyOneOrNone(
       await this.findSyncStates({ partial: { syncStateId: id }, trx })
     )
@@ -245,7 +258,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     id: number,
     trx?: sdk.TrxToken,
     noRawTx?: boolean
-  ): Promise<table.Transaction | undefined> {
+  ): Promise<TableTransaction | undefined> {
     return verifyOneOrNone(
       await this.findTransactions({
         partial: { transactionId: id },
@@ -257,7 +270,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findTxLabelById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.TxLabel | undefined> {
+  ): Promise<TableTxLabel | undefined> {
     return verifyOneOrNone(
       await this.findTxLabels({ partial: { txLabelId: id }, trx })
     )
@@ -265,7 +278,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findOutputTagById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.OutputTag | undefined> {
+  ): Promise<TableOutputTag | undefined> {
     return verifyOneOrNone(
       await this.findOutputTags({ partial: { outputTagId: id }, trx })
     )
@@ -273,7 +286,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findUserById(
     id: number,
     trx?: sdk.TrxToken
-  ): Promise<table.User | undefined> {
+  ): Promise<TableUser | undefined> {
     return verifyOneOrNone(
       await this.findUsers({ partial: { userId: id }, trx })
     )
@@ -282,8 +295,8 @@ export abstract class StorageReaderWriter extends StorageReader {
   async findOrInsertUser(
     identityKey: string,
     trx?: sdk.TrxToken
-  ): Promise<{ user: table.User; isNew: boolean }> {
-    let user: table.User | undefined
+  ): Promise<{ user: TableUser; isNew: boolean }> {
+    let user: TableUser | undefined
     let isNew = false
     for (let retry = 0; ; retry++) {
       try {
@@ -324,10 +337,10 @@ export abstract class StorageReaderWriter extends StorageReader {
   }
 
   async findOrInsertTransaction(
-    newTx: table.Transaction,
+    newTx: TableTransaction,
     trx?: sdk.TrxToken
-  ): Promise<{ tx: table.Transaction; isNew: boolean }> {
-    let tx: table.Transaction | undefined
+  ): Promise<{ tx: TableTransaction; isNew: boolean }> {
+    let tx: TableTransaction | undefined
     let isNew = false
     for (let retry = 0; ; retry++) {
       try {
@@ -353,7 +366,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     userId: number,
     name: string,
     trx?: sdk.TrxToken
-  ): Promise<table.OutputBasket> {
+  ): Promise<TableOutputBasket> {
     const partial = { name, userId }
     for (let retry = 0; ; retry++) {
       try {
@@ -389,7 +402,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     userId: number,
     label: string,
     trx?: sdk.TrxToken
-  ): Promise<table.TxLabel> {
+  ): Promise<TableTxLabel> {
     const partial = { label, userId }
     for (let retry = 0; ; retry++) {
       try {
@@ -421,7 +434,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     transactionId: number,
     txLabelId: number,
     trx?: sdk.TrxToken
-  ): Promise<table.TxLabelMap> {
+  ): Promise<TableTxLabelMap> {
     const partial = { transactionId, txLabelId }
     for (let retry = 0; ; retry++) {
       try {
@@ -454,7 +467,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     userId: number,
     tag: string,
     trx?: sdk.TrxToken
-  ): Promise<table.OutputTag> {
+  ): Promise<TableOutputTag> {
     const partial = { tag, userId }
     for (let retry = 0; ; retry++) {
       try {
@@ -488,7 +501,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     outputId: number,
     outputTagId: number,
     trx?: sdk.TrxToken
-  ): Promise<table.OutputTagMap> {
+  ): Promise<TableOutputTagMap> {
     const partial = { outputId, outputTagId }
     for (let retry = 0; ; retry++) {
       try {
@@ -521,7 +534,7 @@ export abstract class StorageReaderWriter extends StorageReader {
     auth: sdk.AuthId,
     storageIdentityKey: string,
     storageName: string
-  ): Promise<{ syncState: table.SyncState; isNew: boolean }> {
+  ): Promise<{ syncState: TableSyncState; isNew: boolean }> {
     const partial = { userId: auth.userId!, storageIdentityKey, storageName }
     for (let retry = 0; ; retry++) {
       try {
@@ -549,10 +562,10 @@ export abstract class StorageReaderWriter extends StorageReader {
   }
 
   async findOrInsertProvenTxReq(
-    newReq: table.ProvenTxReq,
+    newReq: TableProvenTxReq,
     trx?: sdk.TrxToken
-  ): Promise<{ req: table.ProvenTxReq; isNew: boolean }> {
-    let req: table.ProvenTxReq | undefined
+  ): Promise<{ req: TableProvenTxReq; isNew: boolean }> {
+    let req: TableProvenTxReq | undefined
     let isNew = false
     for (let retry = 0; ; retry++) {
       try {
@@ -572,10 +585,10 @@ export abstract class StorageReaderWriter extends StorageReader {
   }
 
   async findOrInsertProvenTx(
-    newProven: table.ProvenTx,
+    newProven: TableProvenTx,
     trx?: sdk.TrxToken
-  ): Promise<{ proven: table.ProvenTx; isNew: boolean }> {
-    let proven: table.ProvenTx | undefined
+  ): Promise<{ proven: TableProvenTx; isNew: boolean }> {
+    let proven: TableProvenTx | undefined
     let isNew = false
     for (let retry = 0; ; retry++) {
       try {
@@ -600,7 +613,7 @@ export abstract class StorageReaderWriter extends StorageReader {
   ): Promise<sdk.ProcessSyncChunkResult>
 
   async tagOutput(
-    partial: Partial<table.Output>,
+    partial: Partial<TableOutput>,
     tag: string,
     trx?: sdk.TrxToken
   ): Promise<void> {

package/src/storage/StorageSyncReader.ts

@@ -1,4 +1,21 @@
-import { sdk, table } from '../index.client'
+import {
+  sdk,
+  TableCertificate,
+  TableCertificateField,
+  TableCommission,
+  TableOutput,
+  TableOutputBasket,
+  TableOutputTag,
+  TableOutputTagMap,
+  TableProvenTx,
+  TableProvenTxReq,
+  TableSettings,
+  TableSyncState,
+  TableTransaction,
+  TableTxLabel,
+  TableTxLabelMap,
+  TableUser
+} from '../index.client'
 import { StorageReader } from './StorageReader'
 
 /**
@@ -16,7 +33,7 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   isAvailable(): boolean {
     return this.storage.isAvailable()
   }
-  async makeAvailable(): Promise<table.Settings> {
+  async makeAvailable(): Promise<TableSettings> {
     await this.storage.makeAvailable()
     if (this.auth.userId === undefined) {
       const user = await this.storage.findUserByIdentityKey(
@@ -30,7 +47,7 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   destroy(): Promise<void> {
     return this.storage.destroy()
   }
-  getSettings(): table.Settings {
+  getSettings(): TableSettings {
     return this.storage.getSettings()
   }
   async getSyncChunk(args: sdk.RequestSyncChunkArgs): Promise<sdk.SyncChunk> {
@@ -39,14 +56,14 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
       throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.getSyncChunk(args)
   }
-  async findUserByIdentityKey(key: string): Promise<table.User | undefined> {
+  async findUserByIdentityKey(key: string): Promise<TableUser | undefined> {
     if (!this.auth.userId) await this.makeAvailable()
     if (key !== this.auth.identityKey) throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.findUserByIdentityKey(key)
   }
   async findSyncStates(
     args: sdk.FindSyncStatesArgs
-  ): Promise<table.SyncState[]> {
+  ): Promise<TableSyncState[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -54,7 +71,7 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async findCertificateFields(
     args: sdk.FindCertificateFieldsArgs
-  ): Promise<table.CertificateField[]> {
+  ): Promise<TableCertificateField[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -62,7 +79,7 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async findCertificates(
     args: sdk.FindCertificatesArgs
-  ): Promise<table.Certificate[]> {
+  ): Promise<TableCertificate[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -70,7 +87,7 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async findCommissions(
     args: sdk.FindCommissionsArgs
-  ): Promise<table.Commission[]> {
+  ): Promise<TableCommission[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -78,13 +95,13 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async findOutputBaskets(
     args: sdk.FindOutputBasketsArgs
-  ): Promise<table.OutputBasket[]> {
+  ): Promise<TableOutputBasket[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.findOutputBaskets(args)
   }
-  async findOutputs(args: sdk.FindOutputsArgs): Promise<table.Output[]> {
+  async findOutputs(args: sdk.FindOutputsArgs): Promise<TableOutput[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -92,7 +109,7 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async findOutputTags(
     args: sdk.FindOutputTagsArgs
-  ): Promise<table.OutputTag[]> {
+  ): Promise<TableOutputTag[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -100,13 +117,13 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async findTransactions(
     args: sdk.FindTransactionsArgs
-  ): Promise<table.Transaction[]> {
+  ): Promise<TableTransaction[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.findTransactions(args)
   }
-  async findTxLabels(args: sdk.FindTxLabelsArgs): Promise<table.TxLabel[]> {
+  async findTxLabels(args: sdk.FindTxLabelsArgs): Promise<TableTxLabel[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.partial.userId !== this.auth.userId)
       throw new sdk.WERR_UNAUTHORIZED()
@@ -114,28 +131,28 @@ export class StorageSyncReader implements sdk.StorageSyncReader {
   }
   async getProvenTxsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.ProvenTx[]> {
+  ): Promise<TableProvenTx[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.userId !== this.auth.userId) throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.getProvenTxsForUser(args)
   }
   async getProvenTxReqsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.ProvenTxReq[]> {
+  ): Promise<TableProvenTxReq[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.userId !== this.auth.userId) throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.getProvenTxReqsForUser(args)
   }
   async getTxLabelMapsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.TxLabelMap[]> {
+  ): Promise<TableTxLabelMap[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.userId !== this.auth.userId) throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.getTxLabelMapsForUser(args)
   }
   async getOutputTagMapsForUser(
     args: sdk.FindForUserSincePagedArgs
-  ): Promise<table.OutputTagMap[]> {
+  ): Promise<TableOutputTagMap[]> {
     if (!this.auth.userId) await this.makeAvailable()
     if (args.userId !== this.auth.userId) throw new sdk.WERR_UNAUTHORIZED()
     return await this.storage.getOutputTagMapsForUser(args)

package/src/storage/WalletStorageManager.ts

@@ -12,11 +12,16 @@ import {
   RelinquishOutputArgs
 } from '@bsv/sdk'
 import {
-  entity,
+  EntitySyncState,
   sdk,
   StorageProvider,
   StorageSyncReader,
-  table,
+  TableCertificate,
+  TableOutput,
+  TableOutputBasket,
+  TableProvenTxReq,
+  TableSettings,
+  TableUser,
   wait
 } from '../index.client'
 
@@ -250,11 +255,11 @@ export class WalletStorageManager implements sdk.WalletStorage {
     return this._services
   }
 
-  getSettings(): table.Settings {
+  getSettings(): TableSettings {
     return this.getActive().getSettings()
   }
 
-  async makeAvailable(): Promise<table.Settings> {
+  async makeAvailable(): Promise<TableSettings> {
     return await this.runAsWriter(async writer => {
       writer.makeAvailable()
       return writer.getSettings()
@@ -278,7 +283,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
 
   async findOrInsertUser(
     identityKey: string
-  ): Promise<{ user: table.User; isNew: boolean }> {
+  ): Promise<{ user: TableUser; isNew: boolean }> {
     const auth = await this.getAuth()
     if (identityKey != auth.identityKey) throw new sdk.WERR_UNAUTHORIZED()
 
@@ -344,7 +349,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
       return await writer.processAction(auth, args)
     })
   }
-  async insertCertificate(certificate: table.Certificate): Promise<number> {
+  async insertCertificate(certificate: TableCertificate): Promise<number> {
     return await this.runAsWriter(async writer => {
       const auth = await this.getAuth(true)
       return await writer.insertCertificateAuth(auth, certificate)
@@ -377,7 +382,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
   }
   async findCertificates(
     args: sdk.FindCertificatesArgs
-  ): Promise<table.Certificate[]> {
+  ): Promise<TableCertificate[]> {
     const auth = await this.getAuth()
     return await this.runAsReader(async reader => {
       return await reader.findCertificatesAuth(auth, args)
@@ -385,13 +390,13 @@ export class WalletStorageManager implements sdk.WalletStorage {
   }
   async findOutputBaskets(
     args: sdk.FindOutputBasketsArgs
-  ): Promise<table.OutputBasket[]> {
+  ): Promise<TableOutputBasket[]> {
     const auth = await this.getAuth()
     return await this.runAsReader(async reader => {
       return await reader.findOutputBasketsAuth(auth, args)
     })
   }
-  async findOutputs(args: sdk.FindOutputsArgs): Promise<table.Output[]> {
+  async findOutputs(args: sdk.FindOutputsArgs): Promise<TableOutput[]> {
     const auth = await this.getAuth()
     return await this.runAsReader(async reader => {
       return await reader.findOutputsAuth(auth, args)
@@ -400,7 +405,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
 
   async findProvenTxReqs(
     args: sdk.FindProvenTxReqsArgs
-  ): Promise<table.ProvenTxReq[]> {
+  ): Promise<TableProvenTxReq[]> {
     return await this.runAsReader(async reader => {
       return await reader.findProvenTxReqs(args)
     })
@@ -423,7 +428,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
       let inserts = 0,
         updates = 0
       for (;;) {
-        const ss = await entity.SyncState.fromStorage(
+        const ss = await EntitySyncState.fromStorage(
           writer,
           identityKey,
           readerSettings
@@ -470,7 +475,7 @@ export class WalletStorageManager implements sdk.WalletStorage {
       let inserts = 0,
         updates = 0
       for (;;) {
-        const ss = await entity.SyncState.fromStorage(
+        const ss = await EntitySyncState.fromStorage(
           writer,
           identityKey,
           readerSettings

package/src/storage/index.all.ts

@@ -5,6 +5,6 @@ export * from './remoting/StorageClient'
 export * from './remoting/StorageServer'
 export * from './schema/KnexMigrations'
 export * from './StorageKnex'
-export * as table from './schema/tables'
-export * as entity from './schema/entities'
+export * from './schema/tables/index'
+export * from './schema/entities/index'
 export * as sync from './sync'