@exodus/bitcoin-api 4.6.0 → 4.7.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.6.0...@exodus/bitcoin-api@4.7.0) (2025-11-17)
+
+
+### Features
+
+
+* feat: remove giant metadata from createTx result (#6860)
+
+
+
 ## [4.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.2.1...@exodus/bitcoin-api@4.6.0) (2025-11-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "4.6.0",
+  "version": "4.7.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": "660b300377800da2edc9c250d61736b416db73d1"
+  "gitHead": "e281f3eae247487330a0ae16eb57372fa7982ca2"
 }

package/src/psbt-builder.js

@@ -245,6 +245,7 @@ export async function createPsbtWithMetadata({
       addressPathsMap,
       purposeXPubs,
       allowedPurposes,
+      changeOutputIndex: metadata.changeOutputIndex,
     })
     psbt.addOutput(psbtOutput)
   })
@@ -254,5 +255,9 @@ export async function createPsbtWithMetadata({
     writePsbtOutputField(psbt, sendOutputIndex, SubType.OutputRole, 'primary')
   }
 
+  if (metadata.changeOutputIndex !== undefined) {
+    writePsbtOutputField(psbt, metadata.changeOutputIndex, SubType.OutputRole, 'change')
+  }
+
   return psbt
 }

package/src/psbt-parser.js

@@ -1,5 +1,5 @@
 import { publicKeyToX } from '@exodus/crypto/secp256k1'
-import { UtxoCollection } from '@exodus/models'
+import { Address, UtxoCollection } from '@exodus/models'
 import BipPath from 'bip32-path'
 import assert from 'minimalistic-assert'
 
@@ -70,7 +70,7 @@ function parseSingleInput({ txInput, psbtInput, index, asset, purposeXPubs, Tran
     throw new Error(`Input ${index} has no derivation path`)
   }
 
-  input.address = { address, meta: { path: derivation.path, purpose } }
+  input.address = { address, meta: { path: derivation.path } }
   return input
 }
 
@@ -222,32 +222,22 @@ function getSelectedUtxos({ parsedInputs, utxos, asset, txSet }) {
 async function getChangeOutputData({ outputs, assetClientInterface, walletAccount, asset }) {
   let changeOutputData = null
   for (const [i, output] of outputs.entries()) {
-    // Outputs marked “primary” are treated as sends even if they use one of our paths
-    // (common for self‑sends, consolidations, etc.), so skip them during change detection.
-    if (output.metadata?.outputRole === 'primary') {
+    if (output.metadata?.outputRole !== 'change') {
       continue
     }
 
-    // We only treat addresses we can re-derive from the wallet xpub as potential
-    // change outputs.
-    if (!output.address?.meta?.path) {
-      continue
-    }
-
-    // At this point we already know the output was derived by our wallet and it is
-    // not explicitly flagged as a primary/send output, so we tentatively treat it as
-    // change and confirm by re-deriving the on-chain address.
     if (changeOutputData) {
-      // Multiple change outputs are a smell. This can happen if an external PSBT
-      // marks a send output of the same wallet with its derivation path, so we fail fast instead of
-      // silently mislabelling funds.
       throw new Error('Multiple change outputs are not allowed')
     }
 
+    if (!output.address?.meta?.path || !output.address?.meta?.purpose) {
+      throw new Error('Change output has no derivation path or purpose')
+    }
+
     const { path, purpose } = output.address.meta
     const [chainIndex, addressIndex] = BipPath.fromString(path).toPathArray()
 
-    const verifyAddr = await assetClientInterface.getAddress({
+    let ourAddress = await assetClientInterface.getAddress({
       assetName: asset.name,
       walletAccount: walletAccount.toString(),
       purpose,
@@ -255,10 +245,15 @@ async function getChangeOutputData({ outputs, assetClientInterface, walletAccoun
       addressIndex,
     })
 
-    if (verifyAddr.toString() === output.address.address) {
+    if (asset.address.toLegacyAddress) {
+      const legacyAddress = asset.address.toLegacyAddress(ourAddress.address)
+      ourAddress = Address.create(legacyAddress, ourAddress.meta)
+    }
+
+    if (ourAddress.toString() === output.address.address) {
       changeOutputData = {
-        address: verifyAddr,
-        amount: output.amount,
+        address: ourAddress,
+        amount: toBigIntAmount(output.amount),
         index: i,
       }
     } else {
@@ -316,6 +311,17 @@ function buildAddressPathsMap(selectedUtxos, changeOutputData) {
   return addressPathsMap
 }
 
+function buildOutputAddressPurposesMap(outputs) {
+  const map = Object.create(null)
+  for (const output of outputs) {
+    if (output.address?.meta?.purpose) {
+      map[output.address.address] = output.address.meta.purpose
+    }
+  }
+
+  return map
+}
+
 function extractRawTransactions(parsedInputs) {
   const rawTxsData = parsedInputs
     .filter((parsedInput) => parsedInput.prevTxId)
@@ -392,8 +398,127 @@ export async function parsePsbt({
   }
 }
 
+function toBigIntAmount(value) {
+  return Buffer.isBuffer(value) ? value.readBigInt64LE(0) : BigInt(value)
+}
+
+function parseUnsignedTx({ unsignedTx }) {
+  const { txData, txMeta } = unsignedTx
+  assert(txData, 'txData is required')
+  assert(txMeta, 'txMeta is required')
+
+  const {
+    addressPathsMap = Object.create(null),
+    outputAddressPurposesMap = Object.create(null),
+    changeOutputIndex,
+    rawTxs = [],
+    blockHeight,
+    sendOutputIndexes = [],
+    rbfEnabled = false,
+    bumpTxId,
+    txType,
+  } = txMeta
+
+  const rawTxMap = new Map(rawTxs.map((tx) => [tx.txId, tx.rawData]))
+
+  const inputs = (txData.inputs || []).map((input) =>
+    parseUnsignedInput({
+      input,
+      addressPathsMap,
+      rawTxMap,
+    })
+  )
+
+  const outputs = (txData.outputs || []).map((output, index) =>
+    parseUnsignedOutput({
+      index,
+      output,
+      addressPathsMap,
+      outputAddressPurposesMap,
+      sendOutputIndexes,
+      changeOutputIndex,
+    })
+  )
+
+  const fee = computeFee(inputs, outputs)
+
+  const globalMetadata = {
+    blockHeight,
+    rbfEnabled,
+    bumpTxId,
+    txType,
+  }
+
+  return { inputs, outputs, fee, globalMetadata }
+}
+
+function computeFee(inputs, outputs) {
+  const inputSum = inputs.reduce((sum, input) => sum + toBigIntAmount(input.value), BigInt(0))
+  const outputSum = outputs.reduce((sum, output) => sum + toBigIntAmount(output.amount), BigInt(0))
+  return inputSum - outputSum
+}
+
+function parseUnsignedInput({ input, addressPathsMap, rawTxMap }) {
+  const { txId, vout, sequence, value, script, address: addressString } = input
+
+  const path = addressPathsMap[addressString]
+
+  const parsedInput = {
+    txId,
+    vout,
+    sequence,
+    value,
+    script,
+    address: { address: addressString, meta: { path } },
+  }
+
+  const rawTxHex = rawTxMap.get(txId)
+  if (rawTxHex) {
+    parsedInput.prevTxHex = rawTxHex
+    parsedInput.prevTxId = txId
+  }
+
+  return parsedInput
+}
+
+function parseUnsignedOutput({
+  index,
+  output,
+  addressPathsMap,
+  outputAddressPurposesMap,
+  sendOutputIndexes,
+  changeOutputIndex,
+}) {
+  const [addressString, amount] = output
+
+  const purpose = outputAddressPurposesMap[addressString]
+  const path = addressPathsMap[addressString]
+
+  const addressObject = { address: addressString }
+  if (purpose !== undefined) {
+    addressObject.meta = { purpose }
+  }
+
+  if (path !== undefined) {
+    addressObject.meta = { ...addressObject.meta, path }
+  }
+
+  const parsedOutput = {
+    amount,
+    address: addressObject,
+  }
+
+  if (sendOutputIndexes.includes(index)) {
+    parsedOutput.metadata = { outputRole: 'primary' }
+  } else if (changeOutputIndex === index) {
+    parsedOutput.metadata = { outputRole: 'change' }
+  }
+
+  return parsedOutput
+}
+
 export async function extractTransactionContext({
-  psbtBuffer,
+  unsignedTx,
   asset,
   assetClientInterface,
   walletAccount,
@@ -401,27 +526,31 @@ export async function extractTransactionContext({
   Psbt,
   Transaction,
 }) {
-  assert(psbtBuffer, 'psbtBuffer is required')
+  assert(unsignedTx, 'unsignedTx 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 psbtBuffer = unsignedTx?.txData?.psbtBuffer
+
+  const parsed = psbtBuffer
+    ? await parsePsbt({
+        psbtBuffer,
+        asset,
+        assetClientInterface,
+        walletAccount,
+        allowedPurposes,
+        Psbt,
+        Transaction,
+      })
+    : parseUnsignedTx({ unsignedTx })
 
   const {
     inputs: parsedInputs,
     outputs: parsedOutputs,
     fee: calculatedFee,
     globalMetadata,
-  } = await parsePsbt({
-    psbtBuffer,
-    asset,
-    assetClientInterface,
-    walletAccount,
-    allowedPurposes,
-    Psbt,
-    Transaction,
-  })
+  } = parsed
 
   const changeOutputData = await getChangeOutputData({
     outputs: parsedOutputs,
@@ -482,6 +611,7 @@ export async function extractTransactionContext({
   )
 
   const addressPathsMap = buildAddressPathsMap(selectedUtxos, changeOutputData)
+  const outputAddressPurposesMap = buildOutputAddressPurposesMap(parsedOutputs)
   const rawTxs = extractRawTransactions(parsedInputs)
 
   return {
@@ -492,6 +622,7 @@ export async function extractTransactionContext({
     fee: asset.currency.baseUnit(calculatedFee),
     sendOutputIndexes: primaryOutputIndexes,
     changeOutputIndex: changeOutputData?.index,
+    outputAddressPurposesMap,
     sendAmounts,
     changeAmount,
     totalSendAmount,
@@ -505,5 +636,9 @@ export async function extractTransactionContext({
     changeOutput: changeOutputData ? outputs[changeOutputData.index] : undefined,
     rbfEnabled: globalMetadata.rbfEnabled,
     blockHeight: globalMetadata.blockHeight,
+    bumpTxId: globalMetadata.bumpTxId,
+    txType: globalMetadata.txType,
+    useCashAddress: unsignedTx?.txMeta?.useCashAddress,
+    psbtBuffer,
   }
 }

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

@@ -174,6 +174,7 @@ function createTransactionOutputs({
   const assetName = asset.name
   let outputs = []
   let sendOutput
+  let adjustedFee
 
   // Add existing outputs from replacement transaction
   if (replaceTx) {
@@ -196,8 +197,7 @@ function createTransactionOutputs({
       )
     : sendAmount
 
-  // Handle change output
-  const { changeOutput, adjustedFee, changeAddressKeypath, ourAddress } = createChangeOutput({
+  const changeOutputData = createChangeOutput({
     selectedUtxos,
     totalAmount,
     fee,
@@ -206,18 +206,23 @@ function createTransactionOutputs({
     asset,
   })
 
-  if (changeOutput) {
-    outputs.push(changeOutput)
+  if (changeOutputData) {
+    outputs.push(changeOutputData.changeOutput)
+    adjustedFee = fee
+  } else {
+    // If we don't have enough for a change output, then all remaining dust is just added to fee
+    const changeAmount = selectedUtxos.value.sub(totalAmount).sub(fee)
+    adjustedFee = fee.add(changeAmount)
   }
 
   return {
     outputs: replaceTx ? outputs : shuffle(outputs),
     sendOutput,
-    changeOutput,
-    totalAmount,
+    ourAddress: changeOutputData?.ourAddress,
+    changeOutput: changeOutputData?.changeOutput,
+    changeAddressPath: changeOutputData?.changeAddressPath,
+    changeAddressPurpose: changeOutputData?.changeAddressPurpose,
     adjustedFee,
-    changeAddressKeypath,
-    ourAddress,
   }
 }
 
@@ -233,7 +238,7 @@ function createChangeOutput({ selectedUtxos, totalAmount, fee, replaceTx, change
     ourAddress = Address.create(legacyAddress, ourAddress.meta)
   }
 
-  // Create change output if above dust threshold
+  // Create change output if above dust threshold.
   if (change.gte(dust)) {
     const changeOutput = createOutput(
       asset.name,
@@ -241,22 +246,16 @@ function createChangeOutput({ selectedUtxos, totalAmount, fee, replaceTx, change
       change
     )
 
-    // Return the keypath for hardware wallet change detection
+    // Return the path for hardware wallet change detection
     return {
-      changeOutput,
-      adjustedFee: fee,
-      changeAddressKeypath: ourAddress.meta.path,
       ourAddress,
+      changeOutput,
+      changeAddressPath: ourAddress.meta.path,
+      changeAddressPurpose: ourAddress.meta.purpose,
     }
   }
 
-  // Add dust to fee if not enough for change output
-  return {
-    changeOutput: undefined,
-    adjustedFee: fee.add(change),
-    changeAddressKeypath: undefined,
-    ourAddress,
-  }
+  return null
 }
 
 async function createUnsignedTx({
@@ -275,6 +274,7 @@ async function createUnsignedTx({
   txType = 'transfer',
   sendOutputIndex,
   changeOutputIndex,
+  outputAddressPurposesMap,
   allowedPurposes,
   Psbt,
   Transaction,
@@ -291,6 +291,13 @@ async function createUnsignedTx({
       addressPathsMap,
       blockHeight,
       rawTxs: nonWitnessTxs,
+      sendOutputIndexes:
+        sendOutputIndex === undefined || sendOutputIndex === null ? [] : [sendOutputIndex],
+      changeOutputIndex,
+      outputAddressPurposesMap,
+      rbfEnabled,
+      bumpTxId,
+      txType,
     },
   }
 
@@ -450,10 +457,10 @@ const transferHandler = {
       outputs,
       sendOutput,
       changeOutput,
-      totalAmount,
-      adjustedFee,
-      changeAddressKeypath,
+      changeAddressPath,
+      changeAddressPurpose,
       ourAddress,
+      adjustedFee,
     } = createTransactionOutputs({
       replaceTx: processedReplaceTx,
       processedAddress,
@@ -464,11 +471,15 @@ const transferHandler = {
       changeAddress: context.changeAddress,
     })
 
+    // Create a map of wallet's own output addresses and their purposes.
+    const outputAddressPurposesMap = Object.create(null)
+
     // Add the keypath of change address to support Trezor detect the change output.
     // Output is change and does not need approval from user which shows the strange address that user never seen.
-    if (changeAddressKeypath) {
+    if (changeAddressPath && changeAddressPurpose) {
       const changeKey = ourAddress?.address ?? String(ourAddress)
-      addressPathsMap[changeKey] = changeAddressKeypath
+      addressPathsMap[changeKey] = changeAddressPath
+      outputAddressPurposesMap[changeKey] = changeAddressPurpose
     }
 
     // Create unsigned transaction
@@ -477,6 +488,7 @@ const transferHandler = {
       outputs,
       useCashAddress,
       addressPathsMap,
+      outputAddressPurposesMap,
       blockHeight: context.blockHeight,
       asset,
       selectedUtxos,
@@ -493,26 +505,7 @@ const transferHandler = {
       Transaction,
     })
 
-    return {
-      unsignedTx,
-      metadata: {
-        fee: adjustedFee,
-        amount,
-        change: selectedUtxos.value.sub(totalAmount).sub(adjustedFee),
-        totalAmount,
-        address: processedAddress,
-        ourAddress,
-        receiveAddress: utxoParams.receiveAddress,
-        sendAmount: utxoParams.sendAmount,
-        usableUtxos: context.usableUtxos,
-        selectedUtxos,
-        replaceTx: processedReplaceTx,
-        sendOutput,
-        changeOutput,
-        blockHeight: context.blockHeight,
-        rbfEnabled: context.rbfEnabled,
-      },
-    }
+    return { unsignedTx, fee: adjustedFee }
   },
 }
 

package/src/tx-send/index.js

@@ -99,65 +99,21 @@ export async function signTransaction({
   return { rawTx, txId, tx }
 }
 
-const getPrepareSendTransaction = async ({
-  address,
-  allowUnconfirmedRbfEnabledUtxos,
-  amount,
-  asset,
-  assetClientInterface,
-  changeAddressType,
-  getFeeEstimator,
-  options,
-  utxosDescendingOrder,
-  walletAccount,
-  allowedPurposes,
-  Psbt,
-  Transaction,
-}) => {
-  const createTx = createTxFactory({
-    getFeeEstimator,
-    allowUnconfirmedRbfEnabledUtxos,
-    utxosDescendingOrder,
-    assetClientInterface,
-    changeAddressType,
-    allowedPurposes,
-    Psbt,
-    Transaction,
-  })
-
-  // Set default values for options
-  const { isRbfAllowed = true, ...restOptions } = options || Object.create(null)
-
-  return createTx({
-    asset,
-    walletAccount,
-    type: 'transfer',
-    toAddress: address,
-    amount,
-    isRbfAllowed,
-    ...restOptions,
-  })
-}
-
-function toTransactionDescriptor({ txContext, psbtBuffer }) {
+function getTransferUnsignedTx(txContext) {
   const {
     inputs,
     outputs,
+    psbtBuffer,
+    useCashAddress,
     addressPathsMap,
+    outputAddressPurposesMap,
     blockHeight,
     rawTxs,
-    fee,
-    totalSendAmount,
-    changeAmount,
-    totalAmount,
-    primaryAddresses,
-    ourAddress,
-    usableUtxos,
-    selectedUtxos,
-    replaceTx,
-    sendOutputs,
-    changeOutput,
+    txType,
     rbfEnabled,
+    bumpTxId,
+    changeOutputIndex,
+    sendOutputIndexes,
   } = txContext
 
   return {
@@ -168,27 +124,47 @@ function toTransactionDescriptor({ txContext, psbtBuffer }) {
         psbtBuffer,
       },
       txMeta: {
+        useCashAddress,
         addressPathsMap,
+        outputAddressPurposesMap,
         blockHeight,
         rawTxs,
+        txType,
+        rbfEnabled,
+        bumpTxId,
+        changeOutputIndex,
+        sendOutputIndexes,
       },
     },
-    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,
-    },
+  }
+}
+
+// Get additional transaction metadata that are not part of the unsignedTx.txMeta
+function getExtendedTxMeta(txContext) {
+  const {
+    fee,
+    totalSendAmount,
+    changeAmount,
+    totalAmount,
+    primaryAddresses,
+    ourAddress,
+    usableUtxos,
+    selectedUtxos,
+    replaceTx,
+    changeOutput,
+  } = txContext
+
+  return {
+    fee,
+    sendAmount: totalSendAmount,
+    changeAmount,
+    totalAmount,
+    toAddress: primaryAddresses[0]?.address,
+    ourAddress,
+    usableUtxos,
+    selectedUtxos,
+    replaceTx,
+    changeOutput,
   }
 }
 
@@ -206,53 +182,77 @@ export const createAndBroadcastTXFactory =
     Psbt = DefaultPsbt,
     Transaction = DefaultTransaction,
   }) =>
-  async ({ asset, walletAccount, address, amount, ...options }) => {
-    // Prepare transaction
-    const { bumpTxId } = options
-
+  async ({
+    asset,
+    walletAccount,
+    address,
+    amount,
+    multipleAddressesEnabled,
+    feePerKB,
+    customFee,
+    isSendAll,
+    bumpTxId: bumpTxIdProvided,
+    isExchange,
+    isRbfAllowed = true,
+    taprootInputWitnessSize,
+  }) => {
     const assetName = asset.name
     const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
 
-    let transactionDescriptor = await getPrepareSendTransaction({
-      address,
+    const createTx = createTxFactory({
+      getFeeEstimator,
       allowUnconfirmedRbfEnabledUtxos,
+      utxosDescendingOrder,
+      assetClientInterface,
+      changeAddressType,
+      allowedPurposes,
+      Psbt,
+      Transaction,
+    })
+
+    const { unsignedTx: unsignedTxByCreateTx } = await createTx({
+      asset,
+      walletAccount,
+      type: 'transfer',
+      toAddress: address,
       amount,
+      isRbfAllowed,
+      multipleAddressesEnabled,
+      feePerKB,
+      customFee,
+      isSendAll,
+      bumpTxId: bumpTxIdProvided,
+      isExchange,
+      taprootInputWitnessSize,
+    })
+
+    const txContext = await extractTransactionContext({
+      unsignedTx: unsignedTxByCreateTx,
       asset,
       assetClientInterface,
-      changeAddressType,
-      getFeeEstimator,
-      options,
-      utxosDescendingOrder,
       walletAccount,
       allowedPurposes,
       Psbt,
       Transaction,
     })
 
-    // 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
-    }
+    const { unsignedTx } = getTransferUnsignedTx(txContext)
+
+    const {
+      fee,
+      sendAmount,
+      changeAmount,
+      totalAmount,
+      toAddress,
+      ourAddress,
+      usableUtxos,
+      selectedUtxos,
+      replaceTx,
+      changeOutput,
+    } = getExtendedTxMeta(txContext)
 
-    const { sendAmount, usableUtxos, replaceTx, sendOutput, changeOutput } = metadata
+    const { sendOutputIndexes, changeOutputIndex, bumpTxId, rbfEnabled, blockHeight } =
+      unsignedTx.txMeta
 
     // Sign transaction
     const { rawTx, txId, tx } = await signTransaction({
@@ -269,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: ((metadata.fee && metadata.fee.toDefaultString({ unit: true })) || 0).toString(),
+          fee: ((fee && fee.toDefaultString({ unit: true })) || 0).toString(),
           allUtxos: usableUtxos.toJSON(),
         })
       }
@@ -277,34 +277,31 @@ export const createAndBroadcastTXFactory =
       throw err
     }
 
-    function findUtxoIndex(output) {
-      let utxoIndex = -1
-      if (output) {
-        for (const [i, [address, amount]] of unsignedTx.txData.outputs.entries()) {
-          if (output[0] === address && output[1] === amount) {
-            utxoIndex = i
-            break
-          }
-        }
-      }
-
-      return utxoIndex
-    }
+    const changeUtxoIndex = changeOutputIndex ?? -1
+    const sendUtxoIndex = sendOutputIndexes?.[0] ?? -1
 
-    const changeUtxoIndex = findUtxoIndex(changeOutput)
-    const sendUtxoIndex = findUtxoIndex(sendOutput)
+    const { script, size } = getSizeAndChangeScript({
+      assetName,
+      tx,
+      rawTx,
+      changeUtxoIndex,
+      txId,
+    })
 
-    const { size } = await updateAccountState({
+    await updateAccountState({
       assetClientInterface,
       assetName,
       walletAccount,
       accountState,
       txId,
-      metadata,
-      tx,
-      rawTx,
       changeUtxoIndex,
-      getSizeAndChangeScript,
+      script,
+      usableUtxos,
+      selectedUtxos,
+      replaceTx,
+      changeAmount,
+      ourAddress,
+      rbfEnabled,
     })
 
     await updateTransactionLog({
@@ -312,7 +309,16 @@ export const createAndBroadcastTXFactory =
       assetClientInterface,
       walletAccount,
       txId,
-      metadata,
+      totalAmount,
+      selectedUtxos,
+      replaceTx,
+      changeOutput,
+      ourAddress,
+      fee,
+      blockHeight,
+      rbfEnabled,
+      toAddress,
+      sendAmount,
       bumpTxId,
       size,
     })

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

@@ -2,44 +2,21 @@ import { Address } from '@exodus/models'
 
 import { serializeCurrency } from '../fee/fee-utils.js'
 
-/**
- * Update account state after transaction is broadcast
- * @param {Object} params
- * @param {Object} params.assetClientInterface - Asset client interface
- * @param {string} params.assetName - Name of the asset
- * @param {Object} params.walletAccount - Wallet account
- * @param {Object} params.accountState - Current account state
- * @param {string} params.txId - Transaction ID
- * @param {Object} params.metadata - Transaction metadata
- * @param {Object} params.tx - Signed transaction object
- * @param {Buffer} params.rawTx - Raw transaction
- * @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
- */
 export async function updateAccountState({
   assetClientInterface,
   assetName,
   walletAccount,
   accountState,
   txId,
-  metadata,
-  tx,
-  rawTx,
   changeUtxoIndex,
-  getSizeAndChangeScript,
+  script,
+  usableUtxos,
+  selectedUtxos,
+  replaceTx,
+  changeAmount,
+  ourAddress,
+  rbfEnabled,
 }) {
-  const { usableUtxos, selectedUtxos, replaceTx, change, ourAddress, rbfEnabled } = metadata
-
-  // Get change script and size
-  const { script, size } = getSizeAndChangeScript({
-    assetName,
-    tx,
-    rawTx,
-    changeUtxoIndex,
-    txId,
-  })
-
   // Update remaining UTXOs
   const knownBalanceUtxoIds = accountState.knownBalanceUtxoIds || []
   let remainingUtxos = usableUtxos.difference(selectedUtxos)
@@ -52,7 +29,7 @@ export async function updateAccountState({
       address,
       vout: changeUtxoIndex,
       script,
-      value: change,
+      value: changeAmount,
       confirmations: 0,
       rbfEnabled,
     }
@@ -75,42 +52,26 @@ export async function updateAccountState({
       knownBalanceUtxoIds,
     },
   })
-
-  return { size }
 }
 
-/**
- * Update transaction log with new transaction
- * @param {Object} params
- * @param {Object} params.asset - Asset object
- * @param {Object} params.assetClientInterface - Asset client interface
- * @param {Object} params.walletAccount - Wallet account
- * @param {string} params.txId - Transaction ID
- * @param {Object} params.metadata - Transaction metadata
- * @param {string} params.bumpTxId - ID of transaction being bumped (if applicable)
- * @param {number} params.size - Transaction size
- */
 export async function updateTransactionLog({
   asset,
   assetClientInterface,
   walletAccount,
   txId,
-  metadata,
   bumpTxId,
   size,
+  totalAmount,
+  selectedUtxos,
+  replaceTx,
+  changeOutput,
+  ourAddress,
+  fee,
+  blockHeight,
+  rbfEnabled,
+  toAddress,
+  sendAmount,
 }) {
-  const {
-    totalAmount,
-    selectedUtxos,
-    replaceTx,
-    changeOutput,
-    ourAddress,
-    fee,
-    blockHeight,
-    rbfEnabled,
-    address,
-    amount,
-  } = metadata
   const assetName = asset.name
 
   // Check if this is a self-send
@@ -129,9 +90,11 @@ export async function updateTransactionLog({
   // If we have a bumpTxId, but we aren't replacing, then it is a self-send.
   const selfSend = bumpTxId
     ? !replaceTx
-    : walletAddressObjects.some((receiveAddress) => String(receiveAddress) === String(address))
+    : walletAddressObjects.some((receiveAddress) => String(receiveAddress) === String(toAddress))
 
-  const displayReceiveAddress = asset.address.displayAddress?.(address) || address
+  const displayReceiveAddress = asset.address.displayAddress?.(toAddress) || toAddress
+
+  const amountToSerialize = sendAmount.isZero ? undefined : sendAmount
 
   // Build receivers list
   const receivers = bumpTxId
@@ -141,9 +104,17 @@ export async function updateTransactionLog({
     : replaceTx
       ? [
           ...replaceTx.data.sent,
-          { address: displayReceiveAddress, amount: serializeCurrency(amount, asset.currency) },
+          {
+            address: displayReceiveAddress,
+            amount: serializeCurrency(amountToSerialize, asset.currency),
+          },
+        ]
+      : [
+          {
+            address: displayReceiveAddress,
+            amount: serializeCurrency(amountToSerialize, asset.currency),
+          },
         ]
-      : [{ address: displayReceiveAddress, amount: serializeCurrency(amount, asset.currency) }]
 
   // Calculate coin amount
   const coinAmount = selfSend ? asset.currency.ZERO : totalAmount.abs().negate()
@@ -177,11 +148,17 @@ export async function updateTransactionLog({
 
   // If replacing a transaction, update the old one
   if (replaceTx) {
-    replaceTx.data.replacedBy = txId
+    const updatedReplaceTx = {
+      ...replaceTx,
+      data: {
+        ...replaceTx.data,
+        replacedBy: txId,
+      },
+    }
     await assetClientInterface.updateTxLogAndNotify({
       assetName,
       walletAccount,
-      txs: [replaceTx],
+      txs: [updatedReplaceTx],
     })
   }
 }