@btc-vision/transaction 1.7.28 → 1.7.30

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.7.28",
+    "version": "1.7.30",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -143,7 +143,9 @@
         "test": "npm run build && vitest run",
         "test:watch": "npm run build && vitest",
         "test:ui": "npm run build && vitest --ui",
-        "test:coverage": "npm run build && vitest run --coverage"
+        "test:coverage": "npm run build && vitest run --coverage",
+        "check:circular": "madge --circular --extensions ts,tsx src/",
+        "prebuild": "npm run check:circular"
     },
     "devDependencies": {
         "@babel/core": "^7.28.5",
@@ -160,6 +162,7 @@
         "@vitest/ui": "^4.0.8",
         "eslint": "^9.39.1",
         "https-browserify": "^1.0.0",
+        "madge": "^8.0.0",
         "os-browserify": "^0.3.0",
         "prettier": "^3.6.2",
         "stream-browserify": "^3.0.0",
@@ -176,7 +179,7 @@
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.2.0",
         "@btc-vision/bip32": "^6.0.3",
-        "@btc-vision/bitcoin": "^6.5.3",
+        "@btc-vision/bitcoin": "^6.5.4",
         "@btc-vision/bitcoin-rpc": "^1.0.6",
         "@btc-vision/logger": "^1.0.8",
         "@btc-vision/post-quantum": "^0.5.3",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.7.28';
+export const version = '1.7.30';

package/src/consensus/ConsensusConfig.ts

@@ -1,34 +1,7 @@
 import { Consensus } from './Consensus.js';
+import { ConsensusConfig } from './IConsensusConfig.js';
 import { RoswellConsensus } from './metadata/RoswellConsensus.js';
 
-export interface ConsensusConfig<T extends Consensus> {
-    // The consensus type.
-    readonly CONSENSUS: T;
-
-    // The consensus name.
-    readonly CONSENSUS_NAME: string;
-
-    // The block height at which this consensus was enabled.
-    readonly ENABLED_AT_BLOCK: bigint;
-
-    /** WBTC vaults */
-    // Defines the minimum amount that can be consolidated in a single transaction.
-    //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;
-
-    // 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;
-
-    // The maximum fee rate for the consolidation.
-    //readonly UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: bigint;
-}
-
 export const OPNetConsensusConfig: { [key in Consensus]?: ConsensusConfig<key> } = {
     [Consensus.Roswell]: RoswellConsensus,
 };

package/src/consensus/IConsensusConfig.ts

@@ -0,0 +1,29 @@
+import { Consensus } from './Consensus.js';
+
+export interface ConsensusConfig<T extends Consensus> {
+    // The consensus type.
+    readonly CONSENSUS: T;
+
+    // The consensus name.
+    readonly CONSENSUS_NAME: string;
+
+    // The block height at which this consensus was enabled.
+    readonly ENABLED_AT_BLOCK: bigint;
+
+    /** WBTC vaults */
+    // Defines the minimum amount that can be consolidated in a single transaction.
+    //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;
+
+    // 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;
+
+    // The maximum fee rate for the consolidation.
+    //readonly UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT: bigint;
+}

package/src/consensus/metadata/RoswellConsensus.ts

@@ -1,4 +1,4 @@
-import { ConsensusConfig } from '../ConsensusConfig.js';
+import { ConsensusConfig } from '../IConsensusConfig.js';
 import { Consensus } from '../Consensus.js';
 
 export const RoswellConsensus: ConsensusConfig<Consensus.Roswell> = {

package/src/epoch/interfaces/IChallengeSolution.ts

@@ -18,6 +18,16 @@ export interface IChallengeSolution {
     readonly graffiti: Buffer;
     readonly difficulty: number;
     readonly verification: IChallengeVerification;
+
+    verifySubmissionSignature(): boolean;
+    getSubmission(): IChallengeSubmission | undefined;
+    toRaw(): RawChallenge;
+    verify(): boolean;
+    toBuffer(): Buffer;
+    toHex(): string;
+    calculateSolution(): Buffer;
+    checkDifficulty(minDifficulty: number): { valid: boolean; difficulty: number };
+    getMiningTargetBlock(): bigint | null;
 }
 
 export interface RawChallengeVerification {
@@ -41,8 +51,10 @@ export interface RawChallengeSubmission {
 export interface IChallengeSubmission {
     readonly publicKey: Address;
     readonly solution: Buffer;
-    readonly graffiti?: Buffer;
+    readonly graffiti: Buffer | undefined;
     readonly signature: Buffer;
+    readonly epochNumber: bigint;
+    verifySignature(): boolean;
 }
 
 export interface RawChallenge {

package/src/epoch/validator/EpochValidator.ts

@@ -1,6 +1,7 @@
 import { IChallengeSolution, RawChallenge } from '../interfaces/IChallengeSolution.js';
-import { ChallengeSolution } from '../ChallengeSolution.js';
 import { crypto } from '@btc-vision/bitcoin';
+import { Address } from '../../keypair/Address.js';
+import { stringToBuffer } from '../../utils/StringToBuffer.js';
 
 export class EpochValidator {
     private static readonly BLOCKS_PER_EPOCH: bigint = 5n;
@@ -131,8 +132,58 @@ export class EpochValidator {
      * Validate epoch winner from raw data
      */
     public static validateEpochWinner(epochData: RawChallenge): boolean {
-        const preimage = new ChallengeSolution(epochData);
-        return this.verifySolution(preimage);
+        try {
+            const epochNumber = BigInt(epochData.epochNumber);
+            const publicKey = Address.fromString(
+                epochData.mldsaPublicKey,
+                epochData.legacyPublicKey,
+            );
+            const solution = stringToBuffer(epochData.solution);
+            const salt = stringToBuffer(epochData.salt);
+            const difficulty = epochData.difficulty;
+
+            const verification = {
+                epochHash: stringToBuffer(epochData.verification.epochHash),
+                epochRoot: stringToBuffer(epochData.verification.epochRoot),
+                targetHash: stringToBuffer(epochData.verification.targetHash),
+                targetChecksum: stringToBuffer(epochData.verification.targetChecksum),
+                startBlock: BigInt(epochData.verification.startBlock),
+                endBlock: BigInt(epochData.verification.endBlock),
+                proofs: Object.freeze(epochData.verification.proofs.map((p) => stringToBuffer(p))),
+            };
+
+            const calculatedPreimage = this.calculatePreimage(
+                verification.targetChecksum,
+                publicKey.toBuffer(),
+                salt,
+            );
+
+            const computedSolution = this.sha1(calculatedPreimage);
+            const computedSolutionBuffer = this.uint8ArrayToBuffer(computedSolution);
+
+            if (!computedSolutionBuffer.equals(solution)) {
+                return false;
+            }
+
+            const matchingBits = this.countMatchingBits(
+                computedSolutionBuffer,
+                verification.targetHash,
+            );
+
+            if (matchingBits !== difficulty) {
+                return false;
+            }
+
+            const expectedStartBlock = epochNumber * this.BLOCKS_PER_EPOCH;
+            const expectedEndBlock = expectedStartBlock + this.BLOCKS_PER_EPOCH - 1n;
+
+            return !(
+                verification.startBlock !== expectedStartBlock ||
+                verification.endBlock !== expectedEndBlock
+            );
+        } catch {
+            return false;
+        }
     }
 
     /**

package/src/generators/builders/CalldataGenerator.ts

@@ -4,7 +4,7 @@ import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { Feature, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 /**
@@ -58,7 +58,7 @@ export class CalldataGenerator extends Generator {
      * Compile an interaction bitcoin script
      * @param {Buffer} calldata - The calldata to use
      * @param {Buffer} contractSecret - The contract secret
-     * @param {ChallengeSolution} challenge
+     * @param {IChallengeSolution} challenge
      * @param maxPriority - Amount of satoshis to spend max on priority fee
      * @param {Feature<Features>[]} featuresRaw - The features to use
      * @returns {Buffer} - The compiled script
@@ -67,7 +67,7 @@ export class CalldataGenerator extends Generator {
     public compile(
         calldata: Buffer,
         contractSecret: Buffer,
-        challenge: ChallengeSolution,
+        challenge: IChallengeSolution,
         maxPriority: bigint,
         featuresRaw: Feature<Features>[] = [],
     ): Buffer {

package/src/generators/builders/DeploymentGenerator.ts

@@ -1,7 +1,7 @@
 import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 import { Feature, Features } from '../Features.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 export const OPNET_DEPLOYMENT_VERSION = 0x00;
@@ -29,7 +29,7 @@ export class DeploymentGenerator extends Generator {
     public compile(
         contractBytecode: Buffer,
         contractSalt: Buffer,
-        challenge: ChallengeSolution,
+        challenge: IChallengeSolution,
         maxPriority: bigint,
         calldata?: Buffer,
         features?: Feature<Features>[],
@@ -59,7 +59,7 @@ export class DeploymentGenerator extends Generator {
     private getAsm(
         contractBytecode: Buffer,
         contractSalt: Buffer,
-        challenge: ChallengeSolution,
+        challenge: IChallengeSolution,
         maxPriority: bigint,
         calldata?: Buffer,
         featuresRaw?: Feature<Features>[],

package/src/generators/builders/P2WDAGenerator.ts

@@ -2,7 +2,7 @@ import { Network, networks } from '@btc-vision/bitcoin';
 import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 import { Feature, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
-import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IChallengeSolution } from '../../epoch/interfaces/IChallengeSolution.js';
 
 /**
  * @category Generators
@@ -62,7 +62,7 @@ export class P2WDAGenerator extends Generator {
     public compile(
         calldata: Buffer,
         contractSecret: Buffer,
-        challenge: ChallengeSolution,
+        challenge: IChallengeSolution,
         maxPriority: bigint,
         featuresRaw: Feature<Features>[] = [],
     ): Buffer {

package/src/keypair/MessageSigner.ts

@@ -5,7 +5,7 @@ import { TweakedSigner } from '../signer/TweakedSigner.js';
 import { EcKeyPair } from './EcKeyPair.js';
 import { MLDSASecurityLevel, QuantumBIP32Interface } from '@btc-vision/bip32';
 import { isOPWallet, OPWallet } from '../transaction/browser/types/OPWallet.js';
-import { MLDSASignature } from '../transaction/browser/Web3Provider.js';
+import { MLDSASignature } from '../transaction/interfaces/IWeb3ProviderTypes.js';
 
 export interface SignedMessage {
     readonly signature: Uint8Array;

package/src/opnet.ts

@@ -1,4 +1,5 @@
 import { Unisat } from './transaction/browser/types/Unisat.js';
+import { OPWallet } from './transaction/browser/types/OPWallet.js';
 
 export { version } from './_version.js';
 
@@ -55,12 +56,18 @@ export * from './network/ChainId.js';
 
 /** Signer */
 export * from './signer/TweakedSigner.js';
+export * from './signer/IRotationSigner.js';
 export * from './signer/AddressRotation.js';
 
 /** Transaction */
 export * from './transaction/enums/TransactionType.js';
 export * from './transaction/interfaces/ITransactionParameters.js';
 export * from './transaction/interfaces/IConsolidatedTransactionParameters.js';
+export * from './transaction/interfaces/ITransactionResponses.js';
+export * from './transaction/interfaces/IWeb3ProviderTypes.js';
+export * from './transaction/interfaces/ICancelTransactionParameters.js';
+export * from './transaction/interfaces/ICustomTransactionParameters.js';
+export * from './transaction/interfaces/ITweakedTransactionData.js';
 export * from './transaction/interfaces/Tap.js';
 export * from './transaction/TransactionFactory.js';
 
@@ -100,9 +107,6 @@ export * from './utils/lengths.js';
 export * from './utxo/interfaces/IUTXO.js';
 export * from './utxo/OPNetLimitedProvider.js';
 
-/** Processor */
-export * from './transaction/processor/PsbtTransaction.js';
-
 /** Shared */
 export * from './transaction/psbt/PSBTTypes.js';
 export * from './transaction/shared/TweakedTransaction.js';
@@ -112,6 +116,7 @@ export * from './transaction/shared/P2TR_MS.js';
 
 /** Consensus */
 export * from './consensus/Consensus.js';
+export * from './consensus/IConsensusConfig.js';
 export * from './consensus/ConsensusConfig.js';
 export * from './consensus/metadata/RoswellConsensus.js';
 
@@ -135,8 +140,8 @@ export * from './transaction/browser/extensions/XverseSigner.js';
 export * from './transaction/browser/types/Unisat.js';
 export * from './transaction/browser/types/Xverse.js';
 export * from './transaction/browser/types/OPWallet.js';
+export * from './transaction/browser/WalletNetworks.js';
 
-export * from './metadata/tokens.js';
 export * from './transaction/browser/Web3Provider.js';
 
 export * from './keypair/Secp256k1PointDeriver.js';
@@ -148,6 +153,6 @@ export * from './deterministic/CustomMap.js';
 declare global {
     interface Window {
         unisat?: Unisat;
-        opnet?: Unisat;
+        opnet?: OPWallet;
     }
 }

package/src/signer/AddressRotation.ts

@@ -1,11 +1,10 @@
-import { Signer } from '@btc-vision/bitcoin';
-import { ECPairInterface } from 'ecpair';
+import { RotationSignerBase } from './IRotationSigner.js';
 import { UnisatSigner } from '../transaction/browser/extensions/UnisatSigner.js';
 
 /**
- * Supported signer types for address rotation
+ * Supported signer types for address rotation (includes browser signers)
  */
-export type RotationSigner = Signer | ECPairInterface | UnisatSigner;
+export type RotationSigner = RotationSignerBase | UnisatSigner;
 
 /**
  * Map of addresses to their respective signers for address rotation mode.

package/src/signer/IRotationSigner.ts

@@ -0,0 +1,35 @@
+import { Signer } from '@btc-vision/bitcoin';
+import { ECPairInterface } from 'ecpair';
+
+/**
+ * Base signer type for address rotation.
+ * This is the minimal interface required for UTXO signing.
+ * UnisatSigner extends this through the CustomKeypair base class.
+ */
+export type RotationSignerBase = Signer | ECPairInterface;
+
+/**
+ * Map of addresses to their respective signers for address rotation mode.
+ * Each UTXO address can have its own dedicated signer.
+ */
+export type SignerMapBase = Map<string, RotationSignerBase>;
+
+/**
+ * Configuration for address rotation mode (base version without browser signers).
+ * When enabled, each UTXO can be signed by a different signer based on its address.
+ */
+export interface AddressRotationConfigBase {
+    /**
+     * Whether address rotation mode is enabled.
+     * When true, the signerMap will be used to find the appropriate signer for each UTXO.
+     * When false, the default single signer will be used for all inputs.
+     */
+    readonly enabled: boolean;
+
+    /**
+     * Map of addresses to their respective signers.
+     * The key is the address (from UTXO.scriptPubKey.address).
+     * The value is the signer that controls that address.
+     */
+    readonly signerMap: SignerMapBase;
+}

package/src/transaction/TransactionFactory.ts

@@ -1,10 +1,7 @@
 import { Transaction, TxOutput } from '@btc-vision/bitcoin';
 import { currentConsensus } from '../consensus/ConsensusConfig.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
-import {
-    CustomScriptTransaction,
-    ICustomTransactionParameters,
-} from './builders/CustomScriptTransaction.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';
@@ -22,26 +19,23 @@ import {
     ICustomTransactionWithoutSigner,
     IDeploymentParametersWithoutSigner,
     InteractionParametersWithoutSigner,
-} from './browser/Web3Provider.js';
+} from './interfaces/IWeb3ProviderTypes.js';
 import { WindowWithWallets } from './browser/extensions/UnisatSigner.js';
-import { RawChallenge } from '../epoch/interfaces/IChallengeSolution.js';
+import { IChallengeSolution, RawChallenge } from '../epoch/interfaces/IChallengeSolution.js';
 import { P2WDADetector } from '../p2wda/P2WDADetector.js';
 import { InteractionTransactionP2WDA } from './builders/InteractionTransactionP2WDA.js';
-import { ChallengeSolution } from '../epoch/ChallengeSolution.js';
 import { Address } from '../keypair/Address.js';
 import { BitcoinUtils } from '../utils/BitcoinUtils.js';
-import { CancelTransaction, ICancelTransactionParameters } from './builders/CancelTransaction.js';
+import { CancelTransaction } from './builders/CancelTransaction.js';
 import { ConsolidatedInteractionTransaction } from './builders/ConsolidatedInteractionTransaction.js';
 import { IConsolidatedInteractionParameters } from './interfaces/IConsolidatedTransactionParameters.js';
-
-export interface DeploymentResult {
-    readonly transaction: [string, string];
-    readonly contractAddress: string;
-    readonly contractPubKey: string;
-    readonly challenge: RawChallenge;
-    readonly utxos: UTXO[];
-    readonly inputUtxos: UTXO[];
-}
+import {
+    CancelledTransaction,
+    DeploymentResult,
+    InteractionResponse,
+} from './interfaces/ITransactionResponses.js';
+import { ICancelTransactionParameters } from './interfaces/ICancelTransactionParameters.js';
+import { ICustomTransactionParameters } from './interfaces/ICustomTransactionParameters.js';
 
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
@@ -58,28 +52,10 @@ export interface BitcoinTransferBase {
     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 BitcoinTransferResponse extends BitcoinTransferBase {
     readonly original: FundingTransaction;
 }
 
-export interface CancelledTransaction {
-    readonly transaction: string;
-    readonly nextUTXOs: UTXO[];
-    readonly inputUtxos: UTXO[];
-}
-
 /**
  * Response from signConsolidatedInteraction.
  * Contains both setup and reveal transactions for the CHCT system.
@@ -835,7 +811,7 @@ export class TransactionFactory {
      * @param {new (params: P) => T} TransactionClass - The transaction class constructor
      * @param {(tx: T) => Promise<bigint>} calculateAmount - Function to calculate required amount
      * @param {string} debugPrefix - Prefix for debug logging
-     * @returns {Promise<{finalTransaction: T, estimatedAmount: bigint, challenge: ChallengeSolution | null}>} - The final transaction and estimated amount
+     * @returns {Promise<{finalTransaction: T, estimatedAmount: bigint, challenge: IChallengeSolution | null}>} - The final transaction and estimated amount
      */
     private async iterateFundingAmount<
         T extends InteractionTransaction | DeploymentTransaction | CustomScriptTransaction,
@@ -848,7 +824,7 @@ export class TransactionFactory {
     ): Promise<{
         finalTransaction: T;
         estimatedAmount: bigint;
-        challenge: ChallengeSolution | null;
+        challenge: IChallengeSolution | null;
     }> {
         const randomBytes =
             'randomBytes' in params
@@ -861,7 +837,7 @@ export class TransactionFactory {
         let previousAmount = 0n;
         let iterations = 0;
         let finalPreTransaction: T | null = null;
-        let challenge: ChallengeSolution | null = null;
+        let challenge: IChallengeSolution | null = null;
 
         while (iterations < this.MAX_ITERATIONS && estimatedFundingAmount !== previousAmount) {
             previousAmount = estimatedFundingAmount;

package/src/transaction/browser/WalletNetworks.ts

@@ -0,0 +1,15 @@
+export enum WalletNetworks {
+    testnet = 'testnet',
+    mainnet = 'mainnet',
+    regtest = 'regtest',
+}
+
+export enum UnisatChainType {
+    BITCOIN_MAINNET = 'BITCOIN_MAINNET',
+    BITCOIN_TESTNET = 'BITCOIN_TESTNET',
+    BITCOIN_TESTNET4 = 'BITCOIN_TESTNET4',
+    BITCOIN_REGTEST = 'BITCOIN_REGTEST',
+    BITCOIN_SIGNET = 'BITCOIN_SIGNET',
+    FRACTAL_BITCOIN_MAINNET = 'FRACTAL_BITCOIN_MAINNET',
+    FRACTAL_BITCOIN_TESTNET = 'FRACTAL_BITCOIN_TESTNET',
+}

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/browser/extensions/UnisatSigner.ts

@@ -12,11 +12,13 @@ import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { canSignNonTaprootInput, isTaprootInput } from '../../../signer/SignerUtils.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { PsbtSignatureOptions, SignatureType, Unisat, UnisatNetwork } from '../types/Unisat.js';
+import { PsbtSignatureOptions, SignatureType, Unisat } from '../types/Unisat.js';
+import { WalletNetworks } from '../WalletNetworks.js';
+import { OPWallet } from '../types/OPWallet.js';
 
 export interface WindowWithWallets {
     unisat?: Unisat;
-    opnet?: Unisat;
+    opnet?: OPWallet;
 }
 
 export class UnisatSigner extends CustomKeypair {
@@ -105,13 +107,13 @@ export class UnisatSigner extends CustomKeypair {
 
         const network = await this.unisat.getNetwork();
         switch (network) {
-            case UnisatNetwork.mainnet:
+            case WalletNetworks.mainnet:
                 this._network = networks.bitcoin;
                 break;
-            case UnisatNetwork.testnet:
+            case WalletNetworks.testnet:
                 this._network = networks.testnet;
                 break;
-            case UnisatNetwork.regtest:
+            case WalletNetworks.regtest:
                 this._network = networks.regtest;
                 break;
             default: