@exodus/bitcoin-api 4.1.1 → 4.1.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.2](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.1.1...@exodus/bitcoin-api@4.1.2) (2025-10-09)
+
+
+### Bug Fixes
+
+
+* fix: remove isBip70 from bitcoin libs (#6660)
+
+* fix: remove unused bitcoin.api.prepareSendTx (#6662)
+
+
+
 ## [4.1.1](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@4.1.0...@exodus/bitcoin-api@4.1.1) (2025-09-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Bitcoin transaction and fee monitors, RPC with the blockchain node, other networking code.",
   "type": "module",
   "main": "src/index.js",
@@ -12,7 +12,8 @@
   "author": "Exodus Movement, Inc.",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": false
   },
   "scripts": {
     "test": "run -T exodus-test --jest",
@@ -59,5 +60,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "0d64e50fa0875dc526ce20e3be748f50c8483e9e"
+  "gitHead": "6237b0d98791ed9e6290260947068d2600bf8270"
 }

package/src/move-funds.js

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

package/src/send-validation.js

@@ -5,16 +5,6 @@ import { getSendDustValue as getDustValue } from './dust.js'
 
 const { createValidator, FIELDS, PRIORITY_LEVELS, VALIDATION_TYPES } = sendValidationModel
 
-const bip70Validator = createValidator({
-  id: 'BIP70',
-  type: VALIDATION_TYPES.ERROR,
-  priority: PRIORITY_LEVELS.MIDDLE,
-  field: FIELDS.ADDRESS,
-  shouldValidate: ({ bip70 }) => !!bip70,
-  isValid: async ({ bip70 }) => !bip70.isInvalid(),
-  getMessage: () => t(`The payment request is invalid.`),
-})
-
 const bcnLegacyAddressValidator = createValidator({
   type: VALIDATION_TYPES.WARN,
   priority: PRIORITY_LEVELS.BASE,
@@ -80,9 +70,4 @@ const bitcoinCpfpWarning = createValidator({
   },
 })
 
-export default [
-  bitcoinCpfpWarning,
-  bip70Validator,
-  bcnLegacyAddressValidator,
-  notEnoughOutputValidator,
-]
+export default [bitcoinCpfpWarning, bcnLegacyAddressValidator, notEnoughOutputValidator]

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

@@ -0,0 +1,367 @@
+import { Address, UtxoCollection } from '@exodus/models'
+import lodash from 'lodash'
+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 { findUnconfirmedSentRbfTxs } from '../tx-utils.js'
+import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data.js'
+import {
+  getInscriptionIds,
+  getOrdinalsUtxos,
+  getTransferOrdinalsUtxos,
+  getUsableUtxos,
+  getUtxos,
+} from '../utxos-utils.js'
+import { createInputs, createOutput, getBlockHeight, getNonWitnessTxs } from './tx-create-utils.js'
+
+async function createUnsignedTx({
+  inputs,
+  outputs,
+  useCashAddress,
+  addressPathsMap,
+  blockHeight,
+  asset,
+  selectedUtxos,
+  insightClient,
+}) {
+  const nonWitnessTxs = await getNonWitnessTxs(asset, selectedUtxos, insightClient)
+
+  return {
+    txData: {
+      inputs,
+      outputs,
+    },
+    txMeta: {
+      useCashAddress, // for trezor to show the receiver cash address
+      addressPathsMap,
+      blockHeight,
+      rawTxs: nonWitnessTxs,
+    },
+  }
+}
+
+const getTxHandler = (type) => {
+  switch (type) {
+    case 'transfer':
+      return transferHandler
+    default:
+      throw new Error(`Unknown transaction type: ${type}`)
+  }
+}
+
+const transferHandler = {
+  buildTransaction: async ({
+    asset,
+    walletAccount,
+    toAddress,
+    amount,
+    blockHeight: providedBlockHeight,
+    rbfEnabled: providedRbfEnabled,
+    multipleAddressesEnabled,
+    feePerKB,
+    customFee,
+    isSendAll,
+    bumpTxId,
+    nft,
+    isExchange,
+    isRbfAllowed,
+    taprootInputWitnessSize,
+    accountState,
+    feeData,
+    ordinalsEnabled,
+    getFeeEstimator,
+    allowUnconfirmedRbfEnabledUtxos,
+    utxosDescendingOrder,
+    assetClientInterface,
+    changeAddressType,
+  }) => {
+    const assetName = asset.name
+    const updatedFeeData = { ...feeData, feePerKB: feePerKB ?? feeData.feePerKB }
+    const insightClient = asset.baseAsset.insightClient
+
+    const blockHeight = providedBlockHeight || (await getBlockHeight({ assetName, insightClient }))
+
+    const rbfEnabled =
+      providedRbfEnabled || (updatedFeeData.rbfEnabled && !isExchange && isRbfAllowed && !nft)
+
+    const inscriptionIds = getInscriptionIds({ nft })
+
+    assert(
+      ordinalsEnabled || !inscriptionIds,
+      'inscriptions cannot be sent when ordinalsEnabled=false '
+    )
+
+    const shuffle = (list) => {
+      // Using full lodash.shuffle notation so it can be mocked with spyOn in tests
+      return inscriptionIds ? list : lodash.shuffle(list) // don't shuffle when sending ordinal!!!!
+    }
+
+    assert(
+      assetClientInterface,
+      `assetClientInterface must be supplied in sendTx for ${asset.name}`
+    )
+    assert(
+      toAddress || bumpTxId,
+      'should not be called without either a receiving toAddress or to bump a tx'
+    )
+
+    if (inscriptionIds) {
+      assert(!bumpTxId, 'only inscriptionIds or bumpTxId must be provided')
+      assert(toAddress, 'toAddress must be provided when sending ordinals')
+    }
+
+    const useCashAddress = asset.address.isCashAddress?.(toAddress)
+
+    const changeAddress = multipleAddressesEnabled
+      ? await assetClientInterface.getNextChangeAddress({ assetName, walletAccount })
+      : await assetClientInterface.getReceiveAddressObject({ assetName, walletAccount })
+
+    const txSet = await assetClientInterface.getTxLog({ assetName, walletAccount })
+
+    const currentOrdinalsUtxos = getOrdinalsUtxos({ accountState, asset })
+    const transferOrdinalsUtxos = inscriptionIds
+      ? getTransferOrdinalsUtxos({ inscriptionIds, ordinalsUtxos: currentOrdinalsUtxos })
+      : undefined
+
+    const unconfirmedTxAncestor = getUnconfirmedTxAncestorMap({ accountState })
+    const usableUtxos = getUsableUtxos({
+      asset,
+      utxos: getUtxos({ accountState, asset }),
+      feeData: updatedFeeData,
+      txSet,
+      unconfirmedTxAncestor,
+    })
+
+    let replaceableTxs = findUnconfirmedSentRbfTxs(txSet)
+
+    let processedAddress = toAddress
+    if (asset.address.toLegacyAddress) {
+      processedAddress = asset.address.toLegacyAddress(toAddress)
+    }
+
+    if (assetName === 'digibyte' && asset.address.isP2SH2(processedAddress)) {
+      processedAddress = asset.address.P2SH2ToP2SH(processedAddress)
+    }
+
+    let utxosToBump
+    if (bumpTxId) {
+      const bumpTx = replaceableTxs.find(({ txId }) => txId === bumpTxId)
+      if (bumpTx) {
+        replaceableTxs = [bumpTx]
+      } else {
+        utxosToBump = usableUtxos.getTxIdUtxos(bumpTxId)
+        if (utxosToBump.size === 0) {
+          throw new Error(`Cannot bump transaction ${bumpTxId}`)
+        }
+
+        replaceableTxs = []
+      }
+    }
+
+    const sendAmount = bumpTxId || transferOrdinalsUtxos ? asset.currency.ZERO : amount
+    const receiveAddress = bumpTxId
+      ? replaceableTxs.length > 0
+        ? null
+        : changeAddressType
+      : processedAddress
+    const feeRate = updatedFeeData.feePerKB
+    const resolvedIsSendAll = (!rbfEnabled && feePerKB) || transferOrdinalsUtxos ? false : isSendAll
+
+    let { selectedUtxos, fee, replaceTx } = selectUtxos({
+      asset,
+      usableUtxos,
+      replaceableTxs,
+      amount: sendAmount,
+      feeRate: customFee || feeRate,
+      receiveAddress,
+      isSendAll: resolvedIsSendAll,
+      getFeeEstimator: (asset, { feePerKB, ...options }) =>
+        getFeeEstimator(asset, feePerKB, options),
+      mustSpendUtxos: utxosToBump,
+      allowUnconfirmedRbfEnabledUtxos,
+      unconfirmedTxAncestor,
+      inscriptionIds,
+      transferOrdinalsUtxos,
+      utxosDescendingOrder,
+      taprootInputWitnessSize,
+      changeAddressType,
+    })
+
+    if (!selectedUtxos && !replaceTx) throw new Error('Not enough funds.')
+
+    // When bumping a tx, we can either replace the tx with RBF or spend its selected change.
+    // If there is no selected UTXO or the tx to replace is not the tx we want to bump,
+    // then something is wrong because we can't actually bump the tx.
+    // This shouldn't happen but might due to either the tx confirming before accelerate was
+    // pressed, or if the change was already spent from another wallet.
+    if (bumpTxId && (!selectedUtxos || (replaceTx && replaceTx.txId !== bumpTxId))) {
+      throw new Error(`Unable to bump ${bumpTxId}`)
+    }
+
+    if (replaceTx) {
+      replaceTx = replaceTx.clone()
+      replaceTx = replaceTx.update({ data: { ...replaceTx.data } })
+      replaceTx.data.sent = replaceTx.data.sent.map((to) => {
+        return { ...to, amount: serializeCurrency(to.amount, asset.currency) }
+      })
+      selectedUtxos = selectedUtxos.union(
+        // how to avoid replace tx inputs when inputs are ordinals? !!!!
+        UtxoCollection.fromJSON(replaceTx.data.inputs, { currency: asset.currency })
+      )
+    }
+
+    const addressPathsMap = selectedUtxos.getAddressPathsMap()
+
+    // Inputs and Outputs
+    const inputs = shuffle(createInputs(assetName, selectedUtxos.toArray(), rbfEnabled))
+    let outputs = replaceTx
+      ? replaceTx.data.sent.map(({ address, amount }) =>
+          createOutput(assetName, address, parseCurrency(amount, asset.currency))
+        )
+      : []
+
+    // Send output
+    let sendOutput
+    if (processedAddress) {
+      if (transferOrdinalsUtxos) {
+        outputs.push(
+          ...transferOrdinalsUtxos
+            .toArray()
+            .map((ordinalUtxo) => createOutput(assetName, processedAddress, ordinalUtxo.value))
+        )
+      } else {
+        sendOutput = createOutput(assetName, processedAddress, sendAmount)
+        outputs.push(sendOutput)
+      }
+    }
+
+    const totalAmount = replaceTx
+      ? replaceTx.data.sent.reduce(
+          (total, { amount }) => total.add(parseCurrency(amount, asset.currency)),
+          sendAmount
+        )
+      : sendAmount
+
+    const change = selectedUtxos.value
+      .sub(totalAmount)
+      .sub(transferOrdinalsUtxos?.value || asset.currency.ZERO)
+      .sub(fee)
+    const dust = getChangeDustValue(asset)
+    let ourAddress = replaceTx?.data?.changeAddress || changeAddress
+    if (asset.address.toLegacyAddress) {
+      const legacyAddress = asset.address.toLegacyAddress(ourAddress.address)
+      ourAddress = Address.create(legacyAddress, ourAddress.meta)
+    }
+
+    // Change Output
+    let changeOutput
+    if (change.gte(dust)) {
+      changeOutput = createOutput(assetName, ourAddress.address ?? ourAddress.toString(), change)
+      // 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.
+      addressPathsMap[changeAddress] = ourAddress.meta.path
+      outputs.push(changeOutput)
+    } else {
+      // If we don't have enough for a change output, then all remaining dust is just added to fee
+      fee = fee.add(change)
+    }
+
+    outputs = replaceTx ? outputs : shuffle(outputs)
+
+    const unsignedTx = await createUnsignedTx({
+      inputs,
+      outputs,
+      useCashAddress,
+      addressPathsMap,
+      blockHeight,
+      asset,
+      selectedUtxos,
+      insightClient,
+    })
+
+    return {
+      amount,
+      change,
+      totalAmount,
+      currentOrdinalsUtxos,
+      inscriptionIds,
+      address: processedAddress,
+      ourAddress,
+      receiveAddress,
+      sendAmount,
+      fee,
+      usableUtxos,
+      selectedUtxos,
+      transferOrdinalsUtxos,
+      replaceTx,
+      sendOutput,
+      changeOutput,
+      unsignedTx,
+    }
+  },
+}
+
+export const createTxFactory =
+  ({
+    ordinalsEnabled,
+    getFeeEstimator,
+    allowUnconfirmedRbfEnabledUtxos,
+    utxosDescendingOrder,
+    assetClientInterface,
+    changeAddressType,
+  }) =>
+  async ({
+    asset,
+    walletAccount,
+    type,
+    toAddress,
+    amount,
+    blockHeight,
+    rbfEnabled,
+    multipleAddressesEnabled,
+    feePerKB,
+    customFee,
+    isSendAll,
+    bumpTxId,
+    nft,
+    isExchange,
+    isRbfAllowed,
+    taprootInputWitnessSize,
+  }) => {
+    const assetName = asset.name
+    const accountState = await assetClientInterface.getAccountState({
+      assetName,
+      walletAccount,
+    })
+    const feeData = await assetClientInterface.getFeeConfig({ assetName })
+
+    const txHandler = getTxHandler(type)
+
+    return txHandler.buildTransaction({
+      asset,
+      walletAccount,
+      toAddress,
+      amount,
+      blockHeight,
+      rbfEnabled,
+      multipleAddressesEnabled,
+      feePerKB,
+      customFee,
+      isSendAll,
+      bumpTxId,
+      nft,
+      isExchange,
+      isRbfAllowed,
+      taprootInputWitnessSize,
+      accountState,
+      feeData,
+      ordinalsEnabled,
+      getFeeEstimator,
+      allowUnconfirmedRbfEnabledUtxos,
+      utxosDescendingOrder,
+      assetClientInterface,
+      changeAddressType,
+    })
+  }

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

@@ -0,0 +1,91 @@
+import { getTxSequence } from '@exodus/bitcoin-lib'
+
+import {
+  createInputs as dogecoinCreateInputs,
+  createOutput as dogecoinCreateOutput,
+} from './dogecoin.js'
+
+const ASSETS_USING_BUFFER_VALUES = new Set(['dogecoin', 'digibyte'])
+
+const ASSETS_SUPPORTED_BIP_174 = new Set([
+  'bitcoin',
+  'bitcoinregtest',
+  'bitcointestnet',
+  'litecoin',
+  'dash',
+  'dogecoin',
+  'ravencoin',
+  'digibyte',
+  'qtumignition',
+  'vertcoin', // is not available on mobile!
+])
+
+export async function getBlockHeight({ assetName, insightClient }) {
+  return ['zcash', 'bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)
+    ? insightClient.fetchBlockHeight()
+    : 0
+}
+
+export async function getNonWitnessTxs(asset, utxos, insightClient) {
+  const rawTxs = []
+
+  // BIP 174 (PSBT) requires full transaction for non-witness outputs
+  if (ASSETS_SUPPORTED_BIP_174.has(asset.name)) {
+    const nonWitnessTxIds = utxos.txIds.filter((txId) =>
+      utxos
+        .getAddressesForTxId(txId)
+        .toAddressStrings()
+        .some(
+          (a) =>
+            asset.address.isP2PKH(a) ||
+            asset.address.isP2SH(a) ||
+            asset.address.isP2SH2?.(a) ||
+            asset.address.isP2WPKH?.(a) ||
+            asset.address.isP2WSH?.(a)
+        )
+    )
+
+    if (nonWitnessTxIds.length > 0) {
+      for (const txId of nonWitnessTxIds) {
+        // full transaction is required for non-witness outputs
+        const rawData = await insightClient.fetchRawTx(txId)
+        rawTxs.push({ txId, rawData })
+      }
+    }
+  }
+
+  return rawTxs
+}
+
+export function createInputs(assetName, ...rest) {
+  if (ASSETS_USING_BUFFER_VALUES.has(assetName)) {
+    return dogecoinCreateInputs(...rest)
+  }
+
+  return defaultCreateInputs(...rest)
+}
+
+export function defaultCreateInputs(utxos, rbfEnabled) {
+  return utxos.map((utxo) => ({
+    txId: utxo.txId,
+    vout: utxo.vout,
+    address: utxo.address.toString(),
+    value: parseInt(utxo.value.toBaseString(), 10),
+    script: utxo.script,
+    sequence: getTxSequence(rbfEnabled),
+    inscriptionId: utxo.inscriptionId,
+    derivationPath: utxo.derivationPath,
+  }))
+}
+
+export function createOutput(assetName, ...rest) {
+  if (ASSETS_USING_BUFFER_VALUES.has(assetName)) {
+    return dogecoinCreateOutput(...rest)
+  }
+
+  return defaultCreateOutput(...rest)
+}
+
+export function defaultCreateOutput(address, sendAmount) {
+  return [address, parseInt(sendAmount.toBaseString(), 10)]
+}

package/src/tx-send/index.js

@@ -1,72 +1,11 @@
-import { getTxSequence } from '@exodus/bitcoin-lib'
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs'
-import { Address, UtxoCollection } from '@exodus/models'
+import { Address } from '@exodus/models'
 import { retry } from '@exodus/simple-retry'
-import lodash from 'lodash'
 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 { findUnconfirmedSentRbfTxs } from '../tx-utils.js'
-import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data.js'
-import {
-  getInscriptionIds,
-  getOrdinalsUtxos,
-  getTransferOrdinalsUtxos,
-  getUsableUtxos,
-  getUtxos,
-} from '../utxos-utils.js'
-import {
-  createInputs as dogecoinCreateInputs,
-  createOutput as dogecoinCreateOutput,
-} from './dogecoin.js'
-
-const ASSETS_SUPPORTED_BIP_174 = new Set([
-  'bitcoin',
-  'bitcoinregtest',
-  'bitcointestnet',
-  'litecoin',
-  'dash',
-  'dogecoin',
-  'ravencoin',
-  'digibyte',
-  'qtumignition',
-  'vertcoin', // is not available on mobile!
-])
-
-const ASSETS_USING_BUFFER_VALUES = new Set(['dogecoin', 'digibyte'])
-
-export async function getNonWitnessTxs(asset, utxos, insightClient) {
-  const rawTxs = []
-
-  // BIP 174 (PSBT) requires full transaction for non-witness outputs
-  if (ASSETS_SUPPORTED_BIP_174.has(asset.name)) {
-    const nonWitnessTxIds = utxos.txIds.filter((txId) =>
-      utxos
-        .getAddressesForTxId(txId)
-        .toAddressStrings()
-        .some(
-          (a) =>
-            asset.address.isP2PKH(a) ||
-            asset.address.isP2SH(a) ||
-            asset.address.isP2SH2?.(a) ||
-            asset.address.isP2WPKH?.(a) ||
-            asset.address.isP2WSH?.(a)
-        )
-    )
-
-    if (nonWitnessTxIds.length > 0) {
-      for (const txId of nonWitnessTxIds) {
-        // full transaction is required for non-witness outputs
-        const rawData = await insightClient.fetchRawTx(txId)
-        rawTxs.push({ txId, rawData })
-      }
-    }
-  }
-
-  return rawTxs
-}
+import { serializeCurrency } from '../fee/fee-utils.js'
+import { createTxFactory } from '../tx-create/create-tx.js'
+import { getBlockHeight } from '../tx-create/tx-create-utils.js'
 
 const getSize = (tx) => {
   if (typeof tx.size === 'number') return tx.size
@@ -160,290 +99,41 @@ export async function signTransaction({
   return { rawTx, txId, tx }
 }
 
-async function createUnsignedTx({
-  inputs,
-  outputs,
-  useCashAddress,
-  addressPathsMap,
-  blockHeight,
+const getPrepareSendTransaction = async ({
+  address,
+  allowUnconfirmedRbfEnabledUtxos,
+  amount,
   asset,
-  selectedUtxos,
-  insightClient,
-}) {
-  const unsignedTx = {
-    txData: {
-      inputs,
-      outputs,
-    },
-    txMeta: {
-      useCashAddress, // for trezor to show the receiver cash address
-      addressPathsMap,
-      blockHeight,
-    },
-  }
-
-  const nonWitnessTxs = await getNonWitnessTxs(asset, selectedUtxos, insightClient)
-  Object.assign(unsignedTx.txMeta, { rawTxs: nonWitnessTxs })
-  return unsignedTx
-}
-
-async function getBlockHeight({ assetName, insightClient }) {
-  return ['zcash', 'bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)
-    ? insightClient.fetchBlockHeight()
-    : 0
-}
-
-export const getPrepareSendTransaction =
-  ({
-    blockHeight: providedBlockHeight,
+  assetClientInterface,
+  blockHeight,
+  changeAddressType,
+  getFeeEstimator,
+  options,
+  ordinalsEnabled,
+  rbfEnabled,
+  utxosDescendingOrder,
+  walletAccount,
+}) => {
+  const createTx = createTxFactory({
     ordinalsEnabled,
     getFeeEstimator,
     allowUnconfirmedRbfEnabledUtxos,
     utxosDescendingOrder,
-    rbfEnabled: providedRbfEnabled,
     assetClientInterface,
     changeAddressType,
-  }) =>
-  async ({ asset, walletAccount, address, amount, options }) => {
-    const {
-      multipleAddressesEnabled,
-      feePerKB,
-      customFee,
-      isSendAll,
-      bumpTxId,
-      nft,
-      isExchange,
-      isBip70,
-      isRbfAllowed,
-      taprootInputWitnessSize,
-    } = options
-
-    const assetName = asset.name
-    const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
-    const feeData = await assetClientInterface.getFeeConfig({ assetName })
-    feeData.feePerKB = feePerKB ?? feeData.feePerKB
-    const insightClient = asset.baseAsset.insightClient
-
-    const blockHeight = providedBlockHeight || (await getBlockHeight({ assetName, insightClient }))
-
-    const rbfEnabled =
-      providedRbfEnabled || (feeData.rbfEnabled && !isExchange && !isBip70 && isRbfAllowed && !nft)
-
-    const inscriptionIds = getInscriptionIds({ nft })
-
-    assert(
-      ordinalsEnabled || !inscriptionIds,
-      'inscriptions cannot be sent when ordinalsEnabled=false '
-    )
-
-    const shuffle = (list) => {
-      // Using full lodash.shuffle notation so it can be mocked with spyOn in tests
-      return inscriptionIds ? list : lodash.shuffle(list) // don't shuffle when sending ordinal!!!!
-    }
-
-    assert(
-      assetClientInterface,
-      `assetClientInterface must be supplied in sendTx for ${asset.name}`
-    )
-    assert(
-      address || bumpTxId,
-      'should not be called without either a receiving address or to bump a tx'
-    )
-
-    if (inscriptionIds) {
-      assert(!bumpTxId, 'only inscriptionIds or bumpTxId must be provided')
-      assert(address, 'address must be provided when sending ordinals')
-    }
-
-    const useCashAddress = asset.address.isCashAddress?.(address)
-
-    const changeAddress = multipleAddressesEnabled
-      ? await assetClientInterface.getNextChangeAddress({ assetName, walletAccount })
-      : await assetClientInterface.getReceiveAddressObject({ assetName, walletAccount })
-
-    const txSet = await assetClientInterface.getTxLog({ assetName, walletAccount })
-
-    const currentOrdinalsUtxos = getOrdinalsUtxos({ accountState, asset })
-    const transferOrdinalsUtxos = inscriptionIds
-      ? getTransferOrdinalsUtxos({ inscriptionIds, ordinalsUtxos: currentOrdinalsUtxos })
-      : undefined
-
-    const currency = asset.currency
-
-    const unconfirmedTxAncestor = getUnconfirmedTxAncestorMap({ accountState })
-    const usableUtxos = getUsableUtxos({
-      asset,
-      utxos: getUtxos({ accountState, asset }),
-      feeData,
-      txSet,
-      unconfirmedTxAncestor,
-    })
-
-    let replaceableTxs = findUnconfirmedSentRbfTxs(txSet)
-
-    if (asset.address.toLegacyAddress) {
-      address = asset.address.toLegacyAddress(address)
-    }
-
-    if (assetName === 'digibyte' && asset.address.isP2SH2(address)) {
-      address = asset.address.P2SH2ToP2SH(address)
-    }
-
-    let utxosToBump
-    if (bumpTxId) {
-      const bumpTx = replaceableTxs.find(({ txId }) => txId === bumpTxId)
-      if (bumpTx) {
-        replaceableTxs = [bumpTx]
-      } else {
-        utxosToBump = usableUtxos.getTxIdUtxos(bumpTxId)
-        if (utxosToBump.size === 0) {
-          throw new Error(`Cannot bump transaction ${bumpTxId}`)
-        }
-
-        replaceableTxs = []
-      }
-    }
-
-    const sendAmount = bumpTxId || transferOrdinalsUtxos ? asset.currency.ZERO : amount
-    const receiveAddress = bumpTxId
-      ? replaceableTxs.length > 0
-        ? null
-        : changeAddressType
-      : address
-    const feeRate = feeData.feePerKB
-    const resolvedIsSendAll = (!rbfEnabled && feePerKB) || transferOrdinalsUtxos ? false : isSendAll
-
-    let { selectedUtxos, fee, replaceTx } = selectUtxos({
-      asset,
-      usableUtxos,
-      replaceableTxs,
-      amount: sendAmount,
-      feeRate: customFee || feeRate,
-      receiveAddress,
-      isSendAll: resolvedIsSendAll,
-      getFeeEstimator: (asset, { feePerKB, ...options }) =>
-        getFeeEstimator(asset, feePerKB, options),
-      mustSpendUtxos: utxosToBump,
-      allowUnconfirmedRbfEnabledUtxos,
-      unconfirmedTxAncestor,
-      inscriptionIds,
-      transferOrdinalsUtxos,
-      utxosDescendingOrder,
-      taprootInputWitnessSize,
-      changeAddressType,
-    })
-
-    if (!selectedUtxos && !replaceTx) throw new Error('Not enough funds.')
-
-    // When bumping a tx, we can either replace the tx with RBF or spend its selected change.
-    // If there is no selected UTXO or the tx to replace is not the tx we want to bump,
-    // then something is wrong because we can't actually bump the tx.
-    // This shouldn't happen but might due to either the tx confirming before accelerate was
-    // pressed, or if the change was already spent from another wallet.
-    if (bumpTxId && (!selectedUtxos || (replaceTx && replaceTx.txId !== bumpTxId))) {
-      throw new Error(`Unable to bump ${bumpTxId}`)
-    }
-
-    if (replaceTx) {
-      replaceTx = replaceTx.clone()
-      replaceTx = replaceTx.update({ data: { ...replaceTx.data } })
-      replaceTx.data.sent = replaceTx.data.sent.map((to) => {
-        return { ...to, amount: serializeCurrency(to.amount, asset.currency) }
-      })
-      selectedUtxos = selectedUtxos.union(
-        // how to avoid replace tx inputs when inputs are ordinals? !!!!
-        UtxoCollection.fromJSON(replaceTx.data.inputs, { currency: asset.currency })
-      )
-    }
-
-    const addressPathsMap = selectedUtxos.getAddressPathsMap()
-
-    // Inputs and Outputs
-    const inputs = shuffle(createInputs(assetName, selectedUtxos.toArray(), rbfEnabled))
-    let outputs = replaceTx
-      ? replaceTx.data.sent.map(({ address, amount }) =>
-          createOutput(assetName, address, parseCurrency(amount, currency))
-        )
-      : []
-
-    // Send output
-    let sendOutput
-    if (address) {
-      if (transferOrdinalsUtxos) {
-        outputs.push(
-          ...transferOrdinalsUtxos
-            .toArray()
-            .map((ordinalUtxo) => createOutput(assetName, address, ordinalUtxo.value))
-        )
-      } else {
-        sendOutput = createOutput(assetName, address, sendAmount)
-        outputs.push(sendOutput)
-      }
-    }
-
-    const totalAmount = replaceTx
-      ? replaceTx.data.sent.reduce(
-          (total, { amount }) => total.add(parseCurrency(amount, asset.currency)),
-          sendAmount
-        )
-      : sendAmount
-
-    const change = selectedUtxos.value
-      .sub(totalAmount)
-      .sub(transferOrdinalsUtxos?.value || currency.ZERO)
-      .sub(fee)
-    const dust = getChangeDustValue(asset)
-    let ourAddress = replaceTx?.data?.changeAddress || changeAddress
-    if (asset.address.toLegacyAddress) {
-      const legacyAddress = asset.address.toLegacyAddress(ourAddress.address)
-      ourAddress = Address.create(legacyAddress, ourAddress.meta)
-    }
-
-    // Change Output
-    let changeOutput
-    if (change.gte(dust)) {
-      changeOutput = createOutput(assetName, ourAddress.address ?? ourAddress.toString(), change)
-      // 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.
-      addressPathsMap[changeAddress] = ourAddress.meta.path
-      outputs.push(changeOutput)
-    } else {
-      // If we don't have enough for a change output, then all remaining dust is just added to fee
-      fee = fee.add(change)
-    }
-
-    outputs = replaceTx ? outputs : shuffle(outputs)
+  })
 
-    const unsignedTx = await createUnsignedTx({
-      inputs,
-      outputs,
-      useCashAddress,
-      addressPathsMap,
-      blockHeight,
-      asset,
-      selectedUtxos,
-      insightClient,
-    })
-    return {
-      amount,
-      change,
-      totalAmount,
-      currentOrdinalsUtxos,
-      inscriptionIds,
-      address,
-      ourAddress,
-      receiveAddress,
-      sendAmount,
-      fee,
-      usableUtxos,
-      selectedUtxos,
-      transferOrdinalsUtxos,
-      replaceTx,
-      sendOutput,
-      changeOutput,
-      unsignedTx,
-    }
-  }
+  return createTx({
+    asset,
+    walletAccount,
+    type: 'transfer',
+    toAddress: address,
+    amount,
+    blockHeight,
+    rbfEnabled,
+    ...options,
+  })
+}
 
 // not ported from Exodus; but this demos signing / broadcasting
 // NOTE: this will be ripped out in the coming weeks
@@ -459,28 +149,33 @@ export const createAndBroadcastTXFactory =
   }) =>
   async ({ asset, walletAccount, address, amount, options }) => {
     // Prepare transaction
-    const { bumpTxId, nft, isExchange, isBip70, isRbfAllowed = true } = options
+    const { bumpTxId, nft, isExchange, isRbfAllowed = true } = options
 
     const assetName = asset.name
     const feeData = await assetClientInterface.getFeeConfig({ assetName })
     const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
     const insightClient = asset.baseAsset.insightClient
 
-    const rbfEnabled = feeData.rbfEnabled && !isExchange && !isBip70 && isRbfAllowed && !nft
+    const rbfEnabled = feeData.rbfEnabled && !isExchange && isRbfAllowed && !nft
 
     // blockHeight
     const blockHeight = await getBlockHeight({ assetName, insightClient })
 
     const transactionDescriptor = await getPrepareSendTransaction({
-      blockHeight,
-      ordinalsEnabled,
-      getFeeEstimator,
+      address,
       allowUnconfirmedRbfEnabledUtxos,
-      utxosDescendingOrder,
-      rbfEnabled,
+      amount,
+      asset,
       assetClientInterface,
+      blockHeight,
       changeAddressType,
-    })({ asset, walletAccount, address, amount, options })
+      getFeeEstimator,
+      options,
+      ordinalsEnabled,
+      rbfEnabled,
+      utxosDescendingOrder,
+      walletAccount,
+    })
     const {
       change,
       totalAmount,
@@ -705,38 +400,5 @@ export const createAndBroadcastTXFactory =
     }
   }
 
-export function createInputs(assetName, ...rest) {
-  if (ASSETS_USING_BUFFER_VALUES.has(assetName)) {
-    return dogecoinCreateInputs(...rest)
-  }
-
-  return defaultCreateInputs(...rest)
-}
-
-function defaultCreateInputs(utxos, rbfEnabled) {
-  return utxos.map((utxo) => ({
-    txId: utxo.txId,
-    vout: utxo.vout,
-    address: utxo.address.toString(),
-    value: parseInt(utxo.value.toBaseString(), 10),
-    script: utxo.script,
-    sequence: getTxSequence(rbfEnabled),
-    inscriptionId: utxo.inscriptionId,
-    derivationPath: utxo.derivationPath,
-  }))
-}
-
-export function createOutput(assetName, ...rest) {
-  if (ASSETS_USING_BUFFER_VALUES.has(assetName)) {
-    return dogecoinCreateOutput(...rest)
-  }
-
-  return defaultCreateOutput(...rest)
-}
-
-function defaultCreateOutput(address, sendAmount) {
-  return [address, parseInt(sendAmount.toBaseString(), 10)]
-}
-
 // back compatibiliy
 export { getSendDustValue as getDustValue } from '../dust.js'