@exodus/bitcoin-api 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -43,5 +43,5 @@
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "d7b87308c1645a96ba4451f0b40b08ae3c1c29e5"
+  "gitHead": "6cdfe274e480b791993b5d9336ee42d590473de3"
 }

package/src/address-utils.js

@@ -1,10 +1,5 @@
 import assert from 'minimalistic-assert'
 
-export function isOrdinalAddress(address, ordinalChainIndex) {
-  assert(typeof ordinalChainIndex === 'number', `ordinalChainIndex must be a number`)
-  return parsePath(address)[0] === ordinalChainIndex
-}
-
 export function isReceiveAddress(address): boolean {
   return parsePath(address)[0] === 0
 }

package/src/index.js

@@ -18,3 +18,4 @@ export * from './insight-api-client/util'
 export * from './move-funds'
 export { toAsyncSigner } from './tx-sign/taproot'
 export { toXOnly } from './bitcoinjs-lib/ecc-utils'
+export * from './ordinals-utils'

package/src/ordinals-utils.js

@@ -0,0 +1,22 @@
+import assert from 'minimalistic-assert'
+
+export function getOrdinalAddress({
+  asset,
+  assetClientInterface,
+  walletAccount,
+  ordinalChainIndex,
+}) {
+  assert(asset, 'asset is required')
+  assert(assetClientInterface, 'assetClientInterface is required')
+  assert(walletAccount, 'walletAccount is required')
+  if (ordinalChainIndex === undefined) {
+    return undefined
+  }
+  return assetClientInterface.getAddress({
+    assetName: asset.name,
+    walletAccount,
+    purpose: 86,
+    chainIndex: ordinalChainIndex,
+    addressIndex: 0,
+  })
+}

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

@@ -6,6 +6,7 @@ import ms from 'ms'
 import assert from 'minimalistic-assert'
 import { isChangeAddress, isReceiveAddress } from '../address-utils'
 import { getOrdinalsUtxos, getUtxos, partitionUtxos } from '../utxos-utils'
+import { getOrdinalAddress } from '../ordinals-utils'
 
 // Time to check whether to drop a sent tx
 const SENT_TIME_TO_DROP = ms('2m')
@@ -519,7 +520,10 @@ export class BitcoinMonitorScanner {
     })
 
     const utxosData = utxoCol
-      ? partitionUtxos({ allUtxos: utxoCol, ordinalChainIndex: this.#ordinalChainIndex })
+      ? partitionUtxos({
+          allUtxos: utxoCol,
+          ordinalAddress: await this.getOrdinalAddress({ walletAccount }),
+        })
       : {}
 
     return {
@@ -578,7 +582,7 @@ export class BitcoinMonitorScanner {
 
     const { utxos, ordinalsUtxos } = partitionUtxos({
       allUtxos: txConfirmedUtxos,
-      ordinalChainIndex: this.#ordinalChainIndex,
+      ordinalAddress: await this.getOrdinalAddress({ walletAccount }),
     })
 
     return {
@@ -587,4 +591,13 @@ export class BitcoinMonitorScanner {
       txsToUpdate: updatedPropertiesTxs,
     }
   }
+
+  getOrdinalAddress({ walletAccount }) {
+    return getOrdinalAddress({
+      asset: this.#asset,
+      assetClientInterface: this.#assetClientInterface,
+      walletAccount,
+      ordinalChainIndex: this.#ordinalChainIndex,
+    })
+  }
 }

package/src/tx-send/index.js

@@ -201,15 +201,15 @@ export const createAndBroadcastTXFactory = ({
       `Expected ordinal utxos ${inscriptionIds.length}. Found: ${transferOrdinalsUtxos?.size || 0}`
     )
 
-    const unconfirmedOrdinalUtxos = transferOrdinalsUtxos
-      .toArray()
-      .filter((ordinalUtxo) => !(ordinalUtxo.confirmations > 0))
-    assert(
-      !unconfirmedOrdinalUtxos.length,
-      `OrdinalUtxo with inscription ids ${unconfirmedOrdinalUtxos
-        .map((utxo) => utxo.inscriptionId)
-        .join(', ')} have not confirmed yet`
-    )
+    // const unconfirmedOrdinalUtxos = transferOrdinalsUtxos
+    //   .toArray()
+    //   .filter((ordinalUtxo) => !(ordinalUtxo.confirmations > 0))
+    // assert(
+    //   !unconfirmedOrdinalUtxos.length,
+    //   `OrdinalUtxo with inscription ids ${unconfirmedOrdinalUtxos
+    //     .map((utxo) => utxo.inscriptionId)
+    //     .join(', ')} have not confirmed yet`
+    // )
   }
 
   const insightClient = asset.baseAsset.insightClient

package/src/tx-sign/default-create-tx.js

@@ -111,7 +111,7 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
         const publicKey = secp256k1.publicKeyCreate(key.privateKey, true)
         return { key, purpose, publicKey }
       }
-      const path = addressPathsMap[address]
+      const path = getOwnProperty(addressPathsMap, address, 'string')
       assert(hdkeys, 'hdkeys must be provided')
       assert(purpose, `purpose for address ${address} could not be resolved`)
       const hdkey = hdkeys[purpose]

package/src/utxos-utils.js

@@ -2,7 +2,6 @@
 import { UtxoCollection } from '@exodus/models'
 import { findLargeUnconfirmedTxs } from './tx-utils'
 import assert from 'minimalistic-assert'
-import { isOrdinalAddress } from './address-utils'
 
 const MAX_ORDINAL_VALUE_POSTAGE = 10000
 
@@ -24,29 +23,31 @@ export function getOrdinalsUtxos({ accountState, asset }) {
   )
 }
 
-function isOrdinalUtxo({ utxo, ordinalChainIndex }) {
+function isOrdinalUtxo({ utxo, ordinalAddress }) {
   if (utxo.inscriptionId) {
     return true
   }
-  if (ordinalChainIndex === undefined || ordinalChainIndex < 0) {
+  if (!ordinalAddress) {
     // exclude utxos splitting
     return false
   }
 
-  const maybeAnOrdinalAddress =
-    ordinalChainIndex && isOrdinalAddress(utxo.address, ordinalChainIndex) // if wallet receives utxos to the special address, consider it as ordinal
+  if (utxo.address.toString() === ordinalAddress.toString()) {
+    return true // we assume any utxo to the ordinal address is a ordinal utxos just in case
+  }
+
   if (utxo.confirmations) {
-    return maybeAnOrdinalAddress
+    return false
   }
 
-  return utxo.value.toBaseNumber() <= MAX_ORDINAL_VALUE_POSTAGE || maybeAnOrdinalAddress // while unconfirmed, put  < 10000- sats in the ordinal utxos box just in case
+  return utxo.value.toBaseNumber() <= MAX_ORDINAL_VALUE_POSTAGE // while unconfirmed, put  < 10000- sats in the ordinal utxos box just in case
 }
 
-export function partitionUtxos({ allUtxos, ordinalChainIndex }) {
+export function partitionUtxos({ allUtxos, ordinalAddress }) {
   assert(allUtxos, 'allUtxos is required')
   return {
-    utxos: allUtxos.filter((utxo) => !isOrdinalUtxo({ utxo, ordinalChainIndex })),
-    ordinalsUtxos: allUtxos.filter((utxo) => isOrdinalUtxo({ utxo, ordinalChainIndex })),
+    utxos: allUtxos.filter((utxo) => !isOrdinalUtxo({ utxo, ordinalAddress })),
+    ordinalsUtxos: allUtxos.filter((utxo) => isOrdinalUtxo({ utxo, ordinalAddress })),
   }
 }