@exodus/bitcoin-api 2.7.6 → 2.7.7-taprootpatch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.7.6",
+  "version": "2.7.7-taprootpatch",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -42,6 +42,5 @@
     "@scure/base": "^1.1.3",
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
-  },
-  "gitHead": "63ebb228622ae9643c57538d64c1d0d4c2f9c37d"
+  }
 }

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

@@ -22,6 +22,7 @@ export class Monitor extends BaseMonitor {
   #insightClient
   #yieldToUI
   #scanner
+  #webSocketEnabled
 
   constructor({
     asset,
@@ -34,6 +35,7 @@ export class Monitor extends BaseMonitor {
     insightClient,
     apiUrl,
     scanner,
+    webSocketEnabled = true,
     ...extraScannerParams
   }) {
     super({ asset, interval, assetClientInterface, logger, runner })
@@ -44,6 +46,7 @@ export class Monitor extends BaseMonitor {
     this.#ws = null
     this.#apiUrl = apiUrl
     this.#yieldToUI = yieldToUI
+    this.#webSocketEnabled = webSocketEnabled
     this.#wsUrl = null
     this.#runningByWalletAccount = Object.create(null)
     this.#addressesByWalletAccount = Object.create(null)
@@ -95,6 +98,9 @@ export class Monitor extends BaseMonitor {
   }
 
   #connectWS = async (wsUrl) => {
+    if (!this.#webSocketEnabled) {
+      return
+    }
     if (this.#ws) {
       this.#ws.close()
       this.#ws = null

package/src/utxos-utils.js

@@ -69,7 +69,7 @@ export function getValidInscriptions({ utxo }) {
   )
 }
 
-function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds }) {
+function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress }) {
   if (!ordinalsEnabled) {
     return false
   }
@@ -85,18 +85,27 @@ function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds }) {
   }
 
   const validInscriptions = getValidInscriptions({ utxo })
-  return validInscriptions.length > 0
+  const hasOrdinals = validInscriptions.length > 0
+
+  if (ordinalAddress?.toString() === utxo.address.toString()) {
+    // ordinalAddress is the taproot address
+    if (!hasOrdinals) {
+      console.log('Excluding utxo from btc spending:', utxo.address.toString(), utxo)
+    }
+    return true // assume is ordinal just in case
+  }
+  return hasOrdinals
 }
 
-export function partitionUtxos({ allUtxos, ordinalsEnabled, knownBalanceUtxoIds }) {
+export function partitionUtxos({ allUtxos, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress }) {
   assert(allUtxos, 'allUtxos is required')
-  // assert(ordinalAddress, 'ordinalAddress is required') // not used atm we may need to tune by ordinalAddress when unconfirmed or rubbish inscriptions
+  if (ordinalsEnabled) assert(ordinalAddress, 'ordinalAddress is required') // not used atm we may need to tune by ordinalAddress when unconfirmed or rubbish inscriptions
   return {
     utxos: allUtxos.filter(
-      (utxo) => !isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds })
+      (utxo) => !isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress })
     ),
     ordinalsUtxos: allUtxos.filter((utxo) =>
-      isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds })
+      isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress })
     ),
   }
 }