@btc-vision/transaction 1.0.44 → 1.0.45

package/src/transaction/builders/FundingTransaction.ts

@@ -1,40 +1,40 @@
-import { TransactionType } from '../enums/TransactionType.js';
-import { IFundingTransactionParameters } from '../interfaces/ITransactionParameters.js';
-import { Signer } from 'bitcoinjs-lib';
-import { TransactionBuilder } from './TransactionBuilder.js';
-
-export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
-    public readonly type: TransactionType.FUNDING = TransactionType.FUNDING;
-
-    protected childTransactionRequiredFees: bigint;
-
-    constructor(parameters: IFundingTransactionParameters) {
-        super(parameters);
-
-        this.childTransactionRequiredFees = parameters.childTransactionRequiredValue;
-
-        this.internalInit();
-    }
-
-    protected override async buildTransaction(): Promise<void> {
-        if (!this.to) {
-            throw new Error('Recipient address is required');
-        }
-
-        this.addInputsFromUTXO();
-
-        const amountSpent: bigint =
-            this.getTransactionOPNetFee() + this.childTransactionRequiredFees;
-
-        this.addOutput({
-            value: Number(amountSpent),
-            address: this.to,
-        });
-
-        await this.addRefundOutput(amountSpent);
-    }
-
-    protected override getSignerKey(): Signer {
-        return this.signer;
-    }
-}
+import { TransactionType } from '../enums/TransactionType.js';
+import { IFundingTransactionParameters } from '../interfaces/ITransactionParameters.js';
+import { Signer } from 'bitcoinjs-lib';
+import { TransactionBuilder } from './TransactionBuilder.js';
+
+export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
+    public readonly type: TransactionType.FUNDING = TransactionType.FUNDING;
+
+    protected childTransactionRequiredFees: bigint;
+
+    constructor(parameters: IFundingTransactionParameters) {
+        super(parameters);
+
+        this.childTransactionRequiredFees = parameters.amount;
+
+        this.internalInit();
+    }
+
+    protected override async buildTransaction(): Promise<void> {
+        if (!this.to) {
+            throw new Error('Recipient address is required');
+        }
+
+        this.addInputsFromUTXO();
+
+        const amountSpent: bigint =
+            this.getTransactionOPNetFee() + this.childTransactionRequiredFees;
+
+        this.addOutput({
+            value: Number(amountSpent),
+            address: this.to,
+        });
+
+        await this.addRefundOutput(amountSpent);
+    }
+
+    protected override getSignerKey(): Signer {
+        return this.signer;
+    }
+}

package/src/transaction/builders/InteractionTransaction.ts

@@ -31,7 +31,7 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
             this.calldata,
             this.contractSecret,
         );
-
+        
         this.scriptTree = this.getScriptTree();
         this.internalInit();
     }

package/src/transaction/builders/TransactionBuilder.ts

@@ -182,8 +182,8 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
     }
 
     public async getFundingTransactionParameters(): Promise<IFundingTransactionParameters> {
-        if (!this.transactionFee) {
-            this.transactionFee = await this.estimateTransactionFees();
+        if (!this.estimatedFees) {
+            this.estimatedFees = await this.estimateTransactionFees();
         }
 
         return {
@@ -194,7 +194,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             feeRate: this.feeRate,
             priorityFee: this.priorityFee,
             from: this.from,
-            childTransactionRequiredValue: this.transactionFee,
+            amount: this.estimatedFees,
         };
     }
 
@@ -245,6 +245,34 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         throw new Error('Could not sign transaction');
     }
 
+    /**
+     * @description Generates the transaction minimal signatures
+     * @public
+     */
+    public async generateTransactionMinimalSignatures(): Promise<void> {
+        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: PsbtInputExtended[] = this.getInputs();
+            const outputs: PsbtOutputExtended[] = 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);
+        }
+    }
+
     /**
      * @description Signs the transaction
      * @public
@@ -317,9 +345,9 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
         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: number = this.feeRate * size + 1;
+            const fee: number = this.feeRate * size;
 
             this.estimatedFees = BigInt(Math.ceil(fee) + 1);
 

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -17,7 +17,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
 }
 
 export interface IFundingTransactionParameters extends ITransactionParameters {
-    childTransactionRequiredValue: bigint;
+    amount: bigint;
 }
 
 export interface SharedInteractionParameters extends ITransactionParameters {

package/src/transaction/shared/TweakedTransaction.ts

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