@btc-vision/transaction 1.0.104 → 1.0.106

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

@@ -27,6 +27,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected to: Address | undefined;
     protected from: Address;
     protected _maximumFeeRate: number;
+    optionalOutputs: PsbtOutputExtended[] | undefined;
     protected constructor(parameters: ITransactionParameters);
     static getFrom(from: string | undefined, keypair: ECPairInterface, network: Network): Address;
     static witnessStackToScriptWitness(witness: Buffer[]): Buffer;
@@ -50,6 +51,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected getTransactionOPNetFee(): bigint;
     protected calculateTotalUTXOAmount(): bigint;
     protected calculateTotalVOutAmount(): bigint;
+    protected addOptionalOutputsAndGetAmount(): bigint;
     protected addInputsFromUTXO(): void;
     protected internalInit(): void;
     protected abstract buildTransaction(): Promise<void>;

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

@@ -4,12 +4,14 @@ 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 { PsbtOutputExtended } from './Tap.js';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: Address;
-    readonly to?: Address | undefined;
+    readonly to?: Address;
     utxos: UTXO[];
-    nonWitnessUtxo?: Buffer | undefined;
+    nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
+    optionalOutputs?: PsbtOutputExtended[];
     chainId?: ChainId;
     readonly feeRate: number;
     readonly priorityFee: bigint;
@@ -19,27 +21,26 @@ export interface IFundingTransactionParameters extends ITransactionParameters {
     splitInputsInto?: number;
 }
 export interface SharedInteractionParameters extends ITransactionParameters {
-    calldata?: Buffer | undefined;
+    calldata?: Buffer;
     disableAutoRefund?: boolean;
     readonly randomBytes?: Buffer;
 }
-export interface IInteractionParameters extends SharedInteractionParameters {
+export interface IInteractionParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly calldata: Buffer;
     readonly to: Address;
 }
-export interface IWrapParameters extends SharedInteractionParameters {
+export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly to?: Address;
     readonly from: Address;
     readonly amount: bigint;
     readonly receiver?: Address;
     readonly generationParameters: WrappedGeneration;
 }
-export interface IUnwrapParameters extends SharedInteractionParameters {
+export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly unwrapUTXOs: VaultUTXOs[];
     readonly amount: bigint;
 }
-export interface IDeploymentParameters extends ITransactionParameters {
+export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
-    readonly to?: undefined;
     readonly randomBytes?: Buffer;
 }

package/browser/utxo/OPNetLimitedProvider.d.ts

@@ -1,8 +1,15 @@
 import { Address } from '@btc-vision/bsi-binary';
+import { Network } from 'bitcoinjs-lib';
+import { Wallet } from '../opnet.js';
 import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
 import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
 import { BroadcastResponse } from './interfaces/BroadcastResponse.js';
-import { FetchUTXOParams, FetchUTXOParamsMultiAddress, UTXO } from './interfaces/IUTXO.js';
+import { FetchUTXOParams, FetchUTXOParamsMultiAddress, RawUTXOResponse, UTXO } from './interfaces/IUTXO.js';
+export interface WalletUTXOs {
+    readonly confirmed: RawUTXOResponse[];
+    readonly pending: RawUTXOResponse[];
+    readonly spentTransactions: RawUTXOResponse[];
+}
 export declare class OPNetLimitedProvider {
     private readonly opnetAPIUrl;
     private readonly utxoPath;
@@ -11,6 +18,9 @@ export declare class OPNetLimitedProvider {
     fetchUTXO(settings: FetchUTXOParams): Promise<UTXO[]>;
     fetchUTXOMultiAddr(settings: FetchUTXOParamsMultiAddress): Promise<UTXO[]>;
     broadcastTransaction(transaction: string, psbt: boolean): Promise<BroadcastResponse | undefined>;
+    splitUTXOs(wallet: Wallet, network: Network, splitInputsInto: number, amountPerUTXO: bigint): Promise<BroadcastResponse | {
+        error: string;
+    }>;
     rpcMethod(method: string, paramsMethod: unknown[]): Promise<unknown>;
     fetchWrapParameters(amount: bigint): Promise<WrappedGeneration | undefined>;
     fetchUnWrapParameters(amount: bigint, receiver: Address): Promise<UnwrapGeneration | undefined>;

package/browser/utxo/interfaces/IUTXO.d.ts

@@ -9,7 +9,8 @@ export interface FetchUTXOParams {
     readonly address: string;
     readonly minAmount: bigint;
     readonly requestedAmount: bigint;
-    readonly optimized?: boolean;
+    optimized?: boolean;
+    usePendingUTXO?: boolean;
 }
 export interface FetchUTXOParamsMultiAddress {
     readonly addresses: string[];

package/build/transaction/TransactionFactory.js

@@ -115,6 +115,7 @@ export class TransactionFactory {
             utxos: [newUtxo],
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
+            optionalOutputs: []
         };
         const finalTransaction = new DeploymentTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();
@@ -141,7 +142,7 @@ export class TransactionFactory {
         }
         const childTransactionRequiredValue = wrapParameters.amount +
             currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
-            (wrapParameters.priorityFee || 300n);
+            (wrapParameters.priorityFee || 330n);
         const wbtc = new wBTC(wrapParameters.network, wrapParameters.chainId);
         const to = wbtc.getAddress();
         const fundingParameters = {

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

@@ -27,6 +27,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected to: Address | undefined;
     protected from: Address;
     protected _maximumFeeRate: number;
+    optionalOutputs: PsbtOutputExtended[] | undefined;
     protected constructor(parameters: ITransactionParameters);
     static getFrom(from: string | undefined, keypair: ECPairInterface, network: Network): Address;
     static witnessStackToScriptWitness(witness: Buffer[]): Buffer;
@@ -50,6 +51,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected getTransactionOPNetFee(): bigint;
     protected calculateTotalUTXOAmount(): bigint;
     protected calculateTotalVOutAmount(): bigint;
+    protected addOptionalOutputsAndGetAmount(): bigint;
     protected addInputsFromUTXO(): void;
     protected internalInit(): void;
     protected abstract buildTransaction(): Promise<void>;

package/build/transaction/builders/TransactionBuilder.js

@@ -25,6 +25,7 @@ export class TransactionBuilder extends TweakedTransaction {
         this.priorityFee = parameters.priorityFee ?? 0n;
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
+        this.optionalOutputs = parameters.optionalOutputs;
         this.from = TransactionBuilder.getFrom(parameters.from, this.signer, this.network);
         this.totalInputAmount = this.calculateTotalUTXOAmount();
         const totalVOut = this.calculateTotalVOutAmount();
@@ -73,6 +74,7 @@ export class TransactionBuilder extends TweakedTransaction {
             priorityFee: this.priorityFee ?? 0n,
             from: this.from,
             amount: this.estimatedFees,
+            optionalOutputs: this.optionalOutputs,
         };
     }
     setDestinationAddress(address) {
@@ -180,7 +182,7 @@ export class TransactionBuilder extends TweakedTransaction {
         return outputs;
     }
     async addRefundOutput(amountSpent) {
-        const sendBackAmount = this.totalInputAmount - amountSpent;
+        const sendBackAmount = this.totalInputAmount - amountSpent - this.addOptionalOutputsAndGetAmount();
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
             if (AddressVerificator.isValidP2TRAddress(this.from, this.network)) {
                 await this.setFeeOutput({
@@ -231,6 +233,16 @@ export class TransactionBuilder extends TweakedTransaction {
         }
         return total;
     }
+    addOptionalOutputsAndGetAmount() {
+        if (!this.optionalOutputs)
+            return 0n;
+        let refundedFromOptionalOutputs = 0n;
+        for (let i = 0; i < this.optionalOutputs.length; i++) {
+            this.addOutput(this.optionalOutputs[i]);
+            refundedFromOptionalOutputs += BigInt(this.optionalOutputs[i].value);
+        }
+        return refundedFromOptionalOutputs;
+    }
     addInputsFromUTXO() {
         if (this.utxos.length) {
             if (this.totalInputAmount < TransactionBuilder.MINIMUM_DUST) {

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

@@ -4,12 +4,14 @@ 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 { PsbtOutputExtended } from './Tap.js';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: Address;
-    readonly to?: Address | undefined;
+    readonly to?: Address;
     utxos: UTXO[];
-    nonWitnessUtxo?: Buffer | undefined;
+    nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
+    optionalOutputs?: PsbtOutputExtended[];
     chainId?: ChainId;
     readonly feeRate: number;
     readonly priorityFee: bigint;
@@ -19,27 +21,26 @@ export interface IFundingTransactionParameters extends ITransactionParameters {
     splitInputsInto?: number;
 }
 export interface SharedInteractionParameters extends ITransactionParameters {
-    calldata?: Buffer | undefined;
+    calldata?: Buffer;
     disableAutoRefund?: boolean;
     readonly randomBytes?: Buffer;
 }
-export interface IInteractionParameters extends SharedInteractionParameters {
+export interface IInteractionParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly calldata: Buffer;
     readonly to: Address;
 }
-export interface IWrapParameters extends SharedInteractionParameters {
+export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly to?: Address;
     readonly from: Address;
     readonly amount: bigint;
     readonly receiver?: Address;
     readonly generationParameters: WrappedGeneration;
 }
-export interface IUnwrapParameters extends SharedInteractionParameters {
+export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly unwrapUTXOs: VaultUTXOs[];
     readonly amount: bigint;
 }
-export interface IDeploymentParameters extends ITransactionParameters {
+export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
-    readonly to?: undefined;
     readonly randomBytes?: Buffer;
 }

package/build/utxo/OPNetLimitedProvider.d.ts

@@ -1,8 +1,15 @@
 import { Address } from '@btc-vision/bsi-binary';
+import { Network } from 'bitcoinjs-lib';
+import { Wallet } from '../opnet.js';
 import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
 import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
 import { BroadcastResponse } from './interfaces/BroadcastResponse.js';
-import { FetchUTXOParams, FetchUTXOParamsMultiAddress, UTXO } from './interfaces/IUTXO.js';
+import { FetchUTXOParams, FetchUTXOParamsMultiAddress, RawUTXOResponse, UTXO } from './interfaces/IUTXO.js';
+export interface WalletUTXOs {
+    readonly confirmed: RawUTXOResponse[];
+    readonly pending: RawUTXOResponse[];
+    readonly spentTransactions: RawUTXOResponse[];
+}
 export declare class OPNetLimitedProvider {
     private readonly opnetAPIUrl;
     private readonly utxoPath;
@@ -11,6 +18,9 @@ export declare class OPNetLimitedProvider {
     fetchUTXO(settings: FetchUTXOParams): Promise<UTXO[]>;
     fetchUTXOMultiAddr(settings: FetchUTXOParamsMultiAddress): Promise<UTXO[]>;
     broadcastTransaction(transaction: string, psbt: boolean): Promise<BroadcastResponse | undefined>;
+    splitUTXOs(wallet: Wallet, network: Network, splitInputsInto: number, amountPerUTXO: bigint): Promise<BroadcastResponse | {
+        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,4 +1,5 @@
 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 {
@@ -8,6 +9,12 @@ export class OPNetLimitedProvider {
         this.rpc = 'json-rpc';
     }
     async fetchUTXO(settings) {
+        if (settings.usePendingUTXO === undefined) {
+            settings.usePendingUTXO = true;
+        }
+        if (settings.optimized === undefined) {
+            settings.optimized = true;
+        }
         const params = {
             method: 'GET',
             headers: {
@@ -20,10 +27,21 @@ export class OPNetLimitedProvider {
             throw new Error(`Failed to fetch UTXO data: ${resp.statusText}`);
         }
         const fetchedData = (await resp.json());
-        if (fetchedData.length === 0) {
+        const allUtxos = settings.usePendingUTXO
+            ? [...fetchedData.confirmed, ...fetchedData.pending]
+            : fetchedData.confirmed;
+        const unspentUTXOs = [];
+        for (const utxo of allUtxos) {
+            if (fetchedData.spentTransactions.some((spent) => spent.transactionId === utxo.transactionId &&
+                spent.outputIndex === utxo.outputIndex)) {
+                continue;
+            }
+            unspentUTXOs.push(utxo);
+        }
+        if (unspentUTXOs.length === 0) {
             throw new Error('No UTXO found');
         }
-        const meetCriteria = fetchedData.filter((utxo) => {
+        const meetCriteria = unspentUTXOs.filter((utxo) => {
             return BigInt(utxo.value) >= settings.minAmount;
         });
         if (meetCriteria.length === 0) {
@@ -58,6 +76,7 @@ export class OPNetLimitedProvider {
                 minAmount: settings.minAmount,
                 requestedAmount: settings.requestedAmount,
                 optimized: settings.optimized,
+                usePendingUTXO: false,
             };
             const promise = this.fetchUTXO(params).catch(() => {
                 return [];
@@ -86,6 +105,34 @@ export class OPNetLimitedProvider {
         }
         return result;
     }
+    async splitUTXOs(wallet, network, splitInputsInto, amountPerUTXO) {
+        const utxoSetting = {
+            addresses: [wallet.p2wpkh, wallet.p2tr],
+            minAmount: 330n,
+            requestedAmount: 1000000000000000n,
+        };
+        const utxos = await this.fetchUTXOMultiAddr(utxoSetting);
+        if (!utxos || !utxos.length)
+            return { error: 'No UTXOs found' };
+        const amount = BigInt(splitInputsInto) * amountPerUTXO;
+        const fundingTransactionParameters = {
+            amount: amount,
+            feeRate: 500,
+            from: wallet.p2tr,
+            utxos: utxos,
+            signer: wallet.keypair,
+            network,
+            to: wallet.p2tr,
+            splitInputsInto,
+            priorityFee: 330n,
+        };
+        const transactionFactory = new TransactionFactory();
+        const fundingTx = await transactionFactory.createBTCTransfer(fundingTransactionParameters);
+        const broadcastResponse = await this.broadcastTransaction(fundingTx.tx, false);
+        if (!broadcastResponse)
+            return { error: 'Could not broadcast transaction' };
+        return broadcastResponse;
+    }
     async rpcMethod(method, paramsMethod) {
         const params = {
             method: 'POST',

package/build/utxo/interfaces/IUTXO.d.ts

@@ -9,7 +9,8 @@ export interface FetchUTXOParams {
     readonly address: string;
     readonly minAmount: bigint;
     readonly requestedAmount: bigint;
-    readonly optimized?: boolean;
+    optimized?: boolean;
+    usePendingUTXO?: boolean;
 }
 export interface FetchUTXOParamsMultiAddress {
     readonly addresses: string[];

package/eslint.config.js

@@ -28,7 +28,6 @@ export default tseslint.config(
             '@typescript-eslint/no-unnecessary-type-parameters': 'off',
             '@typescript-eslint/no-duplicate-enum-values': 'off',
             'prefer-spread': 'off',
-            '@typescript-eslint/no-empty-object-type': 'off',
         },
     },
     {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.104",
+    "version": "1.0.106",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -91,8 +91,8 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bsi-binary": "^1.0.41",
-        "@btc-vision/bsi-bitcoin-rpc": "^1.0.28",
+        "@btc-vision/bsi-binary": "^1.0.42",
+        "@btc-vision/bsi-bitcoin-rpc": "^1.0.29",
         "@btc-vision/logger": "^1.0.6",
         "@eslint/js": "^9.10.0",
         "assert": "^2.1.0",

package/src/transaction/TransactionFactory.ts

@@ -224,8 +224,7 @@ export class TransactionFactory {
         // Initial generation
         await preTransaction.signTransaction();
 
-        const parameters: IFundingTransactionParameters =
-            await preTransaction.getFundingTransactionParameters();
+        const parameters: IFundingTransactionParameters =await preTransaction.getFundingTransactionParameters();
 
         const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
         const signedTransaction: Transaction = await fundingTransaction.signTransaction();
@@ -249,6 +248,7 @@ export class TransactionFactory {
             utxos: [newUtxo],
             randomBytes: preTransaction.getRndBytes(),
             nonWitnessUtxo: signedTransaction.toBuffer(),
+            optionalOutputs: []
         };
 
         const finalTransaction: DeploymentTransaction = new DeploymentTransaction(newParams);
@@ -291,7 +291,7 @@ export class TransactionFactory {
         const childTransactionRequiredValue: bigint =
             wrapParameters.amount +
             currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT +
-            (wrapParameters.priorityFee || 300n);
+            (wrapParameters.priorityFee || 330n);
 
         const wbtc: wBTC = new wBTC(wrapParameters.network, wrapParameters.chainId);
         const to = wbtc.getAddress();

package/src/transaction/builders/TransactionBuilder.ts

@@ -105,6 +105,9 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
     /**
      * @param {ITransactionParameters} parameters - The transaction parameters
      */
+
+    public optionalOutputs: PsbtOutputExtended[] | undefined;
+
     protected constructor(parameters: ITransactionParameters) {
         super(parameters);
 
@@ -119,6 +122,8 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
 
+        this.optionalOutputs = parameters.optionalOutputs;
+
         this.from = TransactionBuilder.getFrom(
             parameters.from,
             this.signer as ECPairInterface,
@@ -195,6 +200,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             priorityFee: this.priorityFee ?? 0n,
             from: this.from,
             amount: this.estimatedFees,
+            optionalOutputs: this.optionalOutputs,
         };
     }
 
@@ -409,8 +415,8 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      */
     protected async addRefundOutput(amountSpent: bigint): Promise<void> {
         /** Add the refund output */
-        const sendBackAmount: bigint = this.totalInputAmount - amountSpent;
-
+        const sendBackAmount: bigint =
+            this.totalInputAmount - amountSpent - this.addOptionalOutputsAndGetAmount();
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
             if (AddressVerificator.isValidP2TRAddress(this.from, this.network)) {
                 await this.setFeeOutput({
@@ -479,7 +485,6 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         for (const utxo of this.utxos) {
             total += utxo.value;
         }
-
         return total;
     }
 
@@ -496,6 +501,22 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
 
         return total;
     }
+    /**
+     * @description Adds optional outputs to transaction and returns their total value in satoshi to calculate refund transaction
+     * @protected
+     * @returns {bigint}
+     */
+    protected addOptionalOutputsAndGetAmount(): bigint {
+        if (!this.optionalOutputs) return 0n;
+
+        let refundedFromOptionalOutputs = 0n;
+
+        for (let i = 0; i < this.optionalOutputs.length; i++) {
+            this.addOutput(this.optionalOutputs[i]);
+            refundedFromOptionalOutputs += BigInt(this.optionalOutputs[i].value);
+        }
+        return refundedFromOptionalOutputs;
+    }
 
     /**
      * @description Adds the inputs from the utxos

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -4,15 +4,17 @@ 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 { PsbtOutputExtended } from './Tap.js';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: Address;
-    readonly to?: Address | undefined;
+    readonly to?: Address;
     utxos: UTXO[];
 
-    nonWitnessUtxo?: Buffer | undefined;
+    nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
 
+    optionalOutputs?: PsbtOutputExtended[];
+
     chainId?: ChainId;
 
     readonly feeRate: number;
@@ -26,19 +28,20 @@ export interface IFundingTransactionParameters extends ITransactionParameters {
 }
 
 export interface SharedInteractionParameters extends ITransactionParameters {
-    calldata?: Buffer | undefined;
+    calldata?: Buffer;
     disableAutoRefund?: boolean;
 
     readonly randomBytes?: Buffer;
 }
 
-export interface IInteractionParameters extends SharedInteractionParameters {
+export interface IInteractionParameters
+    extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly calldata: Buffer;
 
     readonly to: Address;
 }
 
-export interface IWrapParameters extends SharedInteractionParameters {
+export interface IWrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly to?: Address;
 
     readonly from: Address;
@@ -48,14 +51,13 @@ export interface IWrapParameters extends SharedInteractionParameters {
     readonly generationParameters: WrappedGeneration;
 }
 
-export interface IUnwrapParameters extends SharedInteractionParameters {
+export interface IUnwrapParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
     readonly unwrapUTXOs: VaultUTXOs[];
     readonly amount: bigint;
 }
 
-export interface IDeploymentParameters extends ITransactionParameters {
+export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;
 
-    readonly to?: undefined;
     readonly randomBytes?: Buffer;
 }