@exodus/bitcoin-api 2.9.0 → 2.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -13,34 +13,50 @@
     "access": "restricted"
   },
   "scripts": {
-    "test": "jest",
-    "lint": "eslint ./src",
+    "test": "run -T jest",
+    "lint": "run -T eslint ./src",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^3.7.2",
+    "@exodus/asset-lib": "^4.0.0",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
+    "@exodus/bitcoin-lib": "2.3.0",
     "@exodus/bitcoinjs-lib": "^6.1.5-exodus.0",
+    "@exodus/currency": "^2.3.2",
+    "@exodus/fetch": "^1.3.0",
     "@exodus/models": "^11.0.0",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
     "@noble/secp256k1": "~1.7.1",
     "bech32": "^1.1.3",
+    "bip32-path": "^0.4.2",
+    "bn.js": "4.12.0",
+    "bs58check": "^2.1.2",
     "coininfo": "5.1.0",
+    "create-hash": "^1.2.0",
     "delay": "4.0.1",
     "ecpair": "2.0.1",
+    "lodash": "^4.17.21",
+    "minimalistic-assert": "^1.0.1",
+    "ms": "^2.1.1",
+    "secp256k1": "^3.0.1",
     "socket.io-client": "2.1.1",
     "tiny-secp256k1": "1.1.3",
-    "url-join": "4.0.0"
+    "url-join": "4.0.0",
+    "varuint-bitcoin": "^1.1.0",
+    "wif": "^2.0.6"
   },
   "devDependencies": {
+    "@exodus/assets-testing": "^1.0.0",
     "@exodus/bitcoin-meta": "^1.0.2",
     "@scure/base": "^1.1.3",
     "@scure/btc-signer": "^1.1.0",
-    "jest-when": "^3.5.1"
+    "bigi": "^1.4.2",
+    "jest-when": "^3.5.1",
+    "safe-buffer": "^5.2.1"
   },
-  "gitHead": "ed03529f7a8bb4b39bfd173387f9cdd5d7207925"
+  "gitHead": "b282e5087dda77c80fc63947ccc0020e6aa7db93"
 }

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/fee/can-bump-tx.js

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

package/src/fee/get-fee-resolver.js

@@ -90,6 +90,7 @@ export class GetFeeResolver {
   }) => {
     assert(asset, 'asset must be provided')
     assert(feeData, 'feeData must be provided')
+    assert(customFee || feeData.feePerKB, 'feePerKB must be provided')
     assert(accountState, 'accountState must be provided')
     assert(txSet, 'txSet must be provided')
 

package/src/insight-api-client/index.js

@@ -1,8 +1,9 @@
-/* global fetch */
 import urlJoin from 'url-join'
 import delay from 'delay'
 import { isEmpty } from 'lodash'
 
+import { fetch } from '@exodus/fetch'
+
 const getTextFromResponse = async (response) => {
   try {
     const responseBody = await response.text()

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,
@@ -185,13 +222,17 @@ export function getUsableUtxos({ asset, utxos, feeData, txSet, unconfirmedTxAnce
   assert(txSet, 'txSet is required')
   if (!['bitcoin', 'bitcointestnet', 'bitcoinregtest'].includes(asset.name))
     return filterDustUtxos({ utxos, feeData })
-  const { fastestFee } = feeData
+
+  assert(feeData.fastestFee, 'feeData.fastestFee is required')
+  assert(
+    typeof feeData.maxExtraCpfpFee === 'number' && !Number.isNaN(feeData.maxExtraCpfpFee),
+    ' feeData.maxExtraCpfpFee must be a number'
+  )
+
+  const { fastestFee, maxExtraCpfpFee: maxFee } = feeData
   const feeRate = fastestFee.toBaseNumber()
-  const maxFee = feeData.maxExtraCpfpFee
-  assert(typeof maxFee === 'number' && !Number.isNaN(maxFee), 'maxFee must be a number')
 
   const largeUnconfirmedTxs = findLargeUnconfirmedTxs({
-    assetName: asset.name,
     txSet,
     feeRate,
     maxFee,