@leather.io/bitcoin 0.26.8 → 0.26.9

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @leather.io/bitcoin@0.26.8 build /home/runner/work/mono/mono/packages/bitcoin
+> @leather.io/bitcoin@0.26.9 build /home/runner/work/mono/mono/packages/bitcoin
 > tsup
 
 CLI Building entry: src/index.ts
@@ -8,9 +8,9 @@
 CLI Using tsup config: /home/runner/work/mono/mono/packages/bitcoin/tsup.config.ts
 CLI Target: es2022
 ESM Build start
-ESM dist/index.js     55.48 KB
-ESM dist/index.js.map 109.87 KB
-ESM ⚡️ Build success in 107ms
+ESM dist/index.js     56.01 KB
+ESM dist/index.js.map 110.95 KB
+ESM ⚡️ Build success in 94ms
 DTS Build start
-DTS ⚡️ Build success in 5807ms
-DTS dist/index.d.ts 27.55 KB
+DTS ⚡️ Build success in 6050ms
+DTS dist/index.d.ts 27.83 KB

package/CHANGELOG.md

@@ -776,6 +776,20 @@
   * devDependencies
     * @leather.io/rpc bumped to 2.16.5
 
+## [0.26.9](https://github.com/leather-io/mono/compare/@leather.io/bitcoin-v0.26.8...@leather.io/bitcoin-v0.26.9) (2025-06-04)
+
+
+### Bug Fixes
+
+* **mobile:** disable external psbt fee editing, closes LEA-2679 ([eaf6a15](https://github.com/leather-io/mono/commit/eaf6a15669167244e5aab8a7d748266e6f4b72aa))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @leather.io/crypto bumped to 1.7.6
+
 ## [0.26.0](https://github.com/leather-io/mono/compare/@leather.io/bitcoin-v0.25.2...@leather.io/bitcoin-v0.26.0) (2025-05-16)
 
 

package/dist/index.d.ts

@@ -64,27 +64,40 @@ declare function signBip322MessageSimple(args: SignBip322MessageSimple): Promise
     signature: string;
 }>;
 
+interface CalculateMaxSpendArgs {
+    recipient: string;
+    utxos: {
+        value: number;
+        txid: string;
+    }[];
+    feeRates?: AverageBitcoinFeeRates;
+    feeRate?: number;
+}
+interface CalculateMaxSpendResponse {
+    spendAllFee: number;
+    amount: Money;
+    spendableBitcoin: BigNumber;
+}
+declare function calculateMaxSpend({ recipient, utxos, feeRate, feeRates, }: CalculateMaxSpendArgs): CalculateMaxSpendResponse;
+
 interface CoinSelectionOutput {
     value: bigint;
     address?: string;
 }
-interface CoinSelectionUtxo {
-    address: string;
-    txid: string;
-    value: number;
-    vout: number;
-}
 interface CoinSelectionRecipient {
     address: string;
     amount: Money;
 }
-interface DetermineUtxosForSpendArgs {
+interface DetermineUtxosForSpendArgs<T> {
     feeRate: number;
     recipients: CoinSelectionRecipient[];
-    utxos: CoinSelectionUtxo[];
+    utxos: T[];
 }
-declare function determineUtxosForSpendAll({ feeRate, recipients, utxos, }: DetermineUtxosForSpendArgs): {
-    inputs: CoinSelectionUtxo[];
+declare function determineUtxosForSpendAll<T extends {
+    value: number;
+    txid: string;
+}>({ feeRate, recipients, utxos, }: DetermineUtxosForSpendArgs<T>): {
+    inputs: T[];
     outputs: {
         value: bigint;
         address: string;
@@ -92,31 +105,23 @@ declare function determineUtxosForSpendAll({ feeRate, recipients, utxos, }: Dete
     size: number;
     fee: Money;
 };
-declare function determineUtxosForSpend({ feeRate, recipients, utxos }: DetermineUtxosForSpendArgs): {
+declare function determineUtxosForSpend<T extends {
+    value: number;
+    txid: string;
+}>({ feeRate, recipients, utxos, }: DetermineUtxosForSpendArgs<T>): {
     txVBytes: number;
     txBytes: number;
     txWeight: number;
-    filteredUtxos: CoinSelectionUtxo[];
-    inputs: CoinSelectionUtxo[];
+    filteredUtxos: T[];
+    inputs: T[];
     outputs: CoinSelectionOutput[];
     size: number;
     fee: Money;
 };
 
-interface CalculateMaxSpendArgs {
-    recipient: string;
-    utxos: CoinSelectionUtxo[];
-    feeRates?: AverageBitcoinFeeRates;
-    feeRate?: number;
-}
-interface CalculateMaxSpendResponse {
-    spendAllFee: number;
-    amount: Money;
-    spendableBitcoin: BigNumber;
-}
-declare function calculateMaxSpend({ recipient, utxos, feeRate, feeRates, }: CalculateMaxSpendArgs): CalculateMaxSpendResponse;
-
-declare function getUtxoTotal(utxos: CoinSelectionUtxo[]): BigNumber;
+declare function getUtxoTotal<T extends {
+    value: number;
+}>(utxos: T[]): BigNumber;
 declare function getSizeInfo(payload: {
     inputLength: number;
     recipients: CoinSelectionRecipient[];
@@ -126,23 +131,31 @@ declare function getSizeInfo(payload: {
     txBytes: number;
     txWeight: number;
 };
-interface GetSpendableAmountArgs {
-    utxos: CoinSelectionUtxo[];
+interface GetSpendableAmountArgs<T> {
+    utxos: T[];
     feeRate: number;
     recipients: CoinSelectionRecipient[];
     isSendMax?: boolean;
 }
-declare function getSpendableAmount({ utxos, feeRate, recipients }: GetSpendableAmountArgs): {
+declare function getSpendableAmount<T extends {
+    value: number;
+}>({ utxos, feeRate, recipients, }: GetSpendableAmountArgs<T>): {
     spendableAmount: BigNumber;
     fee: number;
 };
-declare function filterUneconomicalUtxos({ utxos, feeRate, recipients, }: {
-    utxos: CoinSelectionUtxo[];
+declare function filterUneconomicalUtxos<T extends {
+    value: number;
+    txid: string;
+}>({ utxos, feeRate, recipients, }: {
+    utxos: T[];
     feeRate: number;
     recipients: CoinSelectionRecipient[];
-}): CoinSelectionUtxo[];
+}): T[];
 
-type GetBitcoinTransactionFeeArgs = DetermineUtxosForSpendArgs & {
+type GetBitcoinTransactionFeeArgs = DetermineUtxosForSpendArgs<{
+    value: number;
+    txid: string;
+}> & {
     isSendingMax?: boolean;
 };
 declare function getBitcoinTransactionFee({ isSendingMax, ...props }: GetBitcoinTransactionFeeArgs): Money | null;
@@ -165,7 +178,10 @@ interface GetBitcoinFeesArgs {
     feeRates: AverageBitcoinFeeRates;
     isSendingMax?: boolean;
     recipients: CoinSelectionRecipient[];
-    utxos: CoinSelectionUtxo[];
+    utxos: {
+        value: number;
+        txid: string;
+    }[];
 }
 declare function getBitcoinFees({ feeRates, isSendingMax, recipients, utxos }: GetBitcoinFeesArgs): {
     high: {
@@ -447,10 +463,10 @@ interface BitcoinTaprootPayer extends BitcoinPayerBase {
 type BitcoinPayer = BitcoinNativeSegwitPayer | BitcoinTaprootPayer;
 declare function initializeBitcoinAccountKeychainFromDescriptor(descriptor: string): BitcoinAccountKeychain;
 interface BitcoinPayerInfo {
-    receive?: number;
+    change: number;
     addressIndex: number;
 }
-declare function deriveBitcoinPayerFromAccount(descriptor: string, network: BitcoinNetworkModes): ({ receive, addressIndex }: BitcoinPayerInfo) => {
+declare function deriveBitcoinPayerFromAccount(descriptor: string, network: BitcoinNetworkModes): ({ change, addressIndex }: BitcoinPayerInfo) => {
     keyOrigin: string;
     masterKeyFingerprint: string;
     paymentType: SupportedPaymentType;
@@ -498,6 +514,10 @@ type TapBip32DerivationBitcoinJsLib = NonNullable<PsbtInputBitcoinJsLib['tapBip3
 declare function payerToTapBip32DerivationBitcoinJsLib(args: PayerToBip32DerivationArgs): TapBip32DerivationBitcoinJsLib;
 type Bip32DerivationBitcoinJsLib = NonNullable<PsbtInputBitcoinJsLib['bip32Derivation']>['0'];
 declare function payerToBip32DerivationBitcoinJsLib(args: PayerToBip32DerivationArgs): Bip32DerivationBitcoinJsLib;
+declare function extractPayerInfoFromDerivationPath(path: string): {
+    change: number;
+    addressIndex: number;
+};
 /**
  * @description
  * Turns key format from @scure/btc-signer lib back into key origin string
@@ -516,21 +536,25 @@ declare function serializeKeyOrigin({ fingerprint, path }: BtcSignerDerivationPa
  */
 declare function extractRequiredKeyOrigins(derivation: BtcSignerBip32Derivation[]): string[];
 
-interface GenerateBitcoinUnsignedTransactionArgs {
+interface GenerateBitcoinUnsignedTransactionArgs<T> {
     feeRate: number;
     isSendingMax?: boolean;
-    payerAddress: string;
-    payerPublicKey: string;
-    bip32Derivation: BtcSignerDefaultBip32Derivation[];
     network: BtcSignerNetwork;
     recipients: CoinSelectionRecipient[];
-    utxos: CoinSelectionUtxo[];
+    utxos: T[];
+    changeAddress: string;
+    payerLookup(keyOrigin: string): BitcoinNativeSegwitPayer | BitcoinTaprootPayer | undefined;
 }
-declare function generateBitcoinUnsignedTransactionNativeSegwit({ feeRate, isSendingMax, payerAddress, payerPublicKey, bip32Derivation, network, recipients, utxos, }: GenerateBitcoinUnsignedTransactionArgs): {
+declare function generateBitcoinUnsignedTransaction<T extends {
+    txid: string;
+    vout: number;
+    value: number;
+    keyOrigin: string;
+}>({ feeRate, isSendingMax, network, recipients, changeAddress, utxos, payerLookup, }: GenerateBitcoinUnsignedTransactionArgs<T>): {
     tx: btc.Transaction;
     hex: string;
     psbt: Uint8Array<ArrayBufferLike>;
-    inputs: CoinSelectionUtxo[];
+    inputs: T[];
     fee: _leather_io_models.Money;
 };
 
@@ -584,4 +608,4 @@ declare function lookupDerivationByAddress(args: LookUpDerivationByAddressArgs):
     readonly path?: undefined;
 };
 
-export { type AllowedSighashTypes, type BitcoinAccount, type BitcoinAccountKeychain, BitcoinError, type BitcoinErrorKey, type BitcoinFees, type BitcoinNativeSegwitPayer, type BitcoinPayer, type BitcoinPayerBase, type BitcoinPayerInfo, type BitcoinSigner, type BitcoinTaprootPayer, type BtcSignerDefaultBip32Derivation, type BtcSignerLibPaymentTypeIdentifers, type BtcSignerNetwork, type BtcSignerTapBip32Derivation, type CalculateMaxSpendResponse, type CoinSelectionOutput, type CoinSelectionRecipient, type CoinSelectionUtxo, type DetermineUtxosForSpendArgs, type GenerateBitcoinUnsignedTransactionArgs, type GetBitcoinFeesArgs, type PaymentTypeMap, type PsbtInput, type PsbtOutput, type RawPsbt, type SupportedPaymentType, type SupportedPaymentTypeMap, TEST_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_ACCOUNT_1_TAPROOT_ADDRESS, TEST_ACCOUNT_2_TAPROOT_ADDRESS, TEST_TESNET_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_TESTNET_ACCOUNT_2_BTC_ADDRESS, TEST_TESTNET_ACCOUNT_2_TAPROOT_ADDRESS, type WithDerivePayer, bip21, bip322TransactionToSignValues, bitcoinNetworkModeToCoreNetworkMode, bitcoinNetworkToCoreNetworkMap, btcSignerLibPaymentTypeToPaymentTypeMap, calculateMaxSpend, coinTypeMap, createBitcoinAddress, createNativeSegwitBitcoinJsSigner, createTaprootBitcoinJsSigner, createToSpendTx, createWalletIdDecoratedPath, decodeBitcoinTx, decodeCompressedWifPrivateKey, deriveAddressIndexKeychainFromAccount, deriveAddressIndexZeroFromAccount, deriveBitcoinPayerFromAccount, deriveBtcBip49SeedFromMnemonic, deriveNativeSegwitAccountFromRootKeychain, deriveNativeSegwitReceiveAddressIndexZero, deriveRootBtcKeychain, deriveTaprootAccount, deriveTaprootReceiveAddressIndexZero, determineUtxosForSpend, determineUtxosForSpendAll, ecPairFromPrivateKey, ecdsaPublicKeyLength, ecdsaPublicKeyToSchnorr, encodeMessageWitnessData, extractExtendedPublicKeyFromPolicy, extractRequiredKeyOrigins, filterUneconomicalUtxos, generateBitcoinUnsignedTransactionNativeSegwit, getAddressFromOutScript, getBitcoinAddressNetworkType, getBitcoinCoinTypeIndexByNetwork, getBitcoinFees, getBitcoinInputAddress, getBitcoinInputValue, getBitcoinJsLibNetworkConfigByMode, getBitcoinTransactionFee, getBtcSignerLibNetworkConfigByMode, getDescriptorFromKeychain, getHdKeyVersionsFromNetwork, getInputPaymentType, getNativeSegwitAccountDerivationPath, getNativeSegwitAddress, getNativeSegwitAddressIndexDerivationPath, getNativeSegwitPaymentFromAddressIndex, getParsedInputs, getParsedOutputs, getPsbtAsTransaction, getPsbtDetails, getPsbtTotals, getPsbtTxInputs, getPsbtTxOutputs, getRawPsbt, getSizeInfo, getSpendableAmount, getTaprootAccountDerivationPath, getTaprootAddress, getTaprootAddressIndexDerivationPath, getTaprootPayment, getTaprootPaymentFromAddressIndex, getUtxoTotal, hashBip322Message, inValidCharactersAddress, inValidLengthAddress, inferNetworkFromAddress, inferNetworkFromPath, inferPaymentTypeFromAddress, inferPaymentTypeFromPath, initBitcoinAccount, initializeBitcoinAccountKeychainFromDescriptor, invalidAddress, isBitcoinAddress, isBtcBalanceSufficient, isBtcMinimumSpend, isBtcSignerLibPaymentType, isSupportedMessageSigningPaymentType, isValidBitcoinAddress, isValidBitcoinNetworkAddress, isValidBitcoinTransaction, legacyAddress, lookUpLedgerKeysByPath, lookupDerivationByAddress, makeNativeSegwitAccountDerivationPath, makeNativeSegwitAddressIndexDerivationPath, makePayToScriptHashAddress, makePayToScriptHashAddressBytes, makePayToScriptHashKeyHash, makeTaprootAccountDerivationPath, makeTaprootAddressIndexDerivationPath, minSpendAmountInSats, mnemonicToRootNode, parseKnownPaymentType, payToScriptHashTestnetPrefix, payerToBip32Derivation, payerToBip32DerivationBitcoinJsLib, payerToTapBip32Derivation, payerToTapBip32DerivationBitcoinJsLib, paymentTypeMap, publicKeyToPayToScriptHashAddress, recipientAddress, segwitAddress, serializeKeyOrigin, serializeSatPoint, signBip322MessageSimple, taprootAddress, toXOnly, tweakSigner, whenBitcoinNetwork, whenPaymentType, whenSupportedPaymentType };
+export { type AllowedSighashTypes, type BitcoinAccount, type BitcoinAccountKeychain, BitcoinError, type BitcoinErrorKey, type BitcoinFees, type BitcoinNativeSegwitPayer, type BitcoinPayer, type BitcoinPayerBase, type BitcoinPayerInfo, type BitcoinSigner, type BitcoinTaprootPayer, type BtcSignerDefaultBip32Derivation, type BtcSignerLibPaymentTypeIdentifers, type BtcSignerNetwork, type BtcSignerTapBip32Derivation, type CalculateMaxSpendResponse, type CoinSelectionOutput, type CoinSelectionRecipient, type DetermineUtxosForSpendArgs, type GenerateBitcoinUnsignedTransactionArgs, type GetBitcoinFeesArgs, type PaymentTypeMap, type PsbtInput, type PsbtOutput, type RawPsbt, type SupportedPaymentType, type SupportedPaymentTypeMap, TEST_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_ACCOUNT_1_TAPROOT_ADDRESS, TEST_ACCOUNT_2_TAPROOT_ADDRESS, TEST_TESNET_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_TESTNET_ACCOUNT_2_BTC_ADDRESS, TEST_TESTNET_ACCOUNT_2_TAPROOT_ADDRESS, type WithDerivePayer, bip21, bip322TransactionToSignValues, bitcoinNetworkModeToCoreNetworkMode, bitcoinNetworkToCoreNetworkMap, btcSignerLibPaymentTypeToPaymentTypeMap, calculateMaxSpend, coinTypeMap, createBitcoinAddress, createNativeSegwitBitcoinJsSigner, createTaprootBitcoinJsSigner, createToSpendTx, createWalletIdDecoratedPath, decodeBitcoinTx, decodeCompressedWifPrivateKey, deriveAddressIndexKeychainFromAccount, deriveAddressIndexZeroFromAccount, deriveBitcoinPayerFromAccount, deriveBtcBip49SeedFromMnemonic, deriveNativeSegwitAccountFromRootKeychain, deriveNativeSegwitReceiveAddressIndexZero, deriveRootBtcKeychain, deriveTaprootAccount, deriveTaprootReceiveAddressIndexZero, determineUtxosForSpend, determineUtxosForSpendAll, ecPairFromPrivateKey, ecdsaPublicKeyLength, ecdsaPublicKeyToSchnorr, encodeMessageWitnessData, extractExtendedPublicKeyFromPolicy, extractPayerInfoFromDerivationPath, extractRequiredKeyOrigins, filterUneconomicalUtxos, generateBitcoinUnsignedTransaction, getAddressFromOutScript, getBitcoinAddressNetworkType, getBitcoinCoinTypeIndexByNetwork, getBitcoinFees, getBitcoinInputAddress, getBitcoinInputValue, getBitcoinJsLibNetworkConfigByMode, getBitcoinTransactionFee, getBtcSignerLibNetworkConfigByMode, getDescriptorFromKeychain, getHdKeyVersionsFromNetwork, getInputPaymentType, getNativeSegwitAccountDerivationPath, getNativeSegwitAddress, getNativeSegwitAddressIndexDerivationPath, getNativeSegwitPaymentFromAddressIndex, getParsedInputs, getParsedOutputs, getPsbtAsTransaction, getPsbtDetails, getPsbtTotals, getPsbtTxInputs, getPsbtTxOutputs, getRawPsbt, getSizeInfo, getSpendableAmount, getTaprootAccountDerivationPath, getTaprootAddress, getTaprootAddressIndexDerivationPath, getTaprootPayment, getTaprootPaymentFromAddressIndex, getUtxoTotal, hashBip322Message, inValidCharactersAddress, inValidLengthAddress, inferNetworkFromAddress, inferNetworkFromPath, inferPaymentTypeFromAddress, inferPaymentTypeFromPath, initBitcoinAccount, initializeBitcoinAccountKeychainFromDescriptor, invalidAddress, isBitcoinAddress, isBtcBalanceSufficient, isBtcMinimumSpend, isBtcSignerLibPaymentType, isSupportedMessageSigningPaymentType, isValidBitcoinAddress, isValidBitcoinNetworkAddress, isValidBitcoinTransaction, legacyAddress, lookUpLedgerKeysByPath, lookupDerivationByAddress, makeNativeSegwitAccountDerivationPath, makeNativeSegwitAddressIndexDerivationPath, makePayToScriptHashAddress, makePayToScriptHashAddressBytes, makePayToScriptHashKeyHash, makeTaprootAccountDerivationPath, makeTaprootAddressIndexDerivationPath, minSpendAmountInSats, mnemonicToRootNode, parseKnownPaymentType, payToScriptHashTestnetPrefix, payerToBip32Derivation, payerToBip32DerivationBitcoinJsLib, payerToTapBip32Derivation, payerToTapBip32DerivationBitcoinJsLib, paymentTypeMap, publicKeyToPayToScriptHashAddress, recipientAddress, segwitAddress, serializeKeyOrigin, serializeSatPoint, signBip322MessageSimple, taprootAddress, toXOnly, tweakSigner, whenBitcoinNetwork, whenPaymentType, whenSupportedPaymentType };

package/dist/index.js

@@ -837,8 +837,12 @@ function getSizeInfo(payload) {
   });
   return sizeInfo;
 }
-function getSpendableAmount({ utxos, feeRate, recipients }) {
-  const balance = utxos.map((utxo) => Number(utxo.value)).reduce((prevVal, curVal) => prevVal + curVal, 0);
+function getSpendableAmount({
+  utxos,
+  feeRate,
+  recipients
+}) {
+  const balance = utxos.map((utxo) => utxo.value).reduce((prevVal, curVal) => prevVal + curVal, 0);
   const size = getSizeInfo({
     inputLength: utxos.length,
     recipients
@@ -860,7 +864,7 @@ function filterUneconomicalUtxos({
     feeRate,
     recipients
   });
-  const filteredUtxos = utxos.filter((utxo) => utxo.value >= BTC_P2WPKH_DUST_AMOUNT).filter((utxo) => {
+  const filteredUtxos = utxos.filter((utxo) => Number(utxo.value) >= BTC_P2WPKH_DUST_AMOUNT).filter((utxo) => {
     const { spendableAmount } = getSpendableAmount({
       utxos: utxos.filter((u) => u.txid !== utxo.txid),
       feeRate,
@@ -934,7 +938,11 @@ function determineUtxosForSpendAll({
     fee: createMoney2(new BigNumber4(fee), "BTC")
   };
 }
-function determineUtxosForSpend({ feeRate, recipients, utxos }) {
+function determineUtxosForSpend({
+  feeRate,
+  recipients,
+  utxos
+}) {
   recipients.forEach((recipient) => {
     if (!validate3(recipient.address)) throw new BitcoinError("InvalidAddress");
   });
@@ -1278,6 +1286,8 @@ import {
   appendAddressIndexToPath,
   decomposeDescriptor,
   deriveKeychainFromXpub,
+  extractAddressIndexFromPath,
+  extractChangeIndexFromPath,
   keyOriginToDerivationPath
 } from "@leather.io/crypto";
 import { hexToNumber, toHexString } from "@leather.io/utils";
@@ -1297,15 +1307,15 @@ function deriveBitcoinPayerFromAccount(descriptor, network) {
   const paymentType = inferPaymentTypeFromPath(keyOrigin);
   if (accountKeychain.depth !== DerivationPathDepth4.Account)
     throw new Error("Keychain passed is not an account");
-  return ({ receive = 0, addressIndex }) => {
-    const childKeychain = accountKeychain.deriveChild(receive).deriveChild(addressIndex);
+  return ({ change, addressIndex }) => {
+    const childKeychain = accountKeychain.deriveChild(change).deriveChild(addressIndex);
     const derivePayerFromAccount = whenSupportedPaymentType(paymentType)({
       p2tr: getTaprootPaymentFromAddressIndex,
       p2wpkh: getNativeSegwitPaymentFromAddressIndex
     });
     const payment = derivePayerFromAccount(childKeychain, network);
     return {
-      keyOrigin: appendAddressIndexToPath(keyOrigin, 0),
+      keyOrigin: appendAddressIndexToPath(keyOrigin, change, addressIndex),
       masterKeyFingerprint: fingerprint,
       paymentType,
       network,
@@ -1359,6 +1369,12 @@ function payerToBip32DerivationBitcoinJsLib(args) {
     pubkey: Buffer.from(args.publicKey)
   };
 }
+function extractPayerInfoFromDerivationPath(path) {
+  return {
+    change: extractChangeIndexFromPath(path),
+    addressIndex: extractAddressIndexFromPath(path)
+  };
+}
 function serializeKeyOrigin({ fingerprint, path }) {
   const values = path.map((num) => num >= HARDENED_OFFSET ? num - HARDENED_OFFSET + "'" : num);
   return `${toHexString(fingerprint)}/${values.join("/")}`;
@@ -1370,40 +1386,43 @@ function extractRequiredKeyOrigins(derivation) {
 }
 
 // src/transactions/generate-unsigned-transaction.ts
-import { hexToBytes as hexToBytes4 } from "@noble/hashes/utils";
 import * as btc6 from "@scure/btc-signer";
-function generateBitcoinUnsignedTransactionNativeSegwit({
+function generateBitcoinUnsignedTransaction({
   feeRate,
   isSendingMax,
-  payerAddress,
-  payerPublicKey,
-  bip32Derivation,
   network,
   recipients,
-  utxos
+  changeAddress,
+  utxos,
+  payerLookup
 }) {
   const determineUtxosArgs = { feeRate, recipients, utxos };
   const { inputs, outputs, fee } = isSendingMax ? determineUtxosForSpendAll(determineUtxosArgs) : determineUtxosForSpend(determineUtxosArgs);
   if (!inputs.length) throw new BitcoinError("NoInputsToSign");
   if (!outputs.length) throw new BitcoinError("NoOutputsToSign");
   const tx = new btc6.Transaction();
-  const p2wpkh3 = btc6.p2wpkh(hexToBytes4(payerPublicKey), network);
   for (const input of inputs) {
+    const payer = payerLookup(input.keyOrigin);
+    if (!payer) {
+      console.log(`No payer found for input with keyOrigin ${input.keyOrigin}`);
+      continue;
+    }
+    const bip32Derivation = payer.paymentType === "p2tr" ? { tapBip32Derivation: [payerToTapBip32Derivation(payer)] } : { bip32Derivation: [payerToBip32Derivation(payer)] };
+    const tapInternalKey = payer.paymentType === "p2tr" ? { tapInternalKey: payer.payment.tapInternalKey } : {};
     tx.addInput({
       txid: input.txid,
       index: input.vout,
-      sequence: 0,
-      bip32Derivation,
       witnessUtxo: {
-        // script = 0014 + pubKeyHash
-        script: p2wpkh3.script,
+        script: payer.payment.script,
         amount: BigInt(input.value)
-      }
+      },
+      ...bip32Derivation,
+      ...tapInternalKey
     });
   }
   outputs.forEach((output) => {
     if (!output.address) {
-      tx.addOutputAddress(payerAddress, BigInt(output.value), network);
+      tx.addOutputAddress(changeAddress, BigInt(output.value), network);
       return;
     }
     tx.addOutputAddress(output.address, BigInt(output.value), network);
@@ -1542,9 +1561,10 @@ export {
   ecdsaPublicKeyToSchnorr,
   encodeMessageWitnessData,
   extractExtendedPublicKeyFromPolicy,
+  extractPayerInfoFromDerivationPath,
   extractRequiredKeyOrigins,
   filterUneconomicalUtxos,
-  generateBitcoinUnsignedTransactionNativeSegwit,
+  generateBitcoinUnsignedTransaction,
   getAddressFromOutScript,
   getBitcoinAddressNetworkType,
   getBitcoinCoinTypeIndexByNetwork,