@btc-vision/transaction 1.0.108 → 1.0.110

package/browser/transaction/TransactionFactory.d.ts

@@ -51,5 +51,6 @@ export declare class TransactionFactory {
     private calculateNumInputs;
     private maxPubKeySize;
     private writePSBTHeader;
+    private getPriorityFee;
     private getUTXOAsTransaction;
 }

package/build/transaction/TransactionFactory.d.ts

@@ -51,5 +51,6 @@ export declare class TransactionFactory {
     private calculateNumInputs;
     private maxPubKeySize;
     private writePSBTHeader;
+    private getPriorityFee;
     private getUTXOAsTransaction;
 }

package/build/transaction/TransactionFactory.js

@@ -4,6 +4,7 @@ import { CustomScriptTransaction, } from './builders/CustomScriptTransaction.js'
 import { DeploymentTransaction } from './builders/DeploymentTransaction.js';
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { InteractionTransaction } from './builders/InteractionTransaction.js';
+import { TransactionBuilder } from './builders/TransactionBuilder.js';
 import { UnwrapSegwitTransaction } from './builders/UnwrapSegwitTransaction.js';
 import { UnwrapTransaction } from './builders/UnwrapTransaction.js';
 import { WrapTransaction } from './builders/WrapTransaction.js';
@@ -24,7 +25,8 @@ export class TransactionFactory {
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
-            (await preTransaction.estimateTransactionFees()) + interactionParameters.priorityFee;
+            (await preTransaction.estimateTransactionFees()) +
+                this.getPriorityFee(interactionParameters);
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -65,7 +67,8 @@ export class TransactionFactory {
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
-            (await preTransaction.estimateTransactionFees()) + interactionParameters.priorityFee;
+            (await preTransaction.estimateTransactionFees()) +
+                this.getPriorityFee(interactionParameters);
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -95,6 +98,9 @@ export class TransactionFactory {
         const preTransaction = new DeploymentTransaction(deploymentParameters);
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
+        parameters.amount =
+            (await preTransaction.estimateTransactionFees()) +
+                this.getPriorityFee(deploymentParameters);
         const fundingTransaction = new FundingTransaction(parameters);
         const signedTransaction = await fundingTransaction.signTransaction();
         if (!signedTransaction) {
@@ -115,7 +121,7 @@ export class TransactionFactory {
             utxos: [newUtxo],
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
-            optionalOutputs: []
+            optionalOutputs: [],
         };
         const finalTransaction = new DeploymentTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();
@@ -142,7 +148,7 @@ export class TransactionFactory {
         }
         const childTransactionRequiredValue = wrapParameters.amount +
             currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
-            (wrapParameters.priorityFee || 330n);
+            this.getPriorityFee(wrapParameters);
         const wbtc = new wBTC(wrapParameters.network, wrapParameters.chainId);
         const to = wbtc.getAddress();
         const fundingParameters = {
@@ -247,7 +253,8 @@ export class TransactionFactory {
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.utxos = fundingParameters.utxos;
         parameters.amount =
-            (await preTransaction.estimateTransactionFees()) + unwrapParameters.priorityFee;
+            (await preTransaction.estimateTransactionFees()) +
+                this.getPriorityFee(unwrapParameters);
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -340,6 +347,12 @@ export class TransactionFactory {
         header.writeUInt8(currentConsensus, 1);
         return Buffer.concat([header, buf]).toString('hex');
     }
+    getPriorityFee(params) {
+        if (params.priorityFee < TransactionBuilder.MINIMUM_DUST) {
+            return TransactionBuilder.MINIMUM_DUST;
+        }
+        return params.priorityFee;
+    }
     getUTXOAsTransaction(tx, to, index) {
         if (!tx.outs[index])
             return [];

package/build/transaction/builders/FundingTransaction.js

@@ -13,25 +13,16 @@ export class FundingTransaction extends TransactionBuilder {
             throw new Error('Recipient address is required');
         }
         this.addInputsFromUTXO();
-        let amountSpent = 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) {
-            this.splitInputs(amountSpent);
+            this.splitInputs(this.amount);
         }
         else {
             this.addOutput({
-                value: Number(amountSpent),
+                value: Number(this.amount),
                 address: this.to,
             });
         }
-        await this.addRefundOutput(amountSpent);
+        await this.addRefundOutput(this.amount);
     }
     splitInputs(amountSpent) {
         if (!this.to) {

package/package.json

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

package/src/transaction/TransactionFactory.ts

@@ -20,6 +20,7 @@ import {
     IDeploymentParameters,
     IFundingTransactionParameters,
     IInteractionParameters,
+    ITransactionParameters,
     IUnwrapParameters,
     IWrapParameters,
 } from './interfaces/ITransactionParameters.js';
@@ -102,7 +103,8 @@ export class TransactionFactory {
 
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
-            (await preTransaction.estimateTransactionFees()) + interactionParameters.priorityFee;
+            (await preTransaction.estimateTransactionFees()) +
+            this.getPriorityFee(interactionParameters);
 
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
@@ -170,7 +172,8 @@ export class TransactionFactory {
 
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
-            (await preTransaction.estimateTransactionFees()) + interactionParameters.priorityFee;
+            (await preTransaction.estimateTransactionFees()) +
+            this.getPriorityFee(interactionParameters);
 
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
@@ -224,7 +227,12 @@ export class TransactionFactory {
         // Initial generation
         await preTransaction.signTransaction();
 
-        const parameters: IFundingTransactionParameters =await preTransaction.getFundingTransactionParameters();
+        const parameters: IFundingTransactionParameters =
+            await preTransaction.getFundingTransactionParameters();
+
+        parameters.amount =
+            (await preTransaction.estimateTransactionFees()) +
+            this.getPriorityFee(deploymentParameters);
 
         const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
         const signedTransaction: Transaction = await fundingTransaction.signTransaction();
@@ -248,7 +256,7 @@ export class TransactionFactory {
             utxos: [newUtxo],
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
-            optionalOutputs: []
+            optionalOutputs: [],
         };
 
         const finalTransaction: DeploymentTransaction = new DeploymentTransaction(newParams);
@@ -291,7 +299,7 @@ export class TransactionFactory {
         const childTransactionRequiredValue: bigint =
             wrapParameters.amount +
             currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
-            (wrapParameters.priorityFee || 330n);
+            this.getPriorityFee(wrapParameters);
 
         const wbtc: wBTC = new wBTC(wrapParameters.network, wrapParameters.chainId);
         const to = wbtc.getAddress();
@@ -458,7 +466,8 @@ export class TransactionFactory {
 
         parameters.utxos = fundingParameters.utxos;
         parameters.amount =
-            (await preTransaction.estimateTransactionFees()) + unwrapParameters.priorityFee;
+            (await preTransaction.estimateTransactionFees()) +
+            this.getPriorityFee(unwrapParameters);
 
         const signedTransaction = await this.createFundTransaction(parameters);
         if (!signedTransaction) {
@@ -596,6 +605,14 @@ export class TransactionFactory {
         return Buffer.concat([header, buf]).toString('hex');
     }
 
+    private getPriorityFee(params: ITransactionParameters): bigint {
+        if (params.priorityFee < TransactionBuilder.MINIMUM_DUST) {
+            return TransactionBuilder.MINIMUM_DUST;
+        }
+
+        return params.priorityFee;
+    }
+
     private getUTXOAsTransaction(tx: Transaction, to: Address, index: number): UTXO[] {
         if (!tx.outs[index]) return [];
 

package/src/transaction/builders/FundingTransaction.ts

@@ -25,25 +25,16 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
 
         this.addInputsFromUTXO();
 
-        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) {
-            this.splitInputs(amountSpent);
+            this.splitInputs(this.amount);
         } else {
             this.addOutput({
-                value: Number(amountSpent),
+                value: Number(this.amount),
                 address: this.to,
             });
         }
 
-        await this.addRefundOutput(amountSpent);
+        await this.addRefundOutput(this.amount);
     }
 
     protected splitInputs(amountSpent: bigint): void {

package/src/transaction/builders/TransactionBuilder.ts

@@ -365,7 +365,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             const fee: number = this.feeRate * size;
 
             this.estimatedFees = BigInt(Math.ceil(fee) + 1);
-            
+
             return this.estimatedFees;
         } else {
             throw new Error(