@btc-vision/transaction 1.0.91 → 1.0.92

package/browser/transaction/TransactionFactory.d.ts

@@ -40,7 +40,7 @@ export declare class TransactionFactory {
     constructor();
     signInteraction(interactionParameters: IInteractionParameters): Promise<[string, string, UTXO[]]>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
-    wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
+    wrap(wrapParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;

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

@@ -13,7 +13,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     estimatedFees?: bigint;
     chainId?: ChainId;
     readonly feeRate: number;
-    readonly priorityFee?: bigint;
+    readonly priorityFee: bigint;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
     amount: bigint;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.91";
+export declare const version = "1.0.92";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.91';
+export const version = '1.0.92';

package/build/transaction/TransactionFactory.d.ts

@@ -40,7 +40,7 @@ export declare class TransactionFactory {
     constructor();
     signInteraction(interactionParameters: IInteractionParameters): Promise<[string, string, UTXO[]]>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
-    wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
+    wrap(wrapParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;

package/build/transaction/TransactionFactory.js

@@ -93,21 +93,23 @@ export class TransactionFactory {
             utxos: [refundUTXO],
         };
     }
-    async wrap(warpParameters) {
-        if (warpParameters.amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
-            throw new Error(`Amount is too low. Minimum consolidation is ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT} sat. Received ${warpParameters.amount} sat. Make sure that you cover the unwrap consolidation fees of ${currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT}sat.`);
+    async wrap(wrapParameters) {
+        if (wrapParameters.amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
+            throw new Error(`Amount is too low. Minimum consolidation is ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT} sat. Received ${wrapParameters.amount} sat. Make sure that you cover the unwrap consolidation fees of ${currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT}sat.`);
         }
-        const childTransactionRequiredValue = warpParameters.amount + currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
-        const wbtc = new wBTC(warpParameters.network, warpParameters.chainId);
+        const childTransactionRequiredValue = wrapParameters.amount +
+            currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
+            (wrapParameters.priorityFee || 300n);
+        const wbtc = new wBTC(wrapParameters.network, wrapParameters.chainId);
         const to = wbtc.getAddress();
         const fundingParameters = {
-            ...warpParameters,
+            ...wrapParameters,
             amount: childTransactionRequiredValue,
-            to: warpParameters.to ?? to,
+            to: wrapParameters.to ?? to,
         };
         const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        warpParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
-        const preTransaction = new WrapTransaction(warpParameters);
+        wrapParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
+        const preTransaction = new WrapTransaction(wrapParameters);
         await preTransaction.signTransaction();
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.amount += childTransactionRequiredValue;
@@ -117,7 +119,7 @@ export class TransactionFactory {
             throw new Error('Could not sign funding transaction.');
         }
         const newParams = {
-            ...warpParameters,
+            ...wrapParameters,
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, to, 0),
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
@@ -129,7 +131,7 @@ export class TransactionFactory {
             vaultAddress: finalTransaction.vault,
             amount: finalTransaction.amount,
             receiverAddress: finalTransaction.receiver,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, warpParameters.from, 1),
+            utxos: this.getUTXOAsTransaction(signedTransaction.tx, wrapParameters.from, 1),
         };
     }
     async unwrapSegwit(unwrapParameters) {

package/build/transaction/builders/TransactionBuilder.js

@@ -110,7 +110,7 @@ export class TransactionBuilder extends TweakedTransaction {
             if (this.regenerated) {
                 throw new Error('Transaction was regenerated');
             }
-            return this.transaction.extractTransaction(false);
+            return this.transaction.extractTransaction(true, true);
         }
         throw new Error('Could not sign transaction');
     }
@@ -292,7 +292,7 @@ export class TransactionBuilder extends TweakedTransaction {
         if (output.value < TransactionBuilder.MINIMUM_DUST) {
             this.feeOutput = null;
             if (output.value < 0) {
-                throw new Error(`setFeeOutput: Insufficient funds to pay the fees. Fee: ${fee} > Value: ${initialValue}. Total input: ${this.totalInputAmount} sat`);
+                throw new Error(`setFeeOutput: Insufficient funds to pay the fees. Fee: ${fee} < Value: ${initialValue}. Total input: ${this.totalInputAmount} sat`);
             }
         }
         else {

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

@@ -13,7 +13,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     estimatedFees?: bigint;
     chainId?: ChainId;
     readonly feeRate: number;
-    readonly priorityFee?: bigint;
+    readonly priorityFee: bigint;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
     amount: bigint;

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.91",
+    "version": "1.0.92",
     "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.0.91';
+export const version = '1.0.92';

package/src/transaction/TransactionFactory.ts

@@ -207,32 +207,34 @@ export class TransactionFactory {
 
     /**
      * Basically it's fun to manage UTXOs.
-     * @param {IWrapParameters} warpParameters - The wrap parameters
+     * @param {IWrapParameters} wrapParameters - The wrap parameters
      * @returns {Promise<WrapResult>} - The signed transaction
      * @throws {Error} - If the transaction could not be signed
      */
-    public async wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult> {
-        if (warpParameters.amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
+    public async wrap(wrapParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult> {
+        if (wrapParameters.amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
             throw new Error(
-                `Amount is too low. Minimum consolidation is ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT} sat. Received ${warpParameters.amount} sat. Make sure that you cover the unwrap consolidation fees of ${currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT}sat.`,
+                `Amount is too low. Minimum consolidation is ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT} sat. Received ${wrapParameters.amount} sat. Make sure that you cover the unwrap consolidation fees of ${currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT}sat.`,
             );
         }
 
         const childTransactionRequiredValue: bigint =
-            warpParameters.amount + currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
+            wrapParameters.amount +
+            currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
+            (wrapParameters.priorityFee || 300n);
 
-        const wbtc: wBTC = new wBTC(warpParameters.network, warpParameters.chainId);
+        const wbtc: wBTC = new wBTC(wrapParameters.network, wrapParameters.chainId);
         const to = wbtc.getAddress();
         const fundingParameters: IFundingTransactionParameters = {
-            ...warpParameters,
+            ...wrapParameters,
             amount: childTransactionRequiredValue,
-            to: warpParameters.to ?? to,
+            to: wrapParameters.to ?? to,
         };
 
         const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        warpParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
+        wrapParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
 
-        const preTransaction: WrapTransaction = new WrapTransaction(warpParameters);
+        const preTransaction: WrapTransaction = new WrapTransaction(wrapParameters);
 
         // Initial generation
         await preTransaction.signTransaction();
@@ -250,7 +252,7 @@ export class TransactionFactory {
         }
 
         const newParams: IWrapParameters = {
-            ...warpParameters,
+            ...wrapParameters,
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, to, 0), // always 0
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
@@ -265,7 +267,7 @@ export class TransactionFactory {
             vaultAddress: finalTransaction.vault,
             amount: finalTransaction.amount,
             receiverAddress: finalTransaction.receiver,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, warpParameters.from, 1),
+            utxos: this.getUTXOAsTransaction(signedTransaction.tx, wrapParameters.from, 1),
         };
     }
 

package/src/transaction/builders/TransactionBuilder.ts

@@ -243,7 +243,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 throw new Error('Transaction was regenerated');
             }
 
-            return this.transaction.extractTransaction(false);
+            return this.transaction.extractTransaction(true, true);
         }
 
         throw new Error('Could not sign transaction');
@@ -607,7 +607,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
             if (output.value < 0) {
                 throw new Error(
-                    `setFeeOutput: Insufficient funds to pay the fees. Fee: ${fee} > Value: ${initialValue}. Total input: ${this.totalInputAmount} sat`,
+                    `setFeeOutput: Insufficient funds to pay the fees. Fee: ${fee} < Value: ${initialValue}. Total input: ${this.totalInputAmount} sat`,
                 );
             }
         } else {

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -16,7 +16,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     chainId?: ChainId;
 
     readonly feeRate: number;
-    readonly priorityFee?: bigint;
+    readonly priorityFee: bigint;
 }
 
 export interface IFundingTransactionParameters extends ITransactionParameters {