@btc-vision/transaction 1.7.17 → 1.7.19

package/browser/transaction/TransactionFactory.d.ts

@@ -14,17 +14,20 @@ export interface DeploymentResult {
     readonly contractPubKey: string;
     readonly challenge: RawChallenge;
     readonly utxos: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
     readonly original: FundingTransaction;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export interface BitcoinTransferBase {
     readonly tx: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export interface InteractionResponse {
     readonly fundingTransaction: string | null;
@@ -32,6 +35,7 @@ export interface InteractionResponse {
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
     readonly fundingUTXOs: UTXO[];
+    readonly fundingInputUtxos: UTXO[];
     readonly challenge: RawChallenge;
     readonly interactionAddress: string | null;
     readonly compiledTargetScript: string | null;
@@ -42,6 +46,7 @@ export interface BitcoinTransferResponse extends BitcoinTransferBase {
 export interface CancelledTransaction {
     readonly transaction: string;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export declare class TransactionFactory {
     debug: boolean;
@@ -50,7 +55,7 @@ export declare class TransactionFactory {
     private readonly INITIAL_FUNDING_ESTIMATE;
     private readonly MAX_ITERATIONS;
     createCancellableTransaction(params: ICancelTransactionParameters | ICancelTransactionParametersWithoutSigner): Promise<CancelledTransaction>;
-    createCustomScriptTransaction(interactionParameters: ICustomTransactionParameters | ICustomTransactionWithoutSigner): Promise<[string, string, UTXO[]]>;
+    createCustomScriptTransaction(interactionParameters: ICustomTransactionParameters | ICustomTransactionWithoutSigner): Promise<[string, string, UTXO[], UTXO[]]>;
     signInteraction(interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner): Promise<InteractionResponse>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.7.17";
+export declare const version = "1.7.18";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.7.17';
+export const version = '1.7.18';

package/build/transaction/TransactionFactory.d.ts

@@ -14,17 +14,20 @@ export interface DeploymentResult {
     readonly contractPubKey: string;
     readonly challenge: RawChallenge;
     readonly utxos: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
     readonly original: FundingTransaction;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export interface BitcoinTransferBase {
     readonly tx: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export interface InteractionResponse {
     readonly fundingTransaction: string | null;
@@ -32,6 +35,7 @@ export interface InteractionResponse {
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
     readonly fundingUTXOs: UTXO[];
+    readonly fundingInputUtxos: UTXO[];
     readonly challenge: RawChallenge;
     readonly interactionAddress: string | null;
     readonly compiledTargetScript: string | null;
@@ -42,6 +46,7 @@ export interface BitcoinTransferResponse extends BitcoinTransferBase {
 export interface CancelledTransaction {
     readonly transaction: string;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 export declare class TransactionFactory {
     debug: boolean;
@@ -50,7 +55,7 @@ export declare class TransactionFactory {
     private readonly INITIAL_FUNDING_ESTIMATE;
     private readonly MAX_ITERATIONS;
     createCancellableTransaction(params: ICancelTransactionParameters | ICancelTransactionParametersWithoutSigner): Promise<CancelledTransaction>;
-    createCustomScriptTransaction(interactionParameters: ICustomTransactionParameters | ICustomTransactionWithoutSigner): Promise<[string, string, UTXO[]]>;
+    createCustomScriptTransaction(interactionParameters: ICustomTransactionParameters | ICustomTransactionWithoutSigner): Promise<[string, string, UTXO[], UTXO[]]>;
     signInteraction(interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner): Promise<InteractionResponse>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;

package/build/transaction/TransactionFactory.js

@@ -14,10 +14,7 @@ export class TransactionFactory {
     constructor() {
         this.debug = false;
         this.DUMMY_PUBKEY = Buffer.alloc(32, 1);
-        this.P2TR_SCRIPT = Buffer.concat([
-            Buffer.from([0x51, 0x20]),
-            this.DUMMY_PUBKEY,
-        ]);
+        this.P2TR_SCRIPT = Buffer.concat([Buffer.from([0x51, 0x20]), this.DUMMY_PUBKEY]);
         this.INITIAL_FUNDING_ESTIMATE = 2000n;
         this.MAX_ITERATIONS = 10;
     }
@@ -44,6 +41,7 @@ export class TransactionFactory {
         return {
             transaction: rawTx,
             nextUTXOs: this.getUTXOAsTransaction(signed, params.from, 0),
+            inputUtxos: params.utxos,
         };
     }
     async createCustomScriptTransaction(interactionParameters) {
@@ -101,6 +99,7 @@ export class TransactionFactory {
             signedTransaction.tx.toHex(),
             outTx.toHex(),
             this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.from, 1),
+            interactionParameters.utxos,
         ];
     }
     async signInteraction(interactionParameters) {
@@ -174,6 +173,7 @@ export class TransactionFactory {
             nextUTXOs: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.from, 1),
             challenge: challenge.toRaw(),
             fundingUTXOs: fundingUTXO,
+            fundingInputUtxos: interactionParameters.utxos,
             compiledTargetScript: interactionTx.exportCompiledTargetScript().toString('hex'),
         };
     }
@@ -254,6 +254,7 @@ export class TransactionFactory {
             contractPubKey: deploymentTx.contractPubKey,
             utxos: [refundUTXO],
             challenge: challenge.toRaw(),
+            inputUtxos: deploymentParameters.utxos,
         };
     }
     async createBTCTransfer(parameters) {
@@ -266,6 +267,7 @@ export class TransactionFactory {
             original: resp.original,
             tx: resp.tx.toHex(),
             nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
+            inputUtxos: parameters.utxos,
         };
     }
     getAllNewUTXOs(original, tx, to) {
@@ -314,7 +316,10 @@ export class TransactionFactory {
         if (!interaction) {
             throw new Error('Could not sign interaction transaction.');
         }
-        return interaction;
+        return {
+            ...interaction,
+            inputUtxos: interaction.inputUtxos ?? interactionParameters.utxos,
+        };
     }
     async detectInteractionOPWallet(interactionParameters) {
         if (typeof window === 'undefined') {
@@ -332,7 +337,10 @@ export class TransactionFactory {
         if (!interaction) {
             throw new Error('Could not sign interaction transaction.');
         }
-        return interaction;
+        return {
+            ...interaction,
+            fundingInputUtxos: interaction.fundingInputUtxos ?? interactionParameters.utxos,
+        };
     }
     async detectDeploymentOPWallet(deploymentParameters) {
         if (typeof window === 'undefined') {
@@ -350,7 +358,10 @@ export class TransactionFactory {
         if (!deployment) {
             throw new Error('Could not sign interaction transaction.');
         }
-        return deployment;
+        return {
+            ...deployment,
+            inputUtxos: deployment.inputUtxos ?? deploymentParameters.utxos,
+        };
     }
     async createFundTransaction(parameters) {
         if (!parameters.to)
@@ -365,6 +376,7 @@ export class TransactionFactory {
             original: fundingTransaction,
             estimatedFees: fundingTransaction.estimatedFees,
             nextUTXOs: this.getUTXOAsTransaction(signedTransaction, parameters.to, 0),
+            inputUtxos: parameters.utxos,
         };
     }
     hasP2WDAInputs(utxos) {
@@ -398,6 +410,7 @@ export class TransactionFactory {
             estimatedFees: p2wdaTransaction.estimatedFees,
             nextUTXOs: this.getUTXOAsTransaction(signedTx, interactionParameters.from, signedTx.outs.length - 1),
             fundingUTXOs: [...interactionParameters.utxos, ...inputs],
+            fundingInputUtxos: interactionParameters.utxos,
             challenge: interactionParameters.challenge.toRaw(),
             compiledTargetScript: null,
         };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.7.17",
+    "version": "1.7.19",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.7.17';
+export const version = '1.7.18';

package/src/transaction/TransactionFactory.ts

@@ -34,12 +34,11 @@ import { CancelTransaction, ICancelTransactionParameters } from './builders/Canc
 
 export interface DeploymentResult {
     readonly transaction: [string, string];
-
     readonly contractAddress: string;
     readonly contractPubKey: string;
     readonly challenge: RawChallenge;
-
     readonly utxos: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 
 export interface FundingTransactionResponse {
@@ -47,12 +46,14 @@ export interface FundingTransactionResponse {
     readonly original: FundingTransaction;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 
 export interface BitcoinTransferBase {
     readonly tx: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 
 export interface InteractionResponse {
@@ -61,6 +62,7 @@ export interface InteractionResponse {
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
     readonly fundingUTXOs: UTXO[];
+    readonly fundingInputUtxos: UTXO[];
     readonly challenge: RawChallenge;
     readonly interactionAddress: string | null;
     readonly compiledTargetScript: string | null;
@@ -73,19 +75,22 @@ export interface BitcoinTransferResponse extends BitcoinTransferBase {
 export interface CancelledTransaction {
     readonly transaction: string;
     readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
 }
 
 export class TransactionFactory {
     public debug: boolean = false;
 
     private readonly DUMMY_PUBKEY = Buffer.alloc(32, 1);
-    private readonly P2TR_SCRIPT = Buffer.concat([
-        Buffer.from([0x51, 0x20]), // OP_1 + 32 bytes
-        this.DUMMY_PUBKEY,
-    ]);
+    private readonly P2TR_SCRIPT = Buffer.concat([Buffer.from([0x51, 0x20]), this.DUMMY_PUBKEY]);
     private readonly INITIAL_FUNDING_ESTIMATE = 2000n;
     private readonly MAX_ITERATIONS = 10;
 
+    /**
+     * @description Creates a cancellable transaction.
+     * @param {ICancelTransactionParameters | ICancelTransactionParametersWithoutSigner} params - The cancel transaction parameters
+     * @returns {Promise<CancelledTransaction>} - The cancelled transaction result
+     */
     public async createCancellableTransaction(
         params: ICancelTransactionParameters | ICancelTransactionParametersWithoutSigner,
     ): Promise<CancelledTransaction> {
@@ -115,16 +120,18 @@ export class TransactionFactory {
         return {
             transaction: rawTx,
             nextUTXOs: this.getUTXOAsTransaction(signed, params.from, 0),
+            inputUtxos: params.utxos,
         };
     }
 
     /**
      * @description Generate a transaction with a custom script.
-     * @returns {Promise<[string, string]>} - The signed transaction
+     * @param {ICustomTransactionParameters | ICustomTransactionWithoutSigner} interactionParameters - The custom transaction parameters
+     * @returns {Promise<[string, string, UTXO[], UTXO[]]>} - The signed transaction tuple [fundingTx, customTx, nextUTXOs, inputUtxos]
      */
     public async createCustomScriptTransaction(
         interactionParameters: ICustomTransactionParameters | ICustomTransactionWithoutSigner,
-    ): Promise<[string, string, UTXO[]]> {
+    ): Promise<[string, string, UTXO[], UTXO[]]> {
         if (!interactionParameters.to) {
             throw new Error('Field "to" not provided.');
         }
@@ -140,7 +147,6 @@ export class TransactionFactory {
 
         const inputs = this.parseOptionalInputs(interactionParameters.optionalInputs);
 
-        // Use common iteration logic
         const { finalTransaction, estimatedAmount, challenge } = await this.iterateFundingAmount(
             { ...interactionParameters, optionalInputs: inputs },
             CustomScriptTransaction,
@@ -159,7 +165,6 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount = estimatedAmount;
 
-        // Create funding transaction
         const feeEstimationFunding = await this.createFundTransaction({
             ...parameters,
             optionalOutputs: [],
@@ -199,11 +204,13 @@ export class TransactionFactory {
             signedTransaction.tx.toHex(),
             outTx.toHex(),
             this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.from, 1),
+            interactionParameters.utxos,
         ];
     }
 
     /**
      * @description Generates the required transactions.
+     * @param {IInteractionParameters | InteractionParametersWithoutSigner} interactionParameters - The interaction parameters
      * @returns {Promise<InteractionResponse>} - The signed transaction
      */
     public async signInteraction(
@@ -235,7 +242,6 @@ export class TransactionFactory {
 
         const inputs = this.parseOptionalInputs(interactionParameters.optionalInputs);
 
-        // Use common iteration logic
         const { finalTransaction, estimatedAmount, challenge } = await this.iterateFundingAmount(
             { ...interactionParameters, optionalInputs: inputs },
             InteractionTransaction,
@@ -310,6 +316,7 @@ export class TransactionFactory {
             ),
             challenge: challenge.toRaw(),
             fundingUTXOs: fundingUTXO,
+            fundingInputUtxos: interactionParameters.utxos,
             compiledTargetScript: interactionTx.exportCompiledTargetScript().toString('hex'),
         };
     }
@@ -333,7 +340,6 @@ export class TransactionFactory {
 
         const inputs = this.parseOptionalInputs(deploymentParameters.optionalInputs);
 
-        // Use common iteration logic
         const { finalTransaction, estimatedAmount, challenge } = await this.iterateFundingAmount(
             { ...deploymentParameters, optionalInputs: inputs },
             DeploymentTransaction,
@@ -421,13 +427,14 @@ export class TransactionFactory {
             contractPubKey: deploymentTx.contractPubKey,
             utxos: [refundUTXO],
             challenge: challenge.toRaw(),
+            inputUtxos: deploymentParameters.utxos,
         };
     }
 
     /**
      * @description Creates a funding transaction.
      * @param {IFundingTransactionParameters} parameters - The funding transaction parameters
-     * @returns {Promise<{ estimatedFees: bigint; tx: string }>} - The signed transaction
+     * @returns {Promise<BitcoinTransferResponse>} - The signed transaction
      */
     public async createBTCTransfer(
         parameters: IFundingTransactionParameters,
@@ -442,6 +449,7 @@ export class TransactionFactory {
             original: resp.original,
             tx: resp.tx.toHex(),
             nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
+            inputUtxos: parameters.utxos,
         };
     }
 
@@ -450,6 +458,7 @@ export class TransactionFactory {
      * @param {TransactionBuilder<TransactionType>} original - The original transaction
      * @param {Transaction} tx - The transaction
      * @param {string} to - The address to filter
+     * @returns {UTXO[]} - The new UTXOs belonging to the specified address
      */
     public getAllNewUTXOs(
         original: TransactionBuilder<TransactionType>,
@@ -473,6 +482,11 @@ export class TransactionFactory {
         return utxos;
     }
 
+    /**
+     * Parse optional inputs and normalize nonWitnessUtxo format.
+     * @param {UTXO[]} optionalInputs - The optional inputs to parse
+     * @returns {UTXO[]} - The parsed inputs with normalized nonWitnessUtxo
+     */
     private parseOptionalInputs(optionalInputs?: UTXO[]): UTXO[] {
         return (optionalInputs || []).map((input) => {
             let nonWitness = input.nonWitnessUtxo;
@@ -495,6 +509,11 @@ export class TransactionFactory {
         });
     }
 
+    /**
+     * Detect and use OP_WALLET for cancel transactions if available.
+     * @param {ICancelTransactionParameters | ICancelTransactionParametersWithoutSigner} interactionParameters - The cancel parameters
+     * @returns {Promise<CancelledTransaction | null>} - The cancelled transaction or null if OP_WALLET not available
+     */
     private async detectCancelOPWallet(
         interactionParameters:
             | ICancelTransactionParameters
@@ -512,7 +531,6 @@ export class TransactionFactory {
         const opnet = _window.opnet.web3;
         const interaction = await opnet.cancelTransaction({
             ...interactionParameters,
-
             // @ts-expect-error no, this is ok
             signer: undefined,
         });
@@ -521,9 +539,17 @@ export class TransactionFactory {
             throw new Error('Could not sign interaction transaction.');
         }
 
-        return interaction;
+        return {
+            ...interaction,
+            inputUtxos: interaction.inputUtxos ?? interactionParameters.utxos,
+        };
     }
 
+    /**
+     * Detect and use OP_WALLET for interaction transactions if available.
+     * @param {IInteractionParameters | InteractionParametersWithoutSigner} interactionParameters - The interaction parameters
+     * @returns {Promise<InteractionResponse | null>} - The interaction response or null if OP_WALLET not available
+     */
     private async detectInteractionOPWallet(
         interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner,
     ): Promise<InteractionResponse | null> {
@@ -539,7 +565,6 @@ export class TransactionFactory {
         const opnet = _window.opnet.web3;
         const interaction = await opnet.signInteraction({
             ...interactionParameters,
-
             // @ts-expect-error no, this is ok
             signer: undefined,
         });
@@ -548,9 +573,17 @@ export class TransactionFactory {
             throw new Error('Could not sign interaction transaction.');
         }
 
-        return interaction;
+        return {
+            ...interaction,
+            fundingInputUtxos: interaction.fundingInputUtxos ?? interactionParameters.utxos,
+        };
     }
 
+    /**
+     * Detect and use OP_WALLET for deployment transactions if available.
+     * @param {IDeploymentParameters | IDeploymentParametersWithoutSigner} deploymentParameters - The deployment parameters
+     * @returns {Promise<DeploymentResult | null>} - The deployment result or null if OP_WALLET not available
+     */
     private async detectDeploymentOPWallet(
         deploymentParameters: IDeploymentParameters | IDeploymentParametersWithoutSigner,
     ): Promise<DeploymentResult | null> {
@@ -566,7 +599,6 @@ export class TransactionFactory {
         const opnet = _window.opnet.web3;
         const deployment = await opnet.deployContract({
             ...deploymentParameters,
-
             // @ts-expect-error no, this is ok
             signer: undefined,
         });
@@ -575,9 +607,17 @@ export class TransactionFactory {
             throw new Error('Could not sign interaction transaction.');
         }
 
-        return deployment;
+        return {
+            ...deployment,
+            inputUtxos: deployment.inputUtxos ?? deploymentParameters.utxos,
+        };
     }
 
+    /**
+     * Create and sign a funding transaction.
+     * @param {IFundingTransactionParameters} parameters - The funding transaction parameters
+     * @returns {Promise<FundingTransactionResponse>} - The funding transaction response
+     */
     private async createFundTransaction(
         parameters: IFundingTransactionParameters,
     ): Promise<FundingTransactionResponse> {
@@ -594,6 +634,7 @@ export class TransactionFactory {
             original: fundingTransaction,
             estimatedFees: fundingTransaction.estimatedFees,
             nextUTXOs: this.getUTXOAsTransaction(signedTransaction, parameters.to, 0),
+            inputUtxos: parameters.utxos,
         };
     }
 
@@ -604,13 +645,19 @@ export class TransactionFactory {
      * if any of them are P2WDA addresses. P2WDA detection is based on the
      * witness script pattern: (OP_2DROP * 5) <pubkey> OP_CHECKSIG
      *
-     * @param utxos The main UTXOs to check
-     * @returns true if any UTXO is P2WDA, false otherwise
+     * @param {UTXO[]} utxos - The main UTXOs to check
+     * @returns {boolean} - true if any UTXO is P2WDA, false otherwise
      */
     private hasP2WDAInputs(utxos: UTXO[]): boolean {
         return utxos.some((utxo) => P2WDADetector.isP2WDAUTXO(utxo));
     }
 
+    /**
+     * Write PSBT header with type and consensus version.
+     * @param {PSBTTypes} type - The PSBT type
+     * @param {string} psbt - The base64 encoded PSBT
+     * @returns {string} - The hex encoded PSBT with header
+     */
     private writePSBTHeader(type: PSBTTypes, psbt: string): string {
         const buf = Buffer.from(psbt, 'base64');
 
@@ -635,8 +682,8 @@ export class TransactionFactory {
      * - 75% cost reduction for data storage
      * - No separate funding transaction needed
      *
-     * @param interactionParameters The interaction parameters
-     * @returns The signed P2WDA interaction response
+     * @param {IInteractionParameters | InteractionParametersWithoutSigner} interactionParameters - The interaction parameters
+     * @returns {Promise<InteractionResponse>} - The signed P2WDA interaction response
      */
     private async signP2WDAInteraction(
         interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner,
@@ -645,7 +692,6 @@ export class TransactionFactory {
             throw new Error('Field "from" not provided.');
         }
 
-        // Ensure we have a signer for P2WDA
         if (!('signer' in interactionParameters)) {
             throw new Error(
                 'P2WDA interactions require a signer. OP_WALLET is not supported for P2WDA.',
@@ -669,14 +715,20 @@ export class TransactionFactory {
             nextUTXOs: this.getUTXOAsTransaction(
                 signedTx,
                 interactionParameters.from,
-                signedTx.outs.length - 1, // Last output is typically the change
+                signedTx.outs.length - 1,
             ),
             fundingUTXOs: [...interactionParameters.utxos, ...inputs],
+            fundingInputUtxos: interactionParameters.utxos,
             challenge: interactionParameters.challenge.toRaw(),
             compiledTargetScript: null,
         };
     }
 
+    /**
+     * Get the priority fee from transaction parameters.
+     * @param {ITransactionParameters} params - The transaction parameters
+     * @returns {bigint} - The priority fee, minimum dust if below threshold
+     */
     private getPriorityFee(params: ITransactionParameters): bigint {
         const totalFee = params.priorityFee + params.gasSatFee;
         if (totalFee < TransactionBuilder.MINIMUM_DUST) {
@@ -687,7 +739,16 @@ export class TransactionFactory {
     }
 
     /**
-     * Common iteration logic for finding the correct funding amount
+     * Common iteration logic for finding the correct funding amount.
+     *
+     * This method iteratively estimates the required funding amount by simulating
+     * transactions until the amount converges or max iterations is reached.
+     *
+     * @param {P} params - The transaction parameters
+     * @param {new (params: P) => T} TransactionClass - The transaction class constructor
+     * @param {(tx: T) => Promise<bigint>} calculateAmount - Function to calculate required amount
+     * @param {string} debugPrefix - Prefix for debug logging
+     * @returns {Promise<{finalTransaction: T, estimatedAmount: bigint, challenge: ChallengeSolution | null}>} - The final transaction and estimated amount
      */
     private async iterateFundingAmount<
         T extends InteractionTransaction | DeploymentTransaction | CustomScriptTransaction,
@@ -732,14 +793,13 @@ export class TransactionFactory {
                 nonWitnessUtxo: dummyTx.toBuffer(),
             };
 
-            // Build transaction params - TypeScript needs explicit typing here
             let txParams: P;
             if ('challenge' in params && params.challenge) {
                 const withChallenge = {
                     ...params,
                     utxos: [simulatedFundedUtxo],
                     randomBytes: randomBytes,
-                    challenge: challenge ?? params.challenge, // Use existing or original
+                    challenge: challenge ?? params.challenge,
                 };
                 txParams = withChallenge as P;
             } else {
@@ -776,7 +836,6 @@ export class TransactionFactory {
 
             finalPreTransaction = preTransaction;
 
-            // Extract challenge with explicit typing
             if (
                 'getChallenge' in preTransaction &&
                 typeof preTransaction.getChallenge === 'function'
@@ -804,6 +863,13 @@ export class TransactionFactory {
         };
     }
 
+    /**
+     * Convert a transaction output to a UTXO.
+     * @param {Transaction} tx - The transaction
+     * @param {string} to - The address
+     * @param {number} index - The output index
+     * @returns {UTXO[]} - The UTXO array (empty if output doesn't exist)
+     */
     private getUTXOAsTransaction(tx: Transaction, to: string, index: number): UTXO[] {
         if (!tx.outs[index]) return [];