@exodus/bitcoin-api 2.7.8 → 2.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.7.8",
+  "version": "2.8.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -32,7 +32,6 @@
     "coininfo": "5.1.0",
     "delay": "4.0.1",
     "ecpair": "2.0.1",
-    "querystring": "0.2.0",
     "socket.io-client": "2.1.1",
     "tiny-secp256k1": "1.1.3",
     "url-join": "4.0.0"
@@ -43,5 +42,5 @@
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "bcd735ed4e9775e3436257966d80fc524c1fa312"
+  "gitHead": "652eb821c1fe5b2bd561710d05fcb569d9f4a137"
 }

package/src/account-state.js

@@ -11,6 +11,7 @@ export function createAccountState({ asset, ordinalsEnabled = false, brc20Enable
   if (ordinalsEnabled) {
     defaults.ordinalsUtxos = empty
     defaults.knownBalanceUtxoIds = []
+    defaults.mustAvoidUtxoIds = []
   }
 
   if (brc20Enabled) {

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

@@ -3,7 +3,7 @@ import assert from 'minimalistic-assert'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
 import { getUsableUtxos, getUtxos } from '../utxos-utils'
 
-import { BumpType } from '@exodus/bitcoin-lib/lib/selectors/get-can-bump-tx-factory'
+import { BumpType } from '@exodus/bitcoin-lib'
 
 export const ASSET_NAMES = ['bitcoin', 'bitcoinregtest', 'bitcointestnet']
 

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

@@ -1,6 +1,5 @@
 /* global fetch */
 import urlJoin from 'url-join'
-import qs from 'querystring'
 import delay from 'delay'
 import { isEmpty } from 'lodash'
 
@@ -133,7 +132,7 @@ export default class InsightAPIClient {
     if (!Array.isArray(addrs) || addrs.length === 0) return { items: [], totalItems: 0 }
 
     options = { noScriptSig: 1, noAsm: 1, noSpent: 0, from: 0, to: 10, ...options }
-    const url = `${urlJoin(this._baseURL, `/addrs/txs`)}?${qs.stringify(options)}`
+    const url = `${urlJoin(this._baseURL, `/addrs/txs`)}?${new URLSearchParams(options)}`
 
     const fetchOptions = {
       method: 'post',

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

@@ -590,12 +590,19 @@ export class BitcoinMonitorScanner {
     })
 
     const ordinalAddress = await this.getOrdinalAddress({ walletAccount })
+
+    // latest account state, in case knownBalanceUtxoIds or mustAvoidUtxoIds gets updated in on another promise
+    const latestAccountState = await assetClientInterface.getAccountState({
+      assetName,
+      walletAccount,
+    })
     const utxosData = utxoCol
       ? partitionUtxos({
           allUtxos: utxoCol,
           ordinalsEnabled: this.#ordinalsEnabled,
           ordinalAddress,
-          knownBalanceUtxoIds: accountState.knownBalanceUtxoIds,
+          knownBalanceUtxoIds: latestAccountState.knownBalanceUtxoIds,
+          mustAvoidUtxoIds: latestAccountState.mustAvoidUtxoIds,
         })
       : {}
 
@@ -653,11 +660,20 @@ export class BitcoinMonitorScanner {
 
     const txConfirmedUtxos = allStoredUtxos.updateConfirmations(confirmationsList)
 
+    const ordinalAddress = await this.getOrdinalAddress({ walletAccount })
+
+    // latest account state, in case knownBalanceUtxoIds or mustAvoidUtxoIds gets updated in on another promise
+    const latestAccountState = await aci.getAccountState({
+      assetName,
+      walletAccount,
+    })
+
     const { utxos, ordinalsUtxos } = partitionUtxos({
       allUtxos: txConfirmedUtxos,
       ordinalsEnabled: this.#ordinalsEnabled,
-      ordinalAddress: await this.getOrdinalAddress({ walletAccount }),
-      knownBalanceUtxoIds: accountState.knownBalanceUtxoIds,
+      ordinalAddress: ordinalAddress,
+      knownBalanceUtxoIds: latestAccountState.knownBalanceUtxoIds,
+      mustAvoidUtxoIds: latestAccountState.mustAvoidUtxoIds,
     })
 
     return {

package/src/tx-send/index.js

@@ -5,7 +5,7 @@ import doShuffle from 'lodash/shuffle'
 import { UtxoCollection, Address } from '@exodus/models'
 import { retry } from '@exodus/simple-retry'
 import { selectUtxos } from '../fee/utxo-selector'
-import getTxSequence from '@exodus/bitcoin-lib/lib/utils/get-tx-sequence'
+import { getTxSequence } from '@exodus/bitcoin-lib'
 
 import { parseCurrency } from '../fee/fee-utils'
 

package/src/tx-sign/create-sign-with-wallet.js

@@ -33,8 +33,12 @@ export function createSignWithWallet({
       // dApps request to sign only specific transaction inputs.
       if (!inputInfo) continue
       const { address, sigHash } = inputInfo
-      // TODO: we can remove SIGHASH_ALL, it is default.
-      const sigHashTypes = sigHash !== undefined ? [sigHash || Transaction.SIGHASH_ALL] : undefined
+      // The sighash value from the PSBT input itself will be used.
+      // This list just represents possible sighash values the inputs can have.
+      const allowedSigHashTypes =
+        sigHash !== undefined
+          ? [sigHash, Transaction.SIGHASH_ALL] // `SIGHASH_DEFAULT` is a default safe sig hash, always allow it.
+          : undefined
       const { key, purpose, publicKey } = getKeyAndPurpose(address)
 
       const isP2SH = purpose === 49
@@ -67,7 +71,7 @@ export function createSignWithWallet({
 
       // desktop / BE / mobile with bip-schnorr signing
       const signingKey = isTaprootAddress ? tweakSigner({ signer: key, ECPair, network }) : key
-      await psbt.signInputAsync(index, toAsyncSigner({ keyPair: signingKey }), sigHashTypes)
+      await psbt.signInputAsync(index, toAsyncSigner({ keyPair: signingKey }), allowedSigHashTypes)
     }
   }
 }

package/src/utxos-utils.js

@@ -5,18 +5,32 @@ import assert from 'minimalistic-assert'
 
 const MAX_ORDINAL_VALUE_POSTAGE = 10000
 
+export const getInscriptionTxId = (inscriptionId) => {
+  return inscriptionId.split('i')[0]
+}
+
 export function getTransferOrdinalsUtxos({ inscriptionIds, ordinalsUtxos }) {
   const transferOrdinalsUtxos = ordinalsUtxos.filter((utxo) =>
     utxo.inscriptions?.some((i) => inscriptionIds.includes(i.inscriptionId))
   )
+
+  // this is for the micky mouse case. It has 2 inscriptions from the same tx but different output
+  const inscriptionTxs = inscriptionIds.map(getInscriptionTxId)
+
+  // https://ordinals.hiro.so/inscription/862ecd0fe343da32d19ff9277639ff71e10d894f55b6dee82dbfb9c158d5d30ci0
+  // https://ordinals.hiro.so/inscription/862ecd0fe343da32d19ff9277639ff71e10d894f55b6dee82dbfb9c158d5d30ci1
+
   const unsafeInscriptions = transferOrdinalsUtxos.toArray().flatMap(
     (utxo) =>
-      utxo.inscriptions?.filter((i) => {
+      utxo.inscriptions?.filter((inscription) => {
         const validInscription = isValidInscription({
           value: utxo.value.toBaseNumber(),
-          offset: i.offset,
+          offset: inscription.offset,
         })
-        return validInscription && !inscriptionIds.includes(i.inscriptionId)
+        return (
+          validInscription &&
+          !inscriptionTxs.includes(getInscriptionTxId(inscription.inscriptionId))
+        )
       }) || []
   )
   assert(
@@ -69,13 +83,23 @@ export function getValidInscriptions({ utxo }) {
   )
 }
 
-function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress }) {
+function isOrdinalUtxo({
+  utxo,
+  ordinalsEnabled,
+  knownBalanceUtxoIds,
+  ordinalAddress,
+  mustAvoidUtxoIds,
+}) {
   if (!ordinalsEnabled) {
     return false
   }
 
   const utxoId = `${utxo.txId}:${utxo.vout}`.toLowerCase()
 
+  if (mustAvoidUtxoIds && mustAvoidUtxoIds.includes(utxoId)) {
+    return true
+  }
+
   if (knownBalanceUtxoIds?.includes(utxoId) && !utxo.inscriptionsIndexed) {
     return false // this allows users see and spend change balance after sending before hiro confirmation
   }
@@ -98,15 +122,34 @@ function isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddr
   return hasOrdinals
 }
 
-export function partitionUtxos({ allUtxos, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress }) {
+export function partitionUtxos({
+  allUtxos,
+  ordinalsEnabled,
+  knownBalanceUtxoIds,
+  ordinalAddress,
+  mustAvoidUtxoIds,
+}) {
   assert(allUtxos, 'allUtxos is required')
-  if (ordinalsEnabled) 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')
   return {
     utxos: allUtxos.filter(
-      (utxo) => !isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress })
+      (utxo) =>
+        !isOrdinalUtxo({
+          utxo,
+          ordinalsEnabled,
+          knownBalanceUtxoIds,
+          ordinalAddress,
+          mustAvoidUtxoIds,
+        })
     ),
     ordinalsUtxos: allUtxos.filter((utxo) =>
-      isOrdinalUtxo({ utxo, ordinalsEnabled, knownBalanceUtxoIds, ordinalAddress })
+      isOrdinalUtxo({
+        utxo,
+        ordinalsEnabled,
+        knownBalanceUtxoIds,
+        ordinalAddress,
+        mustAvoidUtxoIds,
+      })
     ),
   }
 }