@exodus/bitcoin-api 4.4.0 → 4.6.0

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.2.1...@exodus/bitcoin-api@4.6.0) (2025-11-14)
+
+
+### Features
+
+
+* feat: add PSBT builder infrastructure (#6822)
+
+* feat: add PSBT parser functionality (#6823)
+
+* feat: integrate PSBT support and legacy chain index (#6819)
+
+* feat: integrate PSBT support and legacy chain index (#6819) (#6829)
+
+
+
+## [4.5.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.2.1...@exodus/bitcoin-api@4.5.0) (2025-11-12)
+
+
+### Features
+
+
+* feat: add PSBT builder infrastructure (#6822)
+
+* feat: add PSBT parser functionality (#6823)
+
+* feat: integrate PSBT support and legacy chain index (#6819)
+
+
+
 ## [4.4.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.2.1...@exodus/bitcoin-api@4.4.0) (2025-11-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "4.4.0",
+  "version": "4.6.0",
   "description": "Bitcoin transaction and fee monitors, RPC with the blockchain node, other networking code.",
   "type": "module",
   "main": "src/index.js",
@@ -60,5 +60,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "5bc77cf38ec6fbd32d9e286d5bda25ea7366854d"
+  "gitHead": "660b300377800da2edc9c250d61736b416db73d1"
 }

package/src/psbt-builder.js

@@ -1,11 +1,17 @@
-import { payments, Psbt, Transaction } from '@exodus/bitcoinjs'
+import { payments } from '@exodus/bitcoinjs'
 import { publicKeyToX } from '@exodus/crypto/secp256k1'
 import assert from 'minimalistic-assert'
 
 import { SubType, writePsbtGlobalField, writePsbtOutputField } from './psbt-proprietary-types.js'
-import { getAddressType, getPurposeXPubs, validatePurpose } from './psbt-utils.js'
-
-function canParseTx(rawTxBuffer) {
+import {
+  getAddressType,
+  getPurposeXPubs,
+  setPsbtVersionIfNotBitcoin,
+  validatePurpose,
+} from './psbt-utils.js'
+import { getMaximumFeeRate } from './tx-sign/maximum-fee-rates.js'
+
+function canParseTx(rawTxBuffer, Transaction) {
   try {
     Transaction.fromBuffer(rawTxBuffer)
     return true
@@ -76,7 +82,7 @@ function createPsbtInput({
   addressPathsMap,
   purposeXPubs,
   nonWitnessTxs,
-  allowedPurposes,
+  Transaction,
 }) {
   const psbtInput = {
     hash: input.txId,
@@ -85,7 +91,7 @@ function createPsbtInput({
   }
 
   const purpose = asset.address.resolvePurpose(input.address)
-  validatePurpose(purpose, allowedPurposes, `address ${input.address}`)
+  validatePurpose(purpose, purposeXPubs, `address ${input.address}`)
 
   const { isSegwitAddress, isTaprootAddress, isWrappedSegwitAddress } = getAddressType(purpose)
 
@@ -118,7 +124,7 @@ function createPsbtInput({
     )
 
     const rawTxBuffer = Buffer.from(rawTx.rawData, 'hex')
-    if (canParseTx(rawTxBuffer)) {
+    if (canParseTx(rawTxBuffer, Transaction)) {
       psbtInput.nonWitnessUtxo = rawTxBuffer
     } else {
       // bitcoinjs can’t parse a handful of edge-case transactions (Litecoin MWEB, odd
@@ -141,14 +147,7 @@ function createPsbtInput({
   return { ...psbtInput, ...derivationData }
 }
 
-function createPsbtOutput({
-  address,
-  amount,
-  asset,
-  addressPathsMap,
-  purposeXPubs,
-  allowedPurposes,
-}) {
+function createPsbtOutput({ address, amount, asset, addressPathsMap, purposeXPubs }) {
   const psbtOutput = {
     address,
     value: amount,
@@ -160,7 +159,7 @@ function createPsbtOutput({
   }
 
   const purpose = asset.address.resolvePurpose(address)
-  validatePurpose(purpose, allowedPurposes, `output address ${address}`)
+  validatePurpose(purpose, purposeXPubs, `output address ${address}`)
 
   const { isTaprootAddress, isWrappedSegwitAddress } = getAddressType(purpose)
 
@@ -195,6 +194,8 @@ export async function createPsbtWithMetadata({
   addressPathsMap,
   metadata,
   allowedPurposes,
+  Psbt,
+  Transaction,
 }) {
   assert(inputs, 'inputs is required')
   assert(outputs, 'outputs is required')
@@ -203,8 +204,16 @@ export async function createPsbtWithMetadata({
   assert(walletAccount, 'walletAccount is required')
   assert(addressPathsMap, 'addressPathsMap is required')
   assert(metadata, 'metadata is required')
+  assert(Psbt, 'Psbt is required')
+  assert(Transaction, 'Transaction is required')
+  const psbtOptions = { network: asset.coinInfo.toBitcoinJS() }
+  const maximumFeeRate = getMaximumFeeRate(asset.name)
+  if (maximumFeeRate !== undefined) {
+    psbtOptions.maximumFeeRate = maximumFeeRate
+  }
 
-  const psbt = new Psbt({ network: asset.coinInfo.toBitcoinJS() })
+  const psbt = new Psbt(psbtOptions)
+  setPsbtVersionIfNotBitcoin(psbt, asset.name)
 
   const purposeXPubs = await getPurposeXPubs({
     assetClientInterface,
@@ -223,6 +232,7 @@ export async function createPsbtWithMetadata({
       purposeXPubs,
       nonWitnessTxs,
       allowedPurposes,
+      Transaction,
     })
     psbt.addInput(psbtInput)
   }
@@ -244,5 +254,5 @@ export async function createPsbtWithMetadata({
     writePsbtOutputField(psbt, sendOutputIndex, SubType.OutputRole, 'primary')
   }
 
-  return psbt.toBase64()
+  return psbt
 }

package/src/psbt-parser.js

@@ -1,4 +1,3 @@
-import { Psbt, Transaction } from '@exodus/bitcoinjs'
 import { publicKeyToX } from '@exodus/crypto/secp256k1'
 import { UtxoCollection } from '@exodus/models'
 import BipPath from 'bip32-path'
@@ -11,7 +10,7 @@ import { findUnconfirmedSentRbfTxs } from './tx-utils.js'
 import { getUnconfirmedTxAncestorMap } from './unconfirmed-ancestor-data.js'
 import { getUsableUtxos, getUtxos } from './utxos-utils.js'
 
-function extractInputUtxoData(psbtInput, txInput, index) {
+function extractInputUtxoData(psbtInput, txInput, index, Transaction) {
   if (psbtInput.nonWitnessUtxo) {
     const prevTx = Transaction.fromBuffer(psbtInput.nonWitnessUtxo)
     const prevOutput = prevTx.outs[txInput.index]
@@ -34,14 +33,14 @@ function extractInputUtxoData(psbtInput, txInput, index) {
   throw new Error(`Input ${index} has no witnessUtxo or nonWitnessUtxo`)
 }
 
-function parseSingleInput({ txInput, psbtInput, index, asset, purposeXPubs, allowedPurposes }) {
+function parseSingleInput({ txInput, psbtInput, index, asset, purposeXPubs, Transaction }) {
   const input = {
     txId: Buffer.from(txInput.hash).reverse().toString('hex'),
     vout: txInput.index,
     sequence: txInput.sequence,
   }
 
-  const inputUtxoData = extractInputUtxoData(psbtInput, txInput, index)
+  const inputUtxoData = extractInputUtxoData(psbtInput, txInput, index, Transaction)
 
   input.value = inputUtxoData.value
   input.script = Buffer.from(inputUtxoData.scriptBuffer).toString('hex')
@@ -53,7 +52,7 @@ function parseSingleInput({ txInput, psbtInput, index, asset, purposeXPubs, allo
 
   const address = asset.address.fromScriptPubKey(inputUtxoData.scriptBuffer)
   const purpose = asset.address.resolvePurpose(address)
-  validatePurpose(purpose, allowedPurposes, `input ${index}`)
+  validatePurpose(purpose, purposeXPubs, `input ${index}`)
 
   const { isTaprootAddress } = getAddressType(purpose)
 
@@ -75,15 +74,7 @@ function parseSingleInput({ txInput, psbtInput, index, asset, purposeXPubs, allo
   return input
 }
 
-function parseSingleOutput({
-  txOutput,
-  psbtOutput,
-  index,
-  asset,
-  purposeXPubs,
-  psbt,
-  allowedPurposes,
-}) {
+function parseSingleOutput({ txOutput, psbtOutput, index, asset, purposeXPubs, psbt }) {
   const address = txOutput.address ?? asset.address.fromScriptPubKey(txOutput.script)
   const output = { amount: txOutput.value }
 
@@ -94,7 +85,7 @@ function parseSingleOutput({
 
   const purpose = asset.address.resolvePurpose(address)
   try {
-    validatePurpose(purpose, allowedPurposes)
+    validatePurpose(purpose, purposeXPubs)
   } catch {
     output.address = { address }
     return output
@@ -125,9 +116,15 @@ function readGlobalMetadata(psbt) {
 }
 
 function calculateFee(inputs, outputs) {
-  const inputSum = inputs.reduce((sum, input) => sum + (input.value || 0), 0)
-  const outputSum = outputs.reduce((sum, output) => sum + (output.amount || 0), 0)
-  return inputSum - outputSum
+  const inputSum = inputs.reduce((sum, input) => {
+    const value = BigInt(input.value || 0)
+    return sum + value
+  }, BigInt(0))
+  const outputSum = outputs.reduce((sum, output) => {
+    const amount = BigInt(output.amount || 0)
+    return sum + amount
+  }, BigInt(0))
+  return inputSum - outputSum // Return BigInt directly
 }
 
 function getBip32Derivation(hdkey, bip32Derivations, ignoreY) {
@@ -332,16 +329,20 @@ function extractRawTransactions(parsedInputs) {
 }
 
 export async function parsePsbt({
-  psbtBase64,
+  psbtBuffer,
   asset,
   assetClientInterface,
   walletAccount,
   allowedPurposes,
+  Psbt,
+  Transaction,
 }) {
-  assert(psbtBase64, 'psbtBase64 is required')
+  assert(psbtBuffer, 'psbtBuffer is required')
   assert(asset, 'asset is required')
   assert(assetClientInterface, 'assetClientInterface is required')
   assert(walletAccount, 'walletAccount is required')
+  assert(Psbt, 'Psbt is required')
+  assert(Transaction, 'Transaction is required')
 
   const purposeXPubs = await getPurposeXPubs({
     assetClientInterface,
@@ -350,8 +351,7 @@ export async function parsePsbt({
     allowedPurposes,
   })
 
-  // TBD: change it to fromBuffer
-  const psbt = Psbt.fromBase64(psbtBase64, { network: asset.coinInfo.toBitcoinJS() })
+  const psbt = Psbt.fromBuffer(psbtBuffer, { network: asset.coinInfo.toBitcoinJS() })
 
   const inputs = []
   for (let i = 0; i < psbt.inputCount; i++) {
@@ -362,6 +362,7 @@ export async function parsePsbt({
       asset,
       purposeXPubs,
       allowedPurposes,
+      Transaction,
     })
     inputs.push(input)
   }
@@ -392,16 +393,20 @@ export async function parsePsbt({
 }
 
 export async function extractTransactionContext({
-  psbtBase64,
+  psbtBuffer,
   asset,
   assetClientInterface,
   walletAccount,
   allowedPurposes,
+  Psbt,
+  Transaction,
 }) {
-  assert(psbtBase64, 'psbtBase64 is required')
+  assert(psbtBuffer, 'psbtBuffer is required')
   assert(asset, 'asset is required')
   assert(assetClientInterface, 'assetClientInterface is required')
   assert(walletAccount, 'walletAccount is required')
+  assert(Psbt, 'Psbt is required')
+  assert(Transaction, 'Transaction is required')
 
   const {
     inputs: parsedInputs,
@@ -409,11 +414,13 @@ export async function extractTransactionContext({
     fee: calculatedFee,
     globalMetadata,
   } = await parsePsbt({
-    psbtBase64,
+    psbtBuffer,
     asset,
     assetClientInterface,
     walletAccount,
     allowedPurposes,
+    Psbt,
+    Transaction,
   })
 
   const changeOutputData = await getChangeOutputData({

package/src/psbt-utils.js

@@ -29,26 +29,31 @@ export async function getPurposeXPubs({
   const purposeXPubs = Object.create(null)
 
   for (const purpose of allowedPurposes) {
-    const xpub = await assetClientInterface.getExtendedPublicKey({
-      walletAccount,
-      assetName: asset.name,
-      purpose,
-    })
-    const hdkey = BIP32.fromXPub(xpub)
-    const masterFingerprint = Buffer.alloc(4)
-    masterFingerprint.writeUint32BE(hdkey.fingerprint)
-    purposeXPubs[purpose] = {
-      hdkey,
-      masterFingerprint,
+    try {
+      const xpub = await assetClientInterface.getExtendedPublicKey({
+        walletAccount,
+        assetName: asset.name,
+        purpose,
+      })
+      const hdkey = BIP32.fromXPub(xpub)
+      const masterFingerprint = Buffer.alloc(4)
+      masterFingerprint.writeUint32BE(hdkey.fingerprint)
+      purposeXPubs[purpose] = {
+        hdkey,
+        masterFingerprint,
+      }
+    } catch {
+      // ignore any error that happened while we are getting the extended public key to handle cases where the extended public key is not available
+      // Eg. Ledger/Trezor doesn't support getting extended public keys for certain purposes
     }
   }
 
   return purposeXPubs
 }
 
-export function validatePurpose(purpose, allowedPurposes, context = '') {
-  assert(allowedPurposes, 'allowedPurposes is required')
-  if (!allowedPurposes.includes(purpose)) {
+export function validatePurpose(purpose, purposeXPubs, context = '') {
+  assert(purposeXPubs, 'purposeXPubs is required')
+  if (!purposeXPubs[purpose]) {
     throw new Error(`Purpose ${purpose} not found${context ? ' for ' + context : ''}`)
   }
 }
@@ -126,3 +131,7 @@ export async function withUnsafeNonSegwit({ psbt, fn, unsafe = true }) {
     cache.__UNSAFE_SIGN_NONSEGWIT = prevValue
   }
 }
+
+export function setPsbtVersionIfNotBitcoin(psbt, assetName) {
+  if (!['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) psbt.setVersion(1)
+}

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

@@ -5,6 +5,7 @@ import assert from 'minimalistic-assert'
 import { getChangeDustValue } from '../dust.js'
 import { parseCurrency, serializeCurrency } from '../fee/fee-utils.js'
 import { selectUtxos } from '../fee/utxo-selector.js'
+import { createPsbtWithMetadata } from '../psbt-builder.js'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils.js'
 import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data.js'
 import { getUsableUtxos, getUtxos } from '../utxos-utils.js'
@@ -267,10 +268,20 @@ async function createUnsignedTx({
   asset,
   selectedUtxos,
   insightClient,
+  assetClientInterface,
+  walletAccount,
+  bumpTxId,
+  rbfEnabled,
+  txType = 'transfer',
+  sendOutputIndex,
+  changeOutputIndex,
+  allowedPurposes,
+  Psbt,
+  Transaction,
 }) {
   const nonWitnessTxs = await getNonWitnessTxs(asset, selectedUtxos, insightClient)
 
-  return {
+  const result = {
     txData: {
       inputs,
       outputs,
@@ -282,6 +293,36 @@ async function createUnsignedTx({
       rawTxs: nonWitnessTxs,
     },
   }
+
+  // Create PSBT for all UTXO coins that support it
+  // Note: Some coins (like BCash) may not use PSBT in their signing flow,
+  // but creating it here allows for a unified transaction flow
+  if (Psbt) {
+    const psbt = await createPsbtWithMetadata({
+      inputs,
+      outputs,
+      asset,
+      assetClientInterface,
+      walletAccount,
+      nonWitnessTxs,
+      addressPathsMap,
+      allowedPurposes,
+      metadata: {
+        rbfEnabled,
+        txType,
+        sendOutputIndexes: [sendOutputIndex],
+        changeOutputIndex,
+        bumpTxId,
+        blockHeight,
+      },
+      Psbt,
+      Transaction,
+    })
+
+    result.txData.psbtBuffer = psbt.toBuffer()
+  }
+
+  return result
 }
 
 const getTxHandler = (type) => {
@@ -309,6 +350,9 @@ const transferHandler = {
     utxosDescendingOrder,
     assetClientInterface,
     changeAddressType,
+    allowedPurposes,
+    Psbt,
+    Transaction,
   }) => {
     const assetName = asset.name
     const insightClient = asset.baseAsset.insightClient
@@ -437,12 +481,22 @@ const transferHandler = {
       asset,
       selectedUtxos,
       insightClient,
+      assetClientInterface,
+      walletAccount,
+      bumpTxId,
+      rbfEnabled: context.rbfEnabled,
+      txType: 'transfer',
+      sendOutputIndex: sendOutput ? outputs.indexOf(sendOutput) : undefined,
+      changeOutputIndex: changeOutput ? outputs.indexOf(changeOutput) : undefined,
+      allowedPurposes,
+      Psbt,
+      Transaction,
     })
 
     return {
       unsignedTx,
-      fee: adjustedFee,
       metadata: {
+        fee: adjustedFee,
         amount,
         change: selectedUtxos.value.sub(totalAmount).sub(adjustedFee),
         totalAmount,
@@ -469,6 +523,9 @@ export const createTxFactory =
     utxosDescendingOrder,
     assetClientInterface,
     changeAddressType,
+    allowedPurposes,
+    Psbt,
+    Transaction,
   }) =>
   async ({
     asset,
@@ -514,5 +571,8 @@ export const createTxFactory =
       utxosDescendingOrder,
       assetClientInterface,
       changeAddressType,
+      allowedPurposes,
+      Psbt,
+      Transaction,
     })
   }

package/src/tx-send/index.js

@@ -1,6 +1,8 @@
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs'
+import { Psbt as DefaultPsbt, Transaction as DefaultTransaction } from '@exodus/bitcoinjs'
 import assert from 'minimalistic-assert'
 
+import { extractTransactionContext } from '../psbt-parser.js'
 import { createTxFactory } from '../tx-create/create-tx.js'
 import { broadcastTransaction } from './broadcast-tx.js'
 import { updateAccountState, updateTransactionLog } from './update-state.js'
@@ -108,6 +110,9 @@ const getPrepareSendTransaction = async ({
   options,
   utxosDescendingOrder,
   walletAccount,
+  allowedPurposes,
+  Psbt,
+  Transaction,
 }) => {
   const createTx = createTxFactory({
     getFeeEstimator,
@@ -115,6 +120,9 @@ const getPrepareSendTransaction = async ({
     utxosDescendingOrder,
     assetClientInterface,
     changeAddressType,
+    allowedPurposes,
+    Psbt,
+    Transaction,
   })
 
   // Set default values for options
@@ -131,6 +139,59 @@ const getPrepareSendTransaction = async ({
   })
 }
 
+function toTransactionDescriptor({ txContext, psbtBuffer }) {
+  const {
+    inputs,
+    outputs,
+    addressPathsMap,
+    blockHeight,
+    rawTxs,
+    fee,
+    totalSendAmount,
+    changeAmount,
+    totalAmount,
+    primaryAddresses,
+    ourAddress,
+    usableUtxos,
+    selectedUtxos,
+    replaceTx,
+    sendOutputs,
+    changeOutput,
+    rbfEnabled,
+  } = txContext
+
+  return {
+    unsignedTx: {
+      txData: {
+        inputs,
+        outputs,
+        psbtBuffer,
+      },
+      txMeta: {
+        addressPathsMap,
+        blockHeight,
+        rawTxs,
+      },
+    },
+    metadata: {
+      fee,
+      amount: totalSendAmount.isZero ? undefined : totalSendAmount,
+      sendAmount: totalSendAmount,
+      change: changeAmount,
+      totalAmount,
+      address: primaryAddresses[0]?.address,
+      ourAddress,
+      usableUtxos,
+      selectedUtxos,
+      replaceTx,
+      sendOutput: sendOutputs[0],
+      changeOutput,
+      rbfEnabled,
+      blockHeight,
+    },
+  }
+}
+
 // not ported from Exodus; but this demos signing / broadcasting
 // NOTE: this will be ripped out in the coming weeks
 export const createAndBroadcastTXFactory =
@@ -141,15 +202,18 @@ export const createAndBroadcastTXFactory =
     utxosDescendingOrder,
     assetClientInterface,
     changeAddressType,
+    allowedPurposes,
+    Psbt = DefaultPsbt,
+    Transaction = DefaultTransaction,
   }) =>
-  async ({ asset, walletAccount, address, amount, options }) => {
+  async ({ asset, walletAccount, address, amount, ...options }) => {
     // Prepare transaction
     const { bumpTxId } = options
 
     const assetName = asset.name
     const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
 
-    const transactionDescriptor = await getPrepareSendTransaction({
+    let transactionDescriptor = await getPrepareSendTransaction({
       address,
       allowUnconfirmedRbfEnabledUtxos,
       amount,
@@ -160,22 +224,35 @@ export const createAndBroadcastTXFactory =
       options,
       utxosDescendingOrder,
       walletAccount,
+      allowedPurposes,
+      Psbt,
+      Transaction,
     })
 
-    const { unsignedTx, fee, metadata } = transactionDescriptor
-    const {
-      sendAmount,
-      usableUtxos,
-      replaceTx,
-      sendOutput,
-      changeOutput,
-      blockHeight,
-      rbfEnabled,
-    } = metadata
-
-    const outputs = unsignedTx.txData.outputs
+    // If we already created a PSBT for Bitcoin, hydrate the full transaction
+    // context from it before signing.
+    let unsignedTx, metadata
+    if (transactionDescriptor.unsignedTx?.txData?.psbtBuffer) {
+      const psbtBuffer = transactionDescriptor.unsignedTx.txData.psbtBuffer
+      const txContext = await extractTransactionContext({
+        psbtBuffer,
+        asset,
+        assetClientInterface,
+        walletAccount,
+        allowedPurposes,
+        Psbt,
+        Transaction,
+      })
+      transactionDescriptor = toTransactionDescriptor({ txContext, psbtBuffer })
+      unsignedTx = transactionDescriptor.unsignedTx
+      metadata = transactionDescriptor.metadata
+    } else {
+      // Legacy/non-PSBT flows stick with the original descriptor shape.
+      unsignedTx = transactionDescriptor.unsignedTx
+      metadata = transactionDescriptor.metadata
+    }
 
-    address = metadata.address
+    const { sendAmount, usableUtxos, replaceTx, sendOutput, changeOutput } = metadata
 
     // Sign transaction
     const { rawTx, txId, tx } = await signTransaction({
@@ -192,7 +269,7 @@ export const createAndBroadcastTXFactory =
       if (/insight broadcast http error.*missing inputs/i.test(err.message)) {
         err.txInfo = JSON.stringify({
           amount: sendAmount.toDefaultString({ unit: true }),
-          fee: ((fee && fee.toDefaultString({ unit: true })) || 0).toString(),
+          fee: ((metadata.fee && metadata.fee.toDefaultString({ unit: true })) || 0).toString(),
           allUtxos: usableUtxos.toJSON(),
         })
       }
@@ -203,7 +280,7 @@ export const createAndBroadcastTXFactory =
     function findUtxoIndex(output) {
       let utxoIndex = -1
       if (output) {
-        for (const [i, [address, amount]] of outputs.entries()) {
+        for (const [i, [address, amount]] of unsignedTx.txData.outputs.entries()) {
           if (output[0] === address && output[1] === amount) {
             utxoIndex = i
             break
@@ -228,7 +305,6 @@ export const createAndBroadcastTXFactory =
       rawTx,
       changeUtxoIndex,
       getSizeAndChangeScript,
-      rbfEnabled,
     })
 
     await updateTransactionLog({
@@ -236,14 +312,9 @@ export const createAndBroadcastTXFactory =
       assetClientInterface,
       walletAccount,
       txId,
-      fee,
       metadata,
-      address,
-      amount,
       bumpTxId,
       size,
-      blockHeight,
-      rbfEnabled,
     })
 
     return {

package/src/tx-send/update-state.js

@@ -16,7 +16,6 @@ import { serializeCurrency } from '../fee/fee-utils.js'
  * @param {number} params.changeUtxoIndex - Index of change output
  * @param {Object} params.changeOutput - Change output details
  * @param {Object} params.getSizeAndChangeScript - Function to get size and script
- * @param {boolean} params.rbfEnabled - Whether RBF is enabled
  */
 export async function updateAccountState({
   assetClientInterface,
@@ -29,9 +28,8 @@ export async function updateAccountState({
   rawTx,
   changeUtxoIndex,
   getSizeAndChangeScript,
-  rbfEnabled,
 }) {
-  const { usableUtxos, selectedUtxos, replaceTx, change, ourAddress } = metadata
+  const { usableUtxos, selectedUtxos, replaceTx, change, ourAddress, rbfEnabled } = metadata
 
   // Get change script and size
   const { script, size } = getSizeAndChangeScript({
@@ -88,30 +86,31 @@ export async function updateAccountState({
  * @param {Object} params.assetClientInterface - Asset client interface
  * @param {Object} params.walletAccount - Wallet account
  * @param {string} params.txId - Transaction ID
- * @param {Object} params.fee - Transaction fee
  * @param {Object} params.metadata - Transaction metadata
- * @param {string} params.address - Recipient address
- * @param {Object} params.amount - Transaction amount (for regular sends)
  * @param {string} params.bumpTxId - ID of transaction being bumped (if applicable)
  * @param {number} params.size - Transaction size
- * @param {number} params.blockHeight - Block height
- * @param {boolean} params.rbfEnabled - Whether RBF is enabled
  */
 export async function updateTransactionLog({
   asset,
   assetClientInterface,
   walletAccount,
   txId,
-  fee,
   metadata,
-  address,
-  amount,
   bumpTxId,
   size,
-  blockHeight,
-  rbfEnabled,
 }) {
-  const { totalAmount, selectedUtxos, replaceTx, changeOutput, ourAddress } = metadata
+  const {
+    totalAmount,
+    selectedUtxos,
+    replaceTx,
+    changeOutput,
+    ourAddress,
+    fee,
+    blockHeight,
+    rbfEnabled,
+    address,
+    amount,
+  } = metadata
   const assetName = asset.name
 
   // Check if this is a self-send

package/src/tx-sign/common.js

@@ -27,3 +27,12 @@ export const serializeTx = ({ tx }) => {
     })),
   }
 }
+
+export function shouldSkipFinalize(unsignedTx) {
+  const isExternalPsbt =
+    unsignedTx.txData.psbtBuffer &&
+    unsignedTx.txMeta.addressPathsMap &&
+    unsignedTx.txMeta.inputsToSign
+
+  return isExternalPsbt || unsignedTx.txMeta.returnPsbt
+}

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

@@ -1,6 +1,7 @@
 import { bip371, payments, Transaction } from '@exodus/bitcoinjs'
 import { publicKeyToX } from '@exodus/crypto/secp256k1'
 
+import { withUnsafeNonSegwit } from '../psbt-utils.js'
 import { createGetKeyWithMetadata } from './create-get-key-and-purpose.js'
 import { toAsyncBufferSigner, toAsyncSigner } from './taproot.js'
 
@@ -82,9 +83,12 @@ export function createSignWithWallet({
         : toAsyncSigner({ privateKey, publicKey, isTaprootKeySpend })
 
       // desktop / BE / mobile with bip-schnorr signing
-      signingPromises.push(psbt.signInputAsync(index, asyncSigner, allowedSigHashTypes))
+      signingPromises.push(() => psbt.signInputAsync(index, asyncSigner, allowedSigHashTypes))
     }
 
-    await Promise.all(signingPromises)
+    await withUnsafeNonSegwit({
+      psbt,
+      fn: () => Promise.all(signingPromises.map((sign) => sign())),
+    })
   }
 }

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

@@ -1,7 +1,7 @@
 import { Psbt as DefaultPsbt, Transaction as DefaultTransaction } from '@exodus/bitcoinjs'
 import assert from 'minimalistic-assert'
 
-import { extractTransaction } from './common.js'
+import { extractTransaction, shouldSkipFinalize } from './common.js'
 import { createSignWithWallet } from './create-sign-with-wallet.js'
 import { createPrepareForSigning } from './default-prepare-for-signing.js'
 
@@ -57,7 +57,7 @@ export const signTxFactory = ({
       },
     })
 
-    const skipFinalize = !!unsignedTx.txData.psbtBuffer || unsignedTx.txMeta.returnPsbt
+    const skipFinalize = shouldSkipFinalize(unsignedTx)
     await signWithWallet(psbt, inputsToSign, skipFinalize)
     return extractTransaction({ psbt, skipFinalize })
   }

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

@@ -2,11 +2,8 @@ import { Psbt as DefaultPsbt, Transaction as DefaultTransaction } from '@exodus/
 import assert from 'minimalistic-assert'
 
 import { writePsbtBlockHeight } from '../psbt-proprietary-types.js'
-
-const _MAXIMUM_FEE_RATES = {
-  qtumignition: 25_000,
-  ravencoin: 1_000_000,
-}
+import { setPsbtVersionIfNotBitcoin } from '../psbt-utils.js'
+import { getMaximumFeeRate } from './maximum-fee-rates.js'
 
 /**
  * Factory function that create the prepareForSigning function for a bitcoin-like asset.
@@ -26,17 +23,18 @@ export function createPrepareForSigning({
 
   return ({ unsignedTx }) => {
     const networkInfo = coinInfo.toBitcoinJS()
+    const maximumFeeRate = getMaximumFeeRate(assetName)
 
-    const isPsbtBufferPassed =
-      unsignedTx.txData.psbtBuffer &&
-      unsignedTx.txMeta.addressPathsMap &&
-      unsignedTx.txMeta.inputsToSign
-    if (isPsbtBufferPassed) {
-      // PSBT created externally (Web3, etc..)
+    const psbtOptions = { network: networkInfo }
+    if (maximumFeeRate !== undefined) {
+      psbtOptions.maximumFeeRate = maximumFeeRate
+    }
+
+    if (unsignedTx.txData.psbtBuffer) {
       return createPsbtFromBuffer({
         Psbt,
         psbtBuffer: unsignedTx.txData.psbtBuffer,
-        networkInfo,
+        psbtOptions,
       })
     }
 
@@ -50,15 +48,17 @@ export function createPrepareForSigning({
       Psbt,
       Transaction,
     })
-    if (!['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) psbt.setVersion(1)
+    setPsbtVersionIfNotBitcoin(psbt, assetName)
 
     return psbt
   }
 }
 
 // Creates a PSBT instance from the passed transaction buffer provided by 3rd parties (e.g. dApps).
-function createPsbtFromBuffer({ Psbt, psbtBuffer, ecc, networkInfo }) {
-  return Psbt.fromBuffer(psbtBuffer, { eccLib: ecc, network: networkInfo })
+function createPsbtFromBuffer({ Psbt, psbtBuffer, ecc, psbtOptions = {} }) {
+  const fromBufferOptions = { ...psbtOptions }
+  if (ecc) fromBufferOptions.eccLib = ecc
+  return Psbt.fromBuffer(psbtBuffer, fromBufferOptions)
 }
 
 // Creates a PSBT instance from the passed inputs, outputs etc. The wallet itself provides this data.
@@ -73,11 +73,18 @@ function createPsbtFromTxData({
   Transaction,
   blockHeight,
 }) {
-  // use harcoded max fee rates for specific assets
-  // if undefined, will be set to default value by PSBT (2500)
-  const maximumFeeRate = _MAXIMUM_FEE_RATES[assetName]
+  // use hardcoded max fee rates for specific assets
+  // if undefined, the PSBT default (5000 sat/vB) is used. Passing `undefined`
+  // directly into the constructor used to clobber the default (buggy behavior),
+  // so we now only set the override when we actually have one.
+  const maximumFeeRate = getMaximumFeeRate(assetName)
+
+  const psbtOptions = { network: networkInfo }
+  if (maximumFeeRate !== undefined) {
+    psbtOptions.maximumFeeRate = maximumFeeRate
+  }
 
-  const psbt = new Psbt({ maximumFeeRate, network: networkInfo })
+  const psbt = new Psbt(psbtOptions)
 
   // If present, add blockHeight as a proprietary field
   if (blockHeight !== undefined) {

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

@@ -1,6 +1,6 @@
 import assert from 'minimalistic-assert'
 
-import { extractTransaction } from './common.js'
+import { extractTransaction, shouldSkipFinalize } from './common.js'
 import { createPrepareForSigning } from './default-prepare-for-signing.js'
 
 export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo }) => {
@@ -40,7 +40,7 @@ export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo
       multisigData,
     })
 
-    const skipFinalize = !!unsignedTx.txData.psbtBuffer || unsignedTx.txMeta.returnPsbt
+    const skipFinalize = shouldSkipFinalize(unsignedTx)
     return extractTransaction({ psbt, skipFinalize })
   }
 }

package/src/tx-sign/maximum-fee-rates.js

@@ -0,0 +1,13 @@
+// We keep hardcoded fee caps here so both signing and PSBT builders reuse the
+// same per-asset overrides (e.g. Dogecoin needs a higher ceiling than the
+// bitcoinjs default). If an asset is missing, the library fallback (5000 sat/vB)
+// will apply instead.
+const MAXIMUM_FEE_RATES = {
+  dogecoin: 12_000,
+  qtumignition: 25_000,
+  ravencoin: 1_000_000,
+}
+
+export function getMaximumFeeRate(assetName) {
+  return MAXIMUM_FEE_RATES[assetName]
+}