@bsv/wallet-toolbox 1.1.60 → 1.1.61

package/src/services/providers/Bitails.ts

@@ -1,17 +1,5 @@
-import {
-  Beef,
-  defaultHttpClient,
-  HexString,
-  HttpClient,
-  MerklePath,
-  Utils
-} from '@bsv/sdk'
-import {
-  convertProofToMerklePath,
-  doubleSha256BE,
-  sdk,
-  wait
-} from '../../index.client'
+import { Beef, defaultHttpClient, HexString, HttpClient, Utils } from '@bsv/sdk'
+import { convertProofToMerklePath, doubleSha256BE, sdk, wait } from '../../index.client'
 import { ReqHistoryNote } from '../../sdk'
 
 export interface BitailsConfig {
@@ -33,10 +21,7 @@ export class Bitails {
   constructor(chain: sdk.Chain = 'main', config: BitailsConfig = {}) {
     const { apiKey, httpClient } = config
     this.chain = chain
-    this.URL =
-      chain === 'main'
-        ? `https://api.bitails.io/`
-        : `https://test-api.bitails.io/`
+    this.URL = chain === 'main' ? `https://api.bitails.io/` : `https://test-api.bitails.io/`
     this.httpClient = httpClient ?? defaultHttpClient()
     this.apiKey = apiKey ?? ''
   }
@@ -80,8 +65,7 @@ export class Bitails {
     const r = await this.postRaws(raws)
 
     r.notes!.unshift(note)
-    if (r.status !== 'success')
-      r.notes!.push({ ...nne(), what: 'postBeefError' })
+    if (r.status !== 'success') r.notes!.push({ ...nne(), what: 'postBeefError' })
     else r.notes!.push({ ...nn(), what: 'postBeefSuccess' })
 
     return r
@@ -112,7 +96,6 @@ export class Bitails {
     headers['Content-Type'] = 'application/json'
     //headers['Accept'] = 'text/json'
 
-    //const data = JSON.stringify({ raws })
     const data = { raws: raws }
     const requestOptions = {
       method: 'POST',
@@ -132,72 +115,38 @@ export class Bitails {
       url
     })
 
-    const retryLimit = 5
-    for (let retry = 0; retry < retryLimit; retry++) {
-      try {
-        const response = await this.httpClient.request<BitailsPostRawsResult[]>(
-          url,
-          requestOptions
-        )
-        if (response.statusText === 'Too Many Requests' && retry < 2) {
-          r.notes!.push({ ...nn(), what: 'postRawsRateLimit' })
-          await wait(2000)
-          continue
-        }
-        if (response.ok) {
-          // status: 201, statusText: 'Created'
-          const btrs: BitailsPostRawsResult[] = response.data
-          for (const rt of r.txidResults) {
-            const btr = btrs.find(btr => (btr.txid = rt.txid))
-            if (!btr) {
-              rt.status = 'error'
-              rt.notes!.push({
-                ...nne(),
-                what: 'postRawsMissingResult',
-                txid: rt.txid
-              })
-            } else if (btr.error) {
-              // code: -25, message: 'missing-inputs'
-              rt.status = 'error'
-              rt.notes!.push({
-                ...nne(),
-                what: 'postRawsError',
-                txid: rt.txid,
-                code: btr.error.code,
-                message: btr.error.message
-              })
-            } else {
-              rt.notes!.push({ ...nn(), what: 'postRawsSuccess' })
-            }
-            if (rt.status !== 'success' && r.status === 'success')
-              r.status = 'error'
-          }
-        } else {
-          r.status = 'error'
-          const n: ReqHistoryNote = {
-            ...nne(),
-            what: 'postRawsError'
+    try {
+      const response = await this.httpClient.request<BitailsPostRawsResult[]>(url, requestOptions)
+      if (response.ok) {
+        // status: 201, statusText: 'Created'
+        const btrs: BitailsPostRawsResult[] = response.data
+        for (const rt of r.txidResults) {
+          const btr = btrs.find(btr => (btr.txid = rt.txid))
+          const txid = rt.txid
+          if (!btr) {
+            rt.status = 'error'
+            rt.notes!.push({ ...nne(), what: 'postRawsMissingResult', txid })
+          } else if (btr.error) {
+            // code: -25, message: 'missing-inputs'
+            rt.status = 'error'
+            const { code, message } = btr.error
+            rt.notes!.push({ ...nne(), what: 'postRawsError', txid, code, message })
+          } else {
+            rt.notes!.push({ ...nn(), what: 'postRawsSuccess' })
           }
-          r.notes!.push(n)
+          if (rt.status !== 'success' && r.status === 'success') r.status = 'error'
         }
-      } catch (eu: unknown) {
+      } else {
         r.status = 'error'
-        const e = sdk.WalletError.fromUnknown(eu)
-        r.notes!.push({
-          ...nne(),
-          what: 'postRawsCatch',
-          code: e.code,
-          description: e.description
-        })
+        const n: ReqHistoryNote = { ...nne(), what: 'postRawsError' }
+        r.notes!.push(n)
       }
-      return r
+    } catch (eu: unknown) {
+      r.status = 'error'
+      const e = sdk.WalletError.fromUnknown(eu)
+      const { code, description } = e
+      r.notes!.push({ ...nne(), what: 'postRawsCatch', code, description })
     }
-    r.status = 'error'
-    r.notes!.push({
-      ...nne(),
-      what: 'postRawsRetryLimit',
-      retryLimit
-    })
     return r
   }
 
@@ -207,92 +156,45 @@ export class Bitails {
    * @param services
    * @returns
    */
-  async getMerklePath(
-    txid: string,
-    services: sdk.WalletServices
-  ): Promise<sdk.GetMerklePathResult> {
+  async getMerklePath(txid: string, services: sdk.WalletServices): Promise<sdk.GetMerklePathResult> {
     const r: sdk.GetMerklePathResult = { name: 'BitailsTsc', notes: [] }
 
-    const url = `${this.URL}/tx/${txid}/proof/tsc`
+    const url = `${this.URL}tx/${txid}/proof/tsc`
 
-    const nn = () => ({
-      name: 'BitailsProofTsc',
-      when: new Date().toISOString(),
-      txid,
-      url
-    })
+    const nn = () => ({ name: 'BitailsProofTsc', when: new Date().toISOString(), txid, url })
 
     const headers = this.getHttpHeaders()
-    const requestOptions = {
-      method: 'GET',
-      headers
-    }
-
-    for (let retry = 0; retry < 2; retry++) {
-      try {
-        const response = await this.httpClient.request<BitailsMerkleProof>(
-          url,
-          requestOptions
-        )
-
-        const nne = () => ({
-          ...nn(),
-          txid,
-          url,
-          status: response.status,
-          statusText: response.statusText
-        })
-
-        if (response.statusText === 'Too Many Requests' && retry < 2) {
-          r.notes!.push({ ...nne(), what: 'getMerklePathRetry' })
-          await wait(2000)
-          continue
-        }
-
-        if (response.status === 404 && response.statusText === 'Not Found') {
-          r.notes!.push({ ...nne(), what: 'getMerklePathNotFound' })
-        } else if (
-          !response.ok ||
-          response.status !== 200 ||
-          response.statusText !== 'OK'
-        ) {
-          r.notes!.push({ ...nne(), what: 'getMerklePathBadStatus' })
-        } else if (!response.data) {
-          // Unmined, proof not yet available.
-          r.notes!.push({ ...nne(), what: 'getMerklePathNoData' })
+    const requestOptions = { method: 'GET', headers }
+
+    try {
+      const response = await this.httpClient.request<BitailsMerkleProof>(url, requestOptions)
+
+      const nne = () => ({ ...nn(), txid, url, status: response.status, statusText: response.statusText })
+
+      if (response.status === 404 && response.statusText === 'Not Found') {
+        r.notes!.push({ ...nn(), what: 'getMerklePathNotFound' })
+      } else if (!response.ok || response.status !== 200 || response.statusText !== 'OK') {
+        r.notes!.push({ ...nne(), what: 'getMerklePathBadStatus' })
+      } else if (!response.data) {
+        r.notes!.push({ ...nne(), what: 'getMerklePathNoData' })
+      } else {
+        const p = response.data
+        const header = await services.hashToHeader(p.target)
+        if (header) {
+          const proof = { index: p.index, nodes: p.nodes, height: header.height }
+          r.merklePath = convertProofToMerklePath(txid, proof)
+          r.header = header
+          r.notes!.push({ ...nne(), what: 'getMerklePathSuccess' })
         } else {
-          const p = response.data
-          const header = await services.hashToHeader(p.target)
-          if (header) {
-            const proof = {
-              index: p.index,
-              nodes: p.nodes,
-              height: header.height
-            }
-            r.merklePath = convertProofToMerklePath(txid, proof)
-            r.header = header
-            r.notes!.push({ ...nne(), what: 'getMerklePathSuccess' })
-          } else {
-            r.notes!.push({
-              ...nne(),
-              what: 'getMerklePathNoHeader',
-              target: p.target
-            })
-          }
+          r.notes!.push({ ...nne(), what: 'getMerklePathNoHeader', target: p.target })
         }
-      } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
-        r.notes!.push({
-          ...nn(),
-          what: 'getMerklePathError',
-          code: e.code,
-          description: e.description
-        })
-        r.error = e
       }
-      return r
+    } catch (eu: unknown) {
+      const e = sdk.WalletError.fromUnknown(eu)
+      const { code, description } = e
+      r.notes!.push({ ...nn(), what: 'getMerklePathCatch', code, description })
+      r.error = e
     }
-    r.notes!.push({ ...nn(), what: 'getMerklePathInternal' })
     return r
   }
 }

package/src/services/providers/SdkWhatsOnChain.ts

@@ -1,9 +1,4 @@
-import {
-  ChainTracker,
-  defaultHttpClient,
-  HttpClient,
-  WhatsOnChainConfig
-} from '@bsv/sdk'
+import { ChainTracker, defaultHttpClient, HttpClient, WhatsOnChainConfig } from '@bsv/sdk'
 
 interface WhatsOnChainBlockHeader {
   merkleroot: string
@@ -24,10 +19,7 @@ export default class SdkWhatsOnChain implements ChainTracker {
    * @param {'main' | 'test' | 'stn'} network - The BSV network to use when calling the WhatsOnChain API.
    * @param {WhatsOnChainConfig} config - Configuration options for the WhatsOnChain ChainTracker.
    */
-  constructor(
-    network: 'main' | 'test' | 'stn' = 'main',
-    config: WhatsOnChainConfig = {}
-  ) {
+  constructor(network: 'main' | 'test' | 'stn' = 'main', config: WhatsOnChainConfig = {}) {
     const { apiKey, httpClient } = config
     this.network = network
     this.URL = `https://api.whatsonchain.com/v1/bsv/${network}`
@@ -64,16 +56,11 @@ export default class SdkWhatsOnChain implements ChainTracker {
         headers: this.getHttpHeaders()
       }
 
-      const response = await this.httpClient.request<{ height: number }>(
-        `${this.URL}/block/headers`,
-        requestOptions
-      )
+      const response = await this.httpClient.request<{ height: number }>(`${this.URL}/block/headers`, requestOptions)
       if (response.ok) {
         return response.data[0].height
       } else {
-        throw new Error(
-          `Failed to get current height because of an error: ${JSON.stringify(response.data)} `
-        )
+        throw new Error(`Failed to get current height because of an error: ${JSON.stringify(response.data)} `)
       }
     } catch (error) {
       throw new Error(

package/src/services/providers/WhatsOnChain.ts

@@ -1,12 +1,5 @@
 import { Beef, HexString, Utils, WhatsOnChainConfig } from '@bsv/sdk'
-import {
-  asArray,
-  asString,
-  doubleSha256BE,
-  sdk,
-  validateScriptHash,
-  wait
-} from '../../index.client'
+import { asArray, asString, doubleSha256BE, sdk, validateScriptHash, wait } from '../../index.client'
 import { convertProofToMerklePath } from '../../utility/tscProofToMerklePath'
 import SdkWhatsOnChain from './SdkWhatsOnChain'
 import { ReqHistoryNote } from '../../sdk'
@@ -30,21 +23,10 @@ export class WhatsOnChain extends SdkWhatsOnChain {
       headers: this.getHttpHeaders()
     }
 
-    const response = await this.httpClient.request<string>(
-      `${this.URL}/tx/hash/${txid}/propagation`,
-      requestOptions
-    )
-
-    if (
-      !response.data ||
-      !response.ok ||
-      response.status !== 200 ||
-      response.statusText !== 'OK'
-    )
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'txid',
-        `valid transaction. '${txid}' response ${response.statusText}`
-      )
+    const response = await this.httpClient.request<string>(`${this.URL}/tx/hash/${txid}/propagation`, requestOptions)
+
+    if (!response.data || !response.ok || response.status !== 200 || response.statusText !== 'OK')
+      throw new sdk.WERR_INVALID_PARAMETER('txid', `valid transaction. '${txid}' response ${response.statusText}`)
 
     return 0
   }
@@ -64,28 +46,16 @@ export class WhatsOnChain extends SdkWhatsOnChain {
     }
 
     for (let retry = 0; retry < 2; retry++) {
-      const response = await this.httpClient.request<string>(
-        `${this.URL}/tx/${txid}/hex`,
-        requestOptions
-      )
+      const response = await this.httpClient.request<string>(`${this.URL}/tx/${txid}/hex`, requestOptions)
       if (response.statusText === 'Too Many Requests' && retry < 2) {
         await wait(2000)
         continue
       }
 
-      if (response.status === 404 && response.statusText === 'Not Found')
-        return undefined
-
-      if (
-        !response.data ||
-        !response.ok ||
-        response.status !== 200 ||
-        response.statusText !== 'OK'
-      )
-        throw new sdk.WERR_INVALID_PARAMETER(
-          'txid',
-          `valid transaction. '${txid}' response ${response.statusText}`
-        )
+      if (response.status === 404 && response.statusText === 'Not Found') return undefined
+
+      if (!response.data || !response.ok || response.status !== 200 || response.statusText !== 'OK')
+        throw new sdk.WERR_INVALID_PARAMETER('txid', `valid transaction. '${txid}' response ${response.statusText}`)
 
       return response.data
     }
@@ -138,9 +108,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
 
       const tr = await this.postRawTx(rawTx)
       if (txid !== tr.txid) {
-        throw new sdk.WERR_INTERNAL(
-          `woc returned txid ${tr.txid}, expected ${txid}`
-        )
+        throw new sdk.WERR_INTERNAL(`woc returned txid ${tr.txid}, expected ${txid}`)
       }
 
       r.txidResults.push(tr)
@@ -186,10 +154,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
     const retryLimit = 5
     for (let retry = 0; retry < retryLimit; retry++) {
       try {
-        const response = await this.httpClient.request<string>(
-          url,
-          requestOptions
-        )
+        const response = await this.httpClient.request<string>(url, requestOptions)
         if (response.statusText === 'Too Many Requests' && retry < 2) {
           r.notes!.push({ ...nn(), what: 'postRawTxRateLimit' })
           await wait(2000)
@@ -212,10 +177,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
             n.statusText = response.data.slice(0, 128)
             r.data = `${r.data || ''} ${response.statusText}`
           }
-          if (
-            typeof response.status === 'string' ||
-            typeof response.status === 'number'
-          ) {
+          if (typeof response.status === 'string' || typeof response.status === 'number') {
             n.status = response.data.slice(0, 128)
             r.data = `${r.data || ''} ${response.status}`
           }
@@ -247,10 +209,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
    * @param txid
    * @returns
    */
-  async getMerklePath(
-    txid: string,
-    services: sdk.WalletServices
-  ): Promise<sdk.GetMerklePathResult> {
+  async getMerklePath(txid: string, services: sdk.WalletServices): Promise<sdk.GetMerklePathResult> {
     const r: sdk.GetMerklePathResult = { name: 'WoCTsc', notes: [] }
 
     const headers = this.getHttpHeaders()
@@ -261,9 +220,10 @@ export class WhatsOnChain extends SdkWhatsOnChain {
 
     for (let retry = 0; retry < 2; retry++) {
       try {
-        const response = await this.httpClient.request<
-          WhatsOnChainTscProof | WhatsOnChainTscProof[]
-        >(`${this.URL}/tx/${txid}/proof/tsc`, requestOptions)
+        const response = await this.httpClient.request<WhatsOnChainTscProof | WhatsOnChainTscProof[]>(
+          `${this.URL}/tx/${txid}/proof/tsc`,
+          requestOptions
+        )
         if (response.statusText === 'Too Many Requests' && retry < 2) {
           r.notes!.push({
             what: 'getMerklePathRetry',
@@ -285,21 +245,14 @@ export class WhatsOnChain extends SdkWhatsOnChain {
           return r
         }
 
-        if (
-          !response.ok ||
-          response.status !== 200 ||
-          response.statusText !== 'OK'
-        ) {
+        if (!response.ok || response.status !== 200 || response.statusText !== 'OK') {
           r.notes!.push({
             what: 'getMerklePathBadStatus',
             name: r.name,
             status: response.status,
             statusText: response.statusText
           })
-          throw new sdk.WERR_INVALID_PARAMETER(
-            'txid',
-            `valid transaction. '${txid}' response ${response.statusText}`
-          )
+          throw new sdk.WERR_INVALID_PARAMETER('txid', `valid transaction. '${txid}' response ${response.statusText}`)
         }
 
         if (!response.data) {
@@ -341,10 +294,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
             status: response.status,
             statusText: response.statusText
           })
-          throw new sdk.WERR_INVALID_PARAMETER(
-            'blockhash',
-            'a valid on-chain block hash'
-          )
+          throw new sdk.WERR_INVALID_PARAMETER('blockhash', 'a valid on-chain block hash')
         }
       } catch (eu: unknown) {
         const e = sdk.WalletError.fromUnknown(eu)
@@ -362,10 +312,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
     throw new sdk.WERR_INTERNAL()
   }
 
-  async updateBsvExchangeRate(
-    rate?: sdk.BsvExchangeRate,
-    updateMsecs?: number
-  ): Promise<sdk.BsvExchangeRate> {
+  async updateBsvExchangeRate(rate?: sdk.BsvExchangeRate, updateMsecs?: number): Promise<sdk.BsvExchangeRate> {
     if (rate) {
       // Check if the rate we know is stale enough to update.
       updateMsecs ||= 1000 * 60 * 15
@@ -388,15 +335,8 @@ export class WhatsOnChain extends SdkWhatsOnChain {
         continue
       }
 
-      if (
-        !response.data ||
-        !response.ok ||
-        response.status !== 200 ||
-        response.statusText !== 'OK'
-      )
-        throw new sdk.WERR_INVALID_OPERATION(
-          `WoC exchangerate response ${response.statusText}`
-        )
+      if (!response.data || !response.ok || response.status !== 200 || response.statusText !== 'OK')
+        throw new sdk.WERR_INVALID_OPERATION(`WoC exchangerate response ${response.statusText}`)
 
       const wocrate = response.data
       if (wocrate.currency !== 'USD') wocrate.rate = NaN
@@ -412,10 +352,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
     throw new sdk.WERR_INTERNAL()
   }
 
-  async getUtxoStatus(
-    output: string,
-    outputFormat?: sdk.GetUtxoStatusOutputFormat
-  ): Promise<sdk.GetUtxoStatusResult> {
+  async getUtxoStatus(output: string, outputFormat?: sdk.GetUtxoStatusOutputFormat): Promise<sdk.GetUtxoStatusResult> {
     const r: sdk.GetUtxoStatusResult = {
       name: 'WoC',
       status: 'error',
@@ -434,23 +371,17 @@ export class WhatsOnChain extends SdkWhatsOnChain {
           headers: this.getHttpHeaders()
         }
 
-        const response = await this.httpClient.request<
-          WhatsOnChainUtxoStatus[]
-        >(`${this.URL}/script/${scriptHash}/unspent`, requestOptions)
+        const response = await this.httpClient.request<WhatsOnChainUtxoStatus[]>(
+          `${this.URL}/script/${scriptHash}/unspent`,
+          requestOptions
+        )
         if (response.statusText === 'Too Many Requests' && retry < 2) {
           await wait(2000)
           continue
         }
 
-        if (
-          !response.data ||
-          !response.ok ||
-          response.status !== 200 ||
-          response.statusText !== 'OK'
-        )
-          throw new sdk.WERR_INVALID_OPERATION(
-            `WoC exchangerate response ${response.statusText}`
-          )
+        if (!response.data || !response.ok || response.status !== 200 || response.statusText !== 'OK')
+          throw new sdk.WERR_INVALID_OPERATION(`WoC exchangerate response ${response.statusText}`)
 
         if (Array.isArray(response.data)) {
           const data = response.data

package/src/services/providers/__tests/WhatsOnChain.test.ts

@@ -20,9 +20,7 @@ describe('whatsonchain tests', () => {
   if (_tu.noTestEnv('test')) return
 
   test('0 getRawTx testnet', async () => {
-    const rawTx = await wocTest.getRawTx(
-      '7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b'
-    )
+    const rawTx = await wocTest.getRawTx('7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b')
     expect(
       rawTx ===
         '010000000158EED5DBBB7E2F7D70C79A11B9B61AABEECFA5A7CEC679BEDD00F42C48A4BD45010000006B483045022100AE8BB45498A40E2AC797775C405C108168804CD84E8C09A9D42D280D18EDDB6D022024863BFAAC5FF3C24CA65E2F3677EDA092BC3CC5D2EFABA73264B8FF55CF416B412102094AAF520E14E1C4D68496822800BCC7D3B3B26CA368E004A2CB70B398D82FACFFFFFFFF0203000000000000007421020A624B72B34BC192851C5D8890926BBB70B31BC10FDD4E3BC6534E41B1C81B93AC03010203030405064630440220013B4984F4054C2FBCD2F448AB896CCA5C4E234BF765B0C7FB27EDE572A7F7DA02201A5C8D0D023F94C209046B9A2B96B2882C5E43B72D8115561DF8C07442010EEA6D7592090000000000001976A9146511FCE2F7EF785A2102142FBF381AD1291C918688AC00000000'
@@ -32,9 +30,7 @@ describe('whatsonchain tests', () => {
   })
 
   test('1 getRawTx mainnet', async () => {
-    const rawTx = await wocMain.getRawTx(
-      'd9978ffc6676523208f7b33bebf1b176388bbeace2c7ef67ce35c2eababa1805'
-    )
+    const rawTx = await wocMain.getRawTx('d9978ffc6676523208f7b33bebf1b176388bbeace2c7ef67ce35c2eababa1805')
     expect(
       rawTx ===
         '0100000001026A66A5F724EB490A55E0E08553286F08AD57E92C4BF34B5C44EA6BC0A49828020000006B483045022100C3D9A5ACA30C1F2E1A54532162E7AFE5AA69150E4C06D760414A16D1EA1BABD602205E0D9191838B0911A1E7328554A2B22EFAA80CF52B15FBA37C3046A0996C7AAD412103FA3CF488CA98D9F2DB91843F36BAF6BE39F6C947976C02394602D09FBC5F4CF4FFFFFFFF0210270000000000001976A91444C04354E88975C4BEF30CFE89D300CC7659F7E588AC96BC0000000000001976A9149A53E5CF5F1876924D98A8B35CA0BC693618682488AC00000000'
@@ -99,9 +95,7 @@ describe('whatsonchain tests', () => {
   test('5 getTxPropagation testnet', async () => {
     return
     // throwing internal server error 500 when tested.
-    const count = await wocTest.getTxPropagation(
-      '7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b'
-    )
+    const count = await wocTest.getTxPropagation('7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b')
     expect(count > 0)
 
     expect((await wocTest.getTxPropagation('1'.repeat(64))) === 0)
@@ -186,8 +180,7 @@ describe('whatsonchain tests', () => {
     } catch (eu: unknown) {
       const e = sdk.WalletError.fromUnknown(eu)
       expect(
-        e.message ===
-          'The rawTx parameter must be valid. unexpected response code 500: 258: txn-mempool-conflict' ||
+        e.message === 'The rawTx parameter must be valid. unexpected response code 500: 258: txn-mempool-conflict' ||
           'The rawTx parameter must be valid. unexpected response code 500: Missing inputs'
       )
     }
@@ -237,10 +230,7 @@ describe('whatsonchain tests', () => {
     if (!Setup.getEnv('main').filePath) return
 
     const c = await _tu.createWalletSetupEnv('main')
-    const client = new StorageClient(
-      c.wallet,
-      'https://storage.babbage.systems'
-    )
+    const client = new StorageClient(c.wallet, 'https://storage.babbage.systems')
     await c.storage.addWalletStorageProvider(client)
     await c.storage.updateBackups()
 

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