@bsv/wallet-toolbox 1.1.60 → 1.1.62

package/src/services/providers/echangeRates.ts

@@ -7,10 +7,7 @@ export async function updateChaintracksFiatExchangeRates(
 ): Promise<sdk.FiatExchangeRates> {
   const url = options.chaintracksFiatExchangeRatesUrl
 
-  if (!url)
-    throw new sdk.WERR_MISSING_PARAMETER(
-      'options.chaintracksFiatExchangeRatesUrl'
-    )
+  if (!url) throw new sdk.WERR_MISSING_PARAMETER('options.chaintracksFiatExchangeRatesUrl')
 
   const r = await axios.get(url)
 
@@ -28,20 +25,14 @@ export async function updateExchangeratesapi(
   targetCurrencies: string[],
   options: sdk.WalletServicesOptions
 ): Promise<sdk.FiatExchangeRates> {
-  if (!options.exchangeratesapiKey)
-    throw new sdk.WERR_MISSING_PARAMETER('options.exchangeratesapiKey')
+  if (!options.exchangeratesapiKey) throw new sdk.WERR_MISSING_PARAMETER('options.exchangeratesapiKey')
 
   const iorates = await getExchangeRatesIo(options.exchangeratesapiKey)
 
-  if (!iorates.success)
-    throw new sdk.WERR_BAD_REQUEST(
-      `getExchangeRatesIo returned success ${iorates.success}`
-    )
+  if (!iorates.success) throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo returned success ${iorates.success}`)
 
   if (!iorates.rates['USD'] || !iorates.rates[iorates.base])
-    throw new sdk.WERR_BAD_REQUEST(
-      `getExchangeRatesIo missing rates for 'USD' or base`
-    )
+    throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo missing rates for 'USD' or base`)
 
   const r: sdk.FiatExchangeRates = {
     timestamp: new Date(iorates.timestamp * 1000),
@@ -60,9 +51,7 @@ export async function updateExchangeratesapi(
   }
 
   if (updates !== targetCurrencies.length)
-    throw new sdk.WERR_BAD_REQUEST(
-      `getExchangeRatesIo failed to update all target currencies`
-    )
+    throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo failed to update all target currencies`)
 
   //console.log(`new fiat rates=${JSON.stringify(r)}`)
 
@@ -77,17 +66,13 @@ export interface ExchangeRatesIoApi {
   rates: Record<string, number>
 }
 
-export async function getExchangeRatesIo(
-  key: string
-): Promise<ExchangeRatesIoApi> {
+export async function getExchangeRatesIo(key: string): Promise<ExchangeRatesIoApi> {
   const url = `http://api.exchangeratesapi.io/v1/latest?access_key=${key}`
 
   const r = await axios.get(url)
 
   if (r.status !== 200 || !r.data) {
-    throw new sdk.WERR_BAD_REQUEST(
-      `getExchangeRatesIo returned status ${r.status}`
-    )
+    throw new sdk.WERR_BAD_REQUEST(`getExchangeRatesIo returned status ${r.status}`)
   }
 
   const rates = <ExchangeRatesIoApi>r.data

package/src/signer/WalletSigner.ts

@@ -9,11 +9,7 @@ export class WalletSigner {
   keyDeriver: KeyDeriver
   storage: WalletStorageManager
 
-  constructor(
-    chain: sdk.Chain,
-    keyDeriver: KeyDeriver,
-    storage: WalletStorageManager
-  ) {
+  constructor(chain: sdk.Chain, keyDeriver: KeyDeriver, storage: WalletStorageManager) {
     this.chain = chain
     this.keyDeriver = keyDeriver
     this.storage = storage

package/src/signer/methods/acquireDirectCertificate.ts

@@ -14,10 +14,7 @@ export async function acquireDirectCertificate(
     userId: auth.userId!,
     type: vargs.type,
     subject: vargs.subject,
-    verifier:
-      vargs.keyringRevealer === 'certifier'
-        ? vargs.certifier
-        : vargs.keyringRevealer,
+    verifier: vargs.keyringRevealer === 'certifier' ? vargs.certifier : vargs.keyringRevealer,
     serialNumber: vargs.serialNumber,
     certifier: vargs.certifier,
     revocationOutpoint: vargs.revocationOutpoint,

package/src/signer/methods/buildSignableTransaction.ts

@@ -29,11 +29,7 @@ export function buildSignableTransaction(
   const voutToIndex = Array<number>(storageOutputs.length)
   for (let vout = 0; vout < storageOutputs.length; vout++) {
     const i = storageOutputs.findIndex(o => o.vout === vout)
-    if (i < 0)
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'output.vout',
-        `sequential. ${vout} is missing`
-      )
+    if (i < 0) throw new sdk.WERR_INVALID_PARAMETER('output.vout', `sequential. ${vout} is missing`)
     voutToIndex[vout] = i
   }
 
@@ -44,10 +40,7 @@ export function buildSignableTransaction(
     const i = voutToIndex[vout]
     const out = storageOutputs[i]
     if (vout !== out.vout)
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'output.vout',
-        `equal to array index. ${out.vout} !== ${vout}`
-      )
+      throw new sdk.WERR_INVALID_PARAMETER('output.vout', `equal to array index. ${out.vout} !== ${vout}`)
 
     const change = out.providedBy === 'storage' && out.purpose === 'change'
 
@@ -78,11 +71,7 @@ export function buildSignableTransaction(
     inputs.push({ argsInput, storageInput })
   }
   inputs.sort((a, b) =>
-    a.storageInput.vin! < b.storageInput.vin!
-      ? -1
-      : a.storageInput.vin! === b.storageInput.vin!
-        ? 0
-        : 1
+    a.storageInput.vin! < b.storageInput.vin! ? -1 : a.storageInput.vin! === b.storageInput.vin! ? 0 : 1
   )
 
   const pendingStorageInputs: PendingStorageInput[] = []
@@ -97,12 +86,8 @@ export function buildSignableTransaction(
       // Type 1: User supplied input, with or without an explicit unlockingScript.
       // If without, signAction must be used to provide the actual unlockScript.
       const hasUnlock = typeof argsInput.unlockingScript === 'string'
-      const unlock = hasUnlock
-        ? asBsvSdkScript(argsInput.unlockingScript!)
-        : new Script()
-      const sourceTransaction = args.isSignAction
-        ? inputBeef?.findTxid(argsInput.outpoint.txid)?.tx
-        : undefined
+      const unlock = hasUnlock ? asBsvSdkScript(argsInput.unlockingScript!) : new Script()
+      const sourceTransaction = args.isSignAction ? inputBeef?.findTxid(argsInput.outpoint.txid)?.tx : undefined
       const inputToAdd: TransactionInput = {
         sourceTXID: argsInput.outpoint.txid,
         sourceOutputIndex: argsInput.outpoint.vout,

package/src/signer/methods/createAction.ts

@@ -1,10 +1,4 @@
-import {
-  Beef,
-  CreateActionResult,
-  SendWithResult,
-  SignActionResult,
-  SignActionSpend
-} from '@bsv/sdk'
+import { Beef, CreateActionResult, SendWithResult, SignActionResult, SignActionSpend } from '@bsv/sdk'
 import { Script, Transaction } from '@bsv/sdk'
 import {
   asBsvSdkScript,
@@ -36,11 +30,8 @@ export async function createAction(
     prior.tx = await completeSignedTransaction(prior, {}, wallet)
 
     r.txid = prior.tx.id('hex')
-    r.noSendChange = prior.dcr.noSendChangeOutputVouts?.map(
-      vout => `${r.txid}.${vout}`
-    )
-    if (!vargs.options.returnTXIDOnly)
-      r.tx = makeAtomicBeef(prior.tx, prior.dcr.inputBeef!)
+    r.noSendChange = prior.dcr.noSendChangeOutputVouts?.map(vout => `${r.txid}.${vout}`)
+    if (!vargs.options.returnTXIDOnly) r.tx = makeAtomicBeef(prior.tx, prior.dcr.inputBeef!)
   }
 
   r.sendWithResults = await processAction(prior, wallet, auth, vargs)
@@ -48,10 +39,7 @@ export async function createAction(
   return r
 }
 
-async function createNewTx(
-  wallet: Wallet,
-  args: sdk.ValidCreateActionArgs
-): Promise<PendingSignAction> {
+async function createNewTx(wallet: Wallet, args: sdk.ValidCreateActionArgs): Promise<PendingSignAction> {
   const storageArgs = removeUnlockScripts(args)
   const dcr = await wallet.storage.createAction(storageArgs)
 
@@ -69,15 +57,12 @@ function makeSignableTransactionResult(
   wallet: Wallet,
   args: sdk.ValidCreateActionArgs
 ): CreateActionResult {
-  if (!prior.dcr.inputBeef)
-    throw new sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid')
+  if (!prior.dcr.inputBeef) throw new sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid')
 
   const txid = prior.tx.id('hex')
 
   const r: CreateActionResult = {
-    noSendChange: args.isNoSend
-      ? prior.dcr.noSendChangeOutputVouts?.map(vout => `${txid}.${vout}`)
-      : undefined,
+    noSendChange: args.isNoSend ? prior.dcr.noSendChangeOutputVouts?.map(vout => `${txid}.${vout}`) : undefined,
     signableTransaction: {
       reference: prior.dcr.reference,
       tx: makeSignableTransactionBeef(prior.tx, prior.dcr.inputBeef)
@@ -89,18 +74,13 @@ function makeSignableTransactionResult(
   return r
 }
 
-function makeSignableTransactionBeef(
-  tx: Transaction,
-  inputBEEF: number[]
-): number[] {
+function makeSignableTransactionBeef(tx: Transaction, inputBEEF: number[]): number[] {
   // This is a special case beef for transaction signing.
   // We only need the transaction being signed, and for each input, the raw source transaction.
   const beef = new Beef()
   for (const input of tx.inputs) {
     if (!input.sourceTransaction)
-      throw new sdk.WERR_INTERNAL(
-        'Every signableTransaction input must have a sourceTransaction'
-      )
+      throw new sdk.WERR_INTERNAL('Every signableTransaction input must have a sourceTransaction')
     beef.mergeRawTx(input.sourceTransaction!.toBinary())
   }
   beef.mergeRawTx(tx.toBinary())
@@ -140,12 +120,7 @@ export async function completeSignedTransaction(
     const vin = Number(key)
     const createInput = prior.args.inputs[vin]
     const input = prior.tx.inputs[vin]
-    if (
-      !createInput ||
-      !input ||
-      createInput.unlockingScript ||
-      !Number.isInteger(createInput.unlockingScriptLength)
-    )
+    if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
       throw new sdk.WERR_INVALID_PARAMETER(
         'args',
         `spend does not correspond to prior input with valid unlockingScriptLength.`
@@ -156,8 +131,7 @@ export async function completeSignedTransaction(
         `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`
       )
     input.unlockingScript = asBsvSdkScript(spend.unlockingScript)
-    if (spend.sequenceNumber !== undefined)
-      input.sequence = spend.sequenceNumber
+    if (spend.sequenceNumber !== undefined) input.sequence = spend.sequenceNumber
   }
 
   const results = {
@@ -178,12 +152,7 @@ export async function completeSignedTransaction(
     const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey
     const sourceSatoshis = pdi.sourceSatoshis
     const lockingScript = asBsvSdkScript(pdi.lockingScript)
-    const unlockTemplate = sabppp.unlock(
-      lockerPrivKey,
-      unlockerPubKey,
-      sourceSatoshis,
-      lockingScript
-    )
+    const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript)
     const input = prior.tx.inputs[pdi.vin]
     input.unlockingScriptTemplate = unlockTemplate
   }
@@ -203,10 +172,7 @@ function removeUnlockScripts(args: sdk.ValidCreateActionArgs) {
     for (const i of args.inputs) {
       const di: sdk.ValidCreateActionInput = {
         ...i,
-        unlockingScriptLength:
-          i.unlockingScript !== undefined
-            ? i.unlockingScript.length
-            : i.unlockingScriptLength
+        unlockingScriptLength: i.unlockingScript !== undefined ? i.unlockingScript.length : i.unlockingScriptLength
       }
       delete di.unlockingScript
       storageArgs.inputs.push(di)
@@ -231,19 +197,14 @@ export async function processAction(
     rawTx: prior ? prior.tx.toBinary() : undefined,
     sendWith: vargs.isSendWith ? vargs.options.sendWith : []
   }
-  const r: sdk.StorageProcessActionResults =
-    await wallet.storage.processAction(args)
+  const r: sdk.StorageProcessActionResults = await wallet.storage.processAction(args)
 
   return r.sendWithResults
 }
 
-function makeDummyTransactionForOutputSatoshis(
-  vout: number,
-  satoshis: number
-): Transaction {
+function makeDummyTransactionForOutputSatoshis(vout: number, satoshis: number): Transaction {
   const tx = new Transaction()
-  for (let i = 0; i < vout; i++)
-    tx.addOutput({ lockingScript: new Script(), satoshis: 0 })
+  for (let i = 0; i < vout; i++) tx.addOutput({ lockingScript: new Script(), satoshis: 0 })
   tx.addOutput({ lockingScript: new Script(), satoshis })
   return tx
 }

package/src/signer/methods/internalizeAction.ts

@@ -47,10 +47,7 @@ export async function internalizeAction(
 
   for (const o of vargs.outputs) {
     if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length)
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'outputIndex',
-        `a valid output index in range 0 to ${tx.outputs.length - 1}`
-      )
+      throw new sdk.WERR_INVALID_PARAMETER('outputIndex', `a valid output index in range 0 to ${tx.outputs.length - 1}`)
     switch (o.protocol) {
       case 'basket insertion':
         setupBasketInsertionForOutput(o, vargs)
@@ -63,42 +60,24 @@ export async function internalizeAction(
     }
   }
 
-  const r: InternalizeActionResult =
-    await wallet.storage.internalizeAction(args)
+  const r: InternalizeActionResult = await wallet.storage.internalizeAction(args)
 
   return r
 
-  function setupWalletPaymentForOutput(
-    o: InternalizeOutput,
-    dargs: sdk.ValidInternalizeActionArgs
-  ) {
+  function setupWalletPaymentForOutput(o: InternalizeOutput, dargs: sdk.ValidInternalizeActionArgs) {
     const p = o.paymentRemittance
     const output = tx.outputs[o.outputIndex]
-    if (!p)
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'paymentRemitance',
-        `valid for protocol ${o.protocol}`
-      )
+    if (!p) throw new sdk.WERR_INVALID_PARAMETER('paymentRemitance', `valid for protocol ${o.protocol}`)
 
     const keyID = `${p.derivationPrefix} ${p.derivationSuffix}`
 
-    const privKey = wallet.keyDeriver!.derivePrivateKey(
-      brc29ProtocolID,
-      keyID,
-      p.senderIdentityKey
-    )
+    const privKey = wallet.keyDeriver!.derivePrivateKey(brc29ProtocolID, keyID, p.senderIdentityKey)
     const expectedLockScript = new P2PKH().lock(privKey.toAddress())
     if (output.lockingScript.toHex() !== expectedLockScript.toHex())
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'paymentRemitance',
-        `locked by script conforming to BRC-29`
-      )
+      throw new sdk.WERR_INVALID_PARAMETER('paymentRemitance', `locked by script conforming to BRC-29`)
   }
 
-  function setupBasketInsertionForOutput(
-    o: InternalizeOutput,
-    dargs: sdk.ValidInternalizeActionArgs
-  ) {
+  function setupBasketInsertionForOutput(o: InternalizeOutput, dargs: sdk.ValidInternalizeActionArgs) {
     /*
     No additional validations...
     */
@@ -109,19 +88,11 @@ export async function internalizeAction(
 
     // TODO: Add support for known txids...
 
-    const txValid = await ab.verify(
-      await wallet.getServices().getChainTracker(),
-      false
-    )
-    if (!txValid || !ab.atomicTxid)
-      throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
+    const txValid = await ab.verify(await wallet.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!
 
     /*

package/src/signer/methods/proveCertificate.ts

@@ -24,16 +24,13 @@ export async function proveCertificate(
   }
 
   const lcr = await wallet.storage.listCertificates(lcargs)
-  if (lcr.certificates.length != 1)
-    throw new sdk.WERR_INVALID_PARAMETER('args', `a unique certificate match`)
+  if (lcr.certificates.length != 1) throw new sdk.WERR_INVALID_PARAMETER('args', `a unique certificate match`)
   const storageCert = lcr.certificates[0]
   let proveWallet: CertOpsWallet = wallet
   if (storageCert.subject != wallet.identityKey) {
     // Certificate must have been issued to privileged identity
     if (!wallet.privilegedKeyManager)
-      throw new sdk.WERR_INVALID_OPERATION(
-        'Wallet is not privileged. proveCertificate fails.'
-      )
+      throw new sdk.WERR_INVALID_OPERATION('Wallet is not privileged. proveCertificate fails.')
     proveWallet = wallet.privilegedKeyManager
   }
   const co = await sdk.CertOps.fromCounterparty(proveWallet, {

package/src/signer/methods/signAction.ts

@@ -1,18 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-import {
-  Beef,
-  Transaction as BsvTransaction,
-  SignActionResult,
-  SignActionSpend
-} from '@bsv/sdk'
-import {
-  asBsvSdkScript,
-  PendingSignAction,
-  ScriptTemplateBRC29,
-  sdk,
-  Wallet
-} from '../../index.client'
+import { Beef, Transaction as BsvTransaction, SignActionResult, SignActionSpend } from '@bsv/sdk'
+import { asBsvSdkScript, PendingSignAction, ScriptTemplateBRC29, sdk, Wallet } from '../../index.client'
 import { processAction } from './createAction'
 
 export async function signAction(
@@ -22,11 +11,8 @@ export async function signAction(
 ): Promise<SignActionResult> {
   const prior = wallet.pendingSignActions[vargs.reference]
   if (!prior)
-    throw new sdk.WERR_NOT_IMPLEMENTED(
-      'recovery of out-of-session signAction reference data is not yet implemented.'
-    )
-  if (!prior.dcr.inputBeef)
-    throw new sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid')
+    throw new sdk.WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.')
+  if (!prior.dcr.inputBeef) throw new sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid')
 
   prior.tx = await completeSignedTransaction(prior, vargs.spends, wallet)
 
@@ -34,19 +20,14 @@ export async function signAction(
 
   const r: SignActionResult = {
     txid: prior.tx.id('hex'),
-    tx: vargs.options.returnTXIDOnly
-      ? undefined
-      : makeAtomicBeef(prior.tx, prior.dcr.inputBeef),
+    tx: vargs.options.returnTXIDOnly ? undefined : makeAtomicBeef(prior.tx, prior.dcr.inputBeef),
     sendWithResults
   }
 
   return r
 }
 
-export function makeAtomicBeef(
-  tx: BsvTransaction,
-  beef: number[] | Beef
-): number[] {
+export function makeAtomicBeef(tx: BsvTransaction, beef: number[] | Beef): number[] {
   if (Array.isArray(beef)) beef = Beef.fromBinary(beef)
   beef.mergeTransaction(tx)
   return beef.toBinaryAtomic(tx.id('hex'))
@@ -64,12 +45,7 @@ export async function completeSignedTransaction(
     const vin = Number(key)
     const createInput = prior.args.inputs[vin]
     const input = prior.tx.inputs[vin]
-    if (
-      !createInput ||
-      !input ||
-      createInput.unlockingScript ||
-      !Number.isInteger(createInput.unlockingScriptLength)
-    )
+    if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
       throw new sdk.WERR_INVALID_PARAMETER(
         'args',
         `spend does not correspond to prior input with valid unlockingScriptLength.`
@@ -80,8 +56,7 @@ export async function completeSignedTransaction(
         `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`
       )
     input.unlockingScript = asBsvSdkScript(spend.unlockingScript)
-    if (spend.sequenceNumber !== undefined)
-      input.sequence = spend.sequenceNumber
+    if (spend.sequenceNumber !== undefined) input.sequence = spend.sequenceNumber
   }
 
   const results = {
@@ -102,12 +77,7 @@ export async function completeSignedTransaction(
     const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey
     const sourceSatoshis = pdi.sourceSatoshis
     const lockingScript = asBsvSdkScript(pdi.lockingScript)
-    const unlockTemplate = sabppp.unlock(
-      lockerPrivKey,
-      unlockerPubKey,
-      sourceSatoshis,
-      lockingScript
-    )
+    const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript)
     const input = prior.tx.inputs[pdi.vin]
     input.unlockingScriptTemplate = unlockTemplate
   }