@exodus/bitcoin-api 2.29.8 → 2.31.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.31.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.30.0...@exodus/bitcoin-api@2.31.0) (2025-01-23)
+
+
+### Features
+
+
+* feat(eth-like,btc-like): make broadcastTx compatible with rawTx (#4911)
+
+
+
+## [2.30.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.29.8...@exodus/bitcoin-api@2.30.0) (2025-01-10)
+
+
+### Features
+
+
+* feat: bitcoin dust fee display (#4789)
+
+
+
 ## [2.29.8](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.29.7...@exodus/bitcoin-api@2.29.8) (2025-01-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.29.8",
+  "version": "2.31.0",
   "description": "Bitcoin transaction and fee monitors, RPC with the blockchain node, other networking code.",
   "type": "module",
   "main": "src/index.js",
@@ -56,5 +56,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "c848fe0785fb999de9241cb35456ed5c56c52093"
+  "gitHead": "1f116146a725da6f3c98abdf233261512a6333fc"
 }

package/src/balances.js

@@ -16,23 +16,6 @@ export const getBalancesFactory = ({ feeData, getSpendableBalance, ordinalsEnabl
     assert(accountState, 'accountState is required')
     assert(txLog, 'txLog is required')
 
-    if (accountState.magicEdenApiFungibleBalances) {
-      const validBalances = accountState.magicEdenApiFungibleBalances.filter(
-        (fungibleBalance) => fungibleBalance.asset.ticker === asset.ticker
-      )
-      const parsedBalances = validBalances.map(({ balance }) =>
-        asset.currency.defaultUnit(balance.balance)
-      )
-      const totalBalance = asset.currency.defaultUnit(
-        parsedBalances.reduce((sum, item) => sum.add(item), asset.currency.ZERO)
-      )
-      return {
-        total: totalBalance,
-        // legacy
-        balance: totalBalance,
-      }
-    }
-
     const utxos = getUtxos({ asset, accountState })
     const balance = utxos.value
     const spendableBalance = getSpendableBalance({

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

@@ -59,7 +59,7 @@ export class GetFeeResolver {
 
     const inscriptionIds = getInscriptionIds({ nft, brc20 })
 
-    const { resolvedFee, extraFee } = this.#getUtxosData({
+    const { fee, unspendableFee, extraFeeData } = this.#getUtxosData({
       asset,
       accountState,
       txSet,
@@ -71,7 +71,7 @@ export class GetFeeResolver {
       inscriptionIds,
       taprootInputWitnessSize,
     })
-    return { fee: resolvedFee, extraFee }
+    return { fee, unspendableFee, extraFeeData }
   }
 
   getAvailableBalance = ({

package/src/fee/utxo-selector.js

@@ -3,6 +3,7 @@ import { UtxoCollection } from '@exodus/models'
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 
+import { getChangeDustValue } from '../dust.js'
 import { getConfirmedOrRfbDisabledUtxos, getConfirmedUtxos } from '../utxos-utils.js'
 import { getExtraFee } from './fee-utils.js'
 
@@ -265,7 +266,11 @@ export const getUtxosData = ({
   taprootInputWitnessSize,
   changeAddressType,
 }) => {
-  const { selectedUtxos, replaceTx, fee } = selectUtxos({
+  const {
+    selectedUtxos,
+    replaceTx,
+    fee: unspendableFee,
+  } = selectUtxos({
     asset,
     usableUtxos,
     replaceableTxs,
@@ -285,18 +290,20 @@ export const getUtxosData = ({
     changeAddressType,
   })
 
-  const resolvedFee = replaceTx ? fee.sub(replaceTx.feeAmount) : fee
+  let fee = replaceTx ? unspendableFee.sub(replaceTx.feeAmount) : unspendableFee
   const empty = UtxoCollection.createEmpty({ currency: asset.currency })
+
+  const replaceUtxos = replaceTx ? usableUtxos.getTxIdUtxos(replaceTx.txId) : empty
+
   const spendableUtxos = getConfirmedOrRfbDisabledUtxos({
     asset,
     utxos: usableUtxos,
     allowUnconfirmedRbfEnabledUtxos,
-  }).union(replaceTx ? usableUtxos.getTxIdUtxos(replaceTx.txId) : empty)
-  // .union(selectedUtxos || empty)
+  }).union(replaceUtxos)
 
   const spendableBalance = spendableUtxos.value
 
-  const extraFee = selectedUtxos
+  const extraFeeCpfp = selectedUtxos
     ? asset.currency.baseUnit(
         getExtraFee({
           asset,
@@ -307,15 +314,38 @@ export const getUtxosData = ({
       )
     : asset.currency.ZERO
 
-  const availableBalance = spendableBalance.sub(resolvedFee).clampLowerZero()
+  const availableBalance = spendableBalance.sub(fee).clampLowerZero()
+
+  const change =
+    selectedUtxos?.size && amount
+      ? selectedUtxos.union(replaceUtxos).value.sub(amount).sub(fee)
+      : undefined
+
+  const dust = getChangeDustValue(asset)
+
+  let extraFeeDust = asset.currency.ZERO
+  if (change && !change.isZero && change.lt(dust)) {
+    fee = fee.add(change)
+    extraFeeDust = change
+  }
+
+  let extraFeeData
+  if (!extraFeeCpfp.isZero && !extraFeeDust.isZero) {
+    extraFeeData = { type: 'cpfpdust', extraFee: extraFeeCpfp.add(extraFeeDust) }
+  } else if (!extraFeeDust.isZero) {
+    extraFeeData = { type: 'dust', extraFee: extraFeeDust }
+  } else if (!extraFeeCpfp.isZero) {
+    extraFeeData = { type: 'cpfp', extraFee: extraFeeCpfp }
+  }
+
   return {
     spendableBalance,
     availableBalance,
     selectedUtxos,
+    unspendableFee,
     fee,
-    resolvedFee,
     replaceTx,
-    extraFee,
+    extraFeeData,
   }
 }
 

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

@@ -166,6 +166,7 @@ export default class InsightAPIClient {
   }
 
   async broadcastTx(rawTx) {
+    const _rawTx = rawTx instanceof Uint8Array ? Buffer.from(rawTx).toString('hex') : rawTx
     console.log('gonna broadcastTx')
     const url = urlJoin(this._baseURL, '/tx/send')
     const fetchOptions = {
@@ -174,7 +175,7 @@ export default class InsightAPIClient {
         Accept: 'application/json',
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({ rawtx: rawTx }),
+      body: JSON.stringify({ rawtx: _rawTx }),
     }
 
     const response = await fetch(url, fetchOptions)

package/src/tx-log/bitcoin-monitor.js

@@ -295,12 +295,6 @@ export class Monitor extends BaseMonitor {
       newData.mem = { unconfirmedTxAncestor }
     }
 
-    if (this.fetchFungibleBalances) {
-      try {
-        newData.magicEdenApiFungibleBalances = await this.fetchFungibleBalances(walletAccount)
-      } catch {}
-    }
-
     await aci.updateAccountState({
       assetName,
       walletAccount,