@exodus/bitcoin-api 2.9.6 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.9.6",
+  "version": "2.10.0",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -28,7 +28,6 @@
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
-    "@noble/hashes": "^1.3.3",
     "@noble/secp256k1": "~1.7.1",
     "bech32": "^1.1.3",
     "bip32-path": "^0.4.2",
@@ -58,5 +57,5 @@
     "jest-when": "^3.5.1",
     "safe-buffer": "^5.2.1"
   },
-  "gitHead": "aa2228b4d986dacc2f2ce1975d75f81b48b22d9a"
+  "gitHead": "ec2ae412ef3401a8a451568382c9d7a6782cbd6a"
 }

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

@@ -1,15 +1,7 @@
 import { initEccLib } from 'bitcoinjs-lib'
-import { utils, Point, schnorr, sign } from '@noble/secp256k1'
+import { Point, schnorr, sign } from '@noble/secp256k1'
 import { common, toPubKey } from './common'
 
-import { hmac } from '@noble/hashes/hmac'
-import { sha256 } from '@noble/hashes/sha256'
-
-// hijack to avoid the usage of crypto.subtle, not present in RN atm
-utils.hmacSha256 = (key, ...msgs) => hmac(sha256, key, utils.concatBytes(...msgs))
-
-utils.sha256 = (...msgs) => sha256(utils.concatBytes(...msgs))
-
 /**
  * Wrapper around `secp256k1` in order to follow the bitcoinjs-lib `TinySecp256k1Interface`
  * Schnorr signatures are offered by @noble/secp256k1

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

@@ -17,6 +17,7 @@ const _canBumpTx = ({
   feeData,
   getFeeEstimator,
   allowUnconfirmedRbfEnabledUtxos,
+  utxosDescendingOrder,
 }) => {
   assert(asset, 'asset must be provided')
   assert(tx, 'tx must be provided')
@@ -91,6 +92,7 @@ const _canBumpTx = ({
       getFeeEstimator,
       allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,
+      utxosDescendingOrder,
     })
     if (replaceTx) return { bumpType: BumpType.RBF, bumpFee: fee.sub(replaceTx.feeAmount) }
   }
@@ -104,6 +106,7 @@ const _canBumpTx = ({
     mustSpendUtxos: changeUtxos,
     allowUnconfirmedRbfEnabledUtxos,
     unconfirmedTxAncestor,
+    utxosDescendingOrder,
   })
 
   return fee ? { bumpType: BumpType.CPFP, bumpFee: fee } : { errorMessage: 'insufficient funds' }

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

@@ -8,12 +8,14 @@ import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
 export class GetFeeResolver {
   #getFeeEstimator
   #allowUnconfirmedRbfEnabledUtxos
+  #utxosDescendingOrder
 
-  constructor({ getFeeEstimator, allowUnconfirmedRbfEnabledUtxos }) {
+  constructor({ getFeeEstimator, allowUnconfirmedRbfEnabledUtxos, utxosDescendingOrder }) {
     assert(getFeeEstimator, 'getFeeEstimator must be provided')
     this.#getFeeEstimator = (asset, { feePerKB, ...options }) =>
       getFeeEstimator(asset, feePerKB, options)
     this.#allowUnconfirmedRbfEnabledUtxos = allowUnconfirmedRbfEnabledUtxos
+    this.#utxosDescendingOrder = utxosDescendingOrder
   }
 
   getFee = ({
@@ -120,6 +122,7 @@ export class GetFeeResolver {
       getFeeEstimator: this.#getFeeEstimator,
       allowUnconfirmedRbfEnabledUtxos: this.#allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,
+      utxosDescendingOrder: this.#utxosDescendingOrder,
     })
   }
 
@@ -132,6 +135,7 @@ export class GetFeeResolver {
       feeData,
       getFeeEstimator: this.#getFeeEstimator,
       allowUnconfirmedRbfEnabledUtxos: this.#allowUnconfirmedRbfEnabledUtxos,
+      utxosDescendingOrder: this.#utxosDescendingOrder,
     })
   }
 }

package/src/fee/utxo-selector.js

@@ -1,5 +1,6 @@
 import { UtxoCollection } from '@exodus/models'
 import NumberUnit from '@exodus/currency'
+import { sortBy } from 'lodash'
 import assert from 'minimalistic-assert'
 import { getExtraFee } from './fee-utils'
 import { getConfirmedUtxos, getConfirmedOrRfbDisabledUtxos } from '../utxos-utils'
@@ -20,6 +21,7 @@ const getBestReceiveAddresses = ({ asset, receiveAddress, inscriptionIds }) => {
 
 export const selectUtxos = ({
   asset,
+  utxosDescendingOrder,
   usableUtxos,
   replaceableTxs,
   amount,
@@ -163,7 +165,10 @@ export const selectUtxos = ({
     allowUnconfirmedRbfEnabledUtxos,
   })
 
-  const utxosArray = spendableUtxos.union(ourRbfUtxos).toPriorityOrderedArray()
+  const utxosArray = _toPriorityOrderedArray({
+    utxosDescendingOrder,
+    utxos: spendableUtxos.union(ourRbfUtxos),
+  })
 
   if (isSendAll) {
     const selectedUtxos = UtxoCollection.fromArray(utxosArray, { currency })
@@ -181,10 +186,10 @@ export const selectUtxos = ({
     (total, utxo) => total.add(utxo.value),
     currency.ZERO
   )
-  const remainingUtxosArray = spendableUtxos
-    .union(ourRbfUtxos)
-    .difference(mustSpendUtxos)
-    .toPriorityOrderedArray()
+  const remainingUtxosArray = _toPriorityOrderedArray({
+    utxosDescendingOrder,
+    utxos: spendableUtxos.union(ourRbfUtxos).difference(mustSpendUtxos),
+  })
 
   while (selectedUtxosValue.lte(amount) && remainingUtxosArray.length > 0) {
     const newUtxo = remainingUtxosArray.shift()
@@ -236,6 +241,7 @@ export const getUtxosData = ({
   allowUnconfirmedRbfEnabledUtxos,
   inscriptionIds,
   unconfirmedTxAncestor,
+  utxosDescendingOrder,
 }) => {
   const { selectedUtxos, replaceTx, fee } = selectUtxos({
     asset,
@@ -251,6 +257,7 @@ export const getUtxosData = ({
     allowUnconfirmedRbfEnabledUtxos,
     unconfirmedTxAncestor,
     inscriptionIds,
+    utxosDescendingOrder,
   })
 
   const resolvedFee = replaceTx ? fee.sub(replaceTx.feeAmount) : fee
@@ -286,3 +293,16 @@ export const getUtxosData = ({
     extraFee,
   }
 }
+
+/**
+ * Replacing the `toPriorityOrderedArray` from @exodus/models
+ * Adding the functionality to sort utxos by ascending / descending order
+ */
+const _toPriorityOrderedArray = ({ utxosDescendingOrder = false, utxos }) => {
+  return sortBy(
+    utxos.toArray(),
+    (utxo) => !utxo.confirmations && utxo.rbfEnabled,
+    (utxo) => !utxo.confirmations,
+    (utxo) => utxo.value.toBaseNumber() * (utxosDescendingOrder ? -1 : 1)
+  )
+}

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

@@ -3,6 +3,7 @@ import delay from 'delay'
 import { isEmpty } from 'lodash'
 
 import { fetch } from '@exodus/fetch'
+import { retry } from '@exodus/simple-retry'
 
 const getTextFromResponse = async (response) => {
   try {
@@ -24,23 +25,10 @@ const fetchJson = async (url, fetchOptions) => {
   return response.json()
 }
 
-// TODO: use p-retry
 async function fetchJsonRetry(url, fetchOptions) {
-  const waitTimes = [5, 10, 20, 30].map((t) => t * 1000)
-
-  let i = 0
-  while (true) {
-    try {
-      return await fetchJson(url, fetchOptions)
-    } catch (e) {
-      if (i < waitTimes.length) {
-        await delay(waitTimes[i])
-        i++
-      } else {
-        throw e
-      }
-    }
-  }
+  const waitTimes = ['5s', '10s', '20s', '30s']
+  const fetchWithRetry = retry(fetchJson, { delayTimesMs: waitTimes })
+  return fetchWithRetry(url, fetchOptions)
 }
 
 export default class InsightAPIClient {

package/src/tx-send/index.js

@@ -137,6 +137,7 @@ export const createAndBroadcastTXFactory =
     getSizeAndChangeScript = getSizeAndChangeScriptFactory(), // for decred customizations
     allowUnconfirmedRbfEnabledUtxos,
     ordinalsEnabled = false,
+    utxosDescendingOrder,
   }) =>
   async (
     { asset: maybeToken, walletAccount, address, amount: tokenAmount, options },
@@ -268,6 +269,7 @@ export const createAndBroadcastTXFactory =
       allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,
       inscriptionIds,
+      utxosDescendingOrder,
     })
 
     if (!selectedUtxos && !replaceTx) throw new Error('Not enough funds.')