@bsv/wallet-toolbox 1.1.60 → 1.1.62

package/src/storage/methods/internalizeAction.ts

@@ -23,8 +23,7 @@ import {
   verifyOneOrNone
 } from '../../index.client'
 
-export interface StorageInternalizeActionResult
-  extends InternalizeActionResult {
+export interface StorageInternalizeActionResult extends InternalizeActionResult {
   /** true if internalizing outputs on an existing storage transaction */
   isMerge: boolean
   /** txid of transaction being internalized */
@@ -165,11 +164,7 @@ class InternalizeActionContext {
   }
 
   async asyncSetup() {
-    ;({
-      ab: this.ab,
-      tx: this.tx,
-      txid: this.txid
-    } = await this.validateAtomicBeef(this.args.tx))
+    ;({ ab: this.ab, tx: this.tx, txid: this.txid } = await this.validateAtomicBeef(this.args.tx))
 
     for (const o of this.args.outputs) {
       if (o.outputIndex < 0 || o.outputIndex >= this.tx.outputs.length)
@@ -225,14 +220,7 @@ class InternalizeActionContext {
         partial: { userId: this.userId, txid: this.txid }
       })
     )
-    if (
-      this.etx &&
-      !(
-        this.etx.status == 'completed' ||
-        this.etx.status === 'unproven' ||
-        this.etx.status === 'nosend'
-      )
-    )
+    if (this.etx && !(this.etx.status == 'completed' || this.etx.status === 'unproven' || this.etx.status === 'nosend'))
       throw new sdk.WERR_INVALID_PARAMETER(
         'tx',
         `target transaction of internalizeAction has invalid status ${this.etx.status}.`
@@ -246,11 +234,7 @@ class InternalizeActionContext {
       for (const eo of this.eos) {
         const bi = this.basketInsertions.find(b => b.vout === eo.vout)
         const wp = this.walletPayments.find(b => b.vout === eo.vout)
-        if (bi && wp)
-          throw new sdk.WERR_INVALID_PARAMETER(
-            'outputs',
-            `unique outputIndex values`
-          )
+        if (bi && wp) throw new sdk.WERR_INVALID_PARAMETER('outputs', `unique outputIndex values`)
         if (bi) bi.eo = eo
         if (wp) wp.eo = eo
       }
@@ -290,19 +274,11 @@ class InternalizeActionContext {
 
   async validateAtomicBeef(atomicBeef: number[]) {
     const ab = Beef.fromBinary(atomicBeef)
-    const txValid = await ab.verify(
-      await this.storage.getServices().getChainTracker(),
-      false
-    )
-    if (!txValid || !ab.atomicTxid)
-      throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
+    const txValid = await ab.verify(await this.storage.getServices().getChainTracker(), false)
+    if (!txValid || !ab.atomicTxid) throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
     const txid = ab.atomicTxid
     const btx = ab.findTxid(txid)
-    if (!btx)
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'tx',
-        `valid AtomicBEEF with newest txid of ${txid}`
-      )
+    if (!btx) throw new sdk.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`)
     const tx = btx.tx!
 
     /*
@@ -321,10 +297,7 @@ class InternalizeActionContext {
     return { ab, tx, txid }
   }
 
-  async findOrInsertTargetTransaction(
-    satoshis: number,
-    status: sdk.TransactionStatus
-  ): Promise<TableTransaction> {
+  async findOrInsertTargetTransaction(satoshis: number, status: sdk.TransactionStatus): Promise<TableTransaction> {
     const now = new Date()
     const newTx: TableTransaction = {
       created_at: now,
@@ -365,34 +338,24 @@ class InternalizeActionContext {
     await this.addLabels(transactionId)
 
     for (const payment of this.walletPayments) {
-      if (payment.eo && !payment.ignore)
-        await this.mergeWalletPaymentForOutput(transactionId, payment)
-      else if (!payment.ignore)
-        await this.storeNewWalletPaymentForOutput(transactionId, payment)
+      if (payment.eo && !payment.ignore) await this.mergeWalletPaymentForOutput(transactionId, payment)
+      else if (!payment.ignore) await this.storeNewWalletPaymentForOutput(transactionId, payment)
     }
 
     for (const basket of this.basketInsertions) {
-      if (basket.eo)
-        await this.mergeBasketInsertionForOutput(transactionId, basket)
+      if (basket.eo) await this.mergeBasketInsertionForOutput(transactionId, basket)
       else await this.storeNewBasketInsertionForOutput(transactionId, basket)
     }
   }
 
   async newInternalize() {
-    this.etx = await this.findOrInsertTargetTransaction(
-      this.satoshis,
-      'unproven'
-    )
+    this.etx = await this.findOrInsertTargetTransaction(this.satoshis, 'unproven')
 
     const transactionId = this.etx!.transactionId!
 
     // transaction record for user is new, but the txid may not be new to storage
     // make sure storage pursues getting a proof for it.
-    const newReq = EntityProvenTxReq.fromTxid(
-      this.txid,
-      this.tx.toBinary(),
-      this.args.tx
-    )
+    const newReq = EntityProvenTxReq.fromTxid(this.txid, this.tx.toBinary(), this.args.tx)
     newReq.status = 'unmined'
     newReq.addHistoryNote({ what: 'internalizeAction', userId: this.userId })
     newReq.addNotifyTransactionId(transactionId)
@@ -412,10 +375,7 @@ class InternalizeActionContext {
   async addLabels(transactionId: number) {
     for (const label of this.vargs.labels) {
       const txLabel = await this.storage.findOrInsertTxLabel(this.userId, label)
-      await this.storage.findOrInsertTxLabelMap(
-        verifyId(transactionId),
-        verifyId(txLabel.txLabelId)
-      )
+      await this.storage.findOrInsertTxLabelMap(verifyId(transactionId), verifyId(txLabel.txLabelId))
     }
   }
 
@@ -425,10 +385,7 @@ class InternalizeActionContext {
     }
   }
 
-  async storeNewWalletPaymentForOutput(
-    transactionId: number,
-    payment: WalletPaymentX
-  ): Promise<void> {
+  async storeNewWalletPaymentForOutput(transactionId: number, payment: WalletPaymentX): Promise<void> {
     const now = new Date()
     const txOut: TableOutput = {
       created_at: now,
@@ -459,10 +416,7 @@ class InternalizeActionContext {
     payment.eo = txOut
   }
 
-  async mergeWalletPaymentForOutput(
-    transactionId: number,
-    payment: WalletPaymentX
-  ) {
+  async mergeWalletPaymentForOutput(transactionId: number, payment: WalletPaymentX) {
     const outputId = payment.eo!.outputId!
     const update: Partial<TableOutput> = {
       basketId: this.changeBasket.basketId,
@@ -479,10 +433,7 @@ class InternalizeActionContext {
     payment.eo = { ...payment.eo!, ...update }
   }
 
-  async mergeBasketInsertionForOutput(
-    transactionId: number,
-    basket: BasketInsertionX
-  ) {
+  async mergeBasketInsertionForOutput(transactionId: number, basket: BasketInsertionX) {
     const outputId = basket.eo!.outputId!
     const update: Partial<TableOutput> = {
       basketId: (await this.getBasket(basket.basket)).basketId,
@@ -499,10 +450,7 @@ class InternalizeActionContext {
     basket.eo = { ...basket.eo!, ...update }
   }
 
-  async storeNewBasketInsertionForOutput(
-    transactionId: number,
-    basket: BasketInsertionX
-  ): Promise<void> {
+  async storeNewBasketInsertionForOutput(transactionId: number, basket: BasketInsertionX): Promise<void> {
     const now = new Date()
     const txOut: TableOutput = {
       created_at: now,

package/src/storage/methods/listActions.ts

@@ -58,15 +58,7 @@ export async function listActions(
     'version',
     'lockTime'
   ]
-  const stati: string[] = [
-    'completed',
-    'unprocessed',
-    'sending',
-    'unproven',
-    'unsigned',
-    'nosend',
-    'nonfinal'
-  ]
+  const stati: string[] = ['completed', 'unprocessed', 'sending', 'unproven', 'unsigned', 'nosend', 'nonfinal']
 
   const noLabels = labelIds.length === 0
 
@@ -94,16 +86,12 @@ export async function listActions(
   }
 
   const makeWithoutLabelsQueries = () => {
-    const q = k('transactions')
-      .where('userId', auth.userId)
-      .whereIn('status', stati)
+    const q = k('transactions').where('userId', auth.userId).whereIn('status', stati)
     const qcount = q.clone().count('transactionId as total')
     return { q, qcount }
   }
 
-  const { q, qcount } = noLabels
-    ? makeWithoutLabelsQueries()
-    : makeWithLabelsQueries()
+  const { q, qcount } = noLabels ? makeWithoutLabelsQueries() : makeWithLabelsQueries()
 
   q.limit(limit).offset(offset).orderBy('transactionId', 'asc')
 
@@ -136,9 +124,7 @@ export async function listActions(
         //    i++
         const action = r.actions[i]
         if (vargs.includeLabels) {
-          action.labels = (
-            await storage.getLabelsForTransactionId(tx.transactionId)
-          ).map(l => l.label)
+          action.labels = (await storage.getLabelsForTransactionId(tx.transactionId)).map(l => l.label)
         }
         if (vargs.includeOutputs) {
           const outputs: TableOutputX[] = await storage.findOutputs({
@@ -156,8 +142,7 @@ export async function listActions(
               outputDescription: o.outputDescription || '',
               basket: o.basket?.name || ''
             }
-            if (vargs.includeOutputLockingScripts)
-              wo.lockingScript = asString(o.lockingScript || [])
+            if (vargs.includeOutputLockingScripts) wo.lockingScript = asString(o.lockingScript || [])
             action.outputs.push(wo)
           }
         }
@@ -175,9 +160,7 @@ export async function listActions(
             }
             for (const o of inputs) {
               await storage.extendOutput(o, true, true)
-              const input = bsvTx?.inputs.find(
-                v => v.sourceTXID === o.txid && v.sourceOutputIndex === o.vout
-              )
+              const input = bsvTx?.inputs.find(v => v.sourceTXID === o.txid && v.sourceOutputIndex === o.vout)
               const wo: WalletActionInput = {
                 sourceOutpoint: `${o.txid}.${o.vout}`,
                 sourceSatoshis: o.satoshis || 0,

package/src/storage/methods/listCertificates.ts

@@ -1,7 +1,4 @@
-import {
-  ListCertificatesResult,
-  OriginatorDomainNameStringUnder250Bytes
-} from '@bsv/sdk'
+import { ListCertificatesResult, OriginatorDomainNameStringUnder250Bytes } from '@bsv/sdk'
 import { StorageProvider, TableCertificate } from '../index.client'
 import { sdk } from '../../index.client'
 
@@ -24,8 +21,7 @@ export async function listCertificates(
     if (vp.subject) partial['subject'] = vp.subject
     if (vp.serialNumber) partial['serialNumber'] = vp.serialNumber
     if (vp.certifier) partial['certifier'] = vp.certifier
-    if (vp.revocationOutpoint)
-      partial['revocationOutpoint'] = vp.revocationOutpoint
+    if (vp.revocationOutpoint) partial['revocationOutpoint'] = vp.revocationOutpoint
     if (vp.signature) partial['signature'] = vp.signature
   }
 
@@ -46,12 +42,8 @@ export async function listCertificates(
         })
         return {
           ...cert,
-          fields: Object.fromEntries(
-            fields.map(f => [f.fieldName, f.fieldValue])
-          ),
-          masterKeyring: Object.fromEntries(
-            fields.map(f => [f.fieldName, f.masterKey])
-          )
+          fields: Object.fromEntries(fields.map(f => [f.fieldName, f.fieldValue])),
+          masterKeyring: Object.fromEntries(fields.map(f => [f.fieldName, f.masterKey]))
         }
       })
     )
@@ -69,8 +61,7 @@ export async function listCertificates(
         keyring: cwf.masterKeyring
       }))
     }
-    if (r.certificates.length < paged.limit)
-      r.totalCertificates = r.certificates.length
+    if (r.certificates.length < paged.limit) r.totalCertificates = r.certificates.length
     else {
       r.totalCertificates = await storage.countCertificates(findCertsArgs)
     }

package/src/storage/methods/listOutputs.ts

@@ -1,17 +1,6 @@
-import {
-  Beef,
-  ListOutputsResult,
-  OriginatorDomainNameStringUnder250Bytes,
-  WalletOutput
-} from '@bsv/sdk'
+import { Beef, ListOutputsResult, OriginatorDomainNameStringUnder250Bytes, WalletOutput } from '@bsv/sdk'
 import { TableOutput, TableOutputBasket, TableOutputTag } from '../index.client'
-import {
-  asString,
-  sdk,
-  verifyId,
-  verifyInteger,
-  verifyOne
-} from '../../index.client'
+import { asString, sdk, verifyId, verifyInteger, verifyOne } from '../../index.client'
 import { StorageKnex } from '../StorageKnex'
 import { ValidListOutputsArgs } from '../../sdk'
 
@@ -81,21 +70,12 @@ const basketToSpecOp: Record<string, SpecOp> = {
       outputs: TableOutput[]
     ): Promise<TableOutput[]> => {
       const filteredOutputs: TableOutput[] = []
-      let ok = false
       for (const o of outputs) {
+        let ok = false
         if (o.lockingScript && o.lockingScript.length > 0) {
-          const r = await s
-            .getServices()
-            .getUtxoStatus(asString(o.lockingScript), 'script')
+          const r = await s.getServices().getUtxoStatus(asString(o.lockingScript), 'script')
           if (r.status === 'success' && r.isUtxo && r.details?.length > 0) {
-            if (
-              r.details.some(
-                d =>
-                  d.txid === o.txid &&
-                  d.satoshis === o.satoshis &&
-                  d.index === o.vout
-              )
-            ) {
+            if (r.details.some(d => d.txid === o.txid && d.satoshis === o.satoshis && d.index === o.vout)) {
               ok = true
             }
           }
@@ -122,14 +102,9 @@ const basketToSpecOp: Record<string, SpecOp> = {
       specOpTags: string[]
     ): Promise<ListOutputsResult> => {
       if (specOpTags.length !== 2)
-        throw new sdk.WERR_INVALID_PARAMETER(
-          'numberOfDesiredUTXOs and minimumDesiredUTXOValue',
-          'valid'
-        )
+        throw new sdk.WERR_INVALID_PARAMETER('numberOfDesiredUTXOs and minimumDesiredUTXOValue', 'valid')
       const numberOfDesiredUTXOs: number = verifyInteger(Number(specOpTags[0]))
-      const minimumDesiredUTXOValue: number = verifyInteger(
-        Number(specOpTags[1])
-      )
+      const minimumDesiredUTXOValue: number = verifyInteger(Number(specOpTags[1]))
       const basket = verifyOne(
         await s.findOutputBaskets({
           partial: { userId: verifyId(auth.userId), name: 'default' }
@@ -200,19 +175,14 @@ export async function listOutputs(
   let tags = [...vargs.tags]
   const specOpTags: string[] = []
   if (specOp && specOp.tagsParamsCount) {
-    specOpTags.push(
-      ...tags.splice(0, Math.min(tags.length, specOp.tagsParamsCount))
-    )
+    specOpTags.push(...tags.splice(0, Math.min(tags.length, specOp.tagsParamsCount)))
   }
   if (specOp && specOp.tagsToIntercept) {
     // Pull out tags used by current specOp
     const ts = tags
     tags = []
     for (const t of ts) {
-      if (
-        specOp.tagsToIntercept.length === 0 ||
-        specOp.tagsToIntercept.indexOf(t) >= 0
-      ) {
+      if (specOp.tagsToIntercept.length === 0 || specOp.tagsToIntercept.indexOf(t) >= 0) {
         specOpTags.push(t)
       } else {
         tags.push(t)
@@ -297,9 +267,7 @@ export async function listOutputs(
     return { q, qcount }
   }
 
-  const { q, qcount } = noTags
-    ? makeWithoutTagsQueries()
-    : makeWithTagsQueries()
+  const { q, qcount } = noTags ? makeWithoutTagsQueries() : makeWithTagsQueries()
 
   // Sort order when limit and offset are possible must be ascending for determinism.
   if (!specOp || !specOp.ignoreLimit) q.limit(limit).offset(offset)
@@ -309,22 +277,9 @@ export async function listOutputs(
   let outputs: TableOutput[] = await q
 
   if (specOp) {
-    if (specOp.filterOutputs)
-      outputs = await specOp.filterOutputs(
-        dsk,
-        auth,
-        vargs,
-        specOpTags,
-        outputs
-      )
+    if (specOp.filterOutputs) outputs = await specOp.filterOutputs(dsk, auth, vargs, specOpTags, outputs)
     if (specOp.resultFromOutputs) {
-      const r = await specOp.resultFromOutputs(
-        dsk,
-        auth,
-        vargs,
-        specOpTags,
-        outputs
-      )
+      const r = await specOp.resultFromOutputs(dsk, auth, vargs, specOpTags, outputs)
       return r
     }
   }
@@ -378,13 +333,10 @@ export async function listOutputs(
     //    }
     //    wo.basket = basketsById[o.basketId].name
     //}
-    if (vargs.includeCustomInstructions && o.customInstructions)
-      wo.customInstructions = o.customInstructions
+    if (vargs.includeCustomInstructions && o.customInstructions) wo.customInstructions = o.customInstructions
     if (vargs.includeLabels && o.txid) {
       if (labelsByTxid[o.txid] === undefined) {
-        labelsByTxid[o.txid] = (
-          await dsk.getLabelsForTransactionId(o.transactionId, trx)
-        ).map(l => l.label)
+        labelsByTxid[o.txid] = (await dsk.getLabelsForTransactionId(o.transactionId, trx)).map(l => l.label)
       }
       wo.labels = labelsByTxid[o.txid]
     }
@@ -396,13 +348,7 @@ export async function listOutputs(
       if (o.lockingScript) wo.lockingScript = asString(o.lockingScript)
     }
     if (vargs.includeTransactions && !beef.findTxid(o.txid!)) {
-      await dsk.getValidBeefForKnownTxid(
-        o.txid!,
-        beef,
-        undefined,
-        vargs.knownTxids,
-        trx
-      )
+      await dsk.getValidBeefForKnownTxid(o.txid!, beef, undefined, vargs.knownTxids, trx)
     }
   }