@exodus/bitcoin-api 2.7.7-fix → 2.7.7-taprootpatch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.7.7-fix",
+  "version": "2.7.7-taprootpatch",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [

package/src/fee/can-bump-tx.js

@@ -100,7 +100,7 @@ const _canBumpTx = ({
     allowUnconfirmedRbfEnabledUtxos,
   })
 
-  return fee ? { bumpType: BumpType.CPFP, bumpFee: fee } : { errorMessage: 'insufficient funds' }
+  return fee ? { bumpType: BumpType.CPFP } : { errorMessage: 'insufficient funds' }
 }
 
 const validateIsNumber = (number, name) => {

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 })
     ),
   }
 }