@bsv/wallet-toolbox 1.1.6 → 1.1.8

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

@@ -2,17 +2,16 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   optionalArraysEqual,
   sdk,
-  table,
+  TableOutput,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class Output extends EntityBase<table.Output> {
-  constructor(api?: table.Output) {
+export class EntityOutput extends EntityBase<TableOutput> {
+  constructor(api?: TableOutput) {
     const now = new Date()
     super(
       api || {
@@ -202,16 +201,13 @@ export class Output extends EntityBase<table.Output> {
     this.api.outputId = v
   }
   override get entityName(): string {
-    return 'Output'
+    return 'output'
   }
   override get entityTable(): string {
     return 'outputs'
   }
 
-  override equals(
-    ei: table.Output,
-    syncMap?: entity.SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableOutput, syncMap?: SyncMap | undefined): boolean {
     if (
       this.transactionId !==
         (syncMap
@@ -249,12 +245,12 @@ export class Output extends EntityBase<table.Output> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.Output,
-    syncMap: entity.SyncMap,
+    ei: TableOutput,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.Output; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityOutput; eiId: number }> {
     const transactionId = syncMap.transaction.idMap[ei.transactionId]
     const basketId = ei.basketId
       ? syncMap.outputBasket.idMap[ei.basketId]
@@ -267,15 +263,15 @@ export class Output extends EntityBase<table.Output> {
     )
     return {
       found: !!ef,
-      eo: new entity.Output(ef || { ...ei }),
+      eo: new EntityOutput(ef || { ...ei }),
       eiId: verifyId(ei.outputId)
     }
   }
 
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.userId = userId
@@ -291,10 +287,10 @@ export class Output extends EntityBase<table.Output> {
   }
 
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.Output,
-    syncMap: entity.SyncMap,
+    ei: TableOutput,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false

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

@@ -1,16 +1,15 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableOutputBasket,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class OutputBasket extends EntityBase<table.OutputBasket> {
-  constructor(api?: table.OutputBasket) {
+export class EntityOutputBasket extends EntityBase<TableOutputBasket> {
+  constructor(api?: TableOutputBasket) {
     const now = new Date()
     super(
       api || {
@@ -82,7 +81,7 @@ export class OutputBasket extends EntityBase<table.OutputBasket> {
     this.api.basketId = v
   }
   override get entityName(): string {
-    return 'OutputBasket'
+    return 'outputBasket'
   }
   override get entityTable(): string {
     return 'output_baskets'
@@ -92,7 +91,7 @@ export class OutputBasket extends EntityBase<table.OutputBasket> {
     /* nothing needed yet... */
   }
 
-  override equals(ei: table.OutputBasket, syncMap?: entity.SyncMap): boolean {
+  override equals(ei: TableOutputBasket, syncMap?: SyncMap): boolean {
     const eo = this.api
     if (
       eo.name != ei.name ||
@@ -110,12 +109,12 @@ export class OutputBasket extends EntityBase<table.OutputBasket> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.OutputBasket,
-    syncMap: entity.SyncMap,
+    ei: TableOutputBasket,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: OutputBasket; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityOutputBasket; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findOutputBaskets({
         partial: { name: ei.name, userId },
@@ -124,16 +123,16 @@ export class OutputBasket extends EntityBase<table.OutputBasket> {
     )
     return {
       found: !!ef,
-      eo: new OutputBasket(ef || { ...ei }),
+      eo: new EntityOutputBasket(ef || { ...ei }),
       eiId: verifyId(ei.basketId)
     }
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.userId = userId
@@ -144,10 +143,10 @@ export class OutputBasket extends EntityBase<table.OutputBasket> {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.OutputBasket,
-    syncMap: entity.SyncMap,
+    ei: TableOutputBasket,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false

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

@@ -2,16 +2,15 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableOutputTag,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class OutputTag extends EntityBase<table.OutputTag> {
-  constructor(api?: table.OutputTag) {
+export class EntityOutputTag extends EntityBase<TableOutputTag> {
+  constructor(api?: TableOutputTag) {
     const now = new Date()
     super(
       api || {
@@ -73,16 +72,13 @@ export class OutputTag extends EntityBase<table.OutputTag> {
     this.api.outputTagId = v
   }
   override get entityName(): string {
-    return 'entity.OutputTag'
+    return 'outputTag'
   }
   override get entityTable(): string {
     return 'output_tags'
   }
 
-  override equals(
-    ei: table.OutputTag,
-    syncMap?: entity.SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableOutputTag, syncMap?: SyncMap | undefined): boolean {
     const eo = this.toApi()
     if (eo.tag != ei.tag || eo.isDeleted != ei.isDeleted) return false
     if (!syncMap) {
@@ -92,26 +88,26 @@ export class OutputTag extends EntityBase<table.OutputTag> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.OutputTag,
-    syncMap: entity.SyncMap,
+    ei: TableOutputTag,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.OutputTag; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityOutputTag; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findOutputTags({ partial: { tag: ei.tag, userId }, trx })
     )
     return {
       found: !!ef,
-      eo: new entity.OutputTag(ef || { ...ei }),
+      eo: new EntityOutputTag(ef || { ...ei }),
       eiId: verifyId(ei.outputTagId)
     }
   }
 
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.userId = userId
@@ -120,10 +116,10 @@ export class OutputTag extends EntityBase<table.OutputTag> {
   }
 
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.OutputTag,
-    syncMap: entity.SyncMap,
+    ei: TableOutputTag,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false

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

@@ -2,16 +2,15 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableOutputTagMap,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityStorage, SyncMap } from '.'
 
-export class OutputTagMap extends EntityBase<table.OutputTagMap> {
-  constructor(api?: table.OutputTagMap) {
+export class EntityOutputTagMap extends EntityBase<TableOutputTagMap> {
+  constructor(api?: TableOutputTagMap) {
     const now = new Date()
     super(
       api || {
@@ -63,15 +62,15 @@ export class OutputTagMap extends EntityBase<table.OutputTagMap> {
     throw new sdk.WERR_INVALID_OPERATION('entity has no "id" value')
   }
   override get entityName(): string {
-    return 'OutputTagMap'
+    return 'outputTagMap'
   }
   override get entityTable(): string {
     return 'output_tags_map'
   }
 
   override equals(
-    ei: table.OutputTagMap,
-    syncMap?: entity.SyncMap | undefined
+    ei: TableOutputTagMap,
+    syncMap?: SyncMap | undefined
   ): boolean {
     const eo = this.toApi()
 
@@ -90,12 +89,12 @@ export class OutputTagMap extends EntityBase<table.OutputTagMap> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.OutputTagMap,
-    syncMap: entity.SyncMap,
+    ei: TableOutputTagMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.OutputTagMap; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityOutputTagMap; eiId: number }> {
     const outputId = syncMap.output.idMap[ei.outputId]
     const outputTagId = syncMap.outputTag.idMap[ei.outputTagId]
     const ef = verifyOneOrNone(
@@ -106,15 +105,15 @@ export class OutputTagMap extends EntityBase<table.OutputTagMap> {
     )
     return {
       found: !!ef,
-      eo: new entity.OutputTagMap(ef || { ...ei }),
+      eo: new EntityOutputTagMap(ef || { ...ei }),
       eiId: -1
     }
   }
 
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.outputId = syncMap.output.idMap[this.outputId]
@@ -123,10 +122,10 @@ export class OutputTagMap extends EntityBase<table.OutputTagMap> {
   }
 
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.OutputTagMap,
-    syncMap: entity.SyncMap,
+    ei: TableOutputTagMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     let wasMerged = false

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

@@ -1,15 +1,14 @@
 import { MerklePath } from '@bsv/sdk'
 import {
   arraysEqual,
-  entity,
   sdk,
-  table,
+  TableProvenTx,
   verifyId,
   verifyOneOrNone
 } from '../../../index.client'
-import { EntityBase } from '.'
+import { EntityBase, EntityProvenTxReq, EntityStorage, SyncMap } from '.'
 
-export class ProvenTx extends EntityBase<table.ProvenTx> {
+export class EntityProvenTx extends EntityBase<TableProvenTx> {
   /**
    * Given a txid and optionally its rawTx, create a new ProvenTx object.
    *
@@ -48,7 +47,7 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
     if (gmpr.merklePath && gmpr.header) {
       const index = gmpr.merklePath.path[0].find(l => l.hash === txid)?.offset
       if (index !== undefined) {
-        const api: table.ProvenTx = {
+        const api: TableProvenTx = {
           created_at: new Date(),
           updated_at: new Date(),
           provenTxId: 0,
@@ -60,14 +59,14 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
           blockHash: gmpr.header.hash,
           merkleRoot: gmpr.header.merkleRoot
         }
-        r.proven = new ProvenTx(api)
+        r.proven = new EntityProvenTx(api)
       }
     }
 
     return r
   }
 
-  constructor(api?: table.ProvenTx) {
+  constructor(api?: TableProvenTx) {
     const now = new Date()
     super(
       api || {
@@ -165,16 +164,13 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
     this.api.provenTxId = v
   }
   override get entityName(): string {
-    return 'ProvenTx'
+    return 'provenTx'
   }
   override get entityTable(): string {
     return 'proven_txs'
   }
 
-  override equals(
-    ei: table.ProvenTx,
-    syncMap?: entity.SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableProvenTx, syncMap?: SyncMap | undefined): boolean {
     const eo = this.toApi()
     if (
       eo.txid != ei.txid ||
@@ -198,26 +194,26 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
   }
 
   static async mergeFind(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    ei: table.ProvenTx,
-    syncMap: entity.SyncMap,
+    ei: TableProvenTx,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
-  ): Promise<{ found: boolean; eo: entity.ProvenTx; eiId: number }> {
+  ): Promise<{ found: boolean; eo: EntityProvenTx; eiId: number }> {
     const ef = verifyOneOrNone(
       await storage.findProvenTxs({ partial: { txid: ei.txid }, trx })
     )
     return {
       found: !!ef,
-      eo: new ProvenTx(ef || { ...ei }),
+      eo: new EntityProvenTx(ef || { ...ei }),
       eiId: verifyId(ei.provenTxId)
     }
   }
 
   override async mergeNew(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     userId: number,
-    syncMap: entity.SyncMap,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<void> {
     this.provenTxId = 0
@@ -226,10 +222,10 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
   }
 
   override async mergeExisting(
-    storage: entity.EntityStorage,
+    storage: EntityStorage,
     since: Date | undefined,
-    ei: table.ProvenTx,
-    syncMap: entity.SyncMap,
+    ei: TableProvenTx,
+    syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<boolean> {
     // ProvenTxs are never updated.
@@ -256,10 +252,10 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
    * @returns
    */
   static async fromReq(
-    req: entity.ProvenTxReq,
+    req: EntityProvenTxReq,
     gmpResult: sdk.GetMerklePathResult,
     countsAsAttempt: boolean
-  ): Promise<ProvenTx | undefined> {
+  ): 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')
 
@@ -285,8 +281,8 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
         )
 
         if (
-          req.attempts > entity.ProvenTx.getProofAttemptsLimit &&
-          reqAgeInMinutes > entity.ProvenTx.getProofMinutes
+          req.attempts > EntityProvenTx.getProofAttemptsLimit &&
+          reqAgeInMinutes > EntityProvenTx.getProofMinutes
         ) {
           // Start the process of setting transactions to 'failed'
           req.addHistoryNote({
@@ -318,7 +314,7 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
             'merkle path does not contain leaf for txid'
           )
 
-        const proven = new ProvenTx({
+        const proven = new EntityProvenTx({
           created_at: now,
           updated_at: now,
           provenTxId: 0,
@@ -344,6 +340,6 @@ export class ProvenTx extends EntityBase<table.ProvenTx> {
 }
 
 export interface ProvenTxFromTxidResult {
-  proven?: entity.ProvenTx
+  proven?: EntityProvenTx
   rawTx?: number[]
 }