@btc-vision/transaction 1.3.2 → 1.3.3

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

@@ -28,6 +28,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected priorityFee: bigint;
     protected gasSatFee: bigint;
     protected utxos: UTXO[];
+    protected optionalInputs: UTXO[];
     protected to: string | undefined;
     protected from: string;
     protected _maximumFeeRate: number;

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

@@ -8,6 +8,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     utxos: UTXO[];
     nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
+    optionalInputs?: UTXO[];
     optionalOutputs?: PsbtOutputExtended[];
     chainId?: ChainId;
     readonly feeRate: number;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.2";
+export declare const version = "1.3.3";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.3.2';
+export const version = '1.3.3';

package/build/transaction/TransactionFactory.js

@@ -24,7 +24,11 @@ export class TransactionFactory {
             (await preTransaction.estimateTransactionFees()) +
                 this.getPriorityFee(interactionParameters) +
                 preTransaction.getOptionalOutputValue();
-        const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
+        const feeEstimationFundingTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+            optionalInputs: [],
+        });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
@@ -80,6 +84,7 @@ export class TransactionFactory {
         const feeEstimationFundingTransaction = await this.createFundTransaction({
             ...parameters,
             optionalOutputs: [],
+            optionalInputs: [],
         });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -88,6 +93,7 @@ export class TransactionFactory {
         const signedTransaction = await this.createFundTransaction({
             ...parameters,
             optionalOutputs: [],
+            optionalInputs: [],
         });
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -119,7 +125,11 @@ export class TransactionFactory {
             (await preTransaction.estimateTransactionFees()) +
                 this.getPriorityFee(deploymentParameters) +
                 preTransaction.getOptionalOutputValue();
-        const fundingTransaction = new FundingTransaction(parameters);
+        const fundingTransaction = new FundingTransaction({
+            ...parameters,
+            optionalInputs: [],
+            optionalOutputs: [],
+        });
         const signedTransaction = await fundingTransaction.signTransaction();
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -141,6 +151,7 @@ export class TransactionFactory {
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
             optionalOutputs: [],
+            optionalInputs: [],
         };
         const finalTransaction = new DeploymentTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();

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

@@ -28,6 +28,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected priorityFee: bigint;
     protected gasSatFee: bigint;
     protected utxos: UTXO[];
+    protected optionalInputs: UTXO[];
     protected to: string | undefined;
     protected from: string;
     protected _maximumFeeRate: number;

package/build/transaction/builders/TransactionBuilder.js

@@ -26,6 +26,7 @@ export class TransactionBuilder extends TweakedTransaction {
         this.priorityFee = parameters.priorityFee ?? 0n;
         this.gasSatFee = parameters.gasSatFee ?? 0n;
         this.utxos = parameters.utxos;
+        this.optionalInputs = parameters.optionalInputs || [];
         this.to = parameters.to || undefined;
         this.isPubKeyDestination = this.to
             ? AddressVerificator.isValidPublicKey(this.to, this.network)
@@ -81,6 +82,7 @@ export class TransactionBuilder extends TweakedTransaction {
             from: this.from,
             amount: this.estimatedFees,
             optionalOutputs: this.optionalOutputs,
+            optionalInputs: this.optionalInputs,
         };
     }
     setDestinationAddress(address) {
@@ -254,6 +256,9 @@ export class TransactionBuilder extends TweakedTransaction {
         for (const utxo of this.utxos) {
             total += utxo.value;
         }
+        for (const utxo of this.optionalInputs) {
+            total += utxo.value;
+        }
         return total;
     }
     calculateTotalVOutAmount() {
@@ -261,6 +266,9 @@ export class TransactionBuilder extends TweakedTransaction {
         for (const utxo of this.utxos) {
             total += utxo.value;
         }
+        for (const utxo of this.optionalInputs) {
+            total += utxo.value;
+        }
         return total;
     }
     addOptionalOutputsAndGetAmount() {
@@ -284,6 +292,13 @@ export class TransactionBuilder extends TweakedTransaction {
                 this.addInput(input);
             }
         }
+        if (this.optionalInputs) {
+            for (let i = 0; i < this.optionalInputs.length; i++) {
+                const utxo = this.optionalInputs[i];
+                const input = this.generatePsbtInputExtended(utxo, i);
+                this.addInput(input);
+            }
+        }
     }
     internalInit() {
         this.verifyUTXOValidity();
@@ -313,6 +328,11 @@ export class TransactionBuilder extends TweakedTransaction {
                 throw new Error('Address is required');
             }
         }
+        for (const utxo of this.optionalInputs) {
+            if (!utxo.scriptPubKey) {
+                throw new Error('Address is required');
+            }
+        }
     }
     async setFeeOutput(output) {
         const initialValue = output.value;

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

@@ -8,6 +8,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     utxos: UTXO[];
     nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
+    optionalInputs?: UTXO[];
     optionalOutputs?: PsbtOutputExtended[];
     chainId?: ChainId;
     readonly feeRate: number;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "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.3.2';
+export const version = '1.3.3';

package/src/transaction/TransactionFactory.ts

@@ -103,7 +103,12 @@ export class TransactionFactory {
             this.getPriorityFee(interactionParameters) +
             preTransaction.getOptionalOutputValue();
 
-        const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
+        const feeEstimationFundingTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+            optionalInputs: [],
+        });
+
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
@@ -189,7 +194,9 @@ export class TransactionFactory {
         const feeEstimationFundingTransaction = await this.createFundTransaction({
             ...parameters,
             optionalOutputs: [],
+            optionalInputs: [],
         });
+
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
@@ -199,7 +206,9 @@ export class TransactionFactory {
         const signedTransaction = await this.createFundTransaction({
             ...parameters,
             optionalOutputs: [],
+            optionalInputs: [],
         });
+
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
@@ -259,7 +268,12 @@ export class TransactionFactory {
             this.getPriorityFee(deploymentParameters) +
             preTransaction.getOptionalOutputValue();
 
-        const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
+        const fundingTransaction: FundingTransaction = new FundingTransaction({
+            ...parameters,
+            optionalInputs: [],
+            optionalOutputs: [],
+        });
+
         const signedTransaction: Transaction = await fundingTransaction.signTransaction();
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -283,6 +297,7 @@ export class TransactionFactory {
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
             optionalOutputs: [],
+            optionalInputs: [],
         };
 
         const finalTransaction: DeploymentTransaction = new DeploymentTransaction(newParams);

package/src/transaction/builders/TransactionBuilder.ts

@@ -118,6 +118,12 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      */
     protected utxos: UTXO[];
 
+    /**
+     * @description The inputs of the transaction
+     * @protected
+     */
+    protected optionalInputs: UTXO[];
+
     /**
      * @description The address where the transaction is sent to
      * @protected
@@ -154,6 +160,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.priorityFee = parameters.priorityFee ?? 0n;
         this.gasSatFee = parameters.gasSatFee ?? 0n;
         this.utxos = parameters.utxos;
+        this.optionalInputs = parameters.optionalInputs || [];
         this.to = parameters.to || undefined;
 
         this.isPubKeyDestination = this.to
@@ -236,6 +243,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             from: this.from,
             amount: this.estimatedFees,
             optionalOutputs: this.optionalOutputs,
+            optionalInputs: this.optionalInputs,
         };
     }
 
@@ -551,6 +559,11 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         for (const utxo of this.utxos) {
             total += utxo.value;
         }
+
+        for (const utxo of this.optionalInputs) {
+            total += utxo.value;
+        }
+
         return total;
     }
 
@@ -565,6 +578,10 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             total += utxo.value;
         }
 
+        for (const utxo of this.optionalInputs) {
+            total += utxo.value;
+        }
+
         return total;
     }
 
@@ -607,6 +624,15 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 this.addInput(input);
             }
         }
+
+        if (this.optionalInputs) {
+            for (let i = 0; i < this.optionalInputs.length; i++) {
+                const utxo = this.optionalInputs[i];
+                const input = this.generatePsbtInputExtended(utxo, i);
+
+                this.addInput(input);
+            }
+        }
     }
 
     /**
@@ -676,6 +702,12 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 throw new Error('Address is required');
             }
         }
+
+        for (const utxo of this.optionalInputs) {
+            if (!utxo.scriptPubKey) {
+                throw new Error('Address is required');
+            }
+        }
     }
 
     /**

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -11,7 +11,8 @@ export interface ITransactionParameters extends ITweakedTransactionData {
 
     nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
-
+    
+    optionalInputs?: UTXO[];
     optionalOutputs?: PsbtOutputExtended[];
 
     chainId?: ChainId;