@exodus/bitcoin-api 2.30.0 → 2.31.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.31.1](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.31.0...@exodus/bitcoin-api@2.31.1) (2025-03-19)
+
+
+### Bug Fixes
+
+
+* fix: BTC monitor scanning enhancement (#5112)
+
+* fix: remove brc20 dead code (#5286)
+
+
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.30.0",
+  "version": "2.31.1",
   "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": "94e7e3c3c61802ff79891bf67e66e9f2b87b80a6"
+  "gitHead": "f1b6ccb198231db1fb6c9c51a0173967ec4efd1f"
 }

package/src/account-state.js

@@ -1,6 +1,6 @@
 import { AccountState, UtxoCollection } from '@exodus/models'
 
-export function createAccountState({ asset, ordinalsEnabled = false, brc20Enabled = false }) {
+export function createAccountState({ asset, ordinalsEnabled = false }) {
   const empty = UtxoCollection.createEmpty({
     currency: asset.currency,
   })
@@ -18,10 +18,6 @@ export function createAccountState({ asset, ordinalsEnabled = false, brc20Enable
     defaults.additionalInscriptions = []
   }
 
-  if (brc20Enabled) {
-    defaults.brc20Balances = {}
-  }
-
   return class BitcoinAccountState extends AccountState {
     static defaults = defaults
   }

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

@@ -41,23 +41,15 @@ export class GetFeeResolver {
     customFee,
     isSendAll,
     nft, // sending one nft
-    brc20, // sending multiple inscriptions ids (as in sending multiple transfer ordinals)
     receiveAddress,
     taprootInputWitnessSize,
   }) => {
     if (nft) {
       assert(!amount, 'amount must not be provided when nft is provided!!!')
       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!!!')
-      assert(!nft, 'nft must not be provided when brc20 is provided!!!')
-    }
-
-    const inscriptionIds = getInscriptionIds({ nft, brc20 })
+    const inscriptionIds = getInscriptionIds({ nft })
 
     const { fee, unspendableFee, extraFeeData } = this.#getUtxosData({
       asset,
@@ -65,7 +57,7 @@ export class GetFeeResolver {
       txSet,
       feeData,
       receiveAddress,
-      amount: brc20 ? undefined : amount,
+      amount,
       customFee,
       isSendAll,
       inscriptionIds,

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-scanner.js

@@ -619,7 +619,7 @@ export class BitcoinMonitorScanner {
 
     // this protects from the server returning bad spentTxId
     utxos = utxos.filter((utxo) => {
-      if (!vinTxids[`${utxo.txId}-${utxo.vout}`]) return utxo
+      return !vinTxids[`${utxo.txId}-${utxo.vout}`]
     })
 
     let utxoCol = UtxoCollection.fromArray(utxos, { currency })

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,

package/src/tx-send/index.js

@@ -202,7 +202,7 @@ export const getPrepareSendTransaction =
     assetClientInterface,
     changeAddressType,
   }) =>
-  async ({ asset: maybeToken, walletAccount, address, amount: tokenAmount, options }) => {
+  async ({ asset, walletAccount, address, amount, options }) => {
     const {
       multipleAddressesEnabled,
       feePerKB,
@@ -210,14 +210,12 @@ export const getPrepareSendTransaction =
       isSendAll,
       bumpTxId,
       nft,
-      feeOpts,
       isExchange,
       isBip70,
       isRbfAllowed,
       taprootInputWitnessSize,
     } = options
 
-    const asset = maybeToken.baseAsset
     const assetName = asset.name
     const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
     const feeData = await assetClientInterface.getFeeConfig({ assetName })
@@ -225,19 +223,11 @@ export const getPrepareSendTransaction =
     const insightClient = asset.baseAsset.insightClient
 
     const blockHeight = providedBlockHeight || (await getBlockHeight({ assetName, insightClient }))
-    const brc20 = options.brc20 || feeOpts?.brc20 // feeOpts is the only way I've found atm to pass brc20 param without changing the tx-send hydra module
 
     const rbfEnabled =
-      providedRbfEnabled ||
-      (feeData.rbfEnabled && !isExchange && !isBip70 && isRbfAllowed && !nft && !brc20)
+      providedRbfEnabled || (feeData.rbfEnabled && !isExchange && !isBip70 && isRbfAllowed && !nft)
 
-    const isToken = maybeToken.name !== asset.name
-    if (isToken) {
-      assert(brc20, 'brc20 is required when sending bitcoin token')
-    }
-
-    const amount = isToken ? asset.currency.ZERO : tokenAmount
-    const inscriptionIds = getInscriptionIds({ nft, brc20 })
+    const inscriptionIds = getInscriptionIds({ nft })
 
     assert(
       ordinalsEnabled || !inscriptionIds,
@@ -465,20 +455,16 @@ export const createAndBroadcastTXFactory =
     assetClientInterface,
     changeAddressType,
   }) =>
-  async ({ asset: maybeToken, walletAccount, address, amount: tokenAmount, options }) => {
+  async ({ asset, walletAccount, address, amount, options }) => {
     // Prepare transaction
-    const { bumpTxId, nft, isExchange, isBip70, isRbfAllowed = true, feeOpts } = options
+    const { bumpTxId, nft, isExchange, isBip70, isRbfAllowed = true } = options
 
-    const asset = maybeToken.baseAsset
     const assetName = asset.name
     const feeData = await assetClientInterface.getFeeConfig({ assetName })
     const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
     const insightClient = asset.baseAsset.insightClient
-    const isToken = maybeToken.name !== asset.name
-    const brc20 = options.brc20 || feeOpts?.brc20
 
-    const rbfEnabled =
-      feeData.rbfEnabled && !isExchange && !isBip70 && isRbfAllowed && !nft && !brc20
+    const rbfEnabled = feeData.rbfEnabled && !isExchange && !isBip70 && isRbfAllowed && !nft
 
     // blockHeight
     const blockHeight = await getBlockHeight({ assetName, insightClient })
@@ -492,9 +478,8 @@ export const createAndBroadcastTXFactory =
       rbfEnabled,
       assetClientInterface,
       changeAddressType,
-    })({ asset: maybeToken, walletAccount, address, amount: tokenAmount, options })
+    })({ asset, walletAccount, address, amount, options })
     const {
-      amount,
       change,
       totalAmount,
       currentOrdinalsUtxos,
@@ -648,11 +633,7 @@ export const createAndBroadcastTXFactory =
 
     const calculateCoinAmount = () => {
       if (selfSend) {
-        return maybeToken.currency.ZERO
-      }
-
-      if (isToken) {
-        return tokenAmount.abs().negate()
+        return asset.currency.ZERO
       }
 
       if (nft) {
@@ -665,14 +646,14 @@ export const createAndBroadcastTXFactory =
     const coinAmount = calculateCoinAmount()
 
     await assetClientInterface.updateTxLogAndNotify({
-      assetName: maybeToken.name,
+      assetName: asset.name,
       walletAccount,
       txs: [
         {
           txId,
           confirmations: 0,
           coinAmount,
-          coinName: maybeToken.name,
+          coinName: asset.name,
           feeAmount: fee,
           feeCoinName: assetName,
           selfSend,

package/src/utxos-utils.js

@@ -10,8 +10,8 @@ export const getInscriptionTxId = (inscriptionId) => {
   return inscriptionId.split('i')[0]
 }
 
-export function getInscriptionIds({ nft, brc20 }) {
-  return nft?.tokenId ? [nft?.tokenId] : brc20 ? brc20.inscriptionIds : undefined
+export function getInscriptionIds({ nft }) {
+  return nft?.tokenId ? [nft?.tokenId] : undefined
 }
 
 export function getTransferOrdinalsUtxos({ inscriptionIds, ordinalsUtxos }) {