@btc-vision/transaction 1.0.88 → 1.0.89

package/src/transaction/builders/FundingTransaction.ts

@@ -6,13 +6,13 @@ import { TransactionBuilder } from './TransactionBuilder.js';
 export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     public readonly type: TransactionType.FUNDING = TransactionType.FUNDING;
 
-    protected childTransactionRequiredFees: bigint;
+    protected amount: bigint;
     protected splitInputsInto: number;
 
     constructor(parameters: IFundingTransactionParameters) {
         super(parameters);
 
-        this.childTransactionRequiredFees = parameters.amount;
+        this.amount = parameters.amount;
         this.splitInputsInto = parameters.splitInputsInto ?? 1;
 
         this.internalInit();
@@ -25,10 +25,16 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
 
         this.addInputsFromUTXO();
 
-        const amountSpent: bigint =
-            this.getTransactionOPNetFee() + this.childTransactionRequiredFees;
+        let amountSpent: bigint = this.amount;
+        if (this.getTransactionOPNetFee() === TransactionBuilder.MINIMUM_DUST) {
+            if (amountSpent < TransactionBuilder.MINIMUM_DUST) {
+                amountSpent += TransactionBuilder.MINIMUM_DUST;
+            }
+        } else {
+            amountSpent += this.getTransactionOPNetFee();
+        }
 
-        if(this.splitInputsInto > 1) {
+        if (this.splitInputsInto > 1) {
             await this.splitInputs(amountSpent);
         } else {
             this.addOutput({

package/src/transaction/builders/TransactionBuilder.ts

@@ -119,6 +119,10 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
 
+        if (!this.utxos.length) {
+            throw new Error('No UTXOs specified');
+        }
+
         this.from = TransactionBuilder.getFrom(
             parameters.from,
             this.signer as ECPairInterface,
@@ -372,6 +376,27 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.transaction = psbt;
     }
 
+    /**
+     * Returns the inputs of the transaction.
+     * @protected
+     * @returns {PsbtInputExtended[]}
+     */
+    public getInputs(): PsbtInputExtended[] {
+        return this.inputs;
+    }
+
+    /**
+     * Returns the outputs of the transaction.
+     * @protected
+     * @returns {PsbtOutputExtended[]}
+     */
+    public getOutputs(): PsbtOutputExtended[] {
+        const outputs: PsbtOutputExtended[] = [...this.outputs];
+        if (this.feeOutput) outputs.push(this.feeOutput);
+
+        return outputs;
+    }
+
     /**
      * @description Adds the refund output to the transaction
      * @param {bigint} amountSpent - The amount spent
@@ -381,6 +406,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
     protected async addRefundOutput(amountSpent: bigint): Promise<void> {
         /** Add the refund output */
         const sendBackAmount: bigint = this.totalInputAmount - amountSpent;
+
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
             if (AddressVerificator.isValidP2TRAddress(this.from, this.network)) {
                 await this.setFeeOutput({
@@ -548,27 +574,6 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         return this.tapData.output;
     }
 
-    /**
-     * Returns the inputs of the transaction.
-     * @protected
-     * @returns {PsbtInputExtended[]}
-     */
-    protected getInputs(): PsbtInputExtended[] {
-        return this.inputs;
-    }
-
-    /**
-     * Returns the outputs of the transaction.
-     * @protected
-     * @returns {PsbtOutputExtended[]}
-     */
-    protected getOutputs(): PsbtOutputExtended[] {
-        const outputs: PsbtOutputExtended[] = [...this.outputs];
-        if (this.feeOutput) outputs.push(this.feeOutput);
-
-        return outputs;
-    }
-
     /**
      * Verifies that the utxos are valid.
      * @protected