@exodus/bitcoin-api 2.21.1 → 2.21.3

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.21.3](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.21.2...@exodus/bitcoin-api@2.21.3) (2024-07-31)
+
+
+### Bug Fixes
+
+* pass compatibility mode to getKeyIdentifier ([#3048](https://github.com/ExodusMovement/assets/issues/3048)) ([61066f9](https://github.com/ExodusMovement/assets/commit/61066f958cafb59ab3b9be9234e9c8360ea51841))
+
+
+
+## [2.21.2](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.21.1...@exodus/bitcoin-api@2.21.2) (2024-07-26)
+
+
+### Bug Fixes
+
+* **bitcoin:** make asset config function optional on ACI ([#2983](https://github.com/ExodusMovement/assets/issues/2983)) ([0b45695](https://github.com/ExodusMovement/assets/commit/0b4569522c5a65da8109ae70e74ee75ba8111ce9))
+* disable multi address scanning in `multiAddressMode` is false ([#2984](https://github.com/ExodusMovement/assets/issues/2984)) ([37bab79](https://github.com/ExodusMovement/assets/commit/37bab79ec9bcb8e08850402dd5f71df823eddd3b))
+
+
+
 ## [2.21.1](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.21.0...@exodus/bitcoin-api@2.21.1) (2024-07-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.21.1",
+  "version": "2.21.3",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "3878129a053ebf9877c9d601858b8b2f2c7be70f"
+  "gitHead": "a9a07ce549e5e911d65a75e2d768a6ff5a1d854e"
 }

package/src/balances.js

@@ -1,4 +1,5 @@
 import assert from 'minimalistic-assert'
+
 import { getUtxos } from './utxos-utils'
 
 // known issue!! fee data is static here!

package/src/bitcoinjs-lib/ec-pair.js

@@ -1,4 +1,5 @@
 import ECPairFactory from 'ecpair'
+
 import { ecc } from './ecc'
 
 let ECPair

package/src/btc-like-address.js

@@ -1,8 +1,8 @@
-import bs58check from 'bs58check'
+import * as bitcoinjsOriginal from '@exodus/bitcoinjs-lib'
 import * as bech32 from 'bech32'
-import assert from 'minimalistic-assert'
+import bs58check from 'bs58check'
 import { identity, pickBy } from 'lodash'
-import * as bitcoinjsOriginal from '@exodus/bitcoinjs-lib'
+import assert from 'minimalistic-assert'
 
 export const createBtcLikeAddress = ({
   versions,

package/src/btc-like-keys.js

@@ -1,13 +1,14 @@
-import bs58check from 'bs58check'
-import wif from 'wif'
+import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
 import * as bech32 from 'bech32'
-import assert from 'minimalistic-assert'
+import bs58check from 'bs58check'
 import { identity, pickBy } from 'lodash'
-import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
+import assert from 'minimalistic-assert'
 import secp256k1 from 'secp256k1'
-import { hash160 } from './hash-utils'
-import { toXOnly } from './bitcoinjs-lib/ecc-utils'
+import wif from 'wif'
+
 import { ecc } from './bitcoinjs-lib/ecc'
+import { toXOnly } from './bitcoinjs-lib/ecc-utils'
+import { hash160 } from './hash-utils'
 
 export const publicKeyToHashFactory = (p2pkh) => (publicKey) => {
   const payload = Buffer.concat([Buffer.from([p2pkh]), hash160(publicKey)])

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

@@ -1,10 +1,10 @@
-import { selectUtxos } from './utxo-selector'
+import { BumpType } from '@exodus/bitcoin-lib'
 import assert from 'minimalistic-assert'
-import { findUnconfirmedSentRbfTxs } from '../tx-utils'
-import { getUsableUtxos, getUtxos } from '../utxos-utils'
 
-import { BumpType } from '@exodus/bitcoin-lib'
+import { findUnconfirmedSentRbfTxs } from '../tx-utils'
 import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
+import { getUsableUtxos, getUtxos } from '../utxos-utils'
+import { selectUtxos } from './utxo-selector'
 
 export const ASSET_NAMES = ['bitcoin', 'bitcoinregtest', 'bitcointestnet']
 

package/src/fee/fee-estimator.js

@@ -1,11 +1,10 @@
+import { UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 import * as varuint from 'varuint-bitcoin'
-import { UtxoCollection } from '@exodus/models'
-import { scriptClassify } from '../bitcoinjs-lib'
-
-import { scriptClassifierFactory } from './script-classifier'
 
+import { scriptClassify } from '../bitcoinjs-lib'
 import createDefaultFeeEstimator, { isHex } from './fee-utils'
+import { scriptClassifierFactory } from './script-classifier'
 
 const { P2PKH, P2SH, P2WPKH, P2WSH, P2TR } = scriptClassify.types
 

package/src/fee/fee-utils.js

@@ -1,8 +1,9 @@
 import { isNumberUnit, UnitType } from '@exodus/currency'
-import { resolveExtraFeeOfTx } from '../unconfirmed-ancestor-data'
 import { UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 
+import { resolveExtraFeeOfTx } from '../unconfirmed-ancestor-data'
+
 export const isHex = (s) => typeof s === 'string' && /[\da-f]*/.test(s.toLowerCase())
 
 export function getExtraFee({ asset, inputs, feePerKB, unconfirmedTxAncestor }) {

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

@@ -1,6 +1,7 @@
 import assert from 'minimalistic-assert'
-import { getUtxosData } from './utxo-selector'
+
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
+import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
 import {
   getInscriptionIds,
   getOrdinalsUtxos,
@@ -9,7 +10,7 @@ import {
   getUtxos,
 } from '../utxos-utils'
 import { canBumpTx } from './can-bump-tx'
-import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
+import { getUtxosData } from './utxo-selector'
 
 export class GetFeeResolver {
   #getFeeEstimator

package/src/fee/script-classifier.js

@@ -1,9 +1,9 @@
-import { scriptClassify } from '../bitcoinjs-lib'
-import createHash from 'create-hash'
-
 import { memoizeLruCache } from '@exodus/asset-lib'
+import createHash from 'create-hash'
 import assert from 'minimalistic-assert'
 
+import { scriptClassify } from '../bitcoinjs-lib'
+
 const { P2PKH, P2SH, P2WPKH, P2WSH, P2TR } = scriptClassify.types
 
 const cacheSize = 1000

package/src/fee/utxo-selector.js

@@ -1,9 +1,10 @@
-import { UtxoCollection } from '@exodus/models'
 import NumberUnit from '@exodus/currency'
+import { UtxoCollection } from '@exodus/models'
 import { sortBy } from 'lodash'
 import assert from 'minimalistic-assert'
+
+import { getConfirmedOrRfbDisabledUtxos, getConfirmedUtxos } from '../utxos-utils'
 import { getExtraFee } from './fee-utils'
-import { getConfirmedUtxos, getConfirmedOrRfbDisabledUtxos } from '../utxos-utils'
 
 const MIN_RELAY_FEE = 1000
 

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

@@ -1,9 +1,8 @@
-import urlJoin from 'url-join'
-import delay from 'delay'
-import { isEmpty } from 'lodash'
-
 import { fetch } from '@exodus/fetch'
 import { retry } from '@exodus/simple-retry'
+import delay from 'delay'
+import { isEmpty } from 'lodash'
+import urlJoin from 'url-join'
 
 const getTextFromResponse = async (response) => {
   try {

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

@@ -1,5 +1,5 @@
-import assert from 'minimalistic-assert'
 import { groupBy, sortBy } from 'lodash'
+import assert from 'minimalistic-assert'
 
 // return first to last (ALSO FILTERS)
 // we need to do this because Insight often returns the blocktime as time and many

package/src/move-funds.js

@@ -1,8 +1,9 @@
-import wif from 'wif'
-import { UtxoCollection, Address } from '@exodus/models'
-import { createInputs, createOutput, getNonWitnessTxs } from './tx-send'
+import { Address, UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 import secp256k1 from 'secp256k1'
+import wif from 'wif'
+
+import { createInputs, createOutput, getNonWitnessTxs } from './tx-send'
 
 const isValidPrivateKey = (privateKey) => {
   try {
@@ -97,14 +98,14 @@ export const moveFundsFactory = ({
       throw new MoveFundsError('private-key-invalid', formatProps)
     }
 
-    const config = await assetClientInterface.getAssetConfig({
+    const config = await assetClientInterface.getAssetConfig?.({
       assetName,
       walletAccount,
     })
     const recieveAddressesObjects = await assetClientInterface.getReceiveAddresses({
       walletAccount,
       assetName,
-      multiAddressMode: config.multiAddressMode ?? true,
+      multiAddressMode: config?.multiAddressMode ?? true,
     })
 
     const receiveAddresses = recieveAddressesObjects.map(

package/src/multisig-address.js

@@ -1,6 +1,7 @@
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
-import { toXOnly } from './bitcoinjs-lib/ecc-utils'
+
 import { ecc as defaultEcc } from './bitcoinjs-lib/ecc'
+import { toXOnly } from './bitcoinjs-lib/ecc-utils'
 
 // Key to use when key path spending is disabled https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#constructing-and-spending-taproot-outputs
 const DUMMY_TAPROOT_PUBKEY = Buffer.from(

package/src/parse-unsigned-tx.js

@@ -1,8 +1,8 @@
-import assert from 'minimalistic-assert'
+import { Transaction as BitcoinTransactionClass } from '@exodus/bitcoinjs-lib'
 import BIPPath from 'bip32-path'
 import BN from 'bn.js'
 import lodash from 'lodash'
-import { Transaction as BitcoinTransactionClass } from '@exodus/bitcoinjs-lib'
+import assert from 'minimalistic-assert'
 
 export const parseUnsignedTxFactory =
   ({ Transaction = BitcoinTransactionClass } = {}) =>

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

@@ -1,11 +1,12 @@
-import { orderTxs } from '../insight-api-client/util'
 import { Address, UtxoCollection } from '@exodus/models'
 import { compact, isEqual, uniq } from 'lodash'
-import ms from 'ms'
 import assert from 'minimalistic-assert'
+import ms from 'ms'
+
 import { isChangeAddress, isReceiveAddress } from '../address-utils'
-import { getOrdinalsUtxos, getUtxos, partitionUtxos } from '../utxos-utils'
+import { orderTxs } from '../insight-api-client/util'
 import { getOrdinalAddress } from '../ordinals-utils'
+import { getOrdinalsUtxos, getUtxos, partitionUtxos } from '../utxos-utils'
 import { indexOrdinalUnconfirmedTx } from './ordinals-indexer-utils'
 
 // Time to check whether to drop a sent tx
@@ -54,12 +55,8 @@ export class BitcoinMonitorScanner {
     this.#refreshGapLimit = refreshGapLimit
   }
 
-  async #getGapLimit({ walletAccount, assetName, refresh }) {
-    const assetConfig = await this.#assetClientInterface.getAssetConfig?.({
-      assetName,
-      walletAccount,
-    })
-    if (typeof assetConfig?.gapLimit === 'number') return assetConfig.gapLimit
+  async #getGapLimit({ assetConfig, refresh }) {
+    if (typeof assetConfig.gapLimit === 'number') return assetConfig.gapLimit
     return refresh ? this.#refreshGapLimit : this.#gapLimit
   }
 
@@ -74,6 +71,12 @@ export class BitcoinMonitorScanner {
     const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
     const currency = asset.currency
     const currentTxs = await assetClientInterface.getTxLog({ assetName, walletAccount })
+    const assetConfig = await this.#assetClientInterface.getAssetConfig({
+      assetName,
+      walletAccount,
+    })
+    // multiAddressMode may be null, in which case it is enabled.
+    const multiAddressMode = assetConfig.multiAddressMode ?? true
 
     const storedUtxos = getUtxos({ asset, accountState })
     const storedOrdinalUtxos = getOrdinalsUtxos({ asset, accountState })
@@ -110,7 +113,7 @@ export class BitcoinMonitorScanner {
       walletAccount,
     })
 
-    const resolvedGapLimit = await this.#getGapLimit({ walletAccount, assetName, refresh })
+    const resolvedGapLimit = await this.#getGapLimit({ assetConfig, refresh })
     /*
      * The chain fields/variables are number arrays of size 2
      *
@@ -136,10 +139,22 @@ export class BitcoinMonitorScanner {
      * - for bip/purpose 84 and chainIndex 1 (change), 10 is the greatest unused addressIndex
      */
 
-    const chains = purposes.map((purpose) => ({
-      purpose,
-      chain: unusedAddressIndexes.find((indexes) => indexes.purpose === purpose)?.chain || [0, 0],
-    }))
+    const chains = purposes.map((purpose) => {
+      if (multiAddressMode) {
+        return {
+          purpose,
+          chain: unusedAddressIndexes.find((indexes) => indexes.purpose === purpose)?.chain || [
+            0, 0,
+          ],
+        }
+      }
+
+      // If not in multi address mode then stick chains to 0
+      return {
+        purpose,
+        chain: [0, 0],
+      }
+    })
 
     // cloning
     const newChains = chains.map(({ purpose, chain }) => ({ purpose, chain: [...chain] }))
@@ -153,7 +168,11 @@ export class BitcoinMonitorScanner {
       const promises = []
       for (const chainObject of chainObjects) {
         const { purpose, chainIndex, startAddressIndex, endAddressIndex } = chainObject
-        for (let addressIndex = startAddressIndex; addressIndex < endAddressIndex; addressIndex++) {
+        for (
+          let addressIndex = startAddressIndex;
+          addressIndex <= endAddressIndex;
+          addressIndex++
+        ) {
           promises.push(
             assetClientInterface
               .getAddress({
@@ -246,14 +265,14 @@ export class BitcoinMonitorScanner {
         purpose,
         chain,
         startAddressIndexes: chain.map(() => 0),
-        endAddressIndexes: chain.map((addressIndex) =>
-          refresh ? resolvedGapLimit : addressIndex + resolvedGapLimit
-        ),
+        endAddressIndexes: chain.map((addressIndex) => {
+          if (refresh) return resolvedGapLimit
+          return addressIndex + resolvedGapLimit
+        }),
       }
     })
 
     let allTxs = []
-
     for (let fetchCount = 0; ; fetchCount++) {
       const chainObjects = gapSearchParameters.flatMap(
         ({ purpose, chain, startAddressIndexes, endAddressIndexes }) => {
@@ -303,55 +322,59 @@ export class BitcoinMonitorScanner {
       allTxs = [...allTxs, ...txs]
 
       // Update chains to see if we need to fetch more
-      txs.forEach((tx) =>
-        tx.vout.forEach((vout) => {
-          if (!vout.scriptPubKey) return
-          // this is an array because legacy multisig has multiple addresses
-          if (!Array.isArray(vout.scriptPubKey.addresses)) return
-          if (vout.scriptPubKey.addresses.length === 0) return
-          if (!addrMap[vout.scriptPubKey.addresses[0]]) return
-
-          const address = addrMap[vout.scriptPubKey.addresses[0]]
-          // this is a used address, we need to update the chain
-          const pd = address.meta.path.split('/')
-          const metaChainIndex = parseInt(pd[1])
-          const metaAddressIndex = pd[2] ? parseInt(pd[2]) : undefined // compatibility, it could shorter eg. m/0, not m/0/0
-          const addressString = String(address)
-          const purposeToUpdate = purposeMap[addressString]
-
-          if (
-            metaAddressIndex === undefined ||
-            (metaChainIndex === this.#ordinalChainIndex && this.#ordinalChainIndex > 1)
-          ) {
-            return
-          }
+      if (multiAddressMode) {
+        txs.forEach((tx) =>
+          tx.vout.forEach((vout) => {
+            if (!vout.scriptPubKey) return
+            // this is an array because legacy multisig has multiple addresses
+            if (!Array.isArray(vout.scriptPubKey.addresses)) return
+            if (vout.scriptPubKey.addresses.length === 0) return
+            if (!addrMap[vout.scriptPubKey.addresses[0]]) return
+
+            const address = addrMap[vout.scriptPubKey.addresses[0]]
+            // this is a used address, we need to update the chain
+            const pd = address.meta.path.split('/')
+            const metaChainIndex = parseInt(pd[1])
+            const metaAddressIndex = pd[2] ? parseInt(pd[2]) : undefined // compatibility, it could shorter eg. m/0, not m/0/0
+            const addressString = String(address)
+            const purposeToUpdate = purposeMap[addressString]
+
+            if (
+              metaAddressIndex === undefined ||
+              (metaChainIndex === this.#ordinalChainIndex && this.#ordinalChainIndex > 1)
+            ) {
+              return
+            }
 
-          if (!purposeToUpdate) {
-            console.warn(`${assetName}: Cannot resolve purpose from address ${addressString}`)
-            return
-          }
+            if (!purposeToUpdate) {
+              console.warn(`${assetName}: Cannot resolve purpose from address ${addressString}`)
+              return
+            }
 
-          const chainToUpgrade = newChains.find((newChain) => newChain.purpose === purposeToUpdate)
-          if (!chainToUpgrade) {
-            console.log(
-              `${assetName}: There is no chain info for purpose ${purposeToUpdate} and address ${addressString}`
+            const chainToUpgrade = newChains.find(
+              (newChain) => newChain.purpose === purposeToUpdate
             )
-            return
-          }
+            if (!chainToUpgrade) {
+              console.log(
+                `${assetName}: There is no chain info for purpose ${purposeToUpdate} and address ${addressString}`
+              )
+              return
+            }
 
-          if (chainToUpgrade.chain[metaChainIndex] === undefined) {
-            console.log(
-              `${assetName}: There is no chain info for purpose ${purposeToUpdate}, address ${addressString} and chain index ${metaChainIndex}`
-            )
-            return
-          }
+            if (chainToUpgrade.chain[metaChainIndex] === undefined) {
+              console.log(
+                `${assetName}: There is no chain info for purpose ${purposeToUpdate}, address ${addressString} and chain index ${metaChainIndex}`
+              )
+              return
+            }
 
-          chainToUpgrade.chain[metaChainIndex] = Math.max(
-            metaAddressIndex + 1,
-            chainToUpgrade.chain[metaChainIndex]
-          )
-        })
-      )
+            chainToUpgrade.chain[metaChainIndex] = Math.max(
+              metaAddressIndex + 1,
+              chainToUpgrade.chain[metaChainIndex]
+            )
+          })
+        )
+      }
 
       gapSearchParameters.forEach((indexData) => {
         // eslint-disable-next-line @exodus/mutable/no-param-reassign-prop-only

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

@@ -1,13 +1,13 @@
-import assert from 'minimalistic-assert'
+import { BaseMonitor } from '@exodus/asset-lib'
+import delay from 'delay'
 import { isEmpty, isEqual, pickBy } from 'lodash'
+import assert from 'minimalistic-assert'
+import ms from 'ms'
 
-import { BaseMonitor } from '@exodus/asset-lib'
+import { normalizeInsightConfig, toWSUrl } from '../insight-api-client/util'
 import InsightWSClient from '../insight-api-client/ws'
 import { resolveUnconfirmedAncestorData } from '../unconfirmed-ancestor-data'
 import { BitcoinMonitorScanner } from './bitcoin-monitor-scanner'
-import { normalizeInsightConfig, toWSUrl } from '../insight-api-client/util'
-import ms from 'ms'
-import delay from 'delay'
 
 // NOTE: this is a frankenstein mashup of Exodus desktop
 // assets-refresh/insight action + Neo monitor
@@ -91,14 +91,14 @@ export class Monitor extends BaseMonitor {
       Object.fromEntries(
         await Promise.all(
           walletAccounts.map(async (walletAccount) => {
-            const config = await this.aci.getAssetConfig({
+            const config = await this.aci.getAssetConfig?.({
               assetName: this.asset.name,
               walletAccount,
             })
             return [
               walletAccount,
               await this.aci.getReceiveAddresses({
-                multiAddressMode: config.multiAddressMode ?? true,
+                multiAddressMode: config?.multiAddressMode ?? true,
                 assetName: this.asset.name,
                 walletAccount,
                 useCache: true,

package/src/tx-send/index.js

@@ -1,18 +1,14 @@
-import assert from 'minimalistic-assert'
-import lodash from 'lodash'
-
-import { UtxoCollection, Address } from '@exodus/models'
-import { retry } from '@exodus/simple-retry'
-import { selectUtxos } from '../fee/utxo-selector'
 import { getTxSequence } from '@exodus/bitcoin-lib'
+import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
+import { Address, UtxoCollection } from '@exodus/models'
+import { retry } from '@exodus/simple-retry'
+import lodash from 'lodash'
+import assert from 'minimalistic-assert'
 
 import { parseCurrency } from '../fee/fee-utils'
-
-import {
-  createInputs as dogecoinCreateInputs,
-  createOutput as dogecoinCreateOutput,
-} from './dogecoin'
+import { selectUtxos } from '../fee/utxo-selector'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
+import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
 import {
   getInscriptionIds,
   getOrdinalsUtxos,
@@ -20,9 +16,10 @@ import {
   getUsableUtxos,
   getUtxos,
 } from '../utxos-utils'
-
-import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
-import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
+import {
+  createInputs as dogecoinCreateInputs,
+  createOutput as dogecoinCreateOutput,
+} from './dogecoin'
 
 const ASSETS_SUPPORTED_BIP_174 = new Set([
   'bitcoin',
@@ -635,14 +632,14 @@ export const createAndBroadcastTXFactory =
       },
     })
 
-    const config = await assetClientInterface.getAssetConfig({
+    const config = await assetClientInterface.getAssetConfig?.({
       assetName,
       walletAccount,
     })
     const walletAddressObjects = await assetClientInterface.getReceiveAddresses({
       walletAccount,
       assetName,
-      multiAddressMode: config.multiAddressMode ?? true,
+      multiAddressMode: config?.multiAddressMode ?? true,
     })
     // There are two cases of bumping, replacing or chaining a self-send.
     // If we have a bumpTxId, but we aren't replacing, then it is a self-send.

package/src/tx-sign/create-get-key-and-purpose.js

@@ -1,13 +1,12 @@
-import lodash from 'lodash'
-import BipPath from 'bip32-path'
-import assert from 'minimalistic-assert'
 import { getOwnProperty } from '@exodus/basic-utils'
 import KeyIdentifier from '@exodus/key-identifier'
+import BipPath from 'bip32-path'
+import lodash from 'lodash'
+import assert from 'minimalistic-assert'
+import secp256k1 from 'secp256k1'
 
 import { getECPair } from '../bitcoinjs-lib'
 
-import secp256k1 from 'secp256k1'
-
 const ECPair = getECPair()
 
 export const createGetKeyWithMetadata = ({

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

@@ -1,9 +1,9 @@
-import { Transaction, payments } from '@exodus/bitcoinjs-lib'
+import { payments, Transaction } from '@exodus/bitcoinjs-lib'
 import * as bip371 from '@exodus/bitcoinjs-lib/src/psbt/bip371'
 
 import { toXOnly } from '../bitcoinjs-lib/ecc-utils'
 import { createGetKeyWithMetadata } from './create-get-key-and-purpose'
-import { toAsyncSigner, toAsyncBufferSigner } from './taproot'
+import { toAsyncBufferSigner, toAsyncSigner } from './taproot'
 
 export function createSignWithWallet({
   signer,

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

@@ -1,8 +1,8 @@
 import assert from 'minimalistic-assert'
 
-import { createPrepareForSigning } from './default-prepare-for-signing'
-import { createSignWithWallet } from './create-sign-with-wallet'
 import { extractTransaction } from './common'
+import { createSignWithWallet } from './create-sign-with-wallet'
+import { createPrepareForSigning } from './default-prepare-for-signing'
 
 export const signTxFactory = ({
   assetName,
@@ -28,7 +28,7 @@ export const signTxFactory = ({
       'hdkeys or privateKeysAddressMap or signer is required'
     )
 
-    const { addressPathsMap, accountIndex } = unsignedTx.txMeta
+    const { addressPathsMap, accountIndex, compatibilityMode } = unsignedTx.txMeta
 
     const psbt = prepareForSigning({ unsignedTx })
 
@@ -46,7 +46,7 @@ export const signTxFactory = ({
           !('accountIndex' in args) || args.accountIndex === accountIndex,
           '`accountIndex` mismatch'
         )
-        return getKeyIdentifier({ ...args, accountIndex })
+        return getKeyIdentifier({ compatibilityMode, ...args, accountIndex })
       },
     })
 

package/src/tx-sign/default-prepare-for-signing.js

@@ -1,5 +1,5 @@
-import assert from 'minimalistic-assert'
 import { Psbt, Transaction } from '@exodus/bitcoinjs-lib'
+import assert from 'minimalistic-assert'
 
 const _MAXIMUM_FEE_RATES = {
   qtumignition: 25_000,

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

@@ -1,7 +1,7 @@
 import assert from 'minimalistic-assert'
 
-import { createPrepareForSigning } from './default-prepare-for-signing'
 import { extractTransaction } from './common'
+import { createPrepareForSigning } from './default-prepare-for-signing'
 
 export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo }) => {
   assert(assetName, 'assetName is required')

package/src/tx-sign/taproot.js

@@ -1,9 +1,9 @@
 import { crypto } from '@exodus/bitcoinjs-lib'
 import assert from 'minimalistic-assert'
 
-import defaultEntropy from './default-entropy.cjs'
-import { ecc } from '../bitcoinjs-lib/ecc'
 import { getECPair } from '../bitcoinjs-lib'
+import { ecc } from '../bitcoinjs-lib/ecc'
+import defaultEntropy from './default-entropy.cjs'
 
 const ECPair = getECPair()
 

package/src/utxos-utils.js

@@ -1,8 +1,9 @@
 // Move to shared utils...
 import { UtxoCollection } from '@exodus/models'
-import { findLargeUnconfirmedTxs } from './tx-utils'
 import assert from 'minimalistic-assert'
 
+import { findLargeUnconfirmedTxs } from './tx-utils'
+
 const MAX_ORDINAL_VALUE_POSTAGE = 10_000
 
 export const getInscriptionTxId = (inscriptionId) => {