@bsv/wallet-toolbox 1.1.60 → 1.1.61

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

@@ -52,12 +52,8 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
         syncMap: JSON.stringify(createSyncMap())
       }
     )
-    this.errorLocal = this.api.errorLocal
-      ? <SyncError>JSON.parse(this.api.errorLocal)
-      : undefined
-    this.errorOther = this.api.errorOther
-      ? <SyncError>JSON.parse(this.api.errorOther)
-      : undefined
+    this.errorLocal = this.api.errorLocal ? <SyncError>JSON.parse(this.api.errorLocal) : undefined
+    this.errorOther = this.api.errorOther ? <SyncError>JSON.parse(this.api.errorOther) : undefined
     this.syncMap = <SyncMap>JSON.parse(this.api.syncMap)
     this.validateSyncMap(this.syncMap)
   }
@@ -65,8 +61,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
   validateSyncMap(sm: SyncMap) {
     for (const key of Object.keys(sm)) {
       const esm: EntitySyncMap = sm[key]
-      if (typeof esm.maxUpdated_at === 'string')
-        esm.maxUpdated_at = new Date(esm.maxUpdated_at)
+      if (typeof esm.maxUpdated_at === 'string') esm.maxUpdated_at = new Date(esm.maxUpdated_at)
     }
   }
 
@@ -75,9 +70,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
     userIdentityKey: string,
     remoteSettings: TableSettings
   ): Promise<EntitySyncState> {
-    const { user } = verifyTruthy(
-      await storage.findOrInsertUser(userIdentityKey)
-    )
+    const { user } = verifyTruthy(await storage.findOrInsertUser(userIdentityKey))
     let { syncState: api } = verifyTruthy(
       await storage.findOrInsertSyncStateAuth(
         { userId: user.userId, identityKey: userIdentityKey },
@@ -85,6 +78,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
         remoteSettings.storageName
       )
     )
+    if (!api.syncMap || api.syncMap === '{}') api.syncMap = JSON.stringify(createSyncMap())
     const ss = new EntitySyncState(api)
     return ss
   }
@@ -95,11 +89,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?: sdk.TrxToken) {
     this.updated_at = new Date()
     this.updateApi(notSyncMap && this.id > 0)
     if (this.id === 0) {
@@ -203,10 +193,7 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
     return 'sync_states'
   }
 
-  static mergeIdMap(
-    fromMap: Record<number, number>,
-    toMap: Record<number, number>
-  ) {
+  static mergeIdMap(fromMap: Record<number, number>, toMap: Record<number, number>) {
     for (const [key, value] of Object.entries(fromMap)) {
       const fromValue = fromMap[key]
       const toValue = toMap[key]
@@ -223,42 +210,15 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
    * @param iSyncMap
    */
   mergeSyncMap(iSyncMap: SyncMap) {
-    EntitySyncState.mergeIdMap(
-      iSyncMap.provenTx.idMap!,
-      this.syncMap.provenTx.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.outputBasket.idMap!,
-      this.syncMap.outputBasket.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.transaction.idMap!,
-      this.syncMap.transaction.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.provenTxReq.idMap!,
-      this.syncMap.provenTxReq.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.txLabel.idMap!,
-      this.syncMap.txLabel.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.output.idMap!,
-      this.syncMap.output.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.outputTag.idMap!,
-      this.syncMap.outputTag.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.certificate.idMap!,
-      this.syncMap.certificate.idMap!
-    )
-    EntitySyncState.mergeIdMap(
-      iSyncMap.commission.idMap!,
-      this.syncMap.commission.idMap!
-    )
+    EntitySyncState.mergeIdMap(iSyncMap.provenTx.idMap!, this.syncMap.provenTx.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.outputBasket.idMap!, this.syncMap.outputBasket.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.transaction.idMap!, this.syncMap.transaction.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.provenTxReq.idMap!, this.syncMap.provenTxReq.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.txLabel.idMap!, this.syncMap.txLabel.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.output.idMap!, this.syncMap.output.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.outputTag.idMap!, this.syncMap.outputTag.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.certificate.idMap!, this.syncMap.certificate.idMap!)
+    EntitySyncState.mergeIdMap(iSyncMap.commission.idMap!, this.syncMap.commission.idMap!)
   }
 
   // stringified api properties
@@ -330,11 +290,47 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
       this.syncMap.commission,
       this.syncMap.provenTxReq
     ]) {
+      if (!ess || !ess.entityName) debugger
       a.offsets.push({ name: ess.entityName, offset: ess.count })
     }
     return a
   }
 
+  static syncChunkSummary(c: sdk.SyncChunk): string {
+    let log = ''
+    log += `SYNC CHUNK SUMMARY
+  from storage: ${c.fromStorageIdentityKey}
+  to storage: ${c.toStorageIdentityKey}
+  for user: ${c.userIdentityKey}
+`
+    if (c.user) log += `  USER activeStorage ${c.user.activeStorage}\n`
+    if (!!c.provenTxs) {
+      log += `  PROVEN_TXS\n`
+      for (const r of c.provenTxs) {
+        log += `    ${r.provenTxId} ${r.txid}\n`
+      }
+    }
+    if (!!c.provenTxReqs) {
+      log += `  PROVEN_TX_REQS\n`
+      for (const r of c.provenTxReqs) {
+        log += `    ${r.provenTxReqId} ${r.txid} ${r.status} ${r.provenTxId || ''}\n`
+      }
+    }
+    if (!!c.transactions) {
+      log += `  TRANSACTIONS\n`
+      for (const r of c.transactions) {
+        log += `    ${r.transactionId} ${r.txid} ${r.status} ${r.provenTxId || ''} sats:${r.satoshis}\n`
+      }
+    }
+    if (!!c.outputs) {
+      log += `  OUTPUTS\n`
+      for (const r of c.outputs) {
+        log += `    ${r.outputId} ${r.txid}.${r.vout} ${r.transactionId} ${r.spendable ? 'spendable' : ''} sats:${r.satoshis}\n`
+      }
+    }
+    return log
+  }
+
   async processSyncChunk(
     writer: EntityStorage,
     args: sdk.RequestSyncChunkArgs,
@@ -346,66 +342,18 @@ export class EntitySyncState extends EntityBase<TableSyncState> {
     inserts: number
   }> {
     const mes = [
-      new MergeEntity(
-        chunk.provenTxs,
-        EntityProvenTx.mergeFind,
-        this.syncMap.provenTx
-      ),
-      new MergeEntity(
-        chunk.outputBaskets,
-        EntityOutputBasket.mergeFind,
-        this.syncMap.outputBasket
-      ),
-      new MergeEntity(
-        chunk.outputTags,
-        EntityOutputTag.mergeFind,
-        this.syncMap.outputTag
-      ),
-      new MergeEntity(
-        chunk.txLabels,
-        EntityTxLabel.mergeFind,
-        this.syncMap.txLabel
-      ),
-      new MergeEntity(
-        chunk.transactions,
-        EntityTransaction.mergeFind,
-        this.syncMap.transaction
-      ),
-      new MergeEntity(
-        chunk.outputs,
-        EntityOutput.mergeFind,
-        this.syncMap.output
-      ),
-      new MergeEntity(
-        chunk.txLabelMaps,
-        EntityTxLabelMap.mergeFind,
-        this.syncMap.txLabelMap
-      ),
-      new MergeEntity(
-        chunk.outputTagMaps,
-        EntityOutputTagMap.mergeFind,
-        this.syncMap.outputTagMap
-      ),
-      new MergeEntity(
-        chunk.certificates,
-        EntityCertificate.mergeFind,
-        this.syncMap.certificate
-      ),
-      new MergeEntity(
-        chunk.certificateFields,
-        EntityCertificateField.mergeFind,
-        this.syncMap.certificateField
-      ),
-      new MergeEntity(
-        chunk.commissions,
-        EntityCommission.mergeFind,
-        this.syncMap.commission
-      ),
-      new MergeEntity(
-        chunk.provenTxReqs,
-        EntityProvenTxReq.mergeFind,
-        this.syncMap.provenTxReq
-      )
+      new MergeEntity(chunk.provenTxs, EntityProvenTx.mergeFind, this.syncMap.provenTx),
+      new MergeEntity(chunk.outputBaskets, EntityOutputBasket.mergeFind, this.syncMap.outputBasket),
+      new MergeEntity(chunk.outputTags, EntityOutputTag.mergeFind, this.syncMap.outputTag),
+      new MergeEntity(chunk.txLabels, EntityTxLabel.mergeFind, this.syncMap.txLabel),
+      new MergeEntity(chunk.transactions, EntityTransaction.mergeFind, this.syncMap.transaction),
+      new MergeEntity(chunk.outputs, EntityOutput.mergeFind, this.syncMap.output),
+      new MergeEntity(chunk.txLabelMaps, EntityTxLabelMap.mergeFind, this.syncMap.txLabelMap),
+      new MergeEntity(chunk.outputTagMaps, EntityOutputTagMap.mergeFind, this.syncMap.outputTagMap),
+      new MergeEntity(chunk.certificates, EntityCertificate.mergeFind, this.syncMap.certificate),
+      new MergeEntity(chunk.certificateFields, EntityCertificateField.mergeFind, this.syncMap.certificateField),
+      new MergeEntity(chunk.commissions, EntityCommission.mergeFind, this.syncMap.commission),
+      new MergeEntity(chunk.provenTxReqs, EntityProvenTxReq.mergeFind, this.syncMap.provenTxReq)
     ]
 
     let updates = 0

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

@@ -35,10 +35,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?: sdk.TrxToken): Promise<TableOutput[]> {
     const inputs = await storage.findOutputs({
       partial: { userId: this.userId, spentBy: this.id },
       trx
@@ -56,8 +53,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
           trx
         })
       )
-      if (pso && !inputs.some(i => i.outputId === pso.outputId))
-        inputs.push(pso)
+      if (pso && !inputs.some(i => i.outputId === pso.outputId)) inputs.push(pso)
     }
     return inputs
   }
@@ -208,18 +204,12 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
     return 'transactions'
   }
 
-  override equals(
-    ei: TableTransaction,
-    syncMap?: SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableTransaction, syncMap?: SyncMap | undefined): boolean {
     const eo = this.toApi()
 
     // Properties that are never updated
     if (
-      eo.transactionId !==
-        (syncMap
-          ? syncMap.transaction.idMap[verifyId(ei.transactionId)]
-          : ei.transactionId) ||
+      eo.transactionId !== (syncMap ? syncMap.transaction.idMap[verifyId(ei.transactionId)] : ei.transactionId) ||
       eo.reference !== ei.reference
     )
       return false
@@ -239,11 +229,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
 
     if (
       !eo.provenTxId !== !ei.provenTxId ||
-      (ei.provenTxId &&
-        eo.provenTxId !==
-          (syncMap
-            ? syncMap.provenTx.idMap[verifyId(ei.provenTxId)]
-            : ei.provenTxId))
+      (ei.provenTxId && eo.provenTxId !== (syncMap ? syncMap.provenTx.idMap[verifyId(ei.provenTxId)] : ei.provenTxId))
     )
       return false
 
@@ -270,14 +256,8 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
     }
   }
 
-  override async mergeNew(
-    storage: EntityStorage,
-    userId: number,
-    syncMap: SyncMap,
-    trx?: sdk.TrxToken
-  ): Promise<void> {
-    if (this.provenTxId)
-      this.provenTxId = syncMap.provenTx.idMap[this.provenTxId]
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+    if (this.provenTxId) this.provenTxId = syncMap.provenTx.idMap[this.provenTxId]
     this.userId = userId
     this.transactionId = 0
     this.transactionId = await storage.insertTransaction(this.toApi(), trx)
@@ -302,25 +282,20 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
       this.lockTime = ei.lockTime
       this.isOutgoing = ei.isOutgoing
       this.status = ei.status
-      this.provenTxId = ei.provenTxId
-        ? syncMap.provenTx.idMap[ei.provenTxId]
-        : undefined
+      this.provenTxId = ei.provenTxId ? syncMap.provenTx.idMap[ei.provenTxId] : undefined
       this.satoshis = ei.satoshis
       this.txid = ei.txid
       this.description = ei.description
       this.rawTx = ei.rawTx
       this.inputBEEF = ei.inputBEEF
-      this.updated_at = new Date()
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
       await storage.updateTransaction(this.id, this.toApi(), trx)
       wasMerged = true
     }
     return wasMerged
   }
 
-  async getProvenTx(
-    storage: EntityStorage,
-    trx?: sdk.TrxToken
-  ): Promise<EntityProvenTx | undefined> {
+  async getProvenTx(storage: EntityStorage, trx?: sdk.TrxToken): Promise<EntityProvenTx | undefined> {
     if (!this.provenTxId) return undefined
     const p = verifyOneOrNone(
       await storage.findProvenTxs({

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

@@ -1,12 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  sdk,
-  TableTxLabel,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, sdk, TableTxLabel, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityTxLabel extends EntityBase<TableTxLabel> {
@@ -94,9 +88,7 @@ export class EntityTxLabel extends EntityBase<TableTxLabel> {
     syncMap: SyncMap,
     trx?: sdk.TrxToken
   ): Promise<{ found: boolean; eo: EntityTxLabel; eiId: number }> {
-    const ef = verifyOneOrNone(
-      await storage.findTxLabels({ partial: { label: ei.label, userId }, trx })
-    )
+    const ef = verifyOneOrNone(await storage.findTxLabels({ partial: { label: ei.label, userId }, trx }))
     return {
       found: !!ef,
       eo: new EntityTxLabel(ef || { ...ei }),
@@ -104,12 +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?: sdk.TrxToken): Promise<void> {
     this.userId = userId
     this.txLabelId = 0
     this.txLabelId = await storage.insertTxLabel(this.toApi(), trx)
@@ -125,7 +112,7 @@ export class EntityTxLabel extends EntityBase<TableTxLabel> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {
       this.isDeleted = ei.isDeleted
-      this.updated_at = new Date()
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
       await storage.updateTxLabel(this.id, this.toApi(), trx)
       wasMerged = true
     }

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

@@ -1,12 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  sdk,
-  TableTxLabelMap,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, sdk, TableTxLabelMap, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityTxLabelMap extends EntityBase<TableTxLabelMap> {
@@ -72,14 +66,8 @@ export class EntityTxLabelMap extends EntityBase<TableTxLabelMap> {
     const eo = this.toApi()
 
     if (
-      eo.transactionId !==
-        (syncMap
-          ? syncMap.transaction.idMap[verifyId(ei.transactionId)]
-          : ei.transactionId) ||
-      eo.txLabelId !==
-        (syncMap
-          ? syncMap.txLabel.idMap[verifyId(ei.txLabelId)]
-          : ei.txLabelId) ||
+      eo.transactionId !== (syncMap ? syncMap.transaction.idMap[verifyId(ei.transactionId)] : ei.transactionId) ||
+      eo.txLabelId !== (syncMap ? syncMap.txLabel.idMap[verifyId(ei.txLabelId)] : ei.txLabelId) ||
       eo.isDeleted !== ei.isDeleted
     )
       return false
@@ -109,12 +97,7 @@ export class EntityTxLabelMap extends EntityBase<TableTxLabelMap> {
     }
   }
 
-  override async mergeNew(
-    storage: EntityStorage,
-    userId: number,
-    syncMap: SyncMap,
-    trx?: sdk.TrxToken
-  ): Promise<void> {
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
     this.transactionId = syncMap.transaction.idMap[this.transactionId]
     this.txLabelId = syncMap.txLabel.idMap[this.txLabelId]
     await storage.insertTxLabelMap(this.toApi(), trx)
@@ -130,13 +113,8 @@ export class EntityTxLabelMap extends EntityBase<TableTxLabelMap> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {
       this.isDeleted = ei.isDeleted
-      this.updated_at = new Date()
-      await storage.updateTxLabelMap(
-        this.transactionId,
-        this.txLabelId,
-        this.toApi(),
-        trx
-      )
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
+      await storage.updateTxLabelMap(this.transactionId, this.txLabelId, this.toApi(), trx)
       wasMerged = true
     }
     return wasMerged

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

@@ -1,12 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  sdk,
-  TableUser,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, sdk, TableUser, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityUser extends EntityBase<TableUser> {
@@ -73,11 +67,7 @@ export class EntityUser extends EntityBase<TableUser> {
 
   override equals(ei: TableUser, syncMap?: SyncMap | undefined): boolean {
     const eo = this.toApi()
-    if (
-      eo.identityKey != ei.identityKey ||
-      eo.activeStorage != ei.activeStorage
-    )
-      return false
+    if (eo.identityKey != ei.identityKey || eo.activeStorage != ei.activeStorage) return false
     if (!syncMap) {
       /** */
     }
@@ -89,26 +79,16 @@ export class EntityUser extends EntityBase<TableUser> {
     ei: TableUser,
     trx?: sdk.TrxToken
   ): Promise<{ found: boolean; eo: EntityUser; eiId: number }> {
-    const ef = verifyOneOrNone(
-      await storage.findUsers({ partial: { identityKey: ei.identityKey }, trx })
-    )
-    if (ef && ef.userId != userId)
-      throw new sdk.WERR_INTERNAL('logic error, userIds don not match.')
+    const ef = verifyOneOrNone(await storage.findUsers({ partial: { identityKey: ei.identityKey }, trx }))
+    if (ef && ef.userId != userId) throw new sdk.WERR_INTERNAL('logic error, userIds don not match.')
     return {
       found: !!ef,
       eo: new EntityUser(ef || { ...ei }),
       eiId: verifyId(ei.userId)
     }
   }
-  override async mergeNew(
-    storage: EntityStorage,
-    userId: number,
-    syncMap: SyncMap,
-    trx?: sdk.TrxToken
-  ): Promise<void> {
-    throw new sdk.WERR_INTERNAL(
-      'a sync chunk merge must never create a new user'
-    )
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+    throw new sdk.WERR_INTERNAL('a sync chunk merge must never create a new user')
   }
   override async mergeExisting(
     storage: EntityStorage,
@@ -120,12 +100,9 @@ export class EntityUser extends EntityBase<TableUser> {
     let wasMerged = false
     // The condition on activeStorage here is critical as a new user record may have just been created
     // in a backup store to which a backup is being pushed.
-    if (
-      ei.updated_at > this.updated_at ||
-      (this.activeStorage === undefined && ei.activeStorage !== undefined)
-    ) {
+    if (ei.updated_at > this.updated_at || (this.activeStorage === undefined && ei.activeStorage !== undefined)) {
       this.activeStorage = ei.activeStorage
-      this.updated_at = new Date()
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
       await storage.updateUser(this.id, this.toApi(), trx)
       wasMerged = true
     }

package/src/storage/schema/entities/__tests/CertificateFieldTests.test.ts

@@ -1,14 +1,5 @@
-import {
-  createSyncMap,
-  sdk,
-  SyncMap,
-  TableCertificate,
-  TableCertificateField
-} from '../../../../../src'
-import {
-  TestUtilsWalletStorage as _tu,
-  TestWalletNoSetup
-} from '../../../../../test/utils/TestUtilsWalletStorage'
+import { createSyncMap, sdk, SyncMap, TableCertificate, TableCertificateField } from '../../../../../src'
+import { TestUtilsWalletStorage as _tu, TestWalletNoSetup } from '../../../../../test/utils/TestUtilsWalletStorage'
 import { EntityCertificateField } from '../../../../../src/storage/schema/entities/CertificateField'
 
 describe('CertificateField class method tests', () => {
@@ -21,9 +12,7 @@ describe('CertificateField class method tests', () => {
   beforeAll(async () => {
     if (env.runMySQL) {
       ctxs.push(await _tu.createLegacyWalletMySQLCopy('CertificateFieldTests'))
-      ctxs2.push(
-        await _tu.createLegacyWalletMySQLCopy('CertificateFieldTests2')
-      )
+      ctxs2.push(await _tu.createLegacyWalletMySQLCopy('CertificateFieldTests2'))
     }
     ctxs.push(await _tu.createLegacyWalletSQLiteCopy('CertificateFieldTests'))
     ctxs2.push(await _tu.createLegacyWalletSQLiteCopy('CertificateFieldTests2'))
@@ -50,14 +39,10 @@ describe('CertificateField class method tests', () => {
         userId: 1,
         type: Buffer.from('exampleType').toString('base64'), // Base64-encoded string
         serialNumber: Buffer.from('serial123').toString('base64'), // Base64-encoded string
-        certifier:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234', // PubKeyHex
-        subject:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // PubKeyHex
-        revocationOutpoint:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0', // OutpointString
-        signature:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890', // HexString
+        certifier: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234', // PubKeyHex
+        subject: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // PubKeyHex
+        revocationOutpoint: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0', // OutpointString
+        signature: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890', // HexString
         isDeleted: false
       }
 
@@ -106,14 +91,10 @@ describe('CertificateField class method tests', () => {
         userId: 1,
         type: Buffer.from('exampleType1').toString('base64'), // Unique Base64-encoded string
         serialNumber: Buffer.from('serial123-1').toString('base64'), // Unique Base64-encoded string
-        certifier:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234', // Same PubKeyHex
-        subject:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // Same PubKeyHex
-        revocationOutpoint:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0', // Same OutpointString
-        signature:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890', // Same HexString
+        certifier: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234', // Same PubKeyHex
+        subject: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // Same PubKeyHex
+        revocationOutpoint: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0', // Same OutpointString
+        signature: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890', // Same HexString
         isDeleted: false
       })
 
@@ -124,14 +105,10 @@ describe('CertificateField class method tests', () => {
         userId: 1,
         type: Buffer.from('exampleType2').toString('base64'), // Unique Base64-encoded string
         serialNumber: Buffer.from('serial123-2').toString('base64'), // Unique Base64-encoded string
-        certifier:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // Same PubKeyHex
-        subject:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // Same PubKeyHex
-        revocationOutpoint:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:1', // Unique OutpointString
-        signature:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890', // Same HexString
+        certifier: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // Same PubKeyHex
+        subject: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678', // Same PubKeyHex
+        revocationOutpoint: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:1', // Unique OutpointString
+        signature: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890', // Same HexString
         isDeleted: false
       })
 
@@ -187,14 +164,10 @@ describe('CertificateField class method tests', () => {
         userId: 1,
         type: Buffer.from('exampleTypeMerge').toString('base64'),
         serialNumber: Buffer.from('serialMerge123').toString('base64'),
-        certifier:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234',
-        subject:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678',
-        revocationOutpoint:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0',
-        signature:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
+        certifier: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234',
+        subject: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678',
+        revocationOutpoint: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0',
+        signature: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
         isDeleted: false
       })
 
@@ -265,14 +238,10 @@ describe('CertificateField class method tests', () => {
         userId: 1,
         type: Buffer.from('exampleTypeNoMerge').toString('base64'),
         serialNumber: Buffer.from('serialNoMerge123').toString('base64'),
-        certifier:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234',
-        subject:
-          '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678',
-        revocationOutpoint:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0',
-        signature:
-          'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
+        certifier: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef1234',
+        subject: '02c123eabcdeff1234567890abcdef1234567890abcdef1234567890abcdef5678',
+        revocationOutpoint: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890:0',
+        signature: 'abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
         isDeleted: false
       })