@exodus/bitcoin-api 2.22.1 → 2.24.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.24.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.23.0...@exodus/bitcoin-api@2.24.0) (2024-09-13)
+
+
+### Features
+
+* **BTC:** add multisig data to hardware wallet signing ([#3633](https://github.com/ExodusMovement/assets/issues/3633)) ([90293e9](https://github.com/ExodusMovement/assets/commit/90293e9b80799556df1c595558b1544c5a081d7b))
+
+
+### Bug Fixes
+
+* **BTC:** allow internal pubkey and sort xonly for multisig ([#3634](https://github.com/ExodusMovement/assets/issues/3634)) ([808bf65](https://github.com/ExodusMovement/assets/commit/808bf65f05576e2758bb32ad5654143577db7c38))
+
+
+
+## [2.23.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.22.1...@exodus/bitcoin-api@2.23.0) (2024-09-11)
+
+
+### Features
+
+* switch bitcoin to ESM ([#3433](https://github.com/ExodusMovement/assets/issues/3433)) ([8a2740f](https://github.com/ExodusMovement/assets/commit/8a2740f19401777e3333b89a2b7ac15febcb6bb8)), closes [#3286](https://github.com/ExodusMovement/assets/issues/3286)
+
+
+### Bug Fixes
+
+* **bitcoin-api:** add a missing exodus/bip32 dep ([#3457](https://github.com/ExodusMovement/assets/issues/3457)) ([d8b3499](https://github.com/ExodusMovement/assets/commit/d8b34998c78a55d56cdf787c4805e363336efd2d))
+
+
+### Reverts
+
+* Revert "test(bitcoin-api): use dynamic import( instead of dynamic require( in createSignTestCases (#3286)" (#3300) ([92065cc](https://github.com/ExodusMovement/assets/commit/92065cc44a1ad02fe2330742810679f3594300bf)), closes [#3286](https://github.com/ExodusMovement/assets/issues/3286) [#3300](https://github.com/ExodusMovement/assets/issues/3300)
+
+
+
 ## [2.22.1](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.22.0...@exodus/bitcoin-api@2.22.1) (2024-08-18)
 
 

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.22.1",
+  "version": "2.24.0",
   "description": "Exodus bitcoin-api",
+  "type": "module",
   "main": "src/index.js",
   "files": [
     "src",
@@ -14,23 +15,22 @@
     "access": "restricted"
   },
   "scripts": {
-    "test": "run -T exodus-test --jest --esbuild",
-    "lint": "run -T eslint .",
+    "test": "run -T exodus-test --jest",
+    "lint": "run -T eslintc .",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^4.1.0",
-    "@exodus/basic-utils": "^2.1.0",
-    "@exodus/bip322-js": "^1.1.0-exodus.6",
+    "@exodus/asset-lib": "^5.0.0",
+    "@exodus/basic-utils": "^3.0.1",
+    "@exodus/bip32": "^3.1.0",
+    "@exodus/bip322-js": "^1.1.0",
     "@exodus/bip44-constants": "^195.0.0",
-    "@exodus/bitcoin-lib": "^2.4.1",
-    "@exodus/bitcoinjs-lib": "^6.1.5-exodus.2",
-    "@exodus/currency": "^2.3.2",
-    "@exodus/fetch": "^1.3.0",
+    "@exodus/bitcoin-lib": "^2.4.2",
+    "@exodus/bitcoinjs-lib": "^6.1.6",
+    "@exodus/currency": "^5.0.2",
     "@exodus/key-identifier": "^1.1.1",
-    "@exodus/models": "^11.0.0",
+    "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/timer": "^1.1.1",
     "bech32": "^1.1.3",
     "bip32-path": "^0.4.2",
     "bn.js": "^4.12.0",
@@ -44,19 +44,14 @@
     "ms": "^2.1.1",
     "secp256k1": "^3.0.1",
     "socket.io-client": "^2.1.1",
-    "tiny-secp256k1": "^1.1.3",
     "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",
-    "bigi": "^1.4.2",
-    "jest-when": "^3.5.1",
-    "safe-buffer": "^5.2.1"
+    "@exodus/bitcoin-meta": "^2.0.0",
+    "jest-when": "^3.5.1"
   },
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Abitcoin-api"
@@ -66,5 +61,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "ceb41116fe6afaa75965a0ce9920e379097f2553"
+  "gitHead": "ba34f68e632d17fdd80cc50358792f449e92180a"
 }

package/src/balances.js

@@ -1,6 +1,6 @@
 import assert from 'minimalistic-assert'
 
-import { getUtxos } from './utxos-utils'
+import { getUtxos } from './utxos-utils.js'
 
 // known issue!! fee data is static here!
 // Hydra's balances's module does not provide it when calling asset.api.getBalances

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

@@ -1,6 +1,6 @@
-import ECPairFactory from 'ecpair'
+import { ECPairFactory } from 'ecpair'
 
-import { ecc } from './ecc'
+import { ecc } from './ecc/index.js'
 
 let ECPair
 

package/src/bitcoinjs-lib/index.js

@@ -1,3 +1,3 @@
-export * from './ecc'
-export { scriptClassify } from './script-classify'
-export * from './ec-pair'
+export * from './ecc/index.js'
+export { scriptClassify } from './script-classify/index.js'
+export * from './ec-pair.js'

package/src/btc-like-address.js

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

package/src/btc-like-keys.js

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

package/src/constants/bip44.js

@@ -1,3 +1,3 @@
 // back compatibility. Use @exodus/bip44-constants/by-ticker instead
 
-export { default } from '@exodus/bip44-constants/by-ticker'
+export { default } from '@exodus/bip44-constants/by-ticker.js'

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

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

package/src/fee/fee-estimator.js

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

package/src/fee/fee-utils.js

@@ -2,7 +2,7 @@ import { isNumberUnit, UnitType } from '@exodus/currency'
 import { UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 
-import { resolveExtraFeeOfTx } from '../unconfirmed-ancestor-data'
+import { resolveExtraFeeOfTx } from '../unconfirmed-ancestor-data.js'
 
 export const isHex = (s) => typeof s === 'string' && /[\da-f]*/.test(s.toLowerCase())
 

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

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

package/src/fee/index.js

@@ -1,2 +1,2 @@
-export * from './get-fee-resolver'
-export { default as getFeeEstimatorFactory } from './fee-estimator'
+export * from './get-fee-resolver.js'
+export { default as getFeeEstimatorFactory } from './fee-estimator.js'

package/src/fee/script-classifier.js

@@ -2,7 +2,7 @@ import { memoizeLruCache } from '@exodus/asset-lib'
 import createHash from 'create-hash'
 import assert from 'minimalistic-assert'
 
-import { scriptClassify } from '../bitcoinjs-lib'
+import { scriptClassify } from '../bitcoinjs-lib/index.js'
 
 const { P2PKH, P2SH, P2WPKH, P2WSH, P2TR } = scriptClassify.types
 

package/src/fee/utxo-selector.js

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

package/src/index.js

@@ -1,25 +1,25 @@
-export * from './account-state'
-export * from './balances'
-export * from './btc-address'
-export * from './btc-like-address'
-export * from './btc-like-keys'
-export * from './bitcoinjs-lib'
-export { default as InsightAPIClient } from './insight-api-client'
-export { default as InsightWSClient } from './insight-api-client/ws'
-export { default as bip44Constants } from './constants/bip44'
-export * from './tx-send'
-export * from './tx-sign'
-export * from './fee'
-export * from './utxos-utils'
-export * from './tx-log'
-export * from './unconfirmed-ancestor-data'
-export * from './parse-unsigned-tx'
-export { getCreateBatchTransaction } from './tx-send/batch-tx'
-export { createPsbtToUnsignedTx } from './psbt-utils'
-export * from './insight-api-client/util'
-export * from './move-funds'
-export { createEncodeMultisigContract } from './multisig-address'
-export { toAsyncSigner } from './tx-sign/taproot'
-export { toXOnly } from './bitcoinjs-lib/ecc-utils'
-export * from './ordinals-utils'
-export { signMessage } from './sign-message'
+export * from './account-state.js'
+export * from './balances.js'
+export * from './btc-address.js'
+export * from './btc-like-address.js'
+export * from './btc-like-keys.js'
+export * from './bitcoinjs-lib/index.js'
+export { default as InsightAPIClient } from './insight-api-client/index.js'
+export { default as InsightWSClient } from './insight-api-client/ws.js'
+export { default as bip44Constants } from './constants/bip44.js'
+export * from './tx-send/index.js'
+export * from './tx-sign/index.js'
+export * from './fee/index.js'
+export * from './utxos-utils.js'
+export * from './tx-log/index.js'
+export * from './unconfirmed-ancestor-data.js'
+export * from './parse-unsigned-tx.js'
+export { getCreateBatchTransaction } from './tx-send/batch-tx.js'
+export { createPsbtToUnsignedTx } from './psbt-utils.js'
+export * from './insight-api-client/util.js'
+export * from './move-funds.js'
+export { createEncodeMultisigContract } from './multisig-address.js'
+export { toAsyncSigner } from './tx-sign/taproot.js'
+export { toXOnly } from './bitcoinjs-lib/ecc-utils.js'
+export * from './ordinals-utils.js'
+export { signMessage } from './sign-message.js'

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

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

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

@@ -1,6 +1,8 @@
-import { groupBy, sortBy } from 'lodash'
+import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 
+const { groupBy, sortBy } = lodash
+
 // return first to last (ALSO FILTERS)
 // we need to do this because Insight often returns the blocktime as time and many
 // txs may fall inside the same block, but if one is an input to other, it should preceed

package/src/move-funds.js

@@ -3,7 +3,7 @@ import assert from 'minimalistic-assert'
 import secp256k1 from 'secp256k1'
 import wif from 'wif'
 
-import { createInputs, createOutput, getNonWitnessTxs } from './tx-send'
+import { createInputs, createOutput, getNonWitnessTxs } from './tx-send/index.js'
 
 const isValidPrivateKey = (privateKey) => {
   try {

package/src/multisig-address.js

@@ -1,18 +1,18 @@
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
 
-import { ecc as defaultEcc } from './bitcoinjs-lib/ecc'
-import { toXOnly } from './bitcoinjs-lib/ecc-utils'
+import { ecc as defaultEcc } from './bitcoinjs-lib/ecc/index.js'
+import { toXOnly } from './bitcoinjs-lib/ecc-utils.js'
 
 // 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(
-  '50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0',
+  '0250929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0',
   'hex'
 )
 
 // Leaf version for BIP342 is 0xc0 or 192 https://github.com/bitcoin/bips/blob/master/bip-0342.mediawiki#specification
 const LEAF_VERSION_TAPSCRIPT = 192
 
-// Limit multisig keys to 20 for now
+// Limit multisig keys to 16 for now
 const MAX_PUBKEYS = 20
 
 export const createEncodeMultisigContract =
@@ -21,7 +21,14 @@ export const createEncodeMultisigContract =
     network = bitcoinjsLib.Network.bitcoin,
     ecc = defaultEcc,
   }) =>
-  (publicKeys, { threshold = publicKeys.length, version = 0 } = Object.create(null)) => {
+  (
+    publicKeys,
+    {
+      threshold = publicKeys.length,
+      version = 0,
+      internalPubkey = DUMMY_TAPROOT_PUBKEY,
+    } = Object.create(null)
+  ) => {
     if (
       !Array.isArray(publicKeys) ||
       publicKeys.some((k) => !Buffer.isBuffer(k) || !ecc.isPointCompressed(k))
@@ -57,7 +64,7 @@ export const createEncodeMultisigContract =
     }
 
     // Sort according to BIP67 https://github.com/bitcoin/bips/blob/master/bip-0067.mediawiki
-    publicKeys.sort((a, b) => Buffer.compare(a, b))
+    publicKeys.sort((a, b) => Buffer.compare(toXOnly(a), toXOnly(b)))
 
     // Create multisig redeem script https://github.com/bitcoin/bips/blob/master/bip-0342.mediawiki#cite_note-5
     const OPS = bitcoinjsLib.script.OPS
@@ -74,7 +81,7 @@ export const createEncodeMultisigContract =
     const output = bitcoinjsLib.script.compile(chunks)
 
     return bitcoinjsLib.payments.p2tr({
-      internalPubkey: DUMMY_TAPROOT_PUBKEY,
+      internalPubkey: toXOnly(internalPubkey),
       scriptTree: { output },
       redeem: { output, redeemVersion: LEAF_VERSION_TAPSCRIPT },
       network,

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

@@ -1,13 +1,15 @@
 import { Address, UtxoCollection } from '@exodus/models'
-import { compact, isEqual, uniq } from 'lodash'
+import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 import ms from 'ms'
 
-import { isChangeAddress, isReceiveAddress } from '../address-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'
+import { isChangeAddress, isReceiveAddress } from '../address-utils.js'
+import { orderTxs } from '../insight-api-client/util.js'
+import { getOrdinalAddress } from '../ordinals-utils.js'
+import { getOrdinalsUtxos, getUtxos, partitionUtxos } from '../utxos-utils.js'
+import { indexOrdinalUnconfirmedTx } from './ordinals-indexer-utils.js'
+
+const { compact, isEqual, uniq } = lodash
 
 // Time to check whether to drop a sent tx
 const SENT_TIME_TO_DROP = ms('2m')

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

@@ -1,13 +1,15 @@
 import { BaseMonitor } from '@exodus/asset-lib'
 import delay from 'delay'
-import { isEmpty, isEqual, pickBy } from 'lodash'
+import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 import ms from 'ms'
 
-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.js'
+import InsightWSClient from '../insight-api-client/ws.js'
+import { resolveUnconfirmedAncestorData } from '../unconfirmed-ancestor-data.js'
+import { BitcoinMonitorScanner } from './bitcoin-monitor-scanner.js'
+
+const { isEmpty, isEqual, pickBy } = lodash
 
 // NOTE: this is a frankenstein mashup of Exodus desktop
 // assets-refresh/insight action + Neo monitor

package/src/tx-log/index.js

@@ -1,2 +1,2 @@
-export * from './bitcoin-monitor'
-export * from './bitcoin-monitor-scanner'
+export * from './bitcoin-monitor.js'
+export * from './bitcoin-monitor-scanner.js'

package/src/tx-log/ordinals-indexer-utils.js

@@ -1,5 +1,7 @@
 import { memoizeLruCache } from '@exodus/asset-lib'
-import { cloneDeep } from 'lodash'
+import lodash from 'lodash'
+
+const { cloneDeep } = lodash
 
 export const indexOutputs = ({ tx, currency }) => {
   const inscriptions = []

package/src/tx-send/batch-tx.js

@@ -1,14 +1,12 @@
-// eslint-disable-next-line @exodus/import/no-extraneous-dependencies
 import BIP32 from '@exodus/bip32'
 import { Psbt } from '@exodus/bitcoinjs-lib'
 import BipPath from 'bip32-path'
-// Using this notation so it can be mocked by jest
-import doShuffle from 'lodash/shuffle'
+import lodash from 'lodash' // mockable in tests
 import assert from 'minimalistic-assert'
 
-import { selectUtxos } from '../fee/utxo-selector'
-import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
-import { getUsableUtxos, getUtxos } from '../utxos-utils'
+import { selectUtxos } from '../fee/utxo-selector.js'
+import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data.js'
+import { getUsableUtxos, getUtxos } from '../utxos-utils.js'
 
 const DUST_VALUES = {
   P2WPKH: 294,
@@ -65,7 +63,7 @@ export const getCreateBatchTransaction = ({
 
     const psbt = new Psbt({ network: asset.coinInfo.toBitcoinJS() })
 
-    for (const utxo of doShuffle(selectedUtxos.toArray())) {
+    for (const utxo of lodash.shuffle(selectedUtxos.toArray())) {
       const path = addressPathsMap[utxo.address]
       if (!path) {
         throw new Error(`Path missing for input address ${utxo.address}`)
@@ -153,7 +151,7 @@ export const getCreateBatchTransaction = ({
       recipients.push(output)
     }
 
-    for (const recipient of doShuffle(recipients)) {
+    for (const recipient of lodash.shuffle(recipients)) {
       psbt.addOutput({
         address: recipient.address,
         value: parseInt(recipient.amount.toBaseString(), 10),

package/src/tx-send/index.js

@@ -5,21 +5,21 @@ import { retry } from '@exodus/simple-retry'
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 
-import { parseCurrency } from '../fee/fee-utils'
-import { selectUtxos } from '../fee/utxo-selector'
-import { findUnconfirmedSentRbfTxs } from '../tx-utils'
-import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
+import { parseCurrency } from '../fee/fee-utils.js'
+import { selectUtxos } from '../fee/utxo-selector.js'
+import { findUnconfirmedSentRbfTxs } from '../tx-utils.js'
+import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data.js'
 import {
   getInscriptionIds,
   getOrdinalsUtxos,
   getTransferOrdinalsUtxos,
   getUsableUtxos,
   getUtxos,
-} from '../utxos-utils'
+} from '../utxos-utils.js'
 import {
   createInputs as dogecoinCreateInputs,
   createOutput as dogecoinCreateOutput,
-} from './dogecoin'
+} from './dogecoin.js'
 
 const ASSETS_SUPPORTED_BIP_174 = new Set([
   'bitcoin',

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

@@ -5,7 +5,7 @@ import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 import secp256k1 from 'secp256k1'
 
-import { getECPair } from '../bitcoinjs-lib'
+import { getECPair } from '../bitcoinjs-lib/index.js'
 
 const ECPair = getECPair()
 

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

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

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

@@ -1,8 +1,8 @@
 import assert from 'minimalistic-assert'
 
-import { extractTransaction } from './common'
-import { createSignWithWallet } from './create-sign-with-wallet'
-import { createPrepareForSigning } from './default-prepare-for-signing'
+import { extractTransaction } from './common.js'
+import { createSignWithWallet } from './create-sign-with-wallet.js'
+import { createPrepareForSigning } from './default-prepare-for-signing.js'
 
 export const signTxFactory = ({
   assetName,

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

@@ -1,7 +1,7 @@
 import assert from 'minimalistic-assert'
 
-import { extractTransaction } from './common'
-import { createPrepareForSigning } from './default-prepare-for-signing'
+import { extractTransaction } from './common.js'
+import { createPrepareForSigning } from './default-prepare-for-signing.js'
 
 export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo }) => {
   assert(assetName, 'assetName is required')
@@ -20,7 +20,7 @@ export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo
     resolvePurpose,
   })
 
-  return async ({ unsignedTx, hardwareDevice, accountIndex }) => {
+  return async ({ unsignedTx, hardwareDevice, accountIndex, multisigData }) => {
     assert(unsignedTx, 'unsignedTx is required')
     assert(hardwareDevice, 'hardwareDevice is required')
     assert(Number.isInteger(accountIndex), 'accountIndex must be integer')
@@ -37,35 +37,65 @@ export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo
       addressPathsMap,
       hardwareDevice,
       accountIndex,
+      multisigData,
     })
 
-    const skipFinalize = !!unsignedTx.txData.psbtBuffer
+    const skipFinalize = !!unsignedTx.txData.psbtBuffer || unsignedTx.txMeta.returnPsbt
     return extractTransaction({ psbt, skipFinalize })
   }
 }
 
 function createSignWithHardwareWallet({ assetName, resolvePurpose }) {
-  return async ({ psbt, inputsToSign, addressPathsMap, accountIndex, hardwareDevice }) => {
-    const derivationPaths = getDerivationPaths({ resolvePurpose, addressPathsMap, accountIndex })
+  return async ({
+    psbt,
+    inputsToSign,
+    addressPathsMap,
+    accountIndex,
+    hardwareDevice,
+    multisigData,
+  }) => {
+    const derivationPathsMap = getDerivationPathsMap({
+      resolvePurpose,
+      addressPathsMap,
+      accountIndex,
+    })
     const signatures = await hardwareDevice.signTransaction({
       assetName,
       signableTransaction: psbt.toBuffer(),
-      derivationPaths,
+      derivationPaths: Object.values(derivationPathsMap),
+      derivationPathsMap,
+      multisigData,
     })
 
-    applySignatures(psbt, signatures, inputsToSign)
+    if (multisigData) {
+      applyMultisigSignatures(psbt, signatures)
+    } else {
+      applySignatures(psbt, signatures, inputsToSign)
+    }
   }
 }
 
-function getDerivationPaths({ resolvePurpose, accountIndex, addressPathsMap }) {
-  const derivationPaths = []
+function getDerivationPathsMap({ resolvePurpose, accountIndex, addressPathsMap }) {
+  const derivationPathsMap = {}
   for (const [address, path] of Object.entries(addressPathsMap)) {
     const purpose = resolvePurpose(address)
     const derivationPath = `m/${purpose}'/0'/${accountIndex}'/${path.slice(2)}` // TODO: coinindex
-    derivationPaths.push(derivationPath)
+    derivationPathsMap[address] = derivationPath
   }
 
-  return derivationPaths
+  return derivationPathsMap
+}
+
+function applyMultisigSignatures(psbt, signatures) {
+  for (const signature of signatures) {
+    const input = psbt.data.inputs[signature.inputIndex]
+    if (!input.tapScriptSig) input.tapScriptSig = []
+    input.tapScriptSig.push({
+      pubkey: signature.publicKey,
+      signature: signature.signature,
+      leafHash: signature.tapleafHash,
+    })
+  }
 }
 
 export function applySignatures(psbt, signatures, inputsToSign) {

package/src/tx-sign/index.js

@@ -1,4 +1,4 @@
-export { signTxFactory } from './default-create-tx'
-export { serializeTx } from './common'
-export { signHardwareFactory } from './default-sign-hardware'
-export { createPrepareForSigning } from './default-prepare-for-signing'
+export { signTxFactory } from './default-create-tx.js'
+export { serializeTx } from './common.js'
+export { signHardwareFactory } from './default-sign-hardware.js'
+export { createPrepareForSigning } from './default-prepare-for-signing.js'

package/src/tx-sign/taproot.js

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

package/src/tx-utils.js

@@ -1,4 +1,4 @@
-import { resolveExtraFeeOfTx } from './unconfirmed-ancestor-data'
+import { resolveExtraFeeOfTx } from './unconfirmed-ancestor-data.js'
 
 export const findUnconfirmedSentRbfTxs = (txSet) =>
   [...txSet].filter(

package/src/utxos-utils.js

@@ -2,7 +2,7 @@
 import { UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 
-import { findLargeUnconfirmedTxs } from './tx-utils'
+import { findLargeUnconfirmedTxs } from './tx-utils.js'
 
 const MAX_ORDINAL_VALUE_POSTAGE = 10_000