@btc-vision/transaction 1.0.122 → 1.1.0

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

@@ -1,9 +1,6 @@
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
-import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
-import { Address } from '../../keypair/Address.js';
 import { PsbtOutputExtended } from '@btc-vision/bitcoin';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;
@@ -29,17 +26,6 @@ export interface IInteractionParameters extends Omit<SharedInteractionParameters
     readonly calldata: Buffer;
     readonly to: string;
 }
-export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
-    readonly to?: string;
-    readonly from: string;
-    readonly amount: bigint;
-    readonly receiver?: Address;
-    readonly generationParameters: WrappedGeneration;
-}
-export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
-    readonly unwrapUTXOs: VaultUTXOs[];
-    readonly amount: bigint;
-}
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
     readonly calldata?: Buffer;

package/build/transaction/processor/PsbtTransaction.d.ts

@@ -5,20 +5,6 @@ export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly signer: Signer;
     readonly network: Network;
 }
-export interface IWBTCUTXODocument {
-    readonly vault: string;
-    readonly blockId: bigint;
-    readonly hash: string;
-    readonly value: bigint;
-    readonly outputIndex: number;
-    readonly output: string;
-}
-export interface VaultUTXOs {
-    readonly vault: string;
-    readonly publicKeys: string[];
-    readonly minimum: number;
-    readonly utxos: IWBTCUTXODocument[];
-}
 export type FromBase64Params = Omit<PsbtTransactionData, 'psbt'>;
 export declare class PsbtTransaction extends TweakedTransaction {
     readonly logColor: string;
@@ -36,5 +22,4 @@ export declare class PsbtTransaction extends TweakedTransaction {
     addOutput(output: PsbtOutputExtended): void;
     attemptFinalizeInputs(n?: number): boolean;
     getPSBT(): Psbt;
-    private getTotalOutputAmount;
 }

package/build/transaction/processor/PsbtTransaction.js

@@ -77,13 +77,4 @@ export class PsbtTransaction extends TweakedTransaction {
     getPSBT() {
         return this.transaction;
     }
-    getTotalOutputAmount(vaults) {
-        let total = BigInt(0);
-        for (const vault of vaults) {
-            for (const utxo of vault.utxos) {
-                total += BigInt(utxo.value);
-            }
-        }
-        return total;
-    }
 }

package/build/utils/BitcoinUtils.d.ts

@@ -1,9 +1,6 @@
-import { VaultUTXOs } from '../transaction/processor/PsbtTransaction.js';
 export declare class BitcoinUtils {
     static btcToSatoshi(btc: number): bigint;
     static rndBytes(): Buffer;
     static getUnsafeRandomValues(length: number): Buffer;
     static opnetHash(data: Buffer): string;
-    static orderVaultsByAddress(vaults: VaultUTXOs[]): VaultUTXOs[];
-    static findVaultWithMostPublicKeys(vaults: VaultUTXOs[]): VaultUTXOs;
 }

package/build/utils/BitcoinUtils.js

@@ -28,23 +28,4 @@ export class BitcoinUtils {
         const hash = hashed.digest();
         return `0x${Buffer.from(hash).toString('hex')}`;
     }
-    static orderVaultsByAddress(vaults) {
-        return vaults.sort((a, b) => {
-            return a.vault.localeCompare(b.vault);
-        });
-    }
-    static findVaultWithMostPublicKeys(vaults) {
-        vaults = BitcoinUtils.orderVaultsByAddress(vaults);
-        let mostPublicKeys = 0;
-        let vault;
-        for (const v of vaults) {
-            if (v.publicKeys.length > mostPublicKeys) {
-                mostPublicKeys = v.publicKeys.length;
-                vault = v;
-            }
-        }
-        if (!vault)
-            throw new Error('No vault with public keys found.');
-        return vault;
-    }
 }

package/build/utxo/OPNetLimitedProvider.d.ts

@@ -1,7 +1,5 @@
 import { Network } from '@btc-vision/bitcoin';
-import { Address, Wallet } from '../opnet.js';
-import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
-import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
+import { Wallet } from '../opnet.js';
 import { BroadcastResponse } from './interfaces/BroadcastResponse.js';
 import { FetchUTXOParams, FetchUTXOParamsMultiAddress, RawUTXOResponse, UTXO } from './interfaces/IUTXO.js';
 export interface WalletUTXOs {
@@ -21,6 +19,4 @@ export declare class OPNetLimitedProvider {
         error: string;
     }>;
     rpcMethod(method: string, paramsMethod: unknown[]): Promise<unknown>;
-    fetchWrapParameters(amount: bigint): Promise<WrappedGeneration | undefined>;
-    fetchUnWrapParameters(amount: bigint, receiver: Address): Promise<UnwrapGeneration | undefined>;
 }

package/build/utxo/OPNetLimitedProvider.js

@@ -1,7 +1,4 @@
-import { currentConsensusConfig } from '../consensus/ConsensusConfig.js';
 import { TransactionFactory } from '../opnet.js';
-import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
-import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
 export class OPNetLimitedProvider {
     constructor(opnetAPIUrl) {
         this.opnetAPIUrl = opnetAPIUrl;
@@ -164,29 +161,4 @@ export class OPNetLimitedProvider {
         }
         return result;
     }
-    async fetchWrapParameters(amount) {
-        if (amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {
-            throw new Error(`Amount must be greater than the minimum consolidation amount ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT}sat.`);
-        }
-        const params = [0, amount.toString()];
-        const result = await this.rpcMethod('btc_generate', params);
-        if (!result) {
-            return;
-        }
-        return new WrappedGeneration(result);
-    }
-    async fetchUnWrapParameters(amount, receiver) {
-        if (amount < 330n) {
-            throw new Error(`Amount must be greater than the minimum consolidation amount ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT}sat.`);
-        }
-        if (receiver.length < 50) {
-            throw new Error('Invalid receiver address');
-        }
-        const params = [1, amount.toString(), receiver.toHex()];
-        const result = await this.rpcMethod('btc_generate', params);
-        if (!result) {
-            return;
-        }
-        return new UnwrapGeneration(result);
-    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.122",
+    "version": "1.1.0",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -102,7 +102,6 @@
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
         "bech32": "^2.0.0",
-        "bignumber.js": "^9.1.2",
         "bip32": "^5.0.0-rc.0",
         "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.122';
+export const version = '1.1.0';

package/src/consensus/ConsensusConfig.ts

@@ -13,20 +13,20 @@ export interface ConsensusConfig<T extends Consensus> {
 
     /** WBTC vaults */
     // Defines the minimum amount that can be consolidated in a single transaction.
-    readonly VAULT_MINIMUM_AMOUNT: bigint;
+    //readonly VAULT_MINIMUM_AMOUNT: bigint;
 
     // Defines the requested minimum acceptance for joining UTXOs when an unwrap is being done.
     // If the consolidate output going back to the vault is lower than this amount, the transaction will be rejected.
     // User must pay for the consolidation, this help the network by having fewer UTXOs.
-    readonly VAULT_NETWORK_CONSOLIDATION_ACCEPTANCE: bigint;
+    //readonly VAULT_NETWORK_CONSOLIDATION_ACCEPTANCE: bigint;
 
     // Everytime an user wrap bitcoin, he prepays the fees for the consolidation at a maximum fee rate of the following determined value.
     // If the fees are lower, the user will be refunded the difference.
     // If the fees are higher, the user must pay the difference.
-    readonly UNWRAP_CONSOLIDATION_PREPAID_FEES: bigint;
+    //readonly UNWRAP_CONSOLIDATION_PREPAID_FEES: bigint;
 
     // The maximum fee rate for the consolidation.
-    readonly UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: bigint;
+    //readonly UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: bigint;
 }
 
 export const OPNetConsensusConfig: { [key in Consensus]?: ConsensusConfig<key> } = {

package/src/consensus/metadata/RoswellConsensus.ts

@@ -9,18 +9,18 @@ export const RoswellConsensus: ConsensusConfig<Consensus.Roswell> = {
     ENABLED_AT_BLOCK: 0n,
 
     // Defines the minimum amount that can be consolidated in a single transaction.
-    VAULT_MINIMUM_AMOUNT: 200000n,
+    //VAULT_MINIMUM_AMOUNT: 200000n,
 
     // Defines the requested minimum acceptance for joining UTXOs when an unwrap is being done.
     // If the consolidate output going back to the vault is lower than this amount, the transaction will be rejected.
     // User must pay for the consolidation, this help the network by having fewer UTXOs.
-    VAULT_NETWORK_CONSOLIDATION_ACCEPTANCE: 200000n * 2n,
+    //VAULT_NETWORK_CONSOLIDATION_ACCEPTANCE: 200000n * 2n,
 
     // Everytime an user wrap bitcoin, he prepays the fees for the consolidation at a maximum fee rate of the following determined value.
     // If the fees are lower, the user will be refunded the difference.
     // If the fees are higher, the user must pay the difference.
-    UNWRAP_CONSOLIDATION_PREPAID_FEES: 250n,
+    //UNWRAP_CONSOLIDATION_PREPAID_FEES: 250n,
 
     // Equivalent to 56500 satoshis, calculated from UNWRAP_CONSOLIDATION_PREPAID_FEES.
-    UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: 56500n,
+    //UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: 56500n,
 };

package/src/opnet.ts

@@ -23,7 +23,7 @@ export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.js';
 
 /** Metadata */
-export * from './metadata/contracts/wBTC.js';
+//export * from './metadata/contracts/wBTC.js';
 export * from './metadata/ContractBaseMetadata.js';
 
 /** Signer */
@@ -39,16 +39,16 @@ export * from './transaction/enums/TransactionType.js';
 export * from './transaction/builders/InteractionTransaction.js';
 export * from './transaction/builders/FundingTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
-export * from './transaction/builders/WrapTransaction.js';
+//export * from './transaction/builders/WrapTransaction.ts.disabled';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
-export * from './transaction/builders/UnwrapTransaction.js';
+//export * from './transaction/builders/UnwrapTransaction.ts.disabled';
 export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 
 /** wBTC */
-export * from './wbtc/WrappedGenerationParameters.js';
-export * from './wbtc/Generate.js';
+//export * from '../wbtc_disabled/WrappedGenerationParameters.js';
+//export * from '../wbtc_disabled/Generate.js';
 export * from './network/ChainId.js';
 
 /** Utils */
@@ -67,7 +67,7 @@ export * from './utxo/interfaces/BroadcastResponse.js';
 export * from './transaction/psbt/PSBTTypes.js';
 
 export * from './transaction/shared/P2TR_MS.js';
-export * from './wbtc/UnwrapGeneration.js';
+//export * from '../wbtc_disabled/UnwrapGeneration.ts.disabled';
 
 /** Consensus */
 export * from './consensus/ConsensusConfig.js';

package/src/transaction/TransactionFactory.ts

@@ -1,7 +1,6 @@
-import { Psbt, Transaction } from '@btc-vision/bitcoin';
+import { Transaction } from '@btc-vision/bitcoin';
 import { Output } from '@btc-vision/bitcoin/src/transaction.js';
-import { currentConsensus, currentConsensusConfig } from '../consensus/ConsensusConfig.js';
-import { wBTC } from '../metadata/contracts/wBTC.js';
+import { currentConsensus } from '../consensus/ConsensusConfig.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import {
     CustomScriptTransaction,
@@ -11,19 +10,13 @@ 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';
 import { TransactionType } from './enums/TransactionType.js';
 import {
     IDeploymentParameters,
     IFundingTransactionParameters,
     IInteractionParameters,
     ITransactionParameters,
-    IUnwrapParameters,
-    IWrapParameters,
 } from './interfaces/ITransactionParameters.js';
-import { VaultUTXOs } from './processor/PsbtTransaction.js';
 import { PSBTTypes } from './psbt/PSBTTypes.js';
 
 export interface DeploymentResult {
@@ -58,20 +51,14 @@ export interface BitcoinTransferResponse {
     readonly nextUTXOs: UTXO[];
 }
 
-export interface UnwrapResult {
+/*export interface UnwrapResult {
     readonly fundingTransaction: string;
     readonly psbt: string;
 
-    /**
-     * @description The fee refund or loss.
-     * @description If the amount is negative, it means that the user has to pay the difference. The difference is deducted from the amount.
-     * @description If the amount is positive, it means that the user will be refunded the difference.
-     * @type {bigint}
-     */
     readonly feeRefundOrLoss: bigint;
 
     readonly utxos: UTXO[];
-}
+}*/
 
 export class TransactionFactory {
     /**
@@ -290,7 +277,7 @@ export class TransactionFactory {
      * @returns {Promise<WrapResult>} - The signed transaction
      * @throws {Error} - If the transaction could not be signed
      */
-    public async wrap(wrapParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult> {
+    /*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 ${wrapParameters.amount} sat. Make sure that you cover the unwrap consolidation fees of ${currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT}sat.`,
@@ -348,7 +335,7 @@ export class TransactionFactory {
             receiverAddress: finalTransaction.receiver.p2tr(wrapParameters.network),
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, wrapParameters.from, 1),
         };
-    }
+    }*/
 
     /**
      * Unwrap bitcoin.
@@ -357,7 +344,7 @@ export class TransactionFactory {
      * @throws {Error} - If the transaction could not be signed
      * @deprecated
      */
-    public async unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult> {
+    /*public async unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult> {
         console.error('The "unwrap" method is deprecated. Use unwrapTap instead.');
 
         const transaction: UnwrapSegwitTransaction = new UnwrapSegwitTransaction(unwrapParameters);
@@ -424,7 +411,7 @@ export class TransactionFactory {
             feeRefundOrLoss: estimatedFees,
             utxos: [],
         };
-    }
+    }*/
 
     /**
      * Unwrap bitcoin via taproot.
@@ -432,7 +419,8 @@ export class TransactionFactory {
      * @returns {Promise<UnwrapResult>} - The signed transaction
      * @throws {Error} - If the transaction could not be signed
      */
-    public async unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult> {
+
+    /*public async unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult> {
         if (!unwrapParameters.from) {
             throw new Error('Field "from" not provided.');
         }
@@ -495,7 +483,7 @@ export class TransactionFactory {
             feeRefundOrLoss: finalTransaction.getFeeLossOrRefund(),
             utxos: this.getUTXOAsTransaction(signedTransaction.tx, unwrapParameters.from, 1),
         };
-    }
+    }*/
 
     /**
      * @description Creates a funding transaction.
@@ -566,7 +554,7 @@ export class TransactionFactory {
         };
     }
 
-    private calculateNumSignatures(vault: VaultUTXOs[]): bigint {
+    /*private calculateNumSignatures(vault: VaultUTXOs[]): bigint {
         let numSignatures = 0n;
 
         for (const v of vault) {
@@ -594,7 +582,7 @@ export class TransactionFactory {
         }
 
         return BigInt(size);
-    }
+    }*/
 
     private writePSBTHeader(type: PSBTTypes, psbt: string): string {
         const buf = Buffer.from(psbt, 'base64');

package/src/transaction/browser/Web3Provider.ts

@@ -1,15 +1,11 @@
 import {
     IDeploymentParameters,
     IInteractionParameters,
-    IUnwrapParameters,
-    IWrapParameters,
 } from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { DeploymentResult, UnwrapResult, WrapResult } from '../TransactionFactory';
+import { DeploymentResult } from '../TransactionFactory';
 
 export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer'>;
-export type IWrapParametersWithoutSigner = Omit<IWrapParameters, 'signer'>;
-export type IUnwrapParametersWithoutSigner = Omit<IUnwrapParameters, 'signer'>;
 export type IDeploymentParametersWithoutSigner = Omit<IDeploymentParameters, 'signer' | 'network'>;
 
 export interface BroadcastTransactionOptions {
@@ -54,8 +50,4 @@ export interface Web3Provider {
     deployContract(params: IDeploymentParametersWithoutSigner): Promise<DeploymentResult>;
 
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
-
-    wrap(wrapParameters: IWrapParametersWithoutSigner): Promise<WrapResult>;
-
-    unwrap(unwrapParameters: IUnwrapParametersWithoutSigner): Promise<UnwrapResult>;
 }

package/src/transaction/browser/extensions/UnisatSigner.ts

@@ -3,6 +3,7 @@ import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { PsbtSignatureOptions, Unisat, UnisatNetwork } from '../types/Unisat.js';
+import { PartialSig } from 'bip174/src/lib/interfaces.js';
 
 declare global {
     interface Window {
@@ -138,14 +139,65 @@ export class UnisatSigner extends CustomKeypair {
         i: number,
         sighashTypes: number[],
     ): Promise<void> {
-        const firstSignature = await this.signTweaked(transaction, i, sighashTypes, false);
+        const input = transaction.data.inputs[i];
+        if (
+            input.tapKeySig ||
+            input.finalScriptSig ||
+            (Array.isArray(input.partialSig) &&
+                input.partialSig.length &&
+                this.hasAlreadyPartialSig(input.partialSig)) ||
+            (Array.isArray(input.tapScriptSig) &&
+                input.tapScriptSig.length &&
+                this.hasAlreadySignedTapScriptSig(input.tapScriptSig))
+        ) {
+            return;
+        }
+
+        const firstSignature = await this.signAllTweaked(transaction, sighashTypes, false);
         this.combine(transaction, firstSignature, i);
     }
 
     public async signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void> {
-        const secondSignature = await this.signTweaked(transaction, i, sighashTypes, true);
+        const input = transaction.data.inputs[i];
+        if (
+            input.tapKeySig ||
+            input.finalScriptSig ||
+            (Array.isArray(input.partialSig) &&
+                input.partialSig.length &&
+                this.hasAlreadyPartialSig(input.partialSig)) ||
+            (Array.isArray(input.tapScriptSig) &&
+                input.tapScriptSig.length &&
+                this.hasAlreadySignedTapScriptSig(input.tapScriptSig))
+        ) {
+            return;
+        }
+
+        const firstSignature = await this.signAllTweaked(transaction, sighashTypes, true);
+        this.combine(transaction, firstSignature, i);
+    }
+
+    private hasAlreadySignedTapScriptSig(input: TapScriptSig[]): boolean {
+        for (let i = 0; i < input.length; i++) {
+            const item = input[i];
+            const buf = Buffer.from(item.pubkey);
+            if (buf.equals(this.publicKey) && item.signature) {
+                return true;
+            }
+        }
 
-        this.combine(transaction, secondSignature, i);
+        return false;
+    }
+
+    private hasAlreadyPartialSig(input: PartialSig[]): boolean {
+        for (let i = 0; i < input.length; i++) {
+            const item = input[i];
+            const buf = Buffer.from(item.pubkey);
+            if (buf.equals(this.publicKey) && item.signature) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     private combine(transaction: Psbt, newPsbt: Psbt, i: number): void {
@@ -177,6 +229,34 @@ export class UnisatSigner extends CustomKeypair {
         }
     }
 
+    private async signAllTweaked(
+        transaction: Psbt,
+        sighashTypes: number[],
+        disableTweakSigner: boolean = false,
+    ): Promise<Psbt> {
+        const pubKey = this.publicKey.toString('hex');
+        const toSign = transaction.data.inputs.map((_, i) => {
+            return [
+                {
+                    index: i,
+                    publicKey: pubKey,
+                    sighashTypes,
+                    disableTweakSigner: disableTweakSigner,
+                },
+            ];
+        });
+
+        const opts: PsbtSignatureOptions = {
+            autoFinalized: false,
+            toSignInputs: toSign.flat(),
+        };
+
+        const psbt = transaction.toHex();
+        const signed = await this.unisat.signPsbt(psbt, opts);
+
+        return Psbt.fromHex(signed);
+    }
+
     private async signTweaked(
         transaction: Psbt,
         i: number,

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -188,13 +188,23 @@ export abstract class SharedInteractionTransaction<
 
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                // multi sig input
-                transaction.signInput(0, this.scriptSigner);
-                transaction.signInput(0, this.getSignerKey());
-
-                transaction.finalizeInput(0, this.customFinalizer);
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.scriptSigner);
+                await this.signInput(
+                    transaction,
+                    transaction.data.inputs[i],
+                    i,
+                    this.getSignerKey(),
+                );
+
+                transaction.finalizeInput(i, this.customFinalizer);
             } else {
-                transaction.signInput(i, this.getSignerKey());
+                await this.signInput(
+                    transaction,
+                    transaction.data.inputs[i],
+                    i,
+                    this.getSignerKey(),
+                );
+
                 transaction.finalizeInput(i);
             }
         }

package/src/transaction/builders/{WrapTransaction.ts → WrapTransaction.ts.disabled}

@@ -4,7 +4,7 @@ import { TapLeafScript } from '../interfaces/Tap.js';
 import { IWrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
+import { WrappedGeneration } from '../../../wbtc_disabled/WrappedGenerationParameters.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Network, PsbtOutputExtendedAddress } from '@btc-vision/bitcoin';
 import { P2TR_MS } from '../shared/P2TR_MS.js';

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -1,9 +1,6 @@
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
-import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
-import { Address } from '../../keypair/Address.js';
 import { PsbtOutputExtended } from '@btc-vision/bitcoin';
 
 export interface ITransactionParameters extends ITweakedTransactionData {
@@ -43,7 +40,7 @@ export interface IInteractionParameters
     readonly to: string;
 }
 
-export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
+/*export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly to?: string;
     readonly from: string;
 
@@ -56,7 +53,7 @@ export interface IWrapParameters extends Omit<SharedInteractionParameters, 'opti
 export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly unwrapUTXOs: VaultUTXOs[];
     readonly amount: bigint;
-}
+}*/
 
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;

package/src/transaction/processor/PsbtTransaction.ts

@@ -14,7 +14,7 @@ export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly network: Network;
 }
 
-export interface IWBTCUTXODocument {
+/*export interface IWBTCUTXODocument {
     readonly vault: string;
     readonly blockId: bigint;
 
@@ -30,7 +30,7 @@ export interface VaultUTXOs {
     readonly publicKeys: string[];
     readonly minimum: number;
     readonly utxos: IWBTCUTXODocument[];
-}
+}*/
 
 export type FromBase64Params = Omit<PsbtTransactionData, 'psbt'>;
 
@@ -166,7 +166,7 @@ export class PsbtTransaction extends TweakedTransaction {
         return this.transaction;
     }
 
-    private getTotalOutputAmount(vaults: VaultUTXOs[]): bigint {
+    /*private getTotalOutputAmount(vaults: VaultUTXOs[]): bigint {
         let total = BigInt(0);
         for (const vault of vaults) {
             for (const utxo of vault.utxos) {
@@ -175,5 +175,5 @@ export class PsbtTransaction extends TweakedTransaction {
         }
 
         return total;
-    }
+    }*/
 }