@exodus/bitcoin-api 2.9.0 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -42,5 +42,5 @@
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "ed03529f7a8bb4b39bfd173387f9cdd5d7207925"
+  "gitHead": "1f96673b2977e792373f9f3c4eb98c778817b2b6"
 }

package/src/account-state.js

@@ -15,6 +15,7 @@ export function createAccountState({ asset, ordinalsEnabled = false, brc20Enable
     defaults.ordinalsUtxos = empty
     defaults.knownBalanceUtxoIds = []
     defaults.mustAvoidUtxoIds = []
+    defaults.additionalInscriptions = []
   }
 
   if (brc20Enabled) {

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

@@ -603,6 +603,7 @@ export class BitcoinMonitorScanner {
           ordinalAddress,
           knownBalanceUtxoIds: latestAccountState.knownBalanceUtxoIds,
           mustAvoidUtxoIds: latestAccountState.mustAvoidUtxoIds,
+          additionalInscriptions: latestAccountState.additionalInscriptions,
         })
       : {}
 
@@ -674,6 +675,7 @@ export class BitcoinMonitorScanner {
       ordinalAddress: ordinalAddress,
       knownBalanceUtxoIds: latestAccountState.knownBalanceUtxoIds,
       mustAvoidUtxoIds: latestAccountState.mustAvoidUtxoIds,
+      additionalInscriptions: latestAccountState.additionalInscriptions,
     })
 
     return {

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

@@ -168,13 +168,10 @@ export class Monitor extends BaseMonitor {
       }
 
       if (txsToUpdate.length) {
-        const accountState = await aci.getAccountState({ assetName, walletAccount })
         await this.updateTxLog({ assetName, walletAccount, logItems: txsToUpdate })
-        if (['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) {
+        if (utxos && ['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) {
           const unconfirmedTxAncestor = await resolveUnconfirmedAncestorData({
-            asset: this.asset,
-            accountState,
-            walletAccount,
+            utxos,
             insightClient: this.#insightClient,
           })
           newData.mem = { unconfirmedTxAncestor }
@@ -269,12 +266,9 @@ export class Monitor extends BaseMonitor {
     }
 
     // Move to after tick
-    if (['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) {
-      const accountState = await aci.getAccountState({ assetName, walletAccount })
+    if (utxos && ['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) {
       const unconfirmedTxAncestor = await resolveUnconfirmedAncestorData({
-        asset: this.asset,
-        accountState,
-        walletAccount,
+        utxos,
         insightClient: this.#insightClient,
       })
       newData.mem = { unconfirmedTxAncestor }

package/src/tx-utils.js

@@ -11,13 +11,7 @@ export const findUnconfirmedSentRbfTxs = (txSet) =>
       tx.data.inputs
   )
 
-export const findLargeUnconfirmedTxs = ({
-  assetName,
-  txSet,
-  feeRate,
-  maxFee,
-  unconfirmedTxAncestor,
-}) =>
+export const findLargeUnconfirmedTxs = ({ txSet, feeRate, maxFee, unconfirmedTxAncestor }) =>
   !txSet
     ? new Set()
     : new Set(
@@ -25,7 +19,6 @@ export const findLargeUnconfirmedTxs = ({
           .filter((tx) => {
             if (!tx.pending) return false
             const extraFee = resolveExtraFeeOfTx({
-              assetName,
               feeRate,
               txId: tx.txId,
               unconfirmedTxAncestor,

package/src/unconfirmed-ancestor-data.js

@@ -1,28 +1,18 @@
-import { getUtxos } from './utxos-utils'
+import assert from 'minimalistic-assert'
 
-export async function resolveUnconfirmedAncestorData({
-  asset,
-  walletAccount,
-  accountState,
-  insightClient,
-}) {
-  const dataMap = getUnconfirmedTxAncestorMap({ accountState })
-  Object.entries(dataMap).forEach(([txId, stored]) => {
-    if (stored.walletAccount === walletAccount && stored.assetName === asset.name)
-      delete dataMap[txId]
+export async function resolveUnconfirmedAncestorData({ utxos, insightClient }) {
+  assert(utxos, 'utxos is required')
+  assert(insightClient, 'insightClient is required')
+  const dataMap = Object.create(null)
+  const unconfirmedUtxos = utxos.toArray().filter((data) => {
+    return !data.confirmations || data.confirmations <= 0
   })
-
-  const utxos = getUtxos({ accountState, asset })
-    .toArray()
-    .filter((data) => {
-      return !data.confirmations || data.confirmations <= 0
-    })
-  const txIds = new Set(utxos.map(({ txId }) => txId))
+  const txIds = new Set(unconfirmedUtxos.map(({ txId }) => txId))
   for (const txId of txIds) {
     try {
       const { size, fees } = await insightClient.fetchUnconfirmedAncestorData(txId)
       if (size !== 0) {
-        dataMap[txId] = { assetName: asset.name, walletAccount, size, fees }
+        dataMap[txId] = { size, fees }
       }
     } catch (e) {
       console.warn(e)
@@ -32,19 +22,11 @@ export async function resolveUnconfirmedAncestorData({
 }
 
 export function getUnconfirmedTxAncestorMap({ accountState }) {
-  return accountState?.mem?.unconfirmedTxAncestor || {}
-}
-
-function getUnconfirmedAncestorData({ txId, assetName, unconfirmedTxAncestor = {} }) {
-  const stored = unconfirmedTxAncestor[txId]
-  if (stored?.assetName === assetName) {
-    return { size: stored.size, fees: stored.fees }
-  }
-  return undefined
+  return accountState?.mem?.unconfirmedTxAncestor || Object.create(null)
 }
 
-export function resolveExtraFeeOfTx({ assetName, feeRate, txId, unconfirmedTxAncestor }) {
-  const data = getUnconfirmedAncestorData({ assetName, txId, unconfirmedTxAncestor })
+export function resolveExtraFeeOfTx({ feeRate, txId, unconfirmedTxAncestor }) {
+  const data = unconfirmedTxAncestor?.[txId]
   if (!data) return 0
   const { fees, size } = data
   // Get the difference in fee rate between ancestors and current estimate

package/src/utxos-utils.js

@@ -122,17 +122,54 @@ function isOrdinalUtxo({
   return hasOrdinals
 }
 
+export function mergeAdditionalInscriptions({ allUtxos, additionalInscriptions }) {
+  return UtxoCollection.fromArray(
+    allUtxos.toArray().map((utxo) => {
+      const inscriptions = additionalInscriptions
+        .filter((additionalInscription) => {
+          const forUtxo =
+            additionalInscription.vout === utxo.vout && additionalInscription.txId === utxo.txId
+          if (forUtxo) {
+            // avoid duplicated
+            return !utxo.inscriptions?.find(
+              (existingInscription) =>
+                existingInscription.inscriptionId === additionalInscription.inscriptionId
+            )
+          }
+          return forUtxo
+        })
+        .map((additionalInscription) => ({
+          inscriptionId: additionalInscription.inscriptionId,
+          offset: additionalInscription.offset || 0,
+        }))
+      if (inscriptions.length) {
+        utxo.inscriptions = [...(utxo.inscriptions || []), ...inscriptions]
+      }
+      return utxo
+    }),
+    {
+      currency: allUtxos.currency,
+    }
+  )
+}
+
 export function partitionUtxos({
   allUtxos,
   ordinalsEnabled,
   knownBalanceUtxoIds,
   ordinalAddress,
   mustAvoidUtxoIds,
+  additionalInscriptions,
 }) {
   assert(allUtxos, 'allUtxos is required')
   if (ordinalsEnabled) assert(ordinalAddress, 'ordinalAddress is required')
+
+  const expandedAllUtxos = ordinalsEnabled
+    ? mergeAdditionalInscriptions({ allUtxos, additionalInscriptions })
+    : allUtxos
+
   return {
-    utxos: allUtxos.filter(
+    utxos: expandedAllUtxos.filter(
       (utxo) =>
         !isOrdinalUtxo({
           utxo,
@@ -142,7 +179,7 @@ export function partitionUtxos({
           mustAvoidUtxoIds,
         })
     ),
-    ordinalsUtxos: allUtxos.filter((utxo) =>
+    ordinalsUtxos: expandedAllUtxos.filter((utxo) =>
       isOrdinalUtxo({
         utxo,
         ordinalsEnabled,
@@ -191,7 +228,6 @@ export function getUsableUtxos({ asset, utxos, feeData, txSet, unconfirmedTxAnce
   assert(typeof maxFee === 'number' && !Number.isNaN(maxFee), 'maxFee must be a number')
 
   const largeUnconfirmedTxs = findLargeUnconfirmedTxs({
-    assetName: asset.name,
     txSet,
     feeRate,
     maxFee,