@xchainjs/xchain-bitcoin 2.1.0 → 2.2.0

package/lib/client.d.ts

@@ -47,11 +47,12 @@ declare abstract class Client extends UTXOClient {
      * @param params Transaction parameters
      * @returns Enhanced transaction build result with PSBT, UTXOs, and inputs
      */
-    buildTxEnhanced({ amount, recipient, memo, feeRate, sender, spendPendingUTXO, utxoSelectionPreferences, }: TxParams & {
+    buildTxEnhanced({ amount, recipient, memo, feeRate, sender, spendPendingUTXO, utxoSelectionPreferences, selectedUtxos, }: TxParams & {
         feeRate: FeeRate;
         sender: Address;
         spendPendingUTXO?: boolean;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<{
         psbt: Bitcoin.Psbt;
         utxos: UTXO[];
@@ -77,13 +78,14 @@ declare abstract class Client extends UTXOClient {
      * @param params Send max parameters
      * @returns Transaction details with maximum sendable amount
      */
-    sendMax({ sender, recipient, memo, feeRate, spendPendingUTXO, utxoSelectionPreferences, }: {
+    sendMax({ sender, recipient, memo, feeRate, spendPendingUTXO, utxoSelectionPreferences, selectedUtxos, }: {
         sender: Address;
         recipient: Address;
         memo?: string;
         feeRate: FeeRate;
         spendPendingUTXO?: boolean;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<{
         psbt: Bitcoin.Psbt;
         utxos: UTXO[];
@@ -96,13 +98,14 @@ declare abstract class Client extends UTXOClient {
      * @param params Send max parameters
      * @returns Prepared transaction with maximum sendable amount
      */
-    prepareMaxTx({ sender, recipient, memo, feeRate, spendPendingUTXO, utxoSelectionPreferences, }: {
+    prepareMaxTx({ sender, recipient, memo, feeRate, spendPendingUTXO, utxoSelectionPreferences, selectedUtxos, }: {
         sender: Address;
         recipient: Address;
         memo?: string;
         feeRate: FeeRate;
         spendPendingUTXO?: boolean;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<PreparedTx & {
         maxAmount: number;
         fee: number;
@@ -113,11 +116,12 @@ declare abstract class Client extends UTXOClient {
      * @param params The transfer options with enhanced UTXO selection preferences.
      * @returns The raw unsigned transaction with enhanced error handling.
      */
-    prepareTxEnhanced({ sender, memo, amount, recipient, spendPendingUTXO, feeRate, utxoSelectionPreferences, }: TxParams & {
+    prepareTxEnhanced({ sender, memo, amount, recipient, spendPendingUTXO, feeRate, utxoSelectionPreferences, selectedUtxos, }: TxParams & {
         sender: Address;
         feeRate: FeeRate;
         spendPendingUTXO?: boolean;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<PreparedTx>;
     /**
      * Prepare transfer with enhanced validation and performance.

package/lib/clientKeystore.d.ts

@@ -1,6 +1,6 @@
 import { FeeRate, TxHash } from '@xchainjs/xchain-client';
 import { Address } from '@xchainjs/xchain-util';
-import { TxParams, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
+import { TxParams, UTXO, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
 import { Client } from './client';
 import { AddressFormat } from './types';
 /**
@@ -47,6 +47,7 @@ declare class ClientKeystore extends Client {
     transfer(params: TxParams & {
         feeRate?: FeeRate;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<TxHash>;
     /**
      * Transfer the maximum amount of Bitcoin (sweep).
@@ -66,6 +67,7 @@ declare class ClientKeystore extends Client {
         feeRate?: FeeRate;
         walletIndex?: number;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<{
         hash: TxHash;
         maxAmount: number;

package/lib/clientLedger.d.ts

@@ -1,7 +1,7 @@
 import AppBtc from '@ledgerhq/hw-app-btc';
 import { FeeRate, TxHash } from '@xchainjs/xchain-client';
 import { Address } from '@xchainjs/xchain-util';
-import { TxParams, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
+import { TxParams, UTXO, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
 import { Client } from './client';
 import { AddressFormat } from './types';
 /**
@@ -21,5 +21,17 @@ declare class ClientLedger extends Client {
         feeRate?: FeeRate;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
     }): Promise<TxHash>;
+    transferMax(params: {
+        recipient: Address;
+        memo?: string;
+        feeRate?: FeeRate;
+        walletIndex?: number;
+        utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
+    }): Promise<{
+        hash: TxHash;
+        maxAmount: number;
+        fee: number;
+    }>;
 }
 export { ClientLedger };

package/lib/index.esm.js

@@ -4,7 +4,7 @@ import { getSeed } from '@xchainjs/xchain-crypto';
 import { HDKey } from '@scure/bip32';
 import * as Bitcoin from 'bitcoinjs-lib';
 import { ECPairFactory } from 'ecpair';
-import { Client as Client$1, UtxoError } from '@xchainjs/xchain-utxo';
+import { Client as Client$1, UtxoTransactionValidator, UtxoError } from '@xchainjs/xchain-utxo';
 import { AssetType } from '@xchainjs/xchain-util';
 import { SochainProvider, SochainNetwork, HaskoinProvider, HaskoinNetwork, BlockcypherProvider, BlockcypherNetwork, BitgoProvider } from '@xchainjs/xchain-utxo-providers';
 import AppBtc from '@ledgerhq/hw-app-btc';
@@ -289,7 +289,7 @@ class Client extends Client$1 {
      * @returns Enhanced transaction build result with PSBT, UTXOs, and inputs
      */
     buildTxEnhanced(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ amount, recipient, memo, feeRate, sender, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ amount, recipient, memo, feeRate, sender, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Comprehensive input validation
                 this.validateTransactionInputs({
@@ -299,9 +299,16 @@ class Client extends Client$1 {
                     sender,
                     feeRate,
                 });
-                // Get validated UTXOs
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 const compiledMemo = memo ? this.compileMemo(memo) : null;
                 const targetValue = amount.amount().toNumber();
                 const extraOutputs = 1 + (compiledMemo ? 1 : 0); // recipient + optional memo (change calculated separately)
@@ -382,7 +389,7 @@ class Client extends Client$1 {
      * @returns Transaction details with maximum sendable amount
      */
     sendMax(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Basic validation (skip amount validation since we're calculating max)
                 if (!(recipient === null || recipient === void 0 ? void 0 : recipient.trim())) {
@@ -395,20 +402,32 @@ class Client extends Client$1 {
                     throw UtxoError.invalidAddress(sender, this.network);
                 }
                 // Memo validation is handled by validateTransactionInputs
-                // Get validated UTXOs
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 // Calculate maximum sendable amount
                 const maxCalc = this.calculateMaxSendableAmount(utxos, Math.ceil(feeRate), !!memo, utxoSelectionPreferences);
                 const compiledMemo = memo ? this.compileMemo(memo) : null;
                 const psbt = new Bitcoin.Psbt({ network: btcNetwork(this.network) });
                 // Add inputs
                 if (this.addressFormat === AddressFormat.P2WPKH) {
-                    maxCalc.inputs.forEach((utxo) => psbt.addInput({
-                        hash: utxo.hash,
-                        index: utxo.index,
-                        witnessUtxo: utxo.witnessUtxo,
-                    }));
+                    maxCalc.inputs.forEach((utxo) => {
+                        if (!utxo.witnessUtxo) {
+                            throw UtxoError.fromUnknown(new Error(`Missing witnessUtxo for UTXO ${utxo.hash}:${utxo.index}`), 'sendMax');
+                        }
+                        psbt.addInput({
+                            hash: utxo.hash,
+                            index: utxo.index,
+                            witnessUtxo: utxo.witnessUtxo,
+                        });
+                    });
                 }
                 else {
                     const { pubkey, output } = Bitcoin.payments.p2tr({
@@ -452,7 +471,7 @@ class Client extends Client$1 {
      * @returns Prepared transaction with maximum sendable amount
      */
     prepareMaxTx(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 const { psbt, utxos, inputs, maxAmount, fee } = yield this.sendMax({
                     sender,
@@ -461,6 +480,7 @@ class Client extends Client$1 {
                     feeRate,
                     spendPendingUTXO,
                     utxoSelectionPreferences,
+                    selectedUtxos,
                 });
                 return {
                     rawUnsignedTx: psbt.toBase64(),
@@ -486,7 +506,7 @@ class Client extends Client$1 {
      * @returns The raw unsigned transaction with enhanced error handling.
      */
     prepareTxEnhanced(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, spendPendingUTXO = true, feeRate, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, spendPendingUTXO = true, feeRate, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 const { psbt, utxos, inputs } = yield this.buildTxEnhanced({
                     sender,
@@ -496,6 +516,7 @@ class Client extends Client$1 {
                     memo,
                     spendPendingUTXO,
                     utxoSelectionPreferences,
+                    selectedUtxos,
                 });
                 return { rawUnsignedTx: psbt.toBase64(), utxos, inputs };
             }
@@ -628,7 +649,7 @@ class ClientKeystore extends Client {
             // Merge default preferences with caller-provided preferences
             const mergedUtxoSelectionPreferences = Object.assign({ minimizeFee: true, avoidDust: true, minimizeInputs: false }, params.utxoSelectionPreferences);
             // Prepare the transaction
-            const { rawUnsignedTx } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { sender: this.getAddress(fromAddressIndex), feeRate, utxoSelectionPreferences: mergedUtxoSelectionPreferences }));
+            const { rawUnsignedTx } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { sender: this.getAddress(fromAddressIndex), feeRate, utxoSelectionPreferences: mergedUtxoSelectionPreferences, selectedUtxos: params.selectedUtxos }));
             // Build the PSBT
             const psbt = Bitcoin.Psbt.fromBase64(rawUnsignedTx);
             // Sign all inputs
@@ -667,6 +688,7 @@ class ClientKeystore extends Client {
                 memo: params.memo,
                 feeRate,
                 utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
             });
             const btcKeys = this.getBtcKeys(this.phrase, fromAddressIndex);
             psbt.signAllInputs(this.addressFormat === AddressFormat.P2WPKH
@@ -770,6 +792,50 @@ class ClientLedger extends Client {
             return txHash;
         });
     }
+    // Transfer max BTC from Ledger (sweep transaction)
+    transferMax(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const app = yield this.getApp();
+            const fromAddressIndex = (params === null || params === void 0 ? void 0 : params.walletIndex) || 0;
+            const feeRate = params.feeRate || (yield this.getFeeRates())[FeeOption.Fast];
+            checkFeeBounds(this.feeBounds, feeRate);
+            const sender = yield this.getAddressAsync(fromAddressIndex);
+            const { rawUnsignedTx, inputs, maxAmount, fee } = yield this.prepareMaxTx({
+                sender,
+                recipient: params.recipient,
+                memo: params.memo,
+                feeRate,
+                utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
+            });
+            const psbt = Bitcoin.Psbt.fromBase64(rawUnsignedTx);
+            const ledgerInputs = inputs.map(({ txHex, hash, index }) => {
+                if (!txHex) {
+                    throw Error(`Missing 'txHex' for UTXO (txHash ${hash})`);
+                }
+                const utxoTx = Bitcoin.Transaction.fromHex(txHex);
+                const splittedTx = app.splitTransaction(txHex, utxoTx.hasWitnesses());
+                return [splittedTx, index, null, null];
+            });
+            const associatedKeysets = ledgerInputs.map(() => this.getFullDerivationPath(fromAddressIndex));
+            const unsignedHex = psbt.data.globalMap.unsignedTx.toBuffer().toString('hex');
+            const newTx = app.splitTransaction(unsignedHex, true);
+            const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex');
+            const txHex = yield app.createPaymentTransaction({
+                inputs: ledgerInputs,
+                associatedKeysets,
+                outputScriptHex,
+                segwit: true,
+                useTrustedInputForSegwit: true,
+                additionals: [this.addressFormat === AddressFormat.P2TR ? 'bech32m' : 'bech32'],
+            });
+            const hash = yield this.broadcastTx(txHex);
+            if (!hash) {
+                throw Error('No Tx hash');
+            }
+            return { hash, maxAmount, fee };
+        });
+    }
 }
 
 export { AddressFormat, AssetBTC, BTCChain, BTC_DECIMAL, BTC_SATOSHI_SYMBOL, BTC_SYMBOL, BitgoProviders, BlockcypherDataProviders, ClientKeystore as Client, ClientLedger, HaskoinDataProviders, LOWER_FEE_BOUND, MIN_TX_FEE, SochainDataProviders, UPPER_FEE_BOUND, blockstreamExplorerProviders, defaultBTCParams, getPrefix, tapRootDerivationPaths, validateAddress };

package/lib/index.js

@@ -315,7 +315,7 @@ class Client extends xchainUtxo.Client {
      * @returns Enhanced transaction build result with PSBT, UTXOs, and inputs
      */
     buildTxEnhanced(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ amount, recipient, memo, feeRate, sender, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ amount, recipient, memo, feeRate, sender, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Comprehensive input validation
                 this.validateTransactionInputs({
@@ -325,9 +325,16 @@ class Client extends xchainUtxo.Client {
                     sender,
                     feeRate,
                 });
-                // Get validated UTXOs
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    xchainUtxo.UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 const compiledMemo = memo ? this.compileMemo(memo) : null;
                 const targetValue = amount.amount().toNumber();
                 const extraOutputs = 1 + (compiledMemo ? 1 : 0); // recipient + optional memo (change calculated separately)
@@ -408,7 +415,7 @@ class Client extends xchainUtxo.Client {
      * @returns Transaction details with maximum sendable amount
      */
     sendMax(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Basic validation (skip amount validation since we're calculating max)
                 if (!(recipient === null || recipient === void 0 ? void 0 : recipient.trim())) {
@@ -421,20 +428,32 @@ class Client extends xchainUtxo.Client {
                     throw xchainUtxo.UtxoError.invalidAddress(sender, this.network);
                 }
                 // Memo validation is handled by validateTransactionInputs
-                // Get validated UTXOs
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    xchainUtxo.UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 // Calculate maximum sendable amount
                 const maxCalc = this.calculateMaxSendableAmount(utxos, Math.ceil(feeRate), !!memo, utxoSelectionPreferences);
                 const compiledMemo = memo ? this.compileMemo(memo) : null;
                 const psbt = new Bitcoin__namespace.Psbt({ network: btcNetwork(this.network) });
                 // Add inputs
                 if (this.addressFormat === exports.AddressFormat.P2WPKH) {
-                    maxCalc.inputs.forEach((utxo) => psbt.addInput({
-                        hash: utxo.hash,
-                        index: utxo.index,
-                        witnessUtxo: utxo.witnessUtxo,
-                    }));
+                    maxCalc.inputs.forEach((utxo) => {
+                        if (!utxo.witnessUtxo) {
+                            throw xchainUtxo.UtxoError.fromUnknown(new Error(`Missing witnessUtxo for UTXO ${utxo.hash}:${utxo.index}`), 'sendMax');
+                        }
+                        psbt.addInput({
+                            hash: utxo.hash,
+                            index: utxo.index,
+                            witnessUtxo: utxo.witnessUtxo,
+                        });
+                    });
                 }
                 else {
                     const { pubkey, output } = Bitcoin__namespace.payments.p2tr({
@@ -478,7 +497,7 @@ class Client extends xchainUtxo.Client {
      * @returns Prepared transaction with maximum sendable amount
      */
     prepareMaxTx(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 const { psbt, utxos, inputs, maxAmount, fee } = yield this.sendMax({
                     sender,
@@ -487,6 +506,7 @@ class Client extends xchainUtxo.Client {
                     feeRate,
                     spendPendingUTXO,
                     utxoSelectionPreferences,
+                    selectedUtxos,
                 });
                 return {
                     rawUnsignedTx: psbt.toBase64(),
@@ -512,7 +532,7 @@ class Client extends xchainUtxo.Client {
      * @returns The raw unsigned transaction with enhanced error handling.
      */
     prepareTxEnhanced(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, spendPendingUTXO = true, feeRate, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, spendPendingUTXO = true, feeRate, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 const { psbt, utxos, inputs } = yield this.buildTxEnhanced({
                     sender,
@@ -522,6 +542,7 @@ class Client extends xchainUtxo.Client {
                     memo,
                     spendPendingUTXO,
                     utxoSelectionPreferences,
+                    selectedUtxos,
                 });
                 return { rawUnsignedTx: psbt.toBase64(), utxos, inputs };
             }
@@ -654,7 +675,7 @@ class ClientKeystore extends Client {
             // Merge default preferences with caller-provided preferences
             const mergedUtxoSelectionPreferences = Object.assign({ minimizeFee: true, avoidDust: true, minimizeInputs: false }, params.utxoSelectionPreferences);
             // Prepare the transaction
-            const { rawUnsignedTx } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { sender: this.getAddress(fromAddressIndex), feeRate, utxoSelectionPreferences: mergedUtxoSelectionPreferences }));
+            const { rawUnsignedTx } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { sender: this.getAddress(fromAddressIndex), feeRate, utxoSelectionPreferences: mergedUtxoSelectionPreferences, selectedUtxos: params.selectedUtxos }));
             // Build the PSBT
             const psbt = Bitcoin__namespace.Psbt.fromBase64(rawUnsignedTx);
             // Sign all inputs
@@ -693,6 +714,7 @@ class ClientKeystore extends Client {
                 memo: params.memo,
                 feeRate,
                 utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
             });
             const btcKeys = this.getBtcKeys(this.phrase, fromAddressIndex);
             psbt.signAllInputs(this.addressFormat === exports.AddressFormat.P2WPKH
@@ -796,6 +818,50 @@ class ClientLedger extends Client {
             return txHash;
         });
     }
+    // Transfer max BTC from Ledger (sweep transaction)
+    transferMax(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const app = yield this.getApp();
+            const fromAddressIndex = (params === null || params === void 0 ? void 0 : params.walletIndex) || 0;
+            const feeRate = params.feeRate || (yield this.getFeeRates())[xchainClient.FeeOption.Fast];
+            xchainClient.checkFeeBounds(this.feeBounds, feeRate);
+            const sender = yield this.getAddressAsync(fromAddressIndex);
+            const { rawUnsignedTx, inputs, maxAmount, fee } = yield this.prepareMaxTx({
+                sender,
+                recipient: params.recipient,
+                memo: params.memo,
+                feeRate,
+                utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
+            });
+            const psbt = Bitcoin__namespace.Psbt.fromBase64(rawUnsignedTx);
+            const ledgerInputs = inputs.map(({ txHex, hash, index }) => {
+                if (!txHex) {
+                    throw Error(`Missing 'txHex' for UTXO (txHash ${hash})`);
+                }
+                const utxoTx = Bitcoin__namespace.Transaction.fromHex(txHex);
+                const splittedTx = app.splitTransaction(txHex, utxoTx.hasWitnesses());
+                return [splittedTx, index, null, null];
+            });
+            const associatedKeysets = ledgerInputs.map(() => this.getFullDerivationPath(fromAddressIndex));
+            const unsignedHex = psbt.data.globalMap.unsignedTx.toBuffer().toString('hex');
+            const newTx = app.splitTransaction(unsignedHex, true);
+            const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex');
+            const txHex = yield app.createPaymentTransaction({
+                inputs: ledgerInputs,
+                associatedKeysets,
+                outputScriptHex,
+                segwit: true,
+                useTrustedInputForSegwit: true,
+                additionals: [this.addressFormat === exports.AddressFormat.P2TR ? 'bech32m' : 'bech32'],
+            });
+            const hash = yield this.broadcastTx(txHex);
+            if (!hash) {
+                throw Error('No Tx hash');
+            }
+            return { hash, maxAmount, fee };
+        });
+    }
 }
 
 exports.AssetBTC = AssetBTC;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-bitcoin",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Custom Bitcoin client and utilities used by XChainJS clients",
   "keywords": [
     "XChain",
@@ -39,7 +39,7 @@
     "@xchainjs/xchain-client": "2.0.10",
     "@xchainjs/xchain-crypto": "1.0.6",
     "@xchainjs/xchain-util": "2.0.5",
-    "@xchainjs/xchain-utxo": "2.1.0",
+    "@xchainjs/xchain-utxo": "2.2.0",
     "@xchainjs/xchain-utxo-providers": "2.0.10",
     "bitcoinjs-lib": "^6.1.7",
     "coinselect": "3.1.12",