@exodus/bitcoin-api 2.7.5 → 2.7.7-fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.7.5",
+  "version": "2.7.7-fix",
   "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": "7596b820ccf23528fae15ccee13c269fa930434b"
+  }
 }

package/src/balances.js

@@ -1,12 +1,12 @@
 import assert from 'minimalistic-assert'
-import { getUtxos } from './utxos-utils'
+import { getOrdinalsUtxos, getUtxos } from './utxos-utils'
 
 // known issue!! fee data is static here!
 // Hydra's balances's module does not provide it when calling asset.api.getBalances
 // https://github.com/ExodusMovement/exodus-hydra/blob/f9110f8e9e76b8b199bc4d40461cb1bed3a5be1e/modules/balances/module/index.js#L130
 // feeData is required to know if an unconfirmed tx can or cannot be RBFed?
 // This could be fixed once we allow all unconfirmed utxos to be RBFed or if we change the balance module to provide the feeData when calling asset.api.getBalances
-export const getBalancesFactory = ({ feeData, getSpendableBalance }) => {
+export const getBalancesFactory = ({ feeData, getSpendableBalance, ordinalsEnabled }) => {
   assert(feeData, 'feeData is required')
   assert(getSpendableBalance, 'getSpendableBalance is required')
   return ({ asset, accountState, txLog }) => {
@@ -14,7 +14,10 @@ export const getBalancesFactory = ({ feeData, getSpendableBalance }) => {
     assert(accountState, 'accountState is required')
     assert(txLog, 'txLog is required')
     const utxos = getUtxos({ asset, accountState })
-    const balance = utxos.value
+    const unknownBalance = ordinalsEnabled
+      ? getOrdinalsUtxos({ asset, accountState }).filter((utxo) => !utxo.inscriptions?.length).value
+      : undefined
+    const balance = ordinalsEnabled ? utxos.value.add(unknownBalance) : utxos.value
     const spendableBalance = getSpendableBalance({
       asset,
       accountState,

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

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

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/tx-log/ordinals-indexer-utils.js

@@ -4,30 +4,33 @@ import { cloneDeep } from 'lodash'
 export const indexOutputs = ({ tx, currency }) => {
   const inscriptions = []
 
-  let inputOffset = 0
+  let inputOffset = currency.ZERO
   for (let i = 0; i < tx.vin.length; i++) {
     const vin = tx.vin[i]
-    const value = currency.defaultUnit(vin.value).toBaseNumber()
+    const value = currency.defaultUnit(vin.value)
     inscriptions.push(
-      ...(vin.inscriptions || []).map((i) => ({ ...i, offset: i.offset + inputOffset }))
+      ...(vin.inscriptions || []).map((i) => ({
+        ...i,
+        offset: currency.baseUnit(i.offset).add(inputOffset),
+      }))
     )
-    inputOffset = value
+    inputOffset = inputOffset.add(value)
   }
 
-  let outputOffset = 0
+  let outputOffset = currency.ZERO
   for (let i = 0; i < tx.vout.length; i++) {
     const vout = tx.vout[i]
-    const value = currency.defaultUnit(vout.value).toBaseNumber()
+    const value = currency.defaultUnit(vout.value)
     vout.inscriptions = inscriptions
-      .map((i) => ({ ...i, offset: i.offset - outputOffset }))
-      .filter((i) => i.offset >= 0 && i.offset < value)
-    outputOffset = value
+      .filter((i) => i.offset.gte(outputOffset) && i.offset.lt(value.add(outputOffset)))
+      .map((i) => ({ ...i, offset: i.offset.sub(outputOffset).toBaseNumber() }))
+    outputOffset = outputOffset.add(value)
   }
   tx.inscriptionsMemoryIndexed = true // avoids btc being spent even when the mempool index was done in memory
   return tx
 }
 
-export const indexOrdinalUnconfirmedTx = memoizeLruCache(
+export const cachedIndexOrdinalUnconfirmedTx = memoizeLruCache(
   async ({ insightClient, currency, tx }) => {
     if (tx.inscriptionsIndexed || tx.inscriptionsMemoryIndexed) {
       return tx
@@ -35,7 +38,7 @@ export const indexOrdinalUnconfirmedTx = memoizeLruCache(
     const copyTx = cloneDeep(tx)
     await Promise.all(
       copyTx.vin.map(async (vin) => {
-        const outputTx = await indexOrdinalUnconfirmedTx({
+        const outputTx = await cachedIndexOrdinalUnconfirmedTx({
           insightClient,
           currency,
           tx: await insightClient.fetchTxObject(vin.txid),
@@ -51,3 +54,14 @@ export const indexOrdinalUnconfirmedTx = memoizeLruCache(
   ({ tx }) => `${tx.txid}_${tx.confirmations}`,
   100
 )
+
+export const indexOrdinalUnconfirmedTx = ({ insightClient, currency, tx }) => {
+  if (tx.inscriptionsIndexed) {
+    return tx
+  }
+  return cachedIndexOrdinalUnconfirmedTx({
+    insightClient,
+    currency,
+    tx,
+  })
+}