@btc-vision/transaction 1.7.27 → 1.7.29

package/src/transaction/browser/Web3Provider.ts

@@ -1,82 +1,18 @@
-import {
-    IDeploymentParameters,
-    IInteractionParameters,
-} from '../interfaces/ITransactionParameters.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { CancelledTransaction, DeploymentResult, InteractionResponse } from '../TransactionFactory';
-import { ICustomTransactionParameters } from '../builders/CustomScriptTransaction.js';
-import { ICancelTransactionParameters } from '../builders/CancelTransaction.js';
-import { MLDSASecurityLevel } from '@btc-vision/bip32';
-
-export type InteractionParametersWithoutSigner = Omit<
-    IInteractionParameters,
-    'signer' | 'challenge' | 'mldsaSigner'
->;
-
-export type IDeploymentParametersWithoutSigner = Omit<
-    IDeploymentParameters,
-    'signer' | 'network' | 'challenge' | 'mldsaSigner'
->;
-
-export type ICustomTransactionWithoutSigner = Omit<
-    ICustomTransactionParameters,
-    'signer' | 'challenge' | 'mldsaSigner'
->;
-
-export type ICancelTransactionParametersWithoutSigner = Omit<
-    ICancelTransactionParameters,
-    'signer' | 'challenge' | 'network' | 'mldsaSigner'
->;
-
-export interface BroadcastTransactionOptions {
-    raw: string;
-    psbt: boolean;
-}
-
-export interface BroadcastedTransaction {
-    /** Whether the transaction was successfully broadcasted. */
-    readonly success: boolean;
-
-    /**
-     * The result of the broadcasted transaction.
-     */
-    readonly result?: string;
-
-    /**
-     * The error message if the transaction was not successfully broadcasted.
-     */
-    readonly error?: string;
-
-    /**
-     * The number of peers that the transaction was broadcasted to.
-     */
-    readonly peers?: number;
-}
-
-/**
- * ML-DSA signature result
- */
-export interface MLDSASignature {
-    /**
-     * The ML-DSA signature in hex format
-     */
-    readonly signature: string;
-
-    /**
-     * The ML-DSA public key used for signing in hex format
-     */
-    readonly publicKey: string;
-
-    /**
-     * The security level used (44, 65, or 87)
-     */
-    readonly securityLevel: MLDSASecurityLevel;
-
-    /**
-     * The message hash that was signed
-     */
-    readonly messageHash: string;
-}
+import {
+    CancelledTransaction,
+    DeploymentResult,
+    InteractionResponse,
+} from '../interfaces/ITransactionResponses.js';
+import {
+    BroadcastedTransaction,
+    BroadcastTransactionOptions,
+    ICancelTransactionParametersWithoutSigner,
+    ICustomTransactionWithoutSigner,
+    IDeploymentParametersWithoutSigner,
+    InteractionParametersWithoutSigner,
+    MLDSASignature,
+} from '../interfaces/IWeb3ProviderTypes.js';
 
 export interface Web3Provider {
     signInteraction(

package/src/transaction/builders/CancelTransaction.ts

@@ -2,19 +2,10 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { P2TRPayment, PaymentType, Psbt, PsbtInput, Taptree } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import {
-    ITransactionParameters,
-    SharedInteractionParameters,
-} from '../interfaces/ITransactionParameters.js';
+import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
+import { ICancelTransactionParameters } from '../interfaces/ICancelTransactionParameters.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 
-export interface ICancelTransactionParameters extends Omit<
-    ITransactionParameters,
-    'priorityFee' | 'gasSatFee'
-> {
-    readonly compiledTargetScript: string | Buffer;
-}
-
 export class CancelTransaction extends TransactionBuilder<TransactionType.CANCEL> {
     public type: TransactionType.CANCEL = TransactionType.CANCEL;
 

package/src/transaction/builders/ConsolidatedInteractionTransaction.ts

@@ -14,7 +14,7 @@ import {
 } from '../interfaces/IConsolidatedTransactionParameters.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
@@ -77,7 +77,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
     /** The compressed calldata (same as InteractionTransaction) */
     protected readonly calldata: Buffer;
     /** Challenge solution for epoch (same as InteractionTransaction) */
-    protected readonly challenge: ChallengeSolution;
+    protected readonly challenge: IChallengeSolution;
     /** Epoch challenge P2WSH address (same as InteractionTransaction) */
     protected readonly epochChallenge: IP2WSHAddress;
     /** Script signer for interaction (same as InteractionTransaction) */
@@ -225,7 +225,7 @@ export class ConsolidatedInteractionTransaction extends TransactionBuilder<Trans
     /**
      * Get the challenge solution (same as InteractionTransaction).
      */
-    public getChallenge(): ChallengeSolution {
+    public getChallenge(): IChallengeSolution {
         return this.challenge;
     }
 

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -6,32 +6,18 @@ import {
     Psbt,
     PsbtInput,
     Signer,
-    Stack,
     Taptree,
     toXOnly,
 } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
 import { ECPairInterface } from 'ecpair';
-
-export interface ICustomTransactionParameters extends Omit<
-    SharedInteractionParameters,
-    'challenge'
-> {
-    script: (Buffer | Stack)[];
-    witnesses: Buffer[];
-
-    /** optional Taproot annex payload (without the 0x50 prefix) */
-    annex?: Buffer;
-
-    to: string;
-}
+import { ICustomTransactionParameters } from '../interfaces/ICustomTransactionParameters.js';
 
 /**
  * Class for interaction transactions

package/src/transaction/builders/DeploymentTransaction.ts

@@ -24,7 +24,7 @@ import { ECPairInterface } from 'ecpair';
 import { Address } from '../../keypair/Address.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { Feature, FeaturePriority, Features } from '../../generators/Features.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 
@@ -33,7 +33,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
 
     public type: TransactionType.DEPLOYMENT = TransactionType.DEPLOYMENT;
 
-    protected readonly challenge: ChallengeSolution;
+    protected readonly challenge: IChallengeSolution;
     protected readonly epochChallenge: IP2WSHAddress;
 
     /**
@@ -210,7 +210,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * Get the contract bytecode
      * @returns {Buffer} The contract bytecode
      */
-    public getChallenge(): ChallengeSolution {
+    public getChallenge(): IChallengeSolution {
         return this.challenge;
     }
 

package/src/transaction/builders/InteractionTransactionP2WDA.ts

@@ -9,7 +9,7 @@ import { P2WDAGenerator } from '../../generators/builders/P2WDAGenerator.js';
 import { Feature, FeaturePriority, Features } from '../../generators/Features.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { ECPairInterface } from 'ecpair';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
@@ -36,7 +36,7 @@ export class InteractionTransactionP2WDA extends TransactionBuilder<TransactionT
     private readonly contractAddress: string;
     private readonly contractSecret: Buffer;
     private readonly calldata: Buffer;
-    private readonly challenge: ChallengeSolution;
+    private readonly challenge: IChallengeSolution;
     private readonly randomBytes: Buffer;
     private p2wdaGenerator: P2WDAGenerator;
     private scriptSigner: ECPairInterface;
@@ -131,7 +131,7 @@ export class InteractionTransactionP2WDA extends TransactionBuilder<TransactionT
     /**
      * Get the challenge (for compatibility if needed elsewhere)
      */
-    public getChallenge(): ChallengeSolution {
+    public getChallenge(): IChallengeSolution {
         return this.challenge;
     }
 

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -9,7 +9,7 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { TimeLockGenerator } from '../mineable/TimelockGenerator.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 
 /**
@@ -33,7 +33,7 @@ export abstract class SharedInteractionTransaction<
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
 
-    protected readonly challenge: ChallengeSolution;
+    protected readonly challenge: IChallengeSolution;
     protected readonly epochChallenge: IP2WSHAddress;
 
     protected calldataGenerator: CalldataGenerator;
@@ -118,7 +118,7 @@ export abstract class SharedInteractionTransaction<
     /**
      * Get the preimage
      */
-    public getChallenge(): ChallengeSolution {
+    public getChallenge(): IChallengeSolution {
         return this.challenge;
     }
 

package/src/transaction/builders/TransactionBuilder.ts

@@ -10,8 +10,8 @@ import bitcoin, {
     Signer,
     toXOnly,
     Transaction,
-    varuint,
 } from '@btc-vision/bitcoin';
+import { witnessStackToScriptWitness } from '../utils/WitnessUtils.js';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -232,33 +232,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      * @returns {Buffer}
      */
     public static witnessStackToScriptWitness(witness: Buffer[]): Buffer {
-        let buffer = Buffer.allocUnsafe(0);
-
-        function writeSlice(slice: Buffer) {
-            buffer = Buffer.concat([buffer, Buffer.from(slice)]);
-        }
-
-        function writeVarInt(i: number) {
-            const currentLen = buffer.length;
-            const varintLen = varuint.encodingLength(i);
-
-            buffer = Buffer.concat([buffer, Buffer.allocUnsafe(varintLen)]);
-            varuint.encode(i, buffer, currentLen);
-        }
-
-        function writeVarSlice(slice: Buffer) {
-            writeVarInt(slice.length);
-            writeSlice(slice);
-        }
-
-        function writeVector(vector: Buffer[]) {
-            writeVarInt(vector.length);
-            vector.forEach(writeVarSlice);
-        }
-
-        writeVector(witness);
-
-        return buffer;
+        return witnessStackToScriptWitness(witness);
     }
 
     public addOPReturn(buffer: Buffer): void {

package/src/transaction/interfaces/ICancelTransactionParameters.ts

@@ -0,0 +1,8 @@
+import { ITransactionParameters } from './ITransactionParameters.js';
+
+export interface ICancelTransactionParameters extends Omit<
+    ITransactionParameters,
+    'priorityFee' | 'gasSatFee'
+> {
+    readonly compiledTargetScript: string | Buffer;
+}

package/src/transaction/interfaces/ICustomTransactionParameters.ts

@@ -0,0 +1,15 @@
+import { Stack } from '@btc-vision/bitcoin';
+import { SharedInteractionParameters } from './ITransactionParameters.js';
+
+export interface ICustomTransactionParameters extends Omit<
+    SharedInteractionParameters,
+    'challenge'
+> {
+    script: (Buffer | Stack)[];
+    witnesses: Buffer[];
+
+    /** optional Taproot annex payload (without the 0x50 prefix) */
+    annex?: Buffer;
+
+    to: string;
+}

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -1,9 +1,9 @@
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
+import { ITweakedTransactionData } from './ITweakedTransactionData.js';
 import { ChainId } from '../../network/ChainId.js';
 import { PsbtOutputExtended } from '@btc-vision/bitcoin';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
-import { AddressRotationConfig } from '../../signer/AddressRotation.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
+import { AddressRotationConfigBase } from '../../signer/IRotationSigner.js';
 
 export interface LoadedStorage {
     [key: string]: string[];
@@ -49,7 +49,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
      * When enabled, allows different signers to sign different UTXOs based on their addresses.
      * This supports proper Bitcoin privacy practices where each UTXO has its own key.
      */
-    readonly addressRotation?: AddressRotationConfig;
+    readonly addressRotation?: AddressRotationConfigBase;
 }
 
 export interface IFundingTransactionParameters extends ITransactionParameters {
@@ -62,7 +62,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer;
     disableAutoRefund?: boolean;
 
-    readonly challenge: ChallengeSolution;
+    readonly challenge: IChallengeSolution;
     readonly randomBytes?: Buffer;
 
     readonly loadedStorage?: LoadedStorage;
@@ -81,5 +81,5 @@ export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'
     readonly calldata?: Buffer;
 
     readonly randomBytes?: Buffer;
-    readonly challenge: ChallengeSolution;
+    readonly challenge: IChallengeSolution;
 }

package/src/transaction/interfaces/ITransactionResponses.ts

@@ -0,0 +1,29 @@
+import { RawChallenge } from '../../epoch/interfaces/IChallengeSolution.js';
+import { UTXO } from '../../utxo/interfaces/IUTXO.js';
+
+export interface DeploymentResult {
+    readonly transaction: [string, string];
+    readonly contractAddress: string;
+    readonly contractPubKey: string;
+    readonly challenge: RawChallenge;
+    readonly utxos: UTXO[];
+    readonly inputUtxos: UTXO[];
+}
+
+export interface InteractionResponse {
+    readonly fundingTransaction: string | null;
+    readonly interactionTransaction: string;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+    readonly fundingUTXOs: UTXO[];
+    readonly fundingInputUtxos: UTXO[];
+    readonly challenge: RawChallenge;
+    readonly interactionAddress: string | null;
+    readonly compiledTargetScript: string | null;
+}
+
+export interface CancelledTransaction {
+    readonly transaction: string;
+    readonly nextUTXOs: UTXO[];
+    readonly inputUtxos: UTXO[];
+}

package/src/transaction/interfaces/ITweakedTransactionData.ts

@@ -0,0 +1,24 @@
+import { Network, Signer } from '@btc-vision/bitcoin';
+import { ECPairInterface } from 'ecpair';
+import { QuantumBIP32Interface } from '@btc-vision/bip32';
+import { ChainId } from '../../network/ChainId.js';
+import { AddressRotationConfigBase } from '../../signer/IRotationSigner.js';
+
+export type SupportedTransactionVersion = 1 | 2 | 3;
+
+export interface ITweakedTransactionData {
+    readonly mldsaSigner: QuantumBIP32Interface | null;
+    readonly signer: Signer | ECPairInterface;
+    readonly network: Network;
+    readonly chainId?: ChainId;
+    readonly nonWitnessUtxo?: Buffer;
+    readonly noSignatures?: boolean;
+    readonly unlockScript?: Buffer[];
+    readonly txVersion?: SupportedTransactionVersion;
+
+    /**
+     * Address rotation configuration for per-UTXO signing.
+     * When enabled, each UTXO can be signed by a different signer.
+     */
+    readonly addressRotation?: AddressRotationConfigBase;
+}

package/src/transaction/interfaces/IWeb3ProviderTypes.ts

@@ -0,0 +1,74 @@
+import { IDeploymentParameters, IInteractionParameters } from './ITransactionParameters.js';
+import { ICustomTransactionParameters } from './ICustomTransactionParameters.js';
+import { ICancelTransactionParameters } from './ICancelTransactionParameters.js';
+import { MLDSASecurityLevel } from '@btc-vision/bip32';
+
+export type InteractionParametersWithoutSigner = Omit<
+    IInteractionParameters,
+    'signer' | 'challenge' | 'mldsaSigner'
+>;
+
+export type IDeploymentParametersWithoutSigner = Omit<
+    IDeploymentParameters,
+    'signer' | 'network' | 'challenge' | 'mldsaSigner'
+>;
+
+export type ICustomTransactionWithoutSigner = Omit<
+    ICustomTransactionParameters,
+    'signer' | 'challenge' | 'mldsaSigner'
+>;
+
+export type ICancelTransactionParametersWithoutSigner = Omit<
+    ICancelTransactionParameters,
+    'signer' | 'challenge' | 'network' | 'mldsaSigner'
+>;
+
+export interface BroadcastTransactionOptions {
+    raw: string;
+    psbt: boolean;
+}
+
+export interface BroadcastedTransaction {
+    /** Whether the transaction was successfully broadcasted. */
+    readonly success: boolean;
+
+    /**
+     * The result of the broadcasted transaction.
+     */
+    readonly result?: string;
+
+    /**
+     * The error message if the transaction was not successfully broadcasted.
+     */
+    readonly error?: string;
+
+    /**
+     * The number of peers that the transaction was broadcasted to.
+     */
+    readonly peers?: number;
+}
+
+/**
+ * ML-DSA signature result
+ */
+export interface MLDSASignature {
+    /**
+     * The ML-DSA signature in hex format
+     */
+    readonly signature: string;
+
+    /**
+     * The ML-DSA public key used for signing in hex format
+     */
+    readonly publicKey: string;
+
+    /**
+     * The security level used (44, 65, or 87)
+     */
+    readonly securityLevel: MLDSASecurityLevel;
+
+    /**
+     * The message hash that was signed
+     */
+    readonly messageHash: string;
+}

package/src/transaction/offline/TransactionReconstructor.ts

@@ -33,7 +33,7 @@ import {
     IInteractionParameters,
     ITransactionParameters,
 } from '../interfaces/ITransactionParameters.js';
-import { SupportedTransactionVersion } from '../shared/TweakedTransaction.js';
+import { SupportedTransactionVersion } from '../interfaces/ITweakedTransactionData.js';
 
 /**
  * Options for reconstructing a transaction from serialized state

package/src/transaction/shared/TweakedTransaction.ts

@@ -31,38 +31,15 @@ import { TweakedSigner, TweakSettings } from '../../signer/TweakedSigner.js';
 import { ECPairInterface } from 'ecpair';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { ChainId } from '../../network/ChainId.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
-import {
-    canSignNonTaprootInput,
-    isTaprootInput,
-    pubkeyInScript,
-} from '../../signer/SignerUtils.js';
-import { TransactionBuilder } from '../builders/TransactionBuilder.js';
+import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
+import { witnessStackToScriptWitness } from '../utils/WitnessUtils.js';
 import { Buffer } from 'buffer';
 import { P2WDADetector } from '../../p2wda/P2WDADetector.js';
 import { QuantumBIP32Interface } from '@btc-vision/bip32';
 import { MessageSigner } from '../../keypair/MessageSigner.js';
-import { AddressRotationConfig, RotationSigner, SignerMap } from '../../signer/AddressRotation.js';
-
-export type SupportedTransactionVersion = 1 | 2 | 3;
-
-export interface ITweakedTransactionData {
-    readonly mldsaSigner: QuantumBIP32Interface | null;
-    readonly signer: Signer | ECPairInterface | UnisatSigner;
-    readonly network: Network;
-    readonly chainId?: ChainId;
-    readonly nonWitnessUtxo?: Buffer;
-    readonly noSignatures?: boolean;
-    readonly unlockScript?: Buffer[];
-    readonly txVersion?: SupportedTransactionVersion;
-
-    /**
-     * Address rotation configuration for per-UTXO signing.
-     * When enabled, each UTXO can be signed by a different signer.
-     */
-    readonly addressRotation?: AddressRotationConfig;
-}
+import { RotationSigner, SignerMap } from '../../signer/AddressRotation.js';
+import { ITweakedTransactionData, SupportedTransactionVersion, } from '../interfaces/ITweakedTransactionData.js';
 
 /**
  * The transaction sequence
@@ -1146,8 +1123,7 @@ export abstract class TweakedTransaction extends Logger {
                 const witnessStack = [input.partialSig[0].signature, input.witnessScript];
                 return {
                     finalScriptSig: undefined,
-                    finalScriptWitness:
-                        TransactionBuilder.witnessStackToScriptWitness(witnessStack),
+                    finalScriptWitness: witnessStackToScriptWitness(witnessStack),
                 };
             }
 
@@ -1191,7 +1167,7 @@ export abstract class TweakedTransaction extends Logger {
 
         return {
             finalScriptSig: undefined,
-            finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witnessStack),
+            finalScriptWitness: witnessStackToScriptWitness(witnessStack),
         };
     }
 

package/src/transaction/utils/WitnessUtils.ts

@@ -0,0 +1,36 @@
+import { varuint } from '@btc-vision/bitcoin';
+
+/**
+ * Convert witness stack to script witness buffer
+ * @param {Buffer[]} witness - The witness stack
+ * @returns {Buffer}
+ */
+export function witnessStackToScriptWitness(witness: Buffer[]): Buffer {
+    let buffer = Buffer.allocUnsafe(0);
+
+    function writeSlice(slice: Buffer) {
+        buffer = Buffer.concat([buffer, Buffer.from(slice)]);
+    }
+
+    function writeVarInt(i: number) {
+        const currentLen = buffer.length;
+        const varintLen = varuint.encodingLength(i);
+
+        buffer = Buffer.concat([buffer, Buffer.allocUnsafe(varintLen)]);
+        varuint.encode(i, buffer, currentLen);
+    }
+
+    function writeVarSlice(slice: Buffer) {
+        writeVarInt(slice.length);
+        writeSlice(slice);
+    }
+
+    function writeVector(vector: Buffer[]) {
+        writeVarInt(vector.length);
+        vector.forEach(writeVarSlice);
+    }
+
+    writeVector(witness);
+
+    return buffer;
+}

package/src/utxo/OPNetLimitedProvider.ts

@@ -1,5 +1,7 @@
 import { Network } from '@btc-vision/bitcoin';
-import { IFundingTransactionParameters, TransactionFactory, Wallet } from '../opnet.js';
+import { IFundingTransactionParameters } from '../transaction/interfaces/ITransactionParameters.js';
+import { TransactionFactory } from '../transaction/TransactionFactory.js';
+import { Wallet } from '../keypair/Wallet.js';
 import { BroadcastResponse } from './interfaces/BroadcastResponse.js';
 import {
     FetchUTXOParams,

package/src/utxo/interfaces/IUTXO.ts

@@ -1,5 +1,5 @@
 import { ScriptPubKey } from '@btc-vision/bitcoin-rpc';
-import { RotationSigner } from '../../signer/AddressRotation.js';
+import { RotationSignerBase } from '../../signer/IRotationSigner.js';
 
 export interface UTXO {
     readonly transactionId: string;
@@ -16,7 +16,7 @@ export interface UTXO {
      * Used in address rotation mode where each UTXO may have its own signer.
      * If not provided, the signer will be resolved from the signerMap or the default signer.
      */
-    signer?: RotationSigner;
+    signer?: RotationSignerBase;
 }
 
 export interface FetchUTXOParams {

package/src/verification/TapscriptVerificator.ts

@@ -10,7 +10,7 @@ import {
     toXOnly,
 } from '@btc-vision/bitcoin';
 import { DeploymentGenerator } from '../generators/builders/DeploymentGenerator.js';
-import { ChallengeSolution } from '../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../epoch/interfaces/IChallengeSolution.js';
 import { Feature, Features } from '../generators/Features.js';
 
 export interface ContractAddressVerificationParams {
@@ -18,7 +18,7 @@ export interface ContractAddressVerificationParams {
     readonly contractSaltPubKey: Buffer;
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
-    readonly challenge: ChallengeSolution;
+    readonly challenge: IChallengeSolution;
     readonly priorityFee: bigint;
     readonly features: Feature<Features>[];
     readonly calldata?: Buffer;