@btc-vision/transaction 1.0.123 → 1.1.0

package/browser/opnet.d.ts

@@ -13,7 +13,6 @@ export * from './keypair/EcKeyPair.js';
 export * from './keypair/Wallet.js';
 export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.js';
-export * from './metadata/contracts/wBTC.js';
 export * from './metadata/ContractBaseMetadata.js';
 export * from './signer/TweakedSigner.js';
 export * from './transaction/TransactionFactory.js';
@@ -23,14 +22,10 @@ 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/SharedInteractionTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
-export * from './transaction/builders/UnwrapTransaction.js';
 export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/MultiSignTransaction.js';
-export * from './wbtc/WrappedGenerationParameters.js';
-export * from './wbtc/Generate.js';
 export * from './network/ChainId.js';
 export * from './utils/BitcoinUtils.js';
 export * from './utxo/interfaces/IUTXO.js';
@@ -40,7 +35,6 @@ export * from './transaction/shared/TweakedTransaction.js';
 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 './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';

package/browser/transaction/TransactionFactory.d.ts

@@ -4,7 +4,7 @@ import { ICustomTransactionParameters } from './builders/CustomScriptTransaction
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { TransactionBuilder } from './builders/TransactionBuilder.js';
 import { TransactionType } from './enums/TransactionType.js';
-import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters } from './interfaces/ITransactionParameters.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: string;
@@ -31,25 +31,13 @@ export interface BitcoinTransferResponse {
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
 }
-export interface UnwrapResult {
-    readonly fundingTransaction: string;
-    readonly psbt: string;
-    readonly feeRefundOrLoss: bigint;
-    readonly utxos: UTXO[];
-}
 export declare class TransactionFactory {
     createCustomScriptTransaction(interactionParameters: ICustomTransactionParameters): Promise<[string, string, UTXO[]]>;
     signInteraction(interactionParameters: IInteractionParameters): Promise<[string, string, UTXO[]]>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
-    wrap(wrapParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
-    unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
-    unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
     getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: string): UTXO[];
     private createFundTransaction;
-    private calculateNumSignatures;
-    private calculateNumInputs;
-    private maxPubKeySize;
     private writePSBTHeader;
     private getPriorityFee;
     private getUTXOAsTransaction;

package/browser/transaction/browser/Web3Provider.d.ts

@@ -1,9 +1,7 @@
-import { IDeploymentParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from '../interfaces/ITransactionParameters.js';
+import { IDeploymentParameters, IInteractionParameters } 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 {
     raw: string;
@@ -21,6 +19,4 @@ export interface Web3Provider {
     signAndBroadcastInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
     deployContract(params: IDeploymentParametersWithoutSigner): Promise<DeploymentResult>;
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
-    wrap(wrapParameters: IWrapParametersWithoutSigner): Promise<WrapResult>;
-    unwrap(unwrapParameters: IUnwrapParametersWithoutSigner): Promise<UnwrapResult>;
 }

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

@@ -28,7 +28,10 @@ export declare class UnisatSigner extends CustomKeypair {
     verify(hash: Buffer, signature: Buffer): boolean;
     signTaprootInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
     signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+    private hasAlreadySignedTapScriptSig;
+    private hasAlreadyPartialSig;
     private combine;
+    private signAllTweaked;
     private signTweaked;
     private getNonDuplicateScriptSig;
 }

package/browser/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/browser/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/browser/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/browser/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/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.123";
+export declare const version = "1.1.0";

package/build/_version.js

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

package/build/consensus/ConsensusConfig.d.ts

@@ -3,10 +3,6 @@ export interface ConsensusConfig<T extends Consensus> {
     readonly CONSENSUS: T;
     readonly CONSENSUS_NAME: string;
     readonly ENABLED_AT_BLOCK: bigint;
-    readonly VAULT_MINIMUM_AMOUNT: bigint;
-    readonly VAULT_NETWORK_CONSOLIDATION_ACCEPTANCE: bigint;
-    readonly UNWRAP_CONSOLIDATION_PREPAID_FEES: bigint;
-    readonly UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: bigint;
 }
 export declare const OPNetConsensusConfig: {
     [key in Consensus]?: ConsensusConfig<key>;

package/build/consensus/metadata/RoswellConsensus.js

@@ -3,8 +3,4 @@ export const RoswellConsensus = {
     CONSENSUS: Consensus.Roswell,
     CONSENSUS_NAME: 'Roswell',
     ENABLED_AT_BLOCK: 0n,
-    VAULT_MINIMUM_AMOUNT: 200000n,
-    VAULT_NETWORK_CONSOLIDATION_ACCEPTANCE: 200000n * 2n,
-    UNWRAP_CONSOLIDATION_PREPAID_FEES: 250n,
-    UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: 56500n,
 };

package/build/opnet.d.ts

@@ -13,7 +13,6 @@ export * from './keypair/EcKeyPair.js';
 export * from './keypair/Wallet.js';
 export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.js';
-export * from './metadata/contracts/wBTC.js';
 export * from './metadata/ContractBaseMetadata.js';
 export * from './signer/TweakedSigner.js';
 export * from './transaction/TransactionFactory.js';
@@ -23,14 +22,10 @@ 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/SharedInteractionTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
-export * from './transaction/builders/UnwrapTransaction.js';
 export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/MultiSignTransaction.js';
-export * from './wbtc/WrappedGenerationParameters.js';
-export * from './wbtc/Generate.js';
 export * from './network/ChainId.js';
 export * from './utils/BitcoinUtils.js';
 export * from './utxo/interfaces/IUTXO.js';
@@ -40,7 +35,6 @@ export * from './transaction/shared/TweakedTransaction.js';
 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 './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';

package/build/opnet.js

@@ -13,7 +13,6 @@ export * from './keypair/EcKeyPair.js';
 export * from './keypair/Wallet.js';
 export * from './keypair/interfaces/IWallet.js';
 export * from './keypair/AddressVerificator.js';
-export * from './metadata/contracts/wBTC.js';
 export * from './metadata/ContractBaseMetadata.js';
 export * from './signer/TweakedSigner.js';
 export * from './transaction/TransactionFactory.js';
@@ -23,14 +22,10 @@ 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/SharedInteractionTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
-export * from './transaction/builders/UnwrapTransaction.js';
 export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/MultiSignTransaction.js';
-export * from './wbtc/WrappedGenerationParameters.js';
-export * from './wbtc/Generate.js';
 export * from './network/ChainId.js';
 export * from './utils/BitcoinUtils.js';
 export * from './utxo/interfaces/IUTXO.js';
@@ -40,7 +35,6 @@ export * from './transaction/shared/TweakedTransaction.js';
 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 './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
 export * from './consensus/metadata/RoswellConsensus.js';

package/build/transaction/TransactionFactory.d.ts

@@ -4,7 +4,7 @@ import { ICustomTransactionParameters } from './builders/CustomScriptTransaction
 import { FundingTransaction } from './builders/FundingTransaction.js';
 import { TransactionBuilder } from './builders/TransactionBuilder.js';
 import { TransactionType } from './enums/TransactionType.js';
-import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters } from './interfaces/ITransactionParameters.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: string;
@@ -31,25 +31,13 @@ export interface BitcoinTransferResponse {
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
 }
-export interface UnwrapResult {
-    readonly fundingTransaction: string;
-    readonly psbt: string;
-    readonly feeRefundOrLoss: bigint;
-    readonly utxos: UTXO[];
-}
 export declare class TransactionFactory {
     createCustomScriptTransaction(interactionParameters: ICustomTransactionParameters): Promise<[string, string, UTXO[]]>;
     signInteraction(interactionParameters: IInteractionParameters): Promise<[string, string, UTXO[]]>;
     signDeployment(deploymentParameters: IDeploymentParameters): Promise<DeploymentResult>;
-    wrap(wrapParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
-    unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
-    unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
     getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: string): UTXO[];
     private createFundTransaction;
-    private calculateNumSignatures;
-    private calculateNumInputs;
-    private maxPubKeySize;
     private writePSBTHeader;
     private getPriorityFee;
     private getUTXOAsTransaction;

package/build/transaction/TransactionFactory.js

@@ -1,14 +1,9 @@
-import { currentConsensus, currentConsensusConfig } from '../consensus/ConsensusConfig.js';
-import { wBTC } from '../metadata/contracts/wBTC.js';
+import { currentConsensus } from '../consensus/ConsensusConfig.js';
 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';
-import { PSBTTypes } from './psbt/PSBTTypes.js';
 export class TransactionFactory {
     async createCustomScriptTransaction(interactionParameters) {
         if (!interactionParameters.to) {
@@ -143,140 +138,6 @@ export class TransactionFactory {
             utxos: [refundUTXO],
         };
     }
-    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 = wrapParameters.amount +
-            currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
-            this.getPriorityFee(wrapParameters);
-        const wbtc = new wBTC(wrapParameters.network, wrapParameters.chainId);
-        const to = wbtc.getAddress();
-        const fundingParameters = {
-            ...wrapParameters,
-            amount: childTransactionRequiredValue,
-            to: wrapParameters.to ?? to,
-        };
-        const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        wrapParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
-        const preTransaction = new WrapTransaction(wrapParameters);
-        await preTransaction.signTransaction();
-        const parameters = await preTransaction.getFundingTransactionParameters();
-        parameters.amount += childTransactionRequiredValue;
-        parameters.utxos = fundingParameters.utxos;
-        const signedTransaction = await this.createFundTransaction(parameters);
-        if (!signedTransaction) {
-            throw new Error('Could not sign funding transaction.');
-        }
-        const newParams = {
-            ...wrapParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, to, 0),
-            randomBytes: preTransaction.getRndBytes(),
-            nonWitnessUtxo: signedTransaction.tx.toBuffer(),
-        };
-        const finalTransaction = new WrapTransaction(newParams);
-        const outTx = await finalTransaction.signTransaction();
-        return {
-            transaction: [signedTransaction.tx.toHex(), outTx.toHex()],
-            vaultAddress: finalTransaction.vault,
-            amount: finalTransaction.amount,
-            receiverAddress: finalTransaction.receiver.p2tr(wrapParameters.network),
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, wrapParameters.from, 1),
-        };
-    }
-    async unwrapSegwit(unwrapParameters) {
-        console.error('The "unwrap" method is deprecated. Use unwrapTap instead.');
-        const transaction = new UnwrapSegwitTransaction(unwrapParameters);
-        await transaction.signTransaction();
-        const to = transaction.toAddress();
-        if (!to)
-            throw new Error('To address is required');
-        const estimatedGas = await transaction.estimateTransactionFees();
-        const estimatedFees = transaction.preEstimateTransactionFees(BigInt(unwrapParameters.feeRate), this.calculateNumInputs(unwrapParameters.unwrapUTXOs), 2n, this.calculateNumSignatures(unwrapParameters.unwrapUTXOs), this.maxPubKeySize(unwrapParameters.unwrapUTXOs));
-        const fundingParameters = {
-            ...unwrapParameters,
-            amount: estimatedGas + estimatedFees,
-            to: to,
-        };
-        const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        unwrapParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
-        const preTransaction = new UnwrapSegwitTransaction({
-            ...unwrapParameters,
-            randomBytes: transaction.getRndBytes(),
-        });
-        await preTransaction.signTransaction();
-        const parameters = await preTransaction.getFundingTransactionParameters();
-        parameters.utxos = fundingParameters.utxos;
-        parameters.amount = (await preTransaction.estimateTransactionFees()) + estimatedFees;
-        const signedTransaction = await this.createFundTransaction(parameters);
-        if (!signedTransaction) {
-            throw new Error('Could not sign funding transaction.');
-        }
-        const newParams = {
-            ...unwrapParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, to, 0),
-            randomBytes: preTransaction.getRndBytes(),
-            nonWitnessUtxo: signedTransaction.tx.toBuffer(),
-        };
-        const finalTransaction = new UnwrapSegwitTransaction(newParams);
-        const outTx = await finalTransaction.signPSBT();
-        const asBase64 = outTx.toBase64();
-        const psbt = this.writePSBTHeader(PSBTTypes.UNWRAP, asBase64);
-        return {
-            fundingTransaction: signedTransaction.tx.toHex(),
-            psbt: psbt,
-            feeRefundOrLoss: estimatedFees,
-            utxos: [],
-        };
-    }
-    async unwrap(unwrapParameters) {
-        if (!unwrapParameters.from) {
-            throw new Error('Field "from" not provided.');
-        }
-        const transaction = new UnwrapTransaction(unwrapParameters);
-        await transaction.signTransaction();
-        const to = transaction.toAddress();
-        if (!to)
-            throw new Error('To address is required');
-        const estimatedGas = await transaction.estimateTransactionFees();
-        const fundingParameters = {
-            ...unwrapParameters,
-            amount: estimatedGas,
-            to: to,
-        };
-        const preFundingTransaction = await this.createFundTransaction(fundingParameters);
-        unwrapParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
-        const preTransaction = new UnwrapTransaction({
-            ...unwrapParameters,
-            randomBytes: transaction.getRndBytes(),
-        });
-        await preTransaction.signTransaction();
-        const parameters = await preTransaction.getFundingTransactionParameters();
-        parameters.utxos = fundingParameters.utxos;
-        parameters.amount =
-            (await preTransaction.estimateTransactionFees()) +
-                this.getPriorityFee(unwrapParameters);
-        const signedTransaction = await this.createFundTransaction(parameters);
-        if (!signedTransaction) {
-            throw new Error('Could not sign funding transaction.');
-        }
-        const newParams = {
-            ...unwrapParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, to, 0),
-            randomBytes: preTransaction.getRndBytes(),
-            nonWitnessUtxo: signedTransaction.tx.toBuffer(),
-        };
-        const finalTransaction = new UnwrapTransaction(newParams);
-        const outTx = await finalTransaction.signPSBT();
-        const asBase64 = outTx.toBase64();
-        const psbt = this.writePSBTHeader(PSBTTypes.UNWRAP, asBase64);
-        return {
-            fundingTransaction: signedTransaction.tx.toHex(),
-            psbt: psbt,
-            feeRefundOrLoss: finalTransaction.getFeeLossOrRefund(),
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, unwrapParameters.from, 1),
-        };
-    }
     async createBTCTransfer(parameters) {
         if (!parameters.from) {
             throw new Error('Field "from" not provided.');
@@ -320,27 +181,6 @@ export class TransactionFactory {
             nextUTXOs: this.getUTXOAsTransaction(signedTransaction, parameters.to, 0),
         };
     }
-    calculateNumSignatures(vault) {
-        let numSignatures = 0n;
-        for (const v of vault) {
-            numSignatures += BigInt(v.minimum * v.utxos.length);
-        }
-        return numSignatures;
-    }
-    calculateNumInputs(vault) {
-        let numSignatures = 0n;
-        for (const v of vault) {
-            numSignatures += BigInt(v.utxos.length);
-        }
-        return numSignatures;
-    }
-    maxPubKeySize(vault) {
-        let size = 0;
-        for (const v of vault) {
-            size = Math.max(size, v.publicKeys.length);
-        }
-        return BigInt(size);
-    }
     writePSBTHeader(type, psbt) {
         const buf = Buffer.from(psbt, 'base64');
         const header = Buffer.alloc(2);

package/build/transaction/browser/Web3Provider.d.ts

@@ -1,9 +1,7 @@
-import { IDeploymentParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from '../interfaces/ITransactionParameters.js';
+import { IDeploymentParameters, IInteractionParameters } 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 {
     raw: string;
@@ -21,6 +19,4 @@ export interface Web3Provider {
     signAndBroadcastInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
     deployContract(params: IDeploymentParametersWithoutSigner): Promise<DeploymentResult>;
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
-    wrap(wrapParameters: IWrapParametersWithoutSigner): Promise<WrapResult>;
-    unwrap(unwrapParameters: IUnwrapParametersWithoutSigner): Promise<UnwrapResult>;
 }

package/build/transaction/browser/extensions/UnisatSigner.d.ts

@@ -28,7 +28,10 @@ export declare class UnisatSigner extends CustomKeypair {
     verify(hash: Buffer, signature: Buffer): boolean;
     signTaprootInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
     signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+    private hasAlreadySignedTapScriptSig;
+    private hasAlreadyPartialSig;
     private combine;
+    private signAllTweaked;
     private signTweaked;
     private getNonDuplicateScriptSig;
 }

package/build/transaction/browser/extensions/UnisatSigner.js

@@ -88,12 +88,54 @@ export class UnisatSigner extends CustomKeypair {
         throw new Error('Not implemented: verify');
     }
     async signTaprootInput(transaction, i, sighashTypes) {
-        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);
     }
     async signInput(transaction, i, sighashTypes) {
-        const secondSignature = await this.signTweaked(transaction, i, sighashTypes, true);
-        this.combine(transaction, secondSignature, i);
+        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);
+    }
+    hasAlreadySignedTapScriptSig(input) {
+        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;
+    }
+    hasAlreadyPartialSig(input) {
+        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;
     }
     combine(transaction, newPsbt, i) {
         const signedInput = newPsbt.data.inputs[i];
@@ -117,6 +159,26 @@ export class UnisatSigner extends CustomKeypair {
             }
         }
     }
+    async signAllTweaked(transaction, sighashTypes, disableTweakSigner = false) {
+        const pubKey = this.publicKey.toString('hex');
+        const toSign = transaction.data.inputs.map((_, i) => {
+            return [
+                {
+                    index: i,
+                    publicKey: pubKey,
+                    sighashTypes,
+                    disableTweakSigner: disableTweakSigner,
+                },
+            ];
+        });
+        const opts = {
+            autoFinalized: false,
+            toSignInputs: toSign.flat(),
+        };
+        const psbt = transaction.toHex();
+        const signed = await this.unisat.signPsbt(psbt, opts);
+        return Psbt.fromHex(signed);
+    }
     async signTweaked(transaction, i, sighashTypes, disableTweakSigner = false) {
         const opts = {
             autoFinalized: false,

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;