@exodus/bitcoin-api 2.8.0 → 2.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.8.0",
+  "version": "2.8.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": "2b4d4989b82576d03b90f2eb7e53366a7a485df1"
+  "gitHead": "652eb821c1fe5b2bd561710d05fcb569d9f4a137"
 }

package/src/account-state.js

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

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

@@ -590,12 +590,19 @@ export class BitcoinMonitorScanner {
     })
 
     const ordinalAddress = await this.getOrdinalAddress({ walletAccount })
+
+    // latest account state, in case knownBalanceUtxoIds or mustAvoidUtxoIds gets updated in on another promise
+    const latestAccountState = await assetClientInterface.getAccountState({
+      assetName,
+      walletAccount,
+    })
     const utxosData = utxoCol
       ? partitionUtxos({
           allUtxos: utxoCol,
           ordinalsEnabled: this.#ordinalsEnabled,
           ordinalAddress,
-          knownBalanceUtxoIds: accountState.knownBalanceUtxoIds,
+          knownBalanceUtxoIds: latestAccountState.knownBalanceUtxoIds,
+          mustAvoidUtxoIds: latestAccountState.mustAvoidUtxoIds,
         })
       : {}
 
@@ -653,11 +660,20 @@ export class BitcoinMonitorScanner {
 
     const txConfirmedUtxos = allStoredUtxos.updateConfirmations(confirmationsList)
 
+    const ordinalAddress = await this.getOrdinalAddress({ walletAccount })
+
+    // latest account state, in case knownBalanceUtxoIds or mustAvoidUtxoIds gets updated in on another promise
+    const latestAccountState = await aci.getAccountState({
+      assetName,
+      walletAccount,
+    })
+
     const { utxos, ordinalsUtxos } = partitionUtxos({
       allUtxos: txConfirmedUtxos,
       ordinalsEnabled: this.#ordinalsEnabled,
-      ordinalAddress: await this.getOrdinalAddress({ walletAccount }),
-      knownBalanceUtxoIds: accountState.knownBalanceUtxoIds,
+      ordinalAddress: ordinalAddress,
+      knownBalanceUtxoIds: latestAccountState.knownBalanceUtxoIds,
+      mustAvoidUtxoIds: latestAccountState.mustAvoidUtxoIds,
     })
 
     return {

package/src/utxos-utils.js

@@ -83,13 +83,23 @@ export function getValidInscriptions({ utxo }) {
   )
 }
 
-function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress }) {
+function isOrdinalUtxo({
+  utxo,
+  ordinalsEnabled,
+  knownBalanceUtxoIds,
+  ordinalAddress,
+  mustAvoidUtxoIds,
+}) {
   if (!ordinalsEnabled) {
     return false
   }
 
   const utxoId = `${utxo.txId}:${utxo.vout}`.toLowerCase()
 
+  if (mustAvoidUtxoIds && mustAvoidUtxoIds.includes(utxoId)) {
+    return true
+  }
+
   if (knownBalanceUtxoIds?.includes(utxoId) && !utxo.inscriptionsIndexed) {
     return false // this allows users see and spend change balance after sending before hiro confirmation
   }
@@ -112,15 +122,34 @@ function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddr
   return hasOrdinals
 }
 
-export function partitionUtxos({ allUtxos, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress }) {
+export function partitionUtxos({
+  allUtxos,
+  ordinalsEnabled,
+  knownBalanceUtxoIds,
+  ordinalAddress,
+  mustAvoidUtxoIds,
+}) {
   assert(allUtxos, 'allUtxos is required')
   if (ordinalsEnabled) assert(ordinalAddress, 'ordinalAddress is required')
   return {
     utxos: allUtxos.filter(
-      (utxo) => !isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress })
+      (utxo) =>
+        !isOrdinalUtxo({
+          utxo,
+          ordinalsEnabled,
+          knownBalanceUtxoIds,
+          ordinalAddress,
+          mustAvoidUtxoIds,
+        })
     ),
     ordinalsUtxos: allUtxos.filter((utxo) =>
-      isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress })
+      isOrdinalUtxo({
+        utxo,
+        ordinalsEnabled,
+        knownBalanceUtxoIds,
+        ordinalAddress,
+        mustAvoidUtxoIds,
+      })
     ),
   }
 }