@bsv/wallet-toolbox 1.1.60 → 1.1.62

package/src/storage/schema/KnexMigrations.ts

@@ -29,12 +29,7 @@ export class KnexMigrations implements MigrationSource<string> {
     public storageIdentityKey: string,
     public maxOutputScriptLength: number
   ) {
-    this.migrations = this.setupMigrations(
-      chain,
-      storageName,
-      storageIdentityKey,
-      maxOutputScriptLength
-    )
+    this.migrations = this.setupMigrations(chain, storageName, storageIdentityKey, maxOutputScriptLength)
   }
 
   async getMigrations(): Promise<string[]> {
@@ -65,29 +60,13 @@ export class KnexMigrations implements MigrationSource<string> {
   ): Record<string, Migration> {
     const migrations: Record<string, Migration> = {}
 
-    const addTimeStamps = (
-      knex: Knex<any, any[]>,
-      table: Knex.CreateTableBuilder,
-      dbtype: DBType
-    ) => {
+    const addTimeStamps = (knex: Knex<any, any[]>, table: Knex.CreateTableBuilder, dbtype: DBType) => {
       if (dbtype === 'MySQL') {
-        table
-          .timestamp('created_at', { precision: 3 })
-          .defaultTo(knex.fn.now(3))
-          .notNullable()
-        table
-          .timestamp('updated_at', { precision: 3 })
-          .defaultTo(knex.fn.now(3))
-          .notNullable()
+        table.timestamp('created_at', { precision: 3 }).defaultTo(knex.fn.now(3)).notNullable()
+        table.timestamp('updated_at', { precision: 3 }).defaultTo(knex.fn.now(3)).notNullable()
       } else {
-        table
-          .timestamp('created_at', { precision: 3 })
-          .defaultTo(knex.fn.now())
-          .notNullable()
-        table
-          .timestamp('updated_at', { precision: 3 })
-          .defaultTo(knex.fn.now())
-          .notNullable()
+        table.timestamp('created_at', { precision: 3 }).defaultTo(knex.fn.now()).notNullable()
+        table.timestamp('updated_at', { precision: 3 }).defaultTo(knex.fn.now()).notNullable()
       }
     }
 
@@ -142,9 +121,7 @@ export class KnexMigrations implements MigrationSource<string> {
           knex
         })
         const settings = await storage.makeAvailable()
-        await knex.raw(
-          `update users set activeStorage = '${settings.storageIdentityKey}' where activeStorage is NULL`
-        )
+        await knex.raw(`update users set activeStorage = '${settings.storageIdentityKey}' where activeStorage is NULL`)
         await knex.schema.alterTable('users', table => {
           table.string('activeStorage').notNullable().alter()
         })
@@ -187,11 +164,7 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('proven_tx_reqs', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('provenTxReqId')
-          table
-            .integer('provenTxId')
-            .unsigned()
-            .references('provenTxId')
-            .inTable('proven_txs')
+          table.integer('provenTxId').unsigned().references('provenTxId').inTable('proven_txs')
           table.string('status', 16).notNullable().defaultTo('unknown')
           table.integer('attempts').unsigned().defaultTo(0).notNullable()
           table.boolean('notified').notNullable().defaultTo(false)
@@ -212,12 +185,7 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('certificates', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('certificateId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
           table.string('serialNumber', 100).notNullable()
           table.string('type', 100).notNullable()
           table.string('certifier', 100).notNullable()
@@ -230,18 +198,8 @@ export class KnexMigrations implements MigrationSource<string> {
         })
         await knex.schema.createTable('certificate_fields', table => {
           addTimeStamps(knex, table, dbtype)
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
-          table
-            .integer('certificateId')
-            .unsigned()
-            .references('certificateId')
-            .inTable('certificates')
-            .notNullable()
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
+          table.integer('certificateId').unsigned().references('certificateId').inTable('certificates').notNullable()
           table.string('fieldName', 100).notNullable()
           table.string('fieldValue').notNullable()
           table.string('masterKey', 255).defaultTo('').notNullable()
@@ -250,35 +208,18 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('output_baskets', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('basketId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
           table.string('name', 300).notNullable()
           table.integer('numberOfDesiredUTXOs', 6).defaultTo(6).notNullable()
-          table
-            .integer('minimumDesiredUTXOValue', 15)
-            .defaultTo(10000)
-            .notNullable()
+          table.integer('minimumDesiredUTXOValue', 15).defaultTo(10000).notNullable()
           table.boolean('isDeleted').notNullable().defaultTo(false)
           table.unique(['name', 'userId'])
         })
         await knex.schema.createTable('transactions', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('transactionId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
-          table
-            .integer('provenTxId')
-            .unsigned()
-            .references('provenTxId')
-            .inTable('proven_txs')
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
+          table.integer('provenTxId').unsigned().references('provenTxId').inTable('proven_txs')
           table.string('status', 64).notNullable()
           table.string('reference', 64).notNullable().unique()
           table.boolean('isOutgoing').notNullable()
@@ -294,12 +235,7 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('commissions', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('commissionId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
           table
             .integer('transactionId')
             .unsigned()
@@ -316,23 +252,9 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('outputs', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('outputId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
-          table
-            .integer('transactionId')
-            .unsigned()
-            .references('transactionId')
-            .inTable('transactions')
-            .notNullable()
-          table
-            .integer('basketId')
-            .unsigned()
-            .references('basketId')
-            .inTable('output_baskets')
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
+          table.integer('transactionId').unsigned().references('transactionId').inTable('transactions').notNullable()
+          table.integer('basketId').unsigned().references('basketId').inTable('output_baskets')
           table.boolean('spendable').defaultTo(false).notNullable()
           table.boolean('change').defaultTo(false).notNullable()
           table.integer('vout', 10).notNullable()
@@ -346,11 +268,7 @@ export class KnexMigrations implements MigrationSource<string> {
           table.string('derivationPrefix', 32)
           table.string('derivationSuffix', 32)
           table.string('customInstructions', 2500)
-          table
-            .integer('spentBy')
-            .unsigned()
-            .references('transactionId')
-            .inTable('transactions')
+          table.integer('spentBy').unsigned().references('transactionId').inTable('transactions')
           table.integer('sequenceNumber').unsigned().nullable()
           table.string('spendingDescription')
           table.bigint('scriptLength').unsigned().nullable()
@@ -361,30 +279,15 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('output_tags', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('outputTagId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
           table.string('tag', 150).notNullable()
           table.boolean('isDeleted').notNullable().defaultTo(false)
           table.unique(['tag', 'userId'])
         })
         await knex.schema.createTable('output_tags_map', table => {
           addTimeStamps(knex, table, dbtype)
-          table
-            .integer('outputTagId')
-            .unsigned()
-            .references('outputTagId')
-            .inTable('output_tags')
-            .notNullable()
-          table
-            .integer('outputId')
-            .unsigned()
-            .references('outputId')
-            .inTable('outputs')
-            .notNullable()
+          table.integer('outputTagId').unsigned().references('outputTagId').inTable('output_tags').notNullable()
+          table.integer('outputId').unsigned().references('outputId').inTable('outputs').notNullable()
           table.boolean('isDeleted').notNullable().defaultTo(false)
           table.unique(['outputTagId', 'outputId'])
           table.index('outputId')
@@ -392,30 +295,15 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('tx_labels', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('txLabelId')
-          table
-            .integer('userId')
-            .unsigned()
-            .references('userId')
-            .inTable('users')
-            .notNullable()
+          table.integer('userId').unsigned().references('userId').inTable('users').notNullable()
           table.string('label', 300).notNullable()
           table.boolean('isDeleted').notNullable().defaultTo(false)
           table.unique(['label', 'userId'])
         })
         await knex.schema.createTable('tx_labels_map', table => {
           addTimeStamps(knex, table, dbtype)
-          table
-            .integer('txLabelId')
-            .unsigned()
-            .references('txLabelId')
-            .inTable('tx_labels')
-            .notNullable()
-          table
-            .integer('transactionId')
-            .unsigned()
-            .references('transactionId')
-            .inTable('transactions')
-            .notNullable()
+          table.integer('txLabelId').unsigned().references('txLabelId').inTable('tx_labels').notNullable()
+          table.integer('transactionId').unsigned().references('transactionId').inTable('transactions').notNullable()
           table.boolean('isDeleted').notNullable().defaultTo(false)
           table.unique(['txLabelId', 'transactionId'])
           table.index('transactionId')
@@ -437,12 +325,7 @@ export class KnexMigrations implements MigrationSource<string> {
         await knex.schema.createTable('sync_states', table => {
           addTimeStamps(knex, table, dbtype)
           table.increments('syncStateId')
-          table
-            .integer('userId')
-            .unsigned()
-            .notNullable()
-            .references('userId')
-            .inTable('users')
+          table.integer('userId').unsigned().notNullable().references('userId').inTable('users')
           table.string('storageIdentityKey', 130).notNullable().defaultTo('')
           table.string('storageName').notNullable()
           table.string('status').notNullable().defaultTo('unknown')
@@ -458,22 +341,12 @@ export class KnexMigrations implements MigrationSource<string> {
         })
 
         if (dbtype === 'MySQL') {
-          await knex.raw(
-            'ALTER TABLE proven_tx_reqs MODIFY COLUMN rawTx LONGBLOB'
-          )
-          await knex.raw(
-            'ALTER TABLE proven_tx_reqs MODIFY COLUMN inputBEEF LONGBLOB'
-          )
+          await knex.raw('ALTER TABLE proven_tx_reqs MODIFY COLUMN rawTx LONGBLOB')
+          await knex.raw('ALTER TABLE proven_tx_reqs MODIFY COLUMN inputBEEF LONGBLOB')
           await knex.raw('ALTER TABLE proven_txs MODIFY COLUMN rawTx LONGBLOB')
-          await knex.raw(
-            'ALTER TABLE transactions MODIFY COLUMN rawTx LONGBLOB'
-          )
-          await knex.raw(
-            'ALTER TABLE transactions MODIFY COLUMN inputBEEF LONGBLOB'
-          )
-          await knex.raw(
-            'ALTER TABLE outputs MODIFY COLUMN lockingScript LONGBLOB'
-          )
+          await knex.raw('ALTER TABLE transactions MODIFY COLUMN rawTx LONGBLOB')
+          await knex.raw('ALTER TABLE transactions MODIFY COLUMN inputBEEF LONGBLOB')
+          await knex.raw('ALTER TABLE outputs MODIFY COLUMN lockingScript LONGBLOB')
         } else {
           await knex.schema.alterTable('proven_tx_reqs', table => {
             table.binary('rawTx', 10000000).alter()
@@ -538,16 +411,12 @@ export class KnexMigrations implements MigrationSource<string> {
       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.`
-        )
+        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.`
-      )
+      throw new sdk.WERR_NOT_IMPLEMENTED(`Attempting to create database on unsuported engine.`)
     }
   }
 }

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

@@ -1,12 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  sdk,
-  TableCertificate,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, sdk, TableCertificate, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityCertificate extends EntityBase<TableCertificate> {
@@ -162,12 +156,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?: sdk.TrxToken): Promise<void> {
     this.userId = userId
     this.certificateId = 0
     this.certificateId = await storage.insertCertificate(this.toApi(), trx)
@@ -189,7 +178,7 @@ export class EntityCertificate extends EntityBase<TableCertificate> {
       this.signature = ei.signature
       this.verifier = ei.verifier
       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.updateCertificate(this.id, this.toApi(), trx)
       wasMerged = true
     }

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

@@ -1,11 +1,5 @@
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  sdk,
-  TableCertificateField,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, sdk, TableCertificateField, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityCertificateField extends EntityBase<TableCertificateField> {
@@ -81,15 +75,9 @@ export class EntityCertificateField extends EntityBase<TableCertificateField> {
     return 'certificate_fields'
   }
 
-  override equals(
-    ei: TableCertificateField,
-    syncMap?: SyncMap | undefined
-  ): boolean {
+  override equals(ei: TableCertificateField, syncMap?: SyncMap | undefined): boolean {
     if (
-      this.certificateId !==
-        (syncMap
-          ? syncMap.certificate.idMap[ei.certificateId]
-          : ei.certificateId) ||
+      this.certificateId !== (syncMap ? syncMap.certificate.idMap[ei.certificateId] : ei.certificateId) ||
       this.fieldName !== ei.fieldName ||
       this.fieldValue !== ei.fieldValue ||
       this.masterKey !== ei.masterKey
@@ -120,12 +108,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?: sdk.TrxToken): Promise<void> {
     this.certificateId = syncMap.certificate.idMap[this.certificateId]
     this.userId = userId
     await storage.insertCertificateField(this.toApi(), trx)
@@ -142,13 +125,8 @@ export class EntityCertificateField extends EntityBase<TableCertificateField> {
     if (ei.updated_at > this.updated_at) {
       this.fieldValue = ei.fieldValue
       this.masterKey = ei.masterKey
-      this.updated_at = new Date()
-      await storage.updateCertificateField(
-        this.certificateId,
-        this.fieldName,
-        this.toApi(),
-        trx
-      )
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
+      await storage.updateCertificateField(this.certificateId, this.fieldName, this.toApi(), trx)
       wasMerged = true
     }
     return wasMerged

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

@@ -1,12 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  sdk,
-  TableCommission,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, sdk, TableCommission, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityCommission extends EntityBase<TableCommission> {
@@ -102,10 +96,7 @@ export class EntityCommission extends EntityBase<TableCommission> {
   override equals(ei: TableCommission, syncMap?: SyncMap | undefined): boolean {
     if (
       this.isRedeemed !== ei.isRedeemed ||
-      this.transactionId !==
-        (syncMap
-          ? syncMap.transaction.idMap[ei.transactionId]
-          : ei.transactionId) ||
+      this.transactionId !== (syncMap ? syncMap.transaction.idMap[ei.transactionId] : ei.transactionId) ||
       this.keyOffset !== ei.keyOffset ||
       !arraysEqual(this.lockingScript, ei.lockingScript) ||
       this.satoshis !== ei.satoshis
@@ -123,9 +114,7 @@ export class EntityCommission extends EntityBase<TableCommission> {
     trx?: sdk.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 })
-    )
+    const ef = verifyOneOrNone(await storage.findCommissions({ partial: { transactionId, userId }, trx }))
     return {
       found: !!ef,
       eo: new EntityCommission(ef || { ...ei }),
@@ -133,14 +122,8 @@ export class EntityCommission extends EntityBase<TableCommission> {
     }
   }
 
-  override async mergeNew(
-    storage: EntityStorage,
-    userId: number,
-    syncMap: SyncMap,
-    trx?: sdk.TrxToken
-  ): Promise<void> {
-    if (this.transactionId)
-      this.transactionId = syncMap.transaction.idMap[this.transactionId]
+  override async mergeNew(storage: EntityStorage, userId: number, syncMap: SyncMap, trx?: sdk.TrxToken): Promise<void> {
+    if (this.transactionId) this.transactionId = syncMap.transaction.idMap[this.transactionId]
     this.userId = userId
     this.commissionId = 0
     this.commissionId = await storage.insertCommission(this.toApi(), trx)
@@ -156,7 +139,7 @@ export class EntityCommission extends EntityBase<TableCommission> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {
       this.isRedeemed = ei.isRedeemed
-      this.updated_at = new Date()
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
       await storage.updateCommission(this.id, this.toApi(), trx)
       wasMerged = true
     }

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

@@ -53,12 +53,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?: sdk.TrxToken): Promise<void>
 
   /**
    * Perform a 'merge' / 'convergent' equality migration of state

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

@@ -6,10 +6,7 @@ import { EntityBase, EntityStorage, EntitySyncMap, SyncMap } from './EntityBase'
  * @param API one of the storage table interfaces.
  * @param DE the corresponding entity class
  */
-export class MergeEntity<
-  API extends sdk.EntityTimeStamp,
-  DE extends EntityBase<API>
-> {
+export class MergeEntity<API extends sdk.EntityTimeStamp, DE extends EntityBase<API>> {
   idMap: Record<number, number>
 
   constructor(
@@ -33,9 +30,7 @@ export class MergeEntity<
     if (map[i] === undefined) {
       map[i] = o
     } else if (map[i] !== o)
-      throw new sdk.WERR_INTERNAL(
-        `updateSyncMap map[${inId}] can't override ${map[i]} with ${o}`
-      )
+      throw new sdk.WERR_INTERNAL(`updateSyncMap map[${inId}] can't override ${map[i]} with ${o}`)
   }
 
   /**
@@ -57,22 +52,20 @@ export class MergeEntity<
        * TODO:
        * Switch to using syncMap. If the ei id is in the map its an existing merge, else its a new merge.
        */
-      const { found, eo, eiId } = await this.find(
-        storage,
-        userId,
-        ei,
-        syncMap,
-        trx
-      )
-      if (found) {
-        if (await eo.mergeExisting(storage, since, ei, syncMap, trx)) {
-          updates++
+      try {
+        const { found, eo, eiId } = await this.find(storage, userId, ei, syncMap, trx)
+        if (found) {
+          if (await eo.mergeExisting(storage, since, ei, syncMap, trx)) {
+            updates++
+          }
+        } else {
+          await eo.mergeNew(storage, userId, syncMap, trx)
+          inserts++
         }
-      } else {
-        await eo.mergeNew(storage, userId, syncMap, trx)
-        inserts++
+        if (eiId > -1) this.updateSyncMap(this.idMap, eiId, eo.id)
+      } catch (eu: unknown) {
+        throw eu
       }
-      if (eiId > -1) this.updateSyncMap(this.idMap, eiId, eo.id)
     }
     return { inserts, updates }
   }

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

@@ -1,13 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { MerklePath } from '@bsv/sdk'
-import {
-  arraysEqual,
-  optionalArraysEqual,
-  sdk,
-  TableOutput,
-  verifyId,
-  verifyOneOrNone
-} from '../../../index.client'
+import { arraysEqual, optionalArraysEqual, sdk, TableOutput, verifyId, verifyOneOrNone } from '../../../index.client'
 import { EntityBase, EntityStorage, SyncMap } from '.'
 
 export class EntityOutput extends EntityBase<TableOutput> {
@@ -209,18 +202,9 @@ export class EntityOutput extends EntityBase<TableOutput> {
 
   override equals(ei: TableOutput, syncMap?: SyncMap | undefined): boolean {
     if (
-      this.transactionId !==
-        (syncMap
-          ? syncMap.transaction.idMap[ei.transactionId]
-          : ei.transactionId) ||
-      this.basketId !==
-        (syncMap && ei.basketId
-          ? syncMap.outputBasket.idMap[ei.basketId]
-          : ei.basketId) ||
-      this.spentBy !==
-        (syncMap && ei.spentBy
-          ? syncMap.transaction.idMap[ei.spentBy]
-          : ei.spentBy) ||
+      this.transactionId !== (syncMap ? syncMap.transaction.idMap[ei.transactionId] : ei.transactionId) ||
+      this.basketId !== (syncMap && ei.basketId ? syncMap.outputBasket.idMap[ei.basketId] : ei.basketId) ||
+      this.spentBy !== (syncMap && ei.spentBy ? syncMap.transaction.idMap[ei.spentBy] : ei.spentBy) ||
       this.vout !== ei.vout ||
       this.satoshis !== ei.satoshis ||
       this.spendable !== ei.spendable ||
@@ -252,9 +236,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
     trx?: sdk.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
+    const basketId = ei.basketId ? syncMap.outputBasket.idMap[ei.basketId] : null
     const ef = verifyOneOrNone(
       await storage.findOutputs({
         partial: { userId, transactionId, vout: ei.vout },
@@ -268,20 +250,11 @@ 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?: sdk.TrxToken): Promise<void> {
     this.userId = userId
-    this.basketId = this.basketId
-      ? syncMap.outputBasket.idMap[this.basketId]
-      : undefined
+    this.basketId = this.basketId ? syncMap.outputBasket.idMap[this.basketId] : undefined
     this.transactionId = syncMap.transaction.idMap[this.transactionId]
-    this.spentBy = this.spentBy
-      ? syncMap.transaction.idMap[this.spentBy]
-      : undefined
+    this.spentBy = this.spentBy ? syncMap.transaction.idMap[this.spentBy] : undefined
     this.outputId = 0
     this.outputId = await storage.insertOutput(this.toApi(), trx)
   }
@@ -295,9 +268,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
   ): Promise<boolean> {
     let wasMerged = false
     if (ei.updated_at > this.updated_at) {
-      this.spentBy = ei.spentBy
-        ? syncMap.transaction.idMap[ei.spentBy]
-        : undefined
+      this.spentBy = ei.spentBy ? syncMap.transaction.idMap[ei.spentBy] : undefined
       this.spendable = ei.spendable
       this.change = ei.change
       this.type = ei.type
@@ -310,7 +281,7 @@ export class EntityOutput extends EntityBase<TableOutput> {
       this.scriptLength = ei.scriptLength
       this.scriptOffset = ei.scriptOffset
       this.lockingScript = ei.lockingScript
-      this.updated_at = new Date()
+      this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()))
       await storage.updateOutput(this.id, this.toApi(), trx)
       wasMerged = true
     }