@exodus/bitcoin-api 2.12.0 → 2.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -58,5 +58,5 @@
     "jest-when": "^3.5.1",
     "safe-buffer": "^5.2.1"
   },
-  "gitHead": "49a0b40b825c556ea08538c5cedf64754dd35369"
+  "gitHead": "646b7124b8d80c3e37ac8735fb218061ef24b745"
 }

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

@@ -1,7 +1,13 @@
 import assert from 'minimalistic-assert'
 import { getUtxosData } from './utxo-selector'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
-import { getUsableUtxos, getUtxos } from '../utxos-utils'
+import {
+  getInscriptionIds,
+  getOrdinalsUtxos,
+  getTransferOrdinalsUtxos,
+  getUsableUtxos,
+  getUtxos,
+} from '../utxos-utils'
 import { canBumpTx } from './can-bump-tx'
 import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
 
@@ -42,7 +48,7 @@ export class GetFeeResolver {
       assert(!nft, 'nft must not be provided when brc20 is provided!!!')
     }
 
-    const inscriptionIds = nft?.tokenId ? [nft?.tokenId] : brc20?.inscriptionIds
+    const inscriptionIds = getInscriptionIds({ nft, brc20 })
 
     const { resolvedFee, extraFee } = this.#getUtxosData({
       asset,
@@ -100,6 +106,12 @@ export class GetFeeResolver {
     const utxos = getUtxos({ accountState, asset })
     const unconfirmedTxAncestor = getUnconfirmedTxAncestorMap({ accountState })
 
+    const ordinalsUtxos = getOrdinalsUtxos({ accountState, asset })
+
+    const transferOrdinalsUtxos = inscriptionIds
+      ? getTransferOrdinalsUtxos({ inscriptionIds, ordinalsUtxos })
+      : undefined
+
     const usableUtxos = getUsableUtxos({
       asset,
       utxos,
@@ -117,6 +129,7 @@ export class GetFeeResolver {
       amount,
       feeRate: feePerKB,
       receiveAddress,
+      transferOrdinalsUtxos,
       inscriptionIds,
       isSendAll,
       getFeeEstimator: this.#getFeeEstimator,

package/src/fee/utxo-selector.js

@@ -34,6 +34,7 @@ export const selectUtxos = ({
   allowUnconfirmedRbfEnabledUtxos,
   unconfirmedTxAncestor,
   inscriptionIds, // for each inscription transfer, we need to calculate one more input and one more output
+  transferOrdinalsUtxos, // to calculate the size of the input
 }) => {
   const resolvedReceiveAddresses = getBestReceiveAddresses({
     asset,
@@ -197,7 +198,9 @@ export const selectUtxos = ({
     selectedUtxosValue = selectedUtxosValue.add(newUtxo.value)
   }
 
-  let selectedUtxos = UtxoCollection.fromArray(selectedUtxosArray, { currency })
+  let selectedUtxos = (transferOrdinalsUtxos || UtxoCollection.createEmpty({ currency })).union(
+    UtxoCollection.fromArray(selectedUtxosArray, { currency })
+  ) // extremelly important, orden must be kept!!! ordinals utxos go first!!!
 
   // start figuring out fees
   const outputs =
@@ -240,6 +243,7 @@ export const getUtxosData = ({
   mustSpendUtxos,
   allowUnconfirmedRbfEnabledUtxos,
   inscriptionIds,
+  transferOrdinalsUtxos,
   unconfirmedTxAncestor,
   utxosDescendingOrder,
 }) => {
@@ -257,6 +261,7 @@ export const getUtxosData = ({
     allowUnconfirmedRbfEnabledUtxos,
     unconfirmedTxAncestor,
     inscriptionIds,
+    transferOrdinalsUtxos,
     utxosDescendingOrder,
   })
 

package/src/tx-send/index.js

@@ -15,6 +15,7 @@ import {
 } from './dogecoin'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
 import {
+  getInscriptionIds,
   getOrdinalsUtxos,
   getTransferOrdinalsUtxos,
   getUsableUtxos,
@@ -258,7 +259,7 @@ export const getPrepareSendTransaction =
     }
 
     const amount = isToken ? asset.currency.ZERO : tokenAmount
-    const inscriptionIds = nft?.tokenId ? [nft?.tokenId] : brc20 ? brc20.inscriptionIds : undefined
+    const inscriptionIds = getInscriptionIds({ nft, brc20 })
 
     assert(
       ordinalsEnabled || !inscriptionIds,
@@ -351,6 +352,7 @@ export const getPrepareSendTransaction =
       allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,
       inscriptionIds,
+      transferOrdinalsUtxos,
       utxosDescendingOrder,
     })
 
@@ -365,10 +367,6 @@ export const getPrepareSendTransaction =
       throw new Error(`Unable to bump ${bumpTxId}`)
     }
 
-    if (transferOrdinalsUtxos) {
-      selectedUtxos = transferOrdinalsUtxos.union(selectedUtxos)
-    }
-
     if (replaceTx) {
       replaceTx = replaceTx.clone()
       replaceTx = replaceTx.update({ data: { ...replaceTx.data } })

package/src/utxos-utils.js

@@ -9,6 +9,10 @@ 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 getTransferOrdinalsUtxos({ inscriptionIds, ordinalsUtxos }) {
   const transferOrdinalsUtxos = ordinalsUtxos.filter((utxo) =>
     utxo.inscriptions?.some((i) => inscriptionIds.includes(i.inscriptionId))