@btc-vision/transaction 1.0.44 → 1.0.45

package/browser/transaction/TransactionFactory.d.ts

@@ -1,4 +1,4 @@
-import { IDeploymentParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
 import { Address } from '@btc-vision/bsi-binary';
 export interface DeploymentResult {
     readonly transaction: [string, string];
@@ -23,10 +23,14 @@ export declare class TransactionFactory {
     wrap(warpParameters: IWrapParameters): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
+    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
+        estimatedFees: bigint;
+        tx: string;
+    }>;
+    private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;
     private maxPubKeySize;
     private writePSBTHeader;
     private getUTXOAsTransaction;
-    private createFundTransaction;
 }

package/browser/transaction/builders/TransactionBuilder.d.ts

@@ -35,6 +35,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     setDestinationAddress(address: Address): void;
     setMaximumFeeRate(feeRate: number): void;
     signTransaction(): Promise<Transaction>;
+    generateTransactionMinimalSignatures(): Promise<void>;
     signPSBT(): Promise<Psbt>;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;

package/browser/transaction/interfaces/ITransactionParameters.d.ts

@@ -14,7 +14,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     readonly priorityFee: bigint;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
-    childTransactionRequiredValue: bigint;
+    amount: bigint;
 }
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer | undefined;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.44";
+export declare const version = "1.0.47";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.44';
+export const version = '1.0.47';

package/build/tests/Regtest.js

@@ -8,7 +8,7 @@ export const Regtest = {
     config: {
         BITCOIND_NETWORK: BitcoinNetwork.Regtest,
         BITCOIND_HOST: '51.81.67.34',
-        BITCOIND_PORT: 9242,
+        BITCOIND_PORT: 8001,
         BITCOIND_USERNAME: 'HJSiowseujhs',
         BITCOIND_PASSWORD: 'YHEFHSDJ23JOIhjjef2ied9u290efu2930u90U',
     },

package/build/tests/btc/send.d.ts

@@ -0,0 +1 @@
+export {};

package/build/tests/btc/send.js

@@ -0,0 +1,36 @@
+import { TransactionFactory } from '../../transaction/TransactionFactory.js';
+import { OPNetLimitedProvider } from '../../utxo/OPNetLimitedProvider.js';
+import { Wallet } from '../../keypair/Wallet.js';
+import { Regtest } from '../Regtest.js';
+import { networks } from 'bitcoinjs-lib';
+const network = networks.regtest;
+const utxoManager = new OPNetLimitedProvider('http://localhost:9001');
+const factory = new TransactionFactory();
+const wallet = new Wallet(Regtest.wallet, network);
+const amount = 100000000n;
+const utxoSetting = {
+    addresses: [wallet.p2wpkh, wallet.p2tr],
+    minAmount: 10000n,
+    requestedAmount: amount,
+};
+const utxos = await utxoManager.fetchUTXOMultiAddr(utxoSetting);
+if (!utxos) {
+    throw new Error('No UTXOs found');
+}
+const fundingTransactionParameters = {
+    amount: amount,
+    feeRate: 500,
+    from: wallet.p2wpkh,
+    utxos: utxos,
+    signer: wallet.keypair,
+    network: network,
+    priorityFee: 0n,
+    to: 'bcrt1p2m2yz9hae5lkypuf8heh6udnt0tchmxhaftcfslqsr5vrwzh34yqgn6hs6',
+};
+const fundingTx = await factory.createBTCTransfer(fundingTransactionParameters);
+console.log(fundingTx);
+const broadcastResponse = await utxoManager.broadcastTransaction(fundingTx.tx, false);
+if (!broadcastResponse) {
+    throw new Error('Could not broadcast transaction');
+}
+console.log(broadcastResponse);

package/build/tests/moto/airdropToken.js

@@ -1,5 +1,5 @@
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
-import { interact, wallet } from '../shared/interaction.js';
+import { interact } from '../shared/interaction.js';
 import { MOTO_ADDRESS } from '../shared/tokens.js';
 const abiCoder = new ABICoder();
 const airdropSelector = Number(`0x` + abiCoder.encodeSelector('airdrop'));
@@ -14,8 +14,8 @@ function airdropToken(amount, to) {
     calldata.writeAddressValueTupleMap(aidropToken);
     return Buffer.from(calldata.getBuffer());
 }
-const tokenAmount = expandToDecimals(10000, 8n);
-const receiver = wallet.p2tr;
+const tokenAmount = expandToDecimals(1000, 8n);
+const receiver = 'bcrt1p2m2yz9hae5lkypuf8heh6udnt0tchmxhaftcfslqsr5vrwzh34yqgn6hs6';
 const calldata = airdropToken(tokenAmount, receiver);
 console.log('airdrop ->', calldata.toString('hex'));
 await interact(MOTO_ADDRESS, calldata);

package/build/tests/test.js

@@ -36,7 +36,7 @@ async function mineBlock() {
         network: network,
         feeRate: 150,
         priorityFee: 1000n,
-        childTransactionRequiredValue: 0n,
+        amount: 0n,
     };
     const fundingTransaction = new FundingTransaction(interactionParameters);
     const fundingTx = await fundingTransaction.signTransaction();

package/build/tests/wbtc/transferReg.js

@@ -12,5 +12,5 @@ function getTransferToCalldata(to, amount) {
     return Buffer.from(addCalldata.getBuffer());
 }
 const contract = wBTC.getAddress(networks.regtest);
-const calldata = getTransferToCalldata('bcrt1pmc2dz8fy4rwghzmfz4hdsennusld8cwgtr0mjxl45wt8cnqcm3psssc327', 10000n);
-await interact(contract, calldata, true);
+const calldata = getTransferToCalldata('bcrt1p2m2yz9hae5lkypuf8heh6udnt0tchmxhaftcfslqsr5vrwzh34yqgn6hs6', 50000000n);
+await interact(contract, calldata, false);

package/build/tests/wbtc/unwrapReg.js

@@ -28,7 +28,7 @@ const utxos = await opnet.fetchUTXOMultiAddr(utxoSetting);
 if (!utxos) {
     throw new Error('No UTXOs found');
 }
-const unwrapAmount = 97410676n;
+const unwrapAmount = 600000n;
 const unwrapUtxos = await opnet.fetchUnWrapParameters(unwrapAmount, wallet.p2tr);
 if (!unwrapUtxos) {
     throw new Error('No UTXOs found for unwrap');

package/build/tests/wbtc/withdrawalRequestReg.js

@@ -39,7 +39,7 @@ const utxos = await utxoManager.fetchUTXOMultiAddr(utxoSetting);
 if (!utxos) {
     throw new Error('No UTXOs found');
 }
-const calldata = generateCalldata(97410676n);
+const calldata = generateCalldata(600000n);
 const interactionParameters = {
     from: wallet.p2wpkh,
     to: wBtc.getAddress(),

package/build/tests/wbtc/wrapReg.js

@@ -20,7 +20,7 @@ async function mineBlock() {
     return !!ok.length;
 }
 await rpc.init(Regtest.config);
-const wrapAmount = (currentConsensusConfig.VAULT_MINIMUM_AMOUNT * 30n) / 10n;
+const wrapAmount = 1n * 100000000n;
 const utxoSetting = {
     addresses: [wallet.p2wpkh, wallet.p2tr],
     minAmount: 10000n,
@@ -34,13 +34,12 @@ const generationParameters = await opnet.fetchWrapParameters(wrapAmount);
 if (!generationParameters) {
     throw new Error('No generation parameters found');
 }
-console.log(`UTXOs:`, utxos);
 const wrapParameters = {
     from: wallet.p2wpkh,
     utxos: utxos,
     signer: wallet.keypair,
     network: network,
-    feeRate: 1000,
+    feeRate: 500,
     priorityFee: 100000n,
     receiver: wallet.p2tr,
     amount: wrapAmount,

package/build/transaction/TransactionFactory.d.ts

@@ -1,4 +1,4 @@
-import { IDeploymentParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
 import { Address } from '@btc-vision/bsi-binary';
 export interface DeploymentResult {
     readonly transaction: [string, string];
@@ -23,10 +23,14 @@ export declare class TransactionFactory {
     wrap(warpParameters: IWrapParameters): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
+    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
+        estimatedFees: bigint;
+        tx: string;
+    }>;
+    private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;
     private maxPubKeySize;
     private writePSBTHeader;
     private getUTXOAsTransaction;
-    private createFundTransaction;
 }

package/build/transaction/TransactionFactory.js

@@ -13,25 +13,24 @@ export class TransactionFactory {
         if (!interactionParameters.to) {
             throw new Error('Field "to" not provided.');
         }
-        const transaction = new InteractionTransaction(interactionParameters);
-        await transaction.signTransaction();
-        const estimatedGas = await transaction.estimateTransactionFees();
-        const fundingParameters = {
+        const preTransaction = new InteractionTransaction({
             ...interactionParameters,
-            childTransactionRequiredValue: estimatedGas,
-        };
-        const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        interactionParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, interactionParameters.to, 0);
-        const preTransaction = new InteractionTransaction(interactionParameters);
-        await preTransaction.signTransaction();
+            utxos: [interactionParameters.utxos[0]],
+        });
+        await preTransaction.generateTransactionMinimalSignatures();
         const parameters = await preTransaction.getFundingTransactionParameters();
-        parameters.utxos = fundingParameters.utxos;
-        parameters.childTransactionRequiredValue = await preTransaction.estimateTransactionFees();
-        parameters.estimatedFees = preFundingTransaction.estimatedFees;
+        parameters.utxos = interactionParameters.utxos;
+        parameters.amount = await preTransaction.estimateTransactionFees();
+        const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
+        if (!feeEstimationFundingTransaction) {
+            throw new Error('Could not sign funding transaction.');
+        }
+        parameters.estimatedFees = feeEstimationFundingTransaction.estimatedFees;
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
+        interactionParameters.utxos = this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0);
         const newParams = {
             ...interactionParameters,
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
@@ -85,7 +84,7 @@ export class TransactionFactory {
         const to = wbtc.getAddress();
         const fundingParameters = {
             ...warpParameters,
-            childTransactionRequiredValue: childTransactionRequiredValue,
+            amount: childTransactionRequiredValue,
             to: to,
         };
         const preFundingTransaction = await this.createFundTransaction(fundingParameters);
@@ -93,7 +92,7 @@ export class TransactionFactory {
         const preTransaction = new WrapTransaction(warpParameters);
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
-        parameters.childTransactionRequiredValue += childTransactionRequiredValue;
+        parameters.amount += childTransactionRequiredValue;
         parameters.utxos = fundingParameters.utxos;
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
@@ -125,7 +124,7 @@ export class TransactionFactory {
         const estimatedFees = transaction.preEstimateTransactionFees(BigInt(unwrapParameters.feeRate), this.calculateNumInputs(unwrapParameters.unwrapUTXOs), 2n, this.calculateNumSignatures(unwrapParameters.unwrapUTXOs), this.maxPubKeySize(unwrapParameters.unwrapUTXOs));
         const fundingParameters = {
             ...unwrapParameters,
-            childTransactionRequiredValue: estimatedGas + estimatedFees,
+            amount: estimatedGas + estimatedFees,
             to: to,
         };
         const preFundingTransaction = await this.createFundTransaction(fundingParameters);
@@ -137,8 +136,7 @@ export class TransactionFactory {
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = fundingParameters.utxos;
-        parameters.childTransactionRequiredValue =
-            (await preTransaction.estimateTransactionFees()) + estimatedFees;
+        parameters.amount = (await preTransaction.estimateTransactionFees()) + estimatedFees;
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -168,7 +166,7 @@ export class TransactionFactory {
         const estimatedGas = await transaction.estimateTransactionFees();
         const fundingParameters = {
             ...unwrapParameters,
-            childTransactionRequiredValue: estimatedGas,
+            amount: estimatedGas,
             to: to,
         };
         const preFundingTransaction = await this.createFundTransaction(fundingParameters);
@@ -180,7 +178,7 @@ export class TransactionFactory {
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = fundingParameters.utxos;
-        parameters.childTransactionRequiredValue = await preTransaction.estimateTransactionFees();
+        parameters.amount = await preTransaction.estimateTransactionFees();
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -201,6 +199,25 @@ export class TransactionFactory {
             feeRefundOrLoss: finalTransaction.getFeeLossOrRefund(),
         };
     }
+    async createBTCTransfer(parameters) {
+        const resp = await this.createFundTransaction(parameters);
+        return {
+            estimatedFees: resp.estimatedFees,
+            tx: resp.tx.toHex(),
+        };
+    }
+    async createFundTransaction(parameters) {
+        const fundingTransaction = new FundingTransaction(parameters);
+        const signedTransaction = await fundingTransaction.signTransaction();
+        if (!signedTransaction) {
+            throw new Error('Could not sign funding transaction.');
+        }
+        return {
+            tx: signedTransaction,
+            original: fundingTransaction,
+            estimatedFees: await fundingTransaction.estimateTransactionFees(),
+        };
+    }
     calculateNumSignatures(vault) {
         let numSignatures = 0n;
         for (const v of vault) {
@@ -242,16 +259,4 @@ export class TransactionFactory {
         };
         return [newUtxo];
     }
-    async createFundTransaction(parameters) {
-        const fundingTransaction = new FundingTransaction(parameters);
-        const signedTransaction = await fundingTransaction.signTransaction();
-        if (!signedTransaction) {
-            throw new Error('Could not sign funding transaction.');
-        }
-        return {
-            tx: signedTransaction,
-            original: fundingTransaction,
-            estimatedFees: await fundingTransaction.estimateTransactionFees(),
-        };
-    }
 }

package/build/transaction/builders/FundingTransaction.js

@@ -5,7 +5,7 @@ export class FundingTransaction extends TransactionBuilder {
     childTransactionRequiredFees;
     constructor(parameters) {
         super(parameters);
-        this.childTransactionRequiredFees = parameters.childTransactionRequiredValue;
+        this.childTransactionRequiredFees = parameters.amount;
         this.internalInit();
     }
     async buildTransaction() {

package/build/transaction/builders/TransactionBuilder.d.ts

@@ -35,6 +35,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     setDestinationAddress(address: Address): void;
     setMaximumFeeRate(feeRate: number): void;
     signTransaction(): Promise<Transaction>;
+    generateTransactionMinimalSignatures(): Promise<void>;
     signPSBT(): Promise<Psbt>;
     addInput(input: PsbtInputExtended): void;
     addOutput(output: PsbtOutputExtended): void;

package/build/transaction/builders/TransactionBuilder.js

@@ -74,8 +74,8 @@ export class TransactionBuilder extends TweakedTransaction {
         return buffer;
     }
     async getFundingTransactionParameters() {
-        if (!this.transactionFee) {
-            this.transactionFee = await this.estimateTransactionFees();
+        if (!this.estimatedFees) {
+            this.estimatedFees = await this.estimateTransactionFees();
         }
         return {
             utxos: this.utxos,
@@ -85,7 +85,7 @@ export class TransactionBuilder extends TweakedTransaction {
             feeRate: this.feeRate,
             priorityFee: this.priorityFee,
             from: this.from,
-            childTransactionRequiredValue: this.transactionFee,
+            amount: this.estimatedFees,
         };
     }
     setDestinationAddress(address) {
@@ -111,6 +111,22 @@ export class TransactionBuilder extends TweakedTransaction {
         }
         throw new Error('Could not sign transaction');
     }
+    async generateTransactionMinimalSignatures() {
+        if (this.to && !EcKeyPair.verifyContractAddress(this.to, this.network)) {
+            throw new Error('Invalid contract address. The contract address must be a taproot address.');
+        }
+        await this.buildTransaction();
+        if (this.transaction.data.inputs.length === 0) {
+            const inputs = this.getInputs();
+            const outputs = this.getOutputs();
+            this.transaction.setMaximumFeeRate(this._maximumFeeRate);
+            this.transaction.addInputs(inputs);
+            for (let i = 0; i < this.updateInputs.length; i++) {
+                this.transaction.updateInput(i, this.updateInputs[i]);
+            }
+            this.transaction.addOutputs(outputs);
+        }
+    }
     async signPSBT() {
         if (await this.signTransaction()) {
             return this.transaction;
@@ -142,9 +158,9 @@ export class TransactionBuilder extends TweakedTransaction {
         });
         const builtTx = await this.internalBuildTransaction(fakeTx);
         if (builtTx) {
-            const tx = fakeTx.extractTransaction(false);
+            const tx = fakeTx.extractTransaction(false, true);
             const size = tx.virtualSize();
-            const fee = this.feeRate * size + 1;
+            const fee = this.feeRate * size;
             this.estimatedFees = BigInt(Math.ceil(fee) + 1);
             return this.estimatedFees;
         }

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -14,7 +14,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     readonly priorityFee: bigint;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
-    childTransactionRequiredValue: bigint;
+    amount: bigint;
 }
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer | undefined;

package/build/transaction/shared/TweakedTransaction.js

@@ -205,7 +205,6 @@ export class TweakedTransaction extends Logger {
                 await this.signInput(transaction, input, i);
             }
             catch (e) {
-                console.log(e);
                 this.log(`Failed to sign input ${i}: ${e.stack}`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.44",
+    "version": "1.0.45",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -91,7 +91,7 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bsi-binary": "^1.0.26",
+        "@btc-vision/bsi-binary": "^1.0.28",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.20",
         "@btc-vision/bsi-common": "^1.0.14",
         "@btc-vision/logger": "^1.0.2",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.44';
+export const version = '1.0.45';

package/src/transaction/TransactionFactory.ts

@@ -61,45 +61,39 @@ export class TransactionFactory {
             throw new Error('Field "to" not provided.');
         }
 
-        const transaction: InteractionTransaction = new InteractionTransaction(
-            interactionParameters,
-        );
-
-        await transaction.signTransaction();
-
-        // Initial generation
-        const estimatedGas = await transaction.estimateTransactionFees();
-        const fundingParameters: IFundingTransactionParameters = {
+        const preTransaction: InteractionTransaction = new InteractionTransaction({
             ...interactionParameters,
-            childTransactionRequiredValue: estimatedGas,
-        };
-
-        const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        interactionParameters.utxos = this.getUTXOAsTransaction(
-            preFundingTransaction.tx,
-            interactionParameters.to,
-            0,
-        );
+            utxos: [interactionParameters.utxos[0]], // we simulate one input here.
+        });
 
-        const preTransaction: InteractionTransaction = new InteractionTransaction(
-            interactionParameters,
-        );
+        // we don't sign that transaction, we just need the parameters.
 
-        // Initial generation
-        await preTransaction.signTransaction();
+        await preTransaction.generateTransactionMinimalSignatures();
 
         const parameters: IFundingTransactionParameters =
             await preTransaction.getFundingTransactionParameters();
 
-        parameters.utxos = fundingParameters.utxos;
-        parameters.childTransactionRequiredValue = await preTransaction.estimateTransactionFees();
-        parameters.estimatedFees = preFundingTransaction.estimatedFees;
+        parameters.utxos = interactionParameters.utxos;
+        parameters.amount = await preTransaction.estimateTransactionFees();
+
+        const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
+        if (!feeEstimationFundingTransaction) {
+            throw new Error('Could not sign funding transaction.');
+        }
+
+        parameters.estimatedFees = feeEstimationFundingTransaction.estimatedFees;
 
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
 
+        interactionParameters.utxos = this.getUTXOAsTransaction(
+            signedTransaction.tx,
+            interactionParameters.to,
+            0,
+        );
+
         const newParams: IInteractionParameters = {
             ...interactionParameters,
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0), // always 0
@@ -190,7 +184,7 @@ export class TransactionFactory {
         const to = wbtc.getAddress();
         const fundingParameters: IFundingTransactionParameters = {
             ...warpParameters,
-            childTransactionRequiredValue: childTransactionRequiredValue,
+            amount: childTransactionRequiredValue,
             to: to,
         };
 
@@ -206,7 +200,7 @@ export class TransactionFactory {
             await preTransaction.getFundingTransactionParameters();
 
         // We add the amount
-        parameters.childTransactionRequiredValue += childTransactionRequiredValue;
+        parameters.amount += childTransactionRequiredValue;
         parameters.utxos = fundingParameters.utxos;
 
         const signedTransaction = await this.createFundTransaction(parameters);
@@ -261,7 +255,7 @@ export class TransactionFactory {
 
         const fundingParameters: IFundingTransactionParameters = {
             ...unwrapParameters,
-            childTransactionRequiredValue: estimatedGas + estimatedFees,
+            amount: estimatedGas + estimatedFees,
             to: to,
         };
 
@@ -280,8 +274,7 @@ export class TransactionFactory {
             await preTransaction.getFundingTransactionParameters();
 
         parameters.utxos = fundingParameters.utxos;
-        parameters.childTransactionRequiredValue =
-            (await preTransaction.estimateTransactionFees()) + estimatedFees;
+        parameters.amount = (await preTransaction.estimateTransactionFees()) + estimatedFees;
 
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
@@ -326,7 +319,7 @@ export class TransactionFactory {
         const estimatedGas = await transaction.estimateTransactionFees();
         const fundingParameters: IFundingTransactionParameters = {
             ...unwrapParameters,
-            childTransactionRequiredValue: estimatedGas,
+            amount: estimatedGas,
             to: to,
         };
 
@@ -345,7 +338,7 @@ export class TransactionFactory {
             await preTransaction.getFundingTransactionParameters();
 
         parameters.utxos = fundingParameters.utxos;
-        parameters.childTransactionRequiredValue = await preTransaction.estimateTransactionFees();
+        parameters.amount = await preTransaction.estimateTransactionFees();
 
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
@@ -373,6 +366,41 @@ export class TransactionFactory {
         };
     }
 
+    /**
+     * @description Creates a funding transaction.
+     * @param {IFundingTransactionParameters} parameters - The funding transaction parameters
+     * @returns {Promise<{ estimatedFees: bigint; tx: string }>} - The signed transaction
+     */
+    public async createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
+        estimatedFees: bigint;
+        tx: string;
+    }> {
+        const resp = await this.createFundTransaction(parameters);
+
+        return {
+            estimatedFees: resp.estimatedFees,
+            tx: resp.tx.toHex(),
+        };
+    }
+
+    private async createFundTransaction(parameters: IFundingTransactionParameters): Promise<{
+        tx: Transaction;
+        original: FundingTransaction;
+        estimatedFees: bigint;
+    }> {
+        const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
+        const signedTransaction: Transaction = await fundingTransaction.signTransaction();
+        if (!signedTransaction) {
+            throw new Error('Could not sign funding transaction.');
+        }
+
+        return {
+            tx: signedTransaction,
+            original: fundingTransaction,
+            estimatedFees: await fundingTransaction.estimateTransactionFees(),
+        };
+    }
+
     private calculateNumSignatures(vault: VaultUTXOs[]): bigint {
         let numSignatures = 0n;
 
@@ -427,22 +455,4 @@ export class TransactionFactory {
 
         return [newUtxo];
     }
-
-    private async createFundTransaction(parameters: IFundingTransactionParameters): Promise<{
-        tx: Transaction;
-        original: FundingTransaction;
-        estimatedFees: bigint;
-    }> {
-        const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
-        const signedTransaction: Transaction = await fundingTransaction.signTransaction();
-        if (!signedTransaction) {
-            throw new Error('Could not sign funding transaction.');
-        }
-
-        return {
-            tx: signedTransaction,
-            original: fundingTransaction,
-            estimatedFees: await fundingTransaction.estimateTransactionFees(),
-        };
-    }
 }