@exodus/bitcoin-api 2.9.1 → 2.9.3-hotfix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.9.1",
+  "version": "2.9.3-hotfix",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -13,34 +13,49 @@
     "access": "restricted"
   },
   "scripts": {
-    "test": "jest",
-    "lint": "eslint ./src",
+    "test": "run -T jest",
+    "lint": "run -T eslint ./src",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^3.7.2",
+    "@exodus/asset-lib": "^4.0.0",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
+    "@exodus/bitcoin-lib": "2.3.0",
     "@exodus/bitcoinjs-lib": "^6.1.5-exodus.0",
+    "@exodus/currency": "^2.3.2",
+    "@exodus/fetch": "^1.3.0",
     "@exodus/models": "^11.0.0",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
     "@noble/secp256k1": "~1.7.1",
     "bech32": "^1.1.3",
+    "bip32-path": "^0.4.2",
+    "bn.js": "4.12.0",
+    "bs58check": "^2.1.2",
     "coininfo": "5.1.0",
+    "create-hash": "^1.2.0",
     "delay": "4.0.1",
     "ecpair": "2.0.1",
+    "lodash": "^4.17.21",
+    "minimalistic-assert": "^1.0.1",
+    "ms": "^2.1.1",
+    "secp256k1": "^3.0.1",
     "socket.io-client": "2.1.1",
     "tiny-secp256k1": "1.1.3",
-    "url-join": "4.0.0"
+    "url-join": "4.0.0",
+    "varuint-bitcoin": "^1.1.0",
+    "wif": "^2.0.6"
   },
   "devDependencies": {
+    "@exodus/assets-testing": "^1.0.0",
     "@exodus/bitcoin-meta": "^1.0.2",
     "@scure/base": "^1.1.3",
     "@scure/btc-signer": "^1.1.0",
-    "jest-when": "^3.5.1"
-  },
-  "gitHead": "1f96673b2977e792373f9f3c4eb98c778817b2b6"
+    "bigi": "^1.4.2",
+    "jest-when": "^3.5.1",
+    "safe-buffer": "^5.2.1"
+  }
 }

package/src/bitcoinjs-lib/ecc/common.js

@@ -51,7 +51,7 @@ export const common = {
         parity: t[0] === 0x02 ? 0 : 1,
         xOnlyPubkey: toXOnly(t),
       }
-    } catch (err) {
+    } catch {
       return null
     }
   },

package/src/bitcoinjs-lib/ecc/mobile.js

@@ -53,7 +53,7 @@ export const mobileEcc = {
     try {
       schnorr.verify(message, publicKey, signature)
       return true
-    } catch (e) {
+    } catch {
       return false
     }
   },
@@ -75,7 +75,7 @@ export const mobileEcc = {
     try {
       // temp solution secp256k1 does not actually verify the value range, only the data length
       return isPoint(Buffer.from(publicKey))
-    } catch (err) {
+    } catch {
       return false
     }
   },
@@ -88,7 +88,7 @@ export const mobileEcc = {
     try {
       // temp solution secp256k1 does not actually verify the value range, only the data length
       return isPoint(Buffer.from(toPubKey(publicKey)))
-    } catch (err) {
+    } catch {
       return false
     }
   },

package/src/bitcoinjs-lib/script-classify/index.js

@@ -5,7 +5,7 @@ function isPaymentFactory(payment) {
     try {
       payment({ output: script }, { eccLib })
       return true
-    } catch (err) {
+    } catch {
       return false
     }
   }

package/src/btc-like-address.js

@@ -34,9 +34,8 @@ export const createBtcLikeAddress = ({
             // NOTE: We only support version zero witness programs
             if (decoded.words[0] !== 0) return false
             // Ensure correct length
-            if (bech32.fromWords(decoded.words.slice(1)).length !== length) return false
-            return true
-          } catch (e) {
+            return bech32.fromWords(decoded.words.slice(1)).length === length
+          } catch {
             return false
           }
         }
@@ -55,7 +54,7 @@ export const createBtcLikeAddress = ({
           const network = coinInfo.toBitcoinJS()
           bitcoinjsLibFork.payments.p2tr({ address: addr, network })
           return true
-        } catch (e) {
+        } catch {
           return false
         }
       })) ||

package/src/btc-like-keys.js

@@ -103,18 +103,22 @@ export const createBtcLikeKeys = ({
       assert(encodePublicPurpose44, errorMessage)
       return encodePublicPurpose44(publicKey)
     }
+
     if (purpose === 49) {
       assert(encodeNestedP2WPKH, errorMessage)
       return encodeNestedP2WPKH(publicKey)
     }
+
     if (purpose === 84) {
       assert(encodePublicBech32, errorMessage)
       return encodePublicBech32(publicKey)
     }
+
     if (purpose === 86) {
       assert(encodePublicTaproot, errorMessage)
       return encodePublicTaproot(publicKey)
     }
+
     throw new Error(errorMessage)
   }
 

package/src/constants/bip44.js

@@ -1,3 +1,3 @@
 // back compatibility. Use @exodus/bip44-constants/by-ticker instead
-import bip44Constants from '@exodus/bip44-constants/by-ticker'
-export default bip44Constants
+
+export { default } from '@exodus/bip44-constants/by-ticker'

package/src/fee/can-bump-tx.js

@@ -42,7 +42,9 @@ const _canBumpTx = ({
     const feePerKB = tx.data.feePerKB ? asset.currency.baseUnit(tx.data.feePerKB) : undefined
     if (!feePerKB) {
       return { errorMessage: 'fee rate is high enough' }
-    } else if (feeData.nextBlockMinimumFee) {
+    }
+
+    if (feeData.nextBlockMinimumFee) {
       if (feePerKB.gt(feeData.nextBlockMinimumFee.mul(1e3))) {
         return { errorMessage: 'fee rate is high enough' }
       }
@@ -104,7 +106,7 @@ const _canBumpTx = ({
     unconfirmedTxAncestor,
   })
 
-  return fee ? { bumpType: BumpType.CPFP } : { errorMessage: 'insufficient funds' }
+  return fee ? { bumpType: BumpType.CPFP, bumpFee: fee } : { errorMessage: 'insufficient funds' }
 }
 
 const validateIsNumber = (number, name) => {

package/src/fee/fee-estimator.js

@@ -60,8 +60,9 @@ export const getSizeFactory = ({ defaultOutputType, addressApi }) => {
 
   return (asset, inputs, outputs, { compressed = true } = {}) => {
     if (inputs instanceof UtxoCollection) {
-      inputs = Array.from(inputs).map((utxo) => utxo.script || null)
+      inputs = [...inputs].map((utxo) => utxo.script || null)
     }
+
     const assetName = asset.name
     // other bitcoin-like assets
     const baseSize =
@@ -103,6 +104,7 @@ export const getSizeFactory = ({ defaultOutputType, addressApi }) => {
             address: output,
           })
         }
+
         assert(
           supportedTypes.includes(scriptType),
           `Only ${supportedTypes.join(', ')} outputs supported right now`
@@ -132,6 +134,7 @@ export const getSizeFactory = ({ defaultOutputType, addressApi }) => {
             signatureLength
           )
         }
+
         if ([P2TR].includes(utxoScriptType)) {
           // Only the 64 byte Schnorr signature is present for Taproot Key-Path spend
           const signatureLength = 64
@@ -163,4 +166,5 @@ const getFeeEstimatorFactory = ({ defaultOutputType, addressApi }) => {
   const getSize = getSizeFactory({ defaultOutputType, addressApi })
   return createDefaultFeeEstimator(getSize)
 }
+
 export default getFeeEstimatorFactory

package/src/fee/fee-utils.js

@@ -3,7 +3,7 @@ import { resolveExtraFeeOfTx } from '../unconfirmed-ancestor-data'
 import { UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 
-export const isHex = (s) => typeof s === 'string' && /[0-9a-f]*/.test(s.toLowerCase())
+export const isHex = (s) => typeof s === 'string' && /[\da-f]*/.test(s.toLowerCase())
 
 export function getExtraFee({ asset, inputs, feePerKB, unconfirmedTxAncestor }) {
   let extraFee = 0
@@ -13,9 +13,7 @@ export function getExtraFee({ asset, inputs, feePerKB, unconfirmedTxAncestor })
     (inputs instanceof UtxoCollection || !Array.isArray(inputs))
   ) {
     const feeRate = feePerKB.toBaseNumber() / 1000
-    const utxos = Array.from(inputs).filter(
-      ({ confirmations }) => !confirmations || confirmations <= 0
-    )
+    const utxos = [...inputs].filter(({ confirmations }) => !confirmations || confirmations <= 0)
     const txIds = new Set(utxos.map(({ txId }) => txId))
     for (const txId of txIds) {
       extraFee += resolveExtraFeeOfTx({
@@ -25,8 +23,10 @@ export function getExtraFee({ asset, inputs, feePerKB, unconfirmedTxAncestor })
         unconfirmedTxAncestor,
       })
     }
+
     extraFee = Math.ceil(extraFee)
   }
+
   return extraFee
 }
 
@@ -46,11 +46,12 @@ export default function createDefaultFeeEstimator(getSize) {
     }
   }
 }
+
 export function parseCurrency(val, currency) {
   assert(currency instanceof UnitType, 'Currency must be supples as a UnitType')
 
   if (isNumberUnit(val)) return val // TODO: consider checking if the unitType.equals(currency) (if currency is object)
 
   if (typeof val === 'string') return currency.parse(val)
-  else return currency.parse(val.value + ' ' + val.unit)
+  return currency.parse(val.value + ' ' + val.unit)
 }

package/src/fee/get-fee-resolver.js

@@ -33,6 +33,7 @@ export class GetFeeResolver {
       assert(!isSendAll, 'isSendAll must not be provided when nft is provided!!!')
       assert(!brc20, 'brc20 must not be provided when nft is provided!!!')
     }
+
     if (brc20) {
       // assert(!amount, 'amount must not be provided when brc20 is provided!!!')
       assert(!isSendAll, 'isSendAll must not be provided when brc20 is provided!!!')
@@ -90,6 +91,7 @@ export class GetFeeResolver {
   }) => {
     assert(asset, 'asset must be provided')
     assert(feeData, 'feeData must be provided')
+    assert(customFee || feeData.feePerKB, 'feePerKB must be provided')
     assert(accountState, 'accountState must be provided')
     assert(txSet, 'txSet must be provided')
 
@@ -114,7 +116,7 @@ export class GetFeeResolver {
       feeRate: feePerKB,
       receiveAddress,
       inscriptionIds,
-      isSendAll: isSendAll,
+      isSendAll,
       getFeeEstimator: this.#getFeeEstimator,
       allowUnconfirmedRbfEnabledUtxos: this.#allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,

package/src/fee/script-classifier.js

@@ -9,12 +9,7 @@ const { P2PKH, P2SH, P2WPKH, P2WSH, P2TR } = scriptClassify.types
 const cacheSize = 1000
 const maxSize = 30
 const hashStringIfTooBig = (str) =>
-  str.length > maxSize
-    ? createHash('sha256')
-        .update(str)
-        .digest('hex')
-        .slice(0, maxSize)
-    : str
+  str.length > maxSize ? createHash('sha256').update(str).digest('hex').slice(0, maxSize) : str
 
 export const scriptClassifierFactory = ({ addressApi }) => {
   assert(addressApi, 'addressApi is required')
@@ -36,10 +31,10 @@ export const scriptClassifierFactory = ({ addressApi }) => {
       assert(assetName, 'assetName is required')
       assert(assetName, address, 'address is required')
       if (addressApi.isP2PKH(address)) return P2PKH
-      else if (addressApi.isP2SH(address)) return P2SH
-      else if (addressApi.isP2WPKH && addressApi.isP2WPKH(address)) return P2WPKH
-      else if (addressApi.isP2TR && addressApi.isP2TR(address)) return P2TR
-      else if (addressApi.isP2WSH && addressApi.isP2WSH(address)) return P2WSH
+      if (addressApi.isP2SH(address)) return P2SH
+      if (addressApi.isP2WPKH && addressApi.isP2WPKH(address)) return P2WPKH
+      if (addressApi.isP2TR && addressApi.isP2TR(address)) return P2TR
+      if (addressApi.isP2WSH && addressApi.isP2WSH(address)) return P2WSH
       return classifyScriptHex({
         assetName,
         classifyOutput,

package/src/fee/utxo-selector.js

@@ -10,6 +10,7 @@ const getBestReceiveAddresses = ({ asset, receiveAddress, inscriptionIds }) => {
   if (inscriptionIds) {
     return receiveAddress || 'P2TR'
   }
+
   if (receiveAddress === null) {
     return null
   }
@@ -68,7 +69,7 @@ export const selectUtxos = ({
       (replaceableTxs.length === 1 && confirmedUtxosArray.length === usableUtxos.size - 1))
 
   if (canReplace) {
-    for (let tx of replaceableTxs) {
+    for (const tx of replaceableTxs) {
       const changeUtxos = usableUtxos.getTxIdUtxos(tx.txId)
       // Don't replace a tx that has already been spent
       if (tx.data.changeAddress && changeUtxos.size === 0) continue
@@ -88,7 +89,7 @@ export const selectUtxos = ({
             ...tx.data.sent.map(({ address }) => address),
             tx.data.changeAddress?.address || changeAddressType,
           ]
-      if (receiveAddresses.find(Boolean)) outputs.push(...receiveAddresses)
+      if (receiveAddresses.some(Boolean)) outputs.push(...receiveAddresses)
 
       let fee
       let additionalUtxos
@@ -114,6 +115,7 @@ export const selectUtxos = ({
                 outputs: noChangeOutputs,
               })
             }
+
             break
           }
 
@@ -125,6 +127,7 @@ export const selectUtxos = ({
           })
         }
       }
+
       if (isSendAll || replaceTxAmount.add(additionalUtxos.value).gte(amount.add(fee))) {
         const chainOutputs = isSendAll ? receiveAddresses : [...receiveAddresses, changeAddressType]
         const chainFee = feeEstimator({
@@ -136,6 +139,7 @@ export const selectUtxos = ({
         if ((!amount.isZero || tx.data.changeAddress) && fee.sub(tx.feeAmount).gte(chainFee)) {
           continue
         }
+
         return { selectedUtxos: additionalUtxos, fee, replaceTx: tx }
       }
     }
@@ -146,7 +150,7 @@ export const selectUtxos = ({
   // We can still spend our rbf utxos, but put them last
   let ourRbfUtxos = UtxoCollection.createEmpty({ currency })
   if (replaceableTxs) {
-    for (let tx of replaceableTxs) {
+    for (const tx of replaceableTxs) {
       if (!tx.data.changeAddress) continue
       const changeUtxos = usableUtxos.getTxIdUtxos(tx.txId)
       ourRbfUtxos = ourRbfUtxos.union(changeUtxos)
@@ -167,6 +171,7 @@ export const selectUtxos = ({
     if (selectedUtxos.value.lt(amount.add(fee))) {
       return { fee }
     }
+
     return { selectedUtxos, fee }
   }
 
@@ -209,9 +214,11 @@ export const selectUtxos = ({
     selectedUtxos = selectedUtxos.addUtxo(remainingUtxosArray.shift())
     fee = feeEstimator({ inputs: selectedUtxos, outputs })
   }
+
   if (selectedUtxos.value.lt(amount.add(fee))) {
     return { fee }
   }
+
   return { selectedUtxos, fee }
 }
 

package/src/hash-utils.js

@@ -1,19 +1,14 @@
 import createHash from 'create-hash'
+
 export function hash160(buffer) {
   const sha256Hash = sha256(buffer)
   try {
-    return createHash('ripemd160')
-      .update(sha256Hash)
-      .digest()
+    return createHash('ripemd160').update(sha256Hash).digest()
   } catch {
-    return createHash('rmd160')
-      .update(sha256Hash)
-      .digest()
+    return createHash('rmd160').update(sha256Hash).digest()
   }
 }
 
 export function sha256(buffer) {
-  return createHash('sha256')
-    .update(buffer)
-    .digest()
+  return createHash('sha256').update(buffer).digest()
 }

package/src/insight-api-client/index.js

@@ -1,13 +1,14 @@
-/* global fetch */
 import urlJoin from 'url-join'
 import delay from 'delay'
 import { isEmpty } from 'lodash'
 
+import { fetch } from '@exodus/fetch'
+
 const getTextFromResponse = async (response) => {
   try {
     const responseBody = await response.text()
-    return responseBody.substring(0, 100)
-  } catch (e) {
+    return responseBody.slice(0, 100)
+  } catch {
     return ''
   }
 }
@@ -16,8 +17,9 @@ const fetchJson = async (url, fetchOptions) => {
   const response = await fetch(url, fetchOptions)
   if (!response.ok)
     throw new Error(
-      `${url} returned ${response.status}: ${response.statusText ||
-        'Unknown Status Text'}. Body: ${await getTextFromResponse(response)}`
+      `${url} returned ${response.status}: ${
+        response.statusText || 'Unknown Status Text'
+      }. Body: ${await getTextFromResponse(response)}`
     )
   return response.json()
 }
@@ -29,8 +31,7 @@ async function fetchJsonRetry(url, fetchOptions) {
   let i = 0
   while (true) {
     try {
-      const data = await fetchJson(url, fetchOptions)
-      return data
+      return await fetchJson(url, fetchOptions)
     } catch (e) {
       if (i < waitTimes.length) {
         await delay(waitTimes[i])
@@ -53,7 +54,7 @@ export default class InsightAPIClient {
 
   async isNetworkConnected() {
     const url = urlJoin(this._baseURL, '/peer')
-    const peerStatus = await fetchJson(url, { timeout: 10000 })
+    const peerStatus = await fetchJson(url, { timeout: 10_000 })
     return !!peerStatus.connected
   }
 
@@ -65,15 +66,15 @@ export default class InsightAPIClient {
 
   async fetchBlockHeight() {
     const url = urlJoin(this._baseURL, '/status')
-    const status = await fetchJson(url, { timeout: 10000 })
+    const status = await fetchJson(url, { timeout: 10_000 })
     return status.info.blocks
   }
 
-  async fetchAddress(address, opts = { includeTxs: false }) {
+  async fetchAddress(address, opts) {
     const encodedAddress = encodeURIComponent(address)
     const url = urlJoin(
       this._baseURL,
-      opts.includeTxs ? `/addr/${encodedAddress}` : `/addr/${encodedAddress}?noTxList=1`
+      opts?.includeTxs ? `/addr/${encodedAddress}` : `/addr/${encodedAddress}?noTxList=1`
     )
     return fetchJson(url)
   }
@@ -84,6 +85,7 @@ export default class InsightAPIClient {
     if (assetNames) {
       query.set('assetNames', assetNames.join(','))
     }
+
     const encodedAddresses = encodeURIComponent(addresses)
     const url = urlJoin(this._baseURL, `/addrs/${encodedAddresses}/utxo?${query}`)
     const utxos = await fetchJson(url)
@@ -118,6 +120,7 @@ export default class InsightAPIClient {
     if (isEmpty(object)) {
       return null
     }
+
     return object
   }
 
@@ -132,7 +135,7 @@ export default class InsightAPIClient {
     if (!Array.isArray(addrs) || addrs.length === 0) return { items: [], totalItems: 0 }
 
     options = { noScriptSig: 1, noAsm: 1, noSpent: 0, from: 0, to: 10, ...options }
-    const url = `${urlJoin(this._baseURL, `/addrs/txs`)}?${new URLSearchParams(options)}`
+    const url = `${urlJoin(this._baseURL, '/addrs/txs')}?${new URLSearchParams(options)}`
 
     const fetchOptions = {
       method: 'post',
@@ -141,7 +144,7 @@ export default class InsightAPIClient {
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({ addrs: addrs.join(',') }),
-      timeout: 10000,
+      timeout: 10_000,
     }
 
     return fetchJsonRetry(url, fetchOptions)

package/src/insight-api-client/util.js

@@ -31,41 +31,41 @@ export function orderTxs(txs) {
 
   // sort unique time keys
   const txTimes = Object.keys(txTimesMap)
-  txTimes.sort((a, b) => ~~a - ~~b)
+  txTimes.sort((a, b) => Math.trunc(a) - Math.trunc(b))
 
-  let rettxs = []
+  const rettxs = []
 
   txTimes.forEach((txTime) => {
-    let txsAtTime = txTimesMap[txTime] // array of txs
+    const txsAtTime = txTimesMap[txTime] // array of txs
     // should always be an array, but just incase
     if (!Array.isArray(txsAtTime)) return
     if (txsAtTime.length === 1) return rettxs.push(txsAtTime[0])
 
     // existing order { txid: orderNum }
-    let txOrderCol = []
-    for (let i = 0; i < txsAtTime.length; ++i) {
-      txOrderCol.push({ txid: txsAtTime[i].txid, order: i })
+    const txOrderCol = []
+    for (const [i, element] of txsAtTime.entries()) {
+      txOrderCol.push({ txid: element.txid, order: i })
     }
 
     // determine new orders, checks each vin and looks for max order,
     // want current tx greater than any vin
-    const txsAtTimeClone = txsAtTime.slice(0)
+    const txsAtTimeClone = [...txsAtTime]
     while (txsAtTime.length > 0) {
-      let tx = txsAtTime.shift()
+      const tx = txsAtTime.shift()
       let maxOrder = 0
       tx.vin.forEach((vin) => {
-        let txOrderMatch = txOrderCol.find((opair) => opair.txid === vin.txid)
+        const txOrderMatch = txOrderCol.find((opair) => opair.txid === vin.txid)
         if (txOrderMatch && txOrderMatch.order > maxOrder) maxOrder = txOrderMatch.order
       })
       txOrderCol.find((opair) => opair.txid === tx.txid).order = maxOrder + 1
     }
 
-    let baseTime = ~~txTime
+    const baseTime = Math.trunc(txTime)
     const newWorldOrder = sortBy(txOrderCol, ['order'])
     newWorldOrder.forEach((opair, i) => {
-      let txid = opair.txid
+      const txid = opair.txid
 
-      let tx = txsAtTimeClone.find((tx) => tx.txid === txid)
+      const tx = txsAtTimeClone.find((tx) => tx.txid === txid)
       assert(tx, 'InsightAPIClient.orderTxs() tx undefined.')
 
       // we must do this to preserve order outside of this algorithm, difference is negligible
@@ -89,16 +89,17 @@ export function toWSUrl(apiUrl) {
   if (!apiUrl) {
     return apiUrl
   }
+
   try {
     // Note, we are not using URL because URL is different between mobile, desktop and BE
     // Using hydra's networking modules is an overkill for this function.
     const firstSplit = apiUrl.split('://')
     if (firstSplit.length > 1) {
       return `${firstSplit[0]}://${firstSplit[1].split('/')[0]}`
-    } else {
-      return apiUrl
     }
-  } catch (e) {
+
+    return apiUrl
+  } catch {
     return apiUrl
   }
 }

package/src/insight-api-client/ws.js

@@ -11,7 +11,7 @@ export default class InsightWSClient extends EventEmitter {
 
   connect(addresses, opts) {
     const options = Object.assign(
-      { transports: ['websocket'], reconnectionDelayMax: 30000, reconnectionDelay: 10000 },
+      { transports: ['websocket'], reconnectionDelayMax: 30_000, reconnectionDelay: 10_000 },
       opts
     )