@exodus/bitcoin-api 2.2.2 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -13,7 +13,6 @@
     "access": "restricted"
   },
   "scripts": {
-    "build": "babel --root-mode upward --delete-dir-on-start --ignore '**/__tests__/**' src --out-dir lib",
     "test": "jest",
     "lint": "eslint ./src",
     "lint:fix": "yarn lint --fix"
@@ -41,5 +40,5 @@
     "@exodus/bitcoin-meta": "^1.0.0",
     "@noble/secp256k1": "~1.5.3"
   },
-  "gitHead": "2d223c3c71d00fbd5246af3f39410eec113d0029"
+  "gitHead": "f8d65434ff4e35d66c1da37051f2dae30da419b7"
 }

package/src/balances.js

@@ -0,0 +1,26 @@
+import assert from 'minimalistic-assert'
+import { getUtxos } from './utxos-utils'
+
+// known issue!! fee data is static here!
+// Hydra's balances's module does not provide it when calling asset.api.getBalances
+// https://github.com/ExodusMovement/exodus-hydra/blob/f9110f8e9e76b8b199bc4d40461cb1bed3a5be1e/modules/balances/module/index.js#L130
+// feeData is required to know if an unconfirmed tx can or cannot be RBFed?
+// This could be fixed once we allow all unconfirmed utxos to be RBFed or if we change the balance module to provide the feeData when calling asset.api.getBalances
+export const getBalancesFactory = ({ feeData, getSpendableBalance }) => {
+  assert(feeData, 'feeData is required')
+  assert(getSpendableBalance, 'getSpendableBalance is required')
+  return ({ asset, accountState, txLog }) => {
+    assert(asset, 'asset is required')
+    assert(accountState, 'accountState is required')
+    assert(txLog, 'txLog is required')
+    const utxos = getUtxos({ asset, accountState })
+    const balance = utxos.value
+    const spendableBalance = getSpendableBalance({
+      asset,
+      accountState,
+      txSet: txLog,
+      feeData,
+    })
+    return { balance, spendableBalance }
+  }
+}

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

@@ -78,7 +78,7 @@ const _canBumpTx = ({
     }
 
   if (bumpTx) {
-    const { replaceTx } = selectUtxos({
+    const { replaceTx, fee } = selectUtxos({
       asset,
       usableUtxos,
       replaceableTxs: [bumpTx],
@@ -87,7 +87,7 @@ const _canBumpTx = ({
       getFeeEstimator,
       allowUnconfirmedRbfEnabledUtxos,
     })
-    if (replaceTx) return { bumpType: BumpType.RBF }
+    if (replaceTx) return { bumpType: BumpType.RBF, bumpFee: fee.sub(replaceTx.feeAmount) }
   }
 
   const { fee } = selectUtxos({
@@ -108,8 +108,9 @@ const validateIsNumber = (number, name) => {
   return number
 }
 
-const wrapResponseToObject = ({ bumpType = BumpType.NONE, errorMessage = null } = {}) => ({
+const wrapResponseToObject = ({ bumpType = BumpType.NONE, bumpFee, errorMessage = null } = {}) => ({
   bumpType,
+  bumpFee,
   errorMessage,
 })
 

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

@@ -1,7 +1,7 @@
 import assert from 'minimalistic-assert'
 import { getUtxosData } from './utxo-selector'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
-import { getSpendableUtxos, getUsableUtxos, getUtxos } from '../utxos-utils'
+import { getUsableUtxos, getUtxos } from '../utxos-utils'
 import { canBumpTx } from './can-bump-tx'
 
 export class GetFeeResolver {
@@ -40,15 +40,13 @@ export class GetFeeResolver {
   }
 
   getSpendableBalance = ({ asset, accountState, txSet, feeData }) => {
-    const utxos = getUtxos({ accountState, asset })
-    const spendableUtxos = getSpendableUtxos({
+    return this.#getUtxosData({
       asset,
-      utxos,
-      feeData,
+      accountState,
       txSet,
-      allowUnconfirmedRbfEnabledUtxos: this.#allowUnconfirmedRbfEnabledUtxos,
-    })
-    return spendableUtxos.value
+      feeData,
+      isSendAll: true,
+    }).spendableBalance
   }
 
   #getUtxosData = ({ asset, accountState, txSet, feeData, amount, customFee, isSendAll }) => {

package/src/fee/utxo-selector.js

@@ -209,12 +209,15 @@ export const getUtxosData = ({
   })
 
   const resolvedFee = replaceTx ? fee.sub(replaceTx.feeAmount) : fee
-
-  const spendableBalance = getConfirmedOrRfbDisabledUtxos({
+  const empty = UtxoCollection.createEmpty({ currency: asset.currency })
+  const spendableUtxos = getConfirmedOrRfbDisabledUtxos({
     asset,
     utxos: usableUtxos,
     allowUnconfirmedRbfEnabledUtxos,
-  }).value
+  }).union(replaceTx ? usableUtxos.getTxIdUtxos(replaceTx.txId) : empty)
+  // .union(selectedUtxos || empty)
+
+  const spendableBalance = spendableUtxos.value
 
   const extraFee = selectedUtxos
     ? asset.currency.baseUnit(getExtraFee({ asset, inputs: selectedUtxos, feePerKB: feeRate }))

package/src/index.js

@@ -1,4 +1,5 @@
 export * from './account-state'
+export * from './balances'
 export * from './btc-address'
 export * from './btc-like-address'
 export * from './btc-like-keys'

package/src/utxos-utils.js

@@ -12,26 +12,6 @@ export function getUtxos({ accountState, asset }) {
   )
 }
 
-export const getBalancesFactory = ({ feeData, allowUnconfirmedRbfEnabledUtxos }) => {
-  assert(feeData, 'feeData is required')
-  return ({ asset, accountState, txLog }) => {
-    assert(asset, 'asset is required')
-    assert(accountState, 'accountState is required')
-    assert(txLog, 'txLog is required')
-    const utxos = getUtxos({ asset, accountState })
-    const balance = utxos.value
-    const spendableBalance = getSpendableUtxos({
-      asset,
-      utxos,
-      txSet: txLog,
-      feeData,
-
-      allowUnconfirmedRbfEnabledUtxos,
-    }).value
-    return { balance, spendableBalance }
-  }
-}
-
 export function getConfirmedUtxos({ asset, utxos }) {
   assert(asset, 'asset is required')
   assert(utxos, 'utxos is required')
@@ -83,19 +63,3 @@ export function getUsableUtxos({ asset, utxos, feeData, txSet }) {
         { currency: asset.currency }
       )
 }
-
-export function getSpendableUtxos({
-  asset,
-  utxos,
-  feeData,
-  txSet,
-
-  allowUnconfirmedRbfEnabledUtxos,
-}) {
-  const usableUtxos = getUsableUtxos({ asset, utxos, feeData, txSet })
-  return getConfirmedOrRfbDisabledUtxos({
-    asset,
-    utxos: usableUtxos,
-    allowUnconfirmedRbfEnabledUtxos,
-  })
-}