@btc-vision/transaction 1.0.54 → 1.0.56

package/src/transaction/builders/UnwrapTransaction.ts

@@ -216,21 +216,23 @@ export class UnwrapTransaction extends SharedInteractionTransaction<TransactionT
      * @protected
      */
     protected mergeVaults(): void {
-        const refund: bigint = this.getRefund();
         const totalInputAmount: bigint = this.getVaultTotalOutputAmount(this.vaultUTXOs);
-        const outputLeftAmount = totalInputAmount - refund - this.amount;
 
-        const outAmount: bigint = this.amount + refund - this.estimatedFeeLoss;
+        let refund: bigint = this.getRefund();
+        let outputLeftAmount = totalInputAmount - refund - this.amount;
+
+        if(outputLeftAmount === currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT) {
+            refund += currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
+        } else if (outputLeftAmount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
+            throw new Error(`Output left amount is below the minimum amount: ${outputLeftAmount} below ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT}`);
+        }
 
+        const outAmount: bigint = this.amount + refund - this.estimatedFeeLoss;
         const bestVault = BitcoinUtils.findVaultWithMostPublicKeys(this.vaultUTXOs);
         if (!bestVault) {
             throw new Error('No vaults provided');
         }
 
-        if (outputLeftAmount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
-            throw new Error('Output left amount is below the minimum amount');
-        }
-
         let hasConsolidation: boolean =
             outputLeftAmount > currentConsensusConfig.VAULT_MINIMUM_AMOUNT &&
             outputLeftAmount - currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT !== 0n;

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -1,55 +1,55 @@
-import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { Address } from '@btc-vision/bsi-binary';
-import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
-import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
-import { VaultUTXOs } from '../processor/PsbtTransaction.js';
-
-export interface ITransactionParameters extends ITweakedTransactionData {
-    readonly from?: Address;
-    readonly to?: Address | undefined;
-    utxos: UTXO[];
-
-    nonWitnessUtxo?: Buffer | undefined;
-    estimatedFees?: bigint;
-
-    readonly feeRate: number;
-    readonly priorityFee: bigint;
-}
-
-export interface IFundingTransactionParameters extends ITransactionParameters {
-    amount: bigint;
-}
-
-export interface SharedInteractionParameters extends ITransactionParameters {
-    calldata?: Buffer | undefined;
-    disableAutoRefund?: boolean;
-
-    readonly randomBytes?: Buffer;
-}
-
-export interface IInteractionParameters extends SharedInteractionParameters {
-    readonly calldata: Buffer;
-
-    readonly to: Address;
-}
-
-export interface IWrapParameters extends SharedInteractionParameters {
-    readonly to?: undefined;
-
-    readonly amount: bigint;
-    readonly receiver?: Address;
-
-    readonly generationParameters: WrappedGeneration;
-}
-
-export interface IUnwrapParameters extends SharedInteractionParameters {
-    readonly unwrapUTXOs: VaultUTXOs[];
-    readonly amount: bigint;
-}
-
-export interface IDeploymentParameters extends ITransactionParameters {
-    readonly bytecode: Buffer;
-
-    readonly to?: undefined;
-    readonly randomBytes?: Buffer;
-}
+import { UTXO } from '../../utxo/interfaces/IUTXO.js';
+import { Address } from '@btc-vision/bsi-binary';
+import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
+import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
+import { VaultUTXOs } from '../processor/PsbtTransaction.js';
+
+export interface ITransactionParameters extends ITweakedTransactionData {
+    readonly from?: Address;
+    readonly to?: Address | undefined;
+    utxos: UTXO[];
+
+    nonWitnessUtxo?: Buffer | undefined;
+    estimatedFees?: bigint;
+
+    readonly feeRate: number;
+    readonly priorityFee: bigint;
+}
+
+export interface IFundingTransactionParameters extends ITransactionParameters {
+    amount: bigint;
+}
+
+export interface SharedInteractionParameters extends ITransactionParameters {
+    calldata?: Buffer | undefined;
+    disableAutoRefund?: boolean;
+
+    readonly randomBytes?: Buffer;
+}
+
+export interface IInteractionParameters extends SharedInteractionParameters {
+    readonly calldata: Buffer;
+
+    readonly to: Address;
+}
+
+export interface IWrapParameters extends SharedInteractionParameters {
+    readonly to?: undefined;
+
+    readonly amount: bigint;
+    readonly receiver?: Address;
+
+    readonly generationParameters: WrappedGeneration;
+}
+
+export interface IUnwrapParameters extends SharedInteractionParameters {
+    readonly unwrapUTXOs: VaultUTXOs[];
+    readonly amount: bigint;
+}
+
+export interface IDeploymentParameters extends ITransactionParameters {
+    readonly bytecode: Buffer;
+
+    readonly to?: undefined;
+    readonly randomBytes?: Buffer;
+}

package/src/transaction/interfaces/Tap.ts

@@ -1,26 +1,26 @@
-import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces.js';
-import { TransactionInput } from 'bitcoinjs-lib/src/psbt.js';
-
-export interface TapLeafScript {
-    readonly leafVersion: number;
-    readonly controlBlock: Buffer;
-    readonly script: Buffer;
-}
-
-export interface UpdateInput {
-    tapLeafScript: TapLeafScript[];
-}
-
-export interface PsbtInputExtended extends PsbtInput, TransactionInput {}
-
-export interface PsbtOutputExtendedAddress extends PsbtOutput {
-    address: string;
-    value: number;
-}
-
-export interface PsbtOutputExtendedScript extends PsbtOutput {
-    script: Buffer;
-    value: number;
-}
-
-export type PsbtOutputExtended = PsbtOutputExtendedAddress | PsbtOutputExtendedScript;
+import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces.js';
+import { TransactionInput } from 'bitcoinjs-lib/src/psbt.js';
+
+export interface TapLeafScript {
+    readonly leafVersion: number;
+    readonly controlBlock: Buffer;
+    readonly script: Buffer;
+}
+
+export interface UpdateInput {
+    tapLeafScript: TapLeafScript[];
+}
+
+export interface PsbtInputExtended extends PsbtInput, TransactionInput {}
+
+export interface PsbtOutputExtendedAddress extends PsbtOutput {
+    address: string;
+    value: number;
+}
+
+export interface PsbtOutputExtendedScript extends PsbtOutput {
+    script: Buffer;
+    value: number;
+}
+
+export type PsbtOutputExtended = PsbtOutputExtendedAddress | PsbtOutputExtendedScript;

package/src/transaction/psbt/PSBTTypes.ts

@@ -1,3 +1,3 @@
-export enum PSBTTypes {
-    UNWRAP = 0,
-}
+export enum PSBTTypes {
+    UNWRAP = 0,
+}