@btc-vision/transaction 1.0.88 → 1.0.90

package/browser/transaction/TransactionFactory.d.ts

@@ -1,6 +1,10 @@
+import { Transaction } from 'bitcoinjs-lib';
 import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { FundingTransaction } from './builders/FundingTransaction.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { TransactionBuilder } from './builders/TransactionBuilder.js';
+import { TransactionType } from './enums/TransactionType.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: Address;
@@ -14,6 +18,18 @@ export interface WrapResult {
     readonly receiverAddress: Address;
     readonly utxos: UTXO[];
 }
+export interface FundingTransactionResponse {
+    readonly tx: Transaction;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
+export interface BitcoinTransferResponse {
+    readonly tx: string;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
 export interface UnwrapResult {
     readonly fundingTransaction: string;
     readonly psbt: string;
@@ -27,11 +43,8 @@ export declare class TransactionFactory {
     wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
-    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
-        estimatedFees: bigint;
-        tx: string;
-        nextUTXOs: UTXO[];
-    }>;
+    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
+    getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: Address): UTXO[];
     private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;

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

@@ -4,7 +4,7 @@ import { Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export declare class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     readonly type: TransactionType.FUNDING;
-    protected childTransactionRequiredFees: bigint;
+    protected amount: bigint;
     protected splitInputsInto: number;
     constructor(parameters: IFundingTransactionParameters);
     protected buildTransaction(): Promise<void>;

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

@@ -44,6 +44,8 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     estimateTransactionFees(): Promise<bigint>;
     rebuildFromBase64(base64: string): Promise<Psbt>;
     setPSBT(psbt: Psbt): void;
+    getInputs(): PsbtInputExtended[];
+    getOutputs(): PsbtOutputExtended[];
     protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
@@ -55,8 +57,6 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected updateInput(input: UpdateInput): void;
     protected getWitness(): Buffer;
     protected getTapOutput(): Buffer;
-    protected getInputs(): PsbtInputExtended[];
-    protected getOutputs(): PsbtOutputExtended[];
     protected verifyUTXOValidity(): void;
     protected setFeeOutput(output: PsbtOutputExtended): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.88";
+export declare const version = "1.0.90";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.88';
+export const version = '1.0.90';

package/build/metadata/tokens.js

@@ -11,7 +11,7 @@ export const MOTO_ADDRESS_TESTNET = 'tb1q4tyhf8hpu04qjj3qaag20knun0spctultxzakw'
 export const ROUTER_ADDRESS_TESTNET = 'tb1qnh9mj95nnej25dwhjvvsppwmdm0myhxv7tllgt';
 export const FACTORY_ADDRESS_FRACTAL = 'bc1qr4g85824m58wu0zffjtnf56n425fp0e8azhc7q';
 export const POOL_ADDRESS_FRACTAL = 'bc1qv55cht4zzlt29ea7vdgwsedsn63a2sxtkgpv6h';
-export const WBTC_ADDRESS_FRACTAL = 'u fou';
+export const WBTC_ADDRESS_FRACTAL = 'bc1qdtzlucslvrvu4useyh9r69supqrw3w4xn9t4yv';
 export const MOTO_ADDRESS_FRACTAL = 'bc1qfzq6w5uvgg5489egv0lj4shlqx4dagqt0ewdnu';
 export const ROUTER_ADDRESS_FRACTAL = 'bc1q9w2zvmkzlezt2fu34u57y9vuw6rll5sp2090kn';
 export var OPNetNetwork;

package/build/transaction/TransactionFactory.d.ts

@@ -1,6 +1,10 @@
+import { Transaction } from 'bitcoinjs-lib';
 import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { FundingTransaction } from './builders/FundingTransaction.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { TransactionBuilder } from './builders/TransactionBuilder.js';
+import { TransactionType } from './enums/TransactionType.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: Address;
@@ -14,6 +18,18 @@ export interface WrapResult {
     readonly receiverAddress: Address;
     readonly utxos: UTXO[];
 }
+export interface FundingTransactionResponse {
+    readonly tx: Transaction;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
+export interface BitcoinTransferResponse {
+    readonly tx: string;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
 export interface UnwrapResult {
     readonly fundingTransaction: string;
     readonly psbt: string;
@@ -27,11 +43,8 @@ export declare class TransactionFactory {
     wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
-    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
-        estimatedFees: bigint;
-        tx: string;
-        nextUTXOs: UTXO[];
-    }>;
+    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
+    getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: Address): UTXO[];
     private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;

package/build/transaction/TransactionFactory.js

@@ -230,11 +230,30 @@ export class TransactionFactory {
         const resp = await this.createFundTransaction(parameters);
         return {
             estimatedFees: resp.estimatedFees,
+            original: resp.original,
             tx: resp.tx.toHex(),
-            nextUTXOs: this.getUTXOAsTransaction(resp.tx, parameters.from, 1),
+            nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
         };
     }
+    getAllNewUTXOs(original, tx, to) {
+        const outputs = original.getOutputs();
+        const utxos = [];
+        for (let i = 0; i < tx.outs.length; i++) {
+            const output = outputs[i];
+            if ('address' in output) {
+                if (output.address !== to)
+                    continue;
+            }
+            else {
+                continue;
+            }
+            utxos.push(...this.getUTXOAsTransaction(tx, to, i));
+        }
+        return utxos;
+    }
     async createFundTransaction(parameters) {
+        if (!parameters.to)
+            throw new Error('Field "to" not provided.');
         const fundingTransaction = new FundingTransaction(parameters);
         const signedTransaction = await fundingTransaction.signTransaction();
         if (!signedTransaction) {
@@ -243,7 +262,8 @@ export class TransactionFactory {
         return {
             tx: signedTransaction,
             original: fundingTransaction,
-            estimatedFees: await fundingTransaction.estimateTransactionFees(),
+            estimatedFees: fundingTransaction.estimatedFees,
+            nextUTXOs: this.getUTXOAsTransaction(signedTransaction, parameters.to, 0),
         };
     }
     calculateNumSignatures(vault) {

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

@@ -4,7 +4,7 @@ import { Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export declare class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     readonly type: TransactionType.FUNDING;
-    protected childTransactionRequiredFees: bigint;
+    protected amount: bigint;
     protected splitInputsInto: number;
     constructor(parameters: IFundingTransactionParameters);
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/FundingTransaction.js

@@ -2,11 +2,11 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export class FundingTransaction extends TransactionBuilder {
     type = TransactionType.FUNDING;
-    childTransactionRequiredFees;
+    amount;
     splitInputsInto;
     constructor(parameters) {
         super(parameters);
-        this.childTransactionRequiredFees = parameters.amount;
+        this.amount = parameters.amount;
         this.splitInputsInto = parameters.splitInputsInto ?? 1;
         this.internalInit();
     }
@@ -15,7 +15,15 @@ export class FundingTransaction extends TransactionBuilder {
             throw new Error('Recipient address is required');
         }
         this.addInputsFromUTXO();
-        const amountSpent = this.getTransactionOPNetFee() + this.childTransactionRequiredFees;
+        let amountSpent = this.amount;
+        if (this.getTransactionOPNetFee() === TransactionBuilder.MINIMUM_DUST) {
+            if (amountSpent < TransactionBuilder.MINIMUM_DUST) {
+                amountSpent += TransactionBuilder.MINIMUM_DUST;
+            }
+        }
+        else {
+            amountSpent += this.getTransactionOPNetFee();
+        }
         if (this.splitInputsInto > 1) {
             await this.splitInputs(amountSpent);
         }

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

@@ -44,6 +44,8 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     estimateTransactionFees(): Promise<bigint>;
     rebuildFromBase64(base64: string): Promise<Psbt>;
     setPSBT(psbt: Psbt): void;
+    getInputs(): PsbtInputExtended[];
+    getOutputs(): PsbtOutputExtended[];
     protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
@@ -55,8 +57,6 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected updateInput(input: UpdateInput): void;
     protected getWitness(): Buffer;
     protected getTapOutput(): Buffer;
-    protected getInputs(): PsbtInputExtended[];
-    protected getOutputs(): PsbtOutputExtended[];
     protected verifyUTXOValidity(): void;
     protected setFeeOutput(output: PsbtOutputExtended): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;

package/build/transaction/builders/TransactionBuilder.js

@@ -95,6 +95,9 @@ export class TransactionBuilder extends TweakedTransaction {
         this._maximumFeeRate = feeRate;
     }
     async signTransaction() {
+        if (!this.utxos.length) {
+            throw new Error('No UTXOs specified');
+        }
         if (this.to && !EcKeyPair.verifyContractAddress(this.to, this.network)) {
             throw new Error('Invalid contract address. The contract address must be a taproot address.');
         }
@@ -151,6 +154,9 @@ export class TransactionBuilder extends TweakedTransaction {
         return this.tapData?.address;
     }
     async estimateTransactionFees() {
+        if (!this.utxos.length) {
+            throw new Error('No UTXOs specified');
+        }
         if (this.estimatedFees)
             return this.estimatedFees;
         const fakeTx = new Psbt({
@@ -177,6 +183,15 @@ export class TransactionBuilder extends TweakedTransaction {
     setPSBT(psbt) {
         this.transaction = psbt;
     }
+    getInputs() {
+        return this.inputs;
+    }
+    getOutputs() {
+        const outputs = [...this.outputs];
+        if (this.feeOutput)
+            outputs.push(this.feeOutput);
+        return outputs;
+    }
     async addRefundOutput(amountSpent) {
         const sendBackAmount = this.totalInputAmount - amountSpent;
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
@@ -263,15 +278,6 @@ export class TransactionBuilder extends TweakedTransaction {
         }
         return this.tapData.output;
     }
-    getInputs() {
-        return this.inputs;
-    }
-    getOutputs() {
-        const outputs = [...this.outputs];
-        if (this.feeOutput)
-            outputs.push(this.feeOutput);
-        return outputs;
-    }
     verifyUTXOValidity() {
         for (let utxo of this.utxos) {
             if (!utxo.scriptPubKey) {

package/{Deploy.md → examples/Deploy.md}

@@ -1,5 +1,7 @@
 # Deploying a Smart Contract on OPNet
 
+WARNING: POSSIBLY OUTDATED
+
 This guide will walk you through the process of deploying a smart contract on the OPNet protocol. OPNet allows for the
 execution of smart contracts on the Bitcoin network, leveraging the security and stability of Bitcoin.
 

package/{Unwrap.md → examples/Unwrap.md}

@@ -1,5 +1,7 @@
 # Unwrapping wBTC Guide
 
+WARNING: POSSIBLY OUTDATED
+
 This guide will walk you through the process of unwrapping wBTC (Wrapped Bitcoin) using the OPNet protocol. Unwrapping
 wBTC converts it back into regular Bitcoin, enabling you to use it directly on the Bitcoin network.
 

package/{Wrap.md → examples/Wrap.md}

@@ -1,5 +1,7 @@
 # Wrapping Bitcoin (wBTC) Guide
 
+WARNING: POSSIBLY OUTDATED
+
 This guide will walk you through the process of wrapping Bitcoin (wBTC) using the OPNet protocol. Wrapping Bitcoin
 allows you to use Bitcoin in smart contracts, similar to how ERC-20 tokens are used on Ethereum.
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.88",
+    "version": "1.0.90",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.88';
+export const version = '1.0.90';

package/src/metadata/tokens.ts

@@ -1,135 +1,135 @@
-import { Address } from '@btc-vision/bsi-binary';
-import { ChainId } from '../network/ChainId.js';
-
-// Addresses Regtest
-export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1qxtpreq8zg7pp9wm550kjrhaa2r5kj6lhph9he5';
-export const POOL_ADDRESS_REGTEST: Address = 'bcrt1qqg2a8076rwuruzetdyquj8fh5jxtc22pmh9vep';
-export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qdr7sjgtnudda8zrfklw8l5cnrxum5hns7e46hf';
-export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1q8reuxx9naek4mqesrfsgdpjv3q7a5g2llkh6ua';
-export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1qplnz54sca73t8a03nh494jatr9ffjg6ecarrj8';
-
-// Addresses Testnet
-export const FACTORY_ADDRESS_TESTNET: Address = 'tb1qgev5kldhp5zvg6j8t9vl6x4phkrwn8nk9felxh';
-export const POOL_ADDRESS_TESTNET: Address = 'tb1q6a7yw353hjmresphupytw5vczpqxtg4yrupayk';
-export const WBTC_ADDRESS_TESTNET: Address = 'tb1qp28xna6pv47x6wflcplhu0a9hkld5shtvjx6xv';
-export const MOTO_ADDRESS_TESTNET: Address = 'tb1q4tyhf8hpu04qjj3qaag20knun0spctultxzakw';
-export const ROUTER_ADDRESS_TESTNET: Address = 'tb1qnh9mj95nnej25dwhjvvsppwmdm0myhxv7tllgt';
-
-// Addresses Fractal
-export const FACTORY_ADDRESS_FRACTAL: Address = 'bc1qr4g85824m58wu0zffjtnf56n425fp0e8azhc7q';
-export const POOL_ADDRESS_FRACTAL: Address = 'bc1qv55cht4zzlt29ea7vdgwsedsn63a2sxtkgpv6h';
-export const WBTC_ADDRESS_FRACTAL: Address = 'u fou';
-export const MOTO_ADDRESS_FRACTAL: Address = 'bc1qfzq6w5uvgg5489egv0lj4shlqx4dagqt0ewdnu';
-export const ROUTER_ADDRESS_FRACTAL: Address = 'bc1q9w2zvmkzlezt2fu34u57y9vuw6rll5sp2090kn';
-
-export enum OPNetNetwork {
-    Mainnet = 'mainnet',
-    Testnet = 'testnet',
-    Regtest = 'regtest',
-}
-
-export interface OPNetTokenMetadata {
-    readonly factory: Address;
-    readonly pool: Address;
-    readonly wbtc: Address;
-    readonly moto: Address;
-    readonly router: Address;
-}
-
-export class OPNetTokenAddressManager {
-    private readonly metadata: {
-        [key in ChainId]: { [key in OPNetNetwork]?: OPNetTokenMetadata };
-    } = {
-        [ChainId.Bitcoin]: {
-            [OPNetNetwork.Testnet]: {
-                factory: FACTORY_ADDRESS_TESTNET,
-                pool: POOL_ADDRESS_TESTNET,
-                wbtc: WBTC_ADDRESS_TESTNET,
-                moto: MOTO_ADDRESS_TESTNET,
-                router: ROUTER_ADDRESS_TESTNET,
-            },
-            [OPNetNetwork.Regtest]: {
-                factory: FACTORY_ADDRESS_REGTEST,
-                pool: POOL_ADDRESS_REGTEST,
-                wbtc: WBTC_ADDRESS_REGTEST,
-                moto: MOTO_ADDRESS_REGTEST,
-                router: ROUTER_ADDRESS_REGTEST,
-            },
-        },
-        [ChainId.Fractal]: {
-            [OPNetNetwork.Mainnet]: {
-                factory: FACTORY_ADDRESS_FRACTAL,
-                pool: POOL_ADDRESS_FRACTAL,
-                wbtc: WBTC_ADDRESS_FRACTAL,
-                moto: MOTO_ADDRESS_FRACTAL,
-                router: ROUTER_ADDRESS_FRACTAL,
-            },
-        },
-    };
-
-    public getFactoryAddress(network: OPNetNetwork, chainId: ChainId): Address {
-        const address = this.metadata[chainId][network]?.factory;
-
-        if (!address) {
-            throw new Error(
-                `Factory address not found for network ${network} and chainId ${chainId}`,
-            );
-        }
-
-        return address;
-    }
-
-    public getPoolAddress(network: OPNetNetwork, chainId: ChainId): Address {
-        const address = this.metadata[chainId][network]?.pool;
-
-        if (!address) {
-            throw new Error(`Pool address not found for network ${network} and chainId ${chainId}`);
-        }
-
-        return address;
-    }
-
-    public getWBTCAddress(network: OPNetNetwork, chainId: ChainId): Address {
-        const address = this.metadata[chainId][network]?.wbtc;
-
-        if (!address) {
-            throw new Error(`WBTC address not found for network ${network} and chainId ${chainId}`);
-        }
-
-        return address;
-    }
-
-    public getMOTOAddress(network: OPNetNetwork, chainId: ChainId): Address {
-        const address = this.metadata[chainId][network]?.moto;
-
-        if (!address) {
-            throw new Error(`MOTO address not found for network ${network} and chainId ${chainId}`);
-        }
-
-        return address;
-    }
-
-    public getRouterAddress(network: OPNetNetwork, chainId: ChainId): Address {
-        const address = this.metadata[chainId][network]?.router;
-
-        if (!address) {
-            throw new Error(
-                `Router address not found for network ${network} and chainId ${chainId}`,
-            );
-        }
-
-        return address;
-    }
-
-    public getAddresses(network: OPNetNetwork, chainId: ChainId): OPNetTokenMetadata {
-        const metadata = this.metadata[chainId][network];
-
-        if (!metadata) {
-            throw new Error(`Metadata not found for network ${network} and chainId ${chainId}`);
-        }
-
-        return metadata;
-    }
-}
-
-export const OPNetMetadata: OPNetTokenAddressManager = new OPNetTokenAddressManager();
+import { Address } from '@btc-vision/bsi-binary';
+import { ChainId } from '../network/ChainId.js';
+
+// Addresses Regtest
+export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1qxtpreq8zg7pp9wm550kjrhaa2r5kj6lhph9he5';
+export const POOL_ADDRESS_REGTEST: Address = 'bcrt1qqg2a8076rwuruzetdyquj8fh5jxtc22pmh9vep';
+export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qdr7sjgtnudda8zrfklw8l5cnrxum5hns7e46hf';
+export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1q8reuxx9naek4mqesrfsgdpjv3q7a5g2llkh6ua';
+export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1qplnz54sca73t8a03nh494jatr9ffjg6ecarrj8';
+
+// Addresses Testnet
+export const FACTORY_ADDRESS_TESTNET: Address = 'tb1qgev5kldhp5zvg6j8t9vl6x4phkrwn8nk9felxh';
+export const POOL_ADDRESS_TESTNET: Address = 'tb1q6a7yw353hjmresphupytw5vczpqxtg4yrupayk';
+export const WBTC_ADDRESS_TESTNET: Address = 'tb1qp28xna6pv47x6wflcplhu0a9hkld5shtvjx6xv';
+export const MOTO_ADDRESS_TESTNET: Address = 'tb1q4tyhf8hpu04qjj3qaag20knun0spctultxzakw';
+export const ROUTER_ADDRESS_TESTNET: Address = 'tb1qnh9mj95nnej25dwhjvvsppwmdm0myhxv7tllgt';
+
+// Addresses Fractal
+export const FACTORY_ADDRESS_FRACTAL: Address = 'bc1qr4g85824m58wu0zffjtnf56n425fp0e8azhc7q';
+export const POOL_ADDRESS_FRACTAL: Address = 'bc1qv55cht4zzlt29ea7vdgwsedsn63a2sxtkgpv6h';
+export const WBTC_ADDRESS_FRACTAL: Address = 'bc1qdtzlucslvrvu4useyh9r69supqrw3w4xn9t4yv';
+export const MOTO_ADDRESS_FRACTAL: Address = 'bc1qfzq6w5uvgg5489egv0lj4shlqx4dagqt0ewdnu';
+export const ROUTER_ADDRESS_FRACTAL: Address = 'bc1q9w2zvmkzlezt2fu34u57y9vuw6rll5sp2090kn';
+
+export enum OPNetNetwork {
+    Mainnet = 'mainnet',
+    Testnet = 'testnet',
+    Regtest = 'regtest',
+}
+
+export interface OPNetTokenMetadata {
+    readonly factory: Address;
+    readonly pool: Address;
+    readonly wbtc: Address;
+    readonly moto: Address;
+    readonly router: Address;
+}
+
+export class OPNetTokenAddressManager {
+    private readonly metadata: {
+        [key in ChainId]: { [key in OPNetNetwork]?: OPNetTokenMetadata };
+    } = {
+        [ChainId.Bitcoin]: {
+            [OPNetNetwork.Testnet]: {
+                factory: FACTORY_ADDRESS_TESTNET,
+                pool: POOL_ADDRESS_TESTNET,
+                wbtc: WBTC_ADDRESS_TESTNET,
+                moto: MOTO_ADDRESS_TESTNET,
+                router: ROUTER_ADDRESS_TESTNET,
+            },
+            [OPNetNetwork.Regtest]: {
+                factory: FACTORY_ADDRESS_REGTEST,
+                pool: POOL_ADDRESS_REGTEST,
+                wbtc: WBTC_ADDRESS_REGTEST,
+                moto: MOTO_ADDRESS_REGTEST,
+                router: ROUTER_ADDRESS_REGTEST,
+            },
+        },
+        [ChainId.Fractal]: {
+            [OPNetNetwork.Mainnet]: {
+                factory: FACTORY_ADDRESS_FRACTAL,
+                pool: POOL_ADDRESS_FRACTAL,
+                wbtc: WBTC_ADDRESS_FRACTAL,
+                moto: MOTO_ADDRESS_FRACTAL,
+                router: ROUTER_ADDRESS_FRACTAL,
+            },
+        },
+    };
+
+    public getFactoryAddress(network: OPNetNetwork, chainId: ChainId): Address {
+        const address = this.metadata[chainId][network]?.factory;
+
+        if (!address) {
+            throw new Error(
+                `Factory address not found for network ${network} and chainId ${chainId}`,
+            );
+        }
+
+        return address;
+    }
+
+    public getPoolAddress(network: OPNetNetwork, chainId: ChainId): Address {
+        const address = this.metadata[chainId][network]?.pool;
+
+        if (!address) {
+            throw new Error(`Pool address not found for network ${network} and chainId ${chainId}`);
+        }
+
+        return address;
+    }
+
+    public getWBTCAddress(network: OPNetNetwork, chainId: ChainId): Address {
+        const address = this.metadata[chainId][network]?.wbtc;
+
+        if (!address) {
+            throw new Error(`WBTC address not found for network ${network} and chainId ${chainId}`);
+        }
+
+        return address;
+    }
+
+    public getMOTOAddress(network: OPNetNetwork, chainId: ChainId): Address {
+        const address = this.metadata[chainId][network]?.moto;
+
+        if (!address) {
+            throw new Error(`MOTO address not found for network ${network} and chainId ${chainId}`);
+        }
+
+        return address;
+    }
+
+    public getRouterAddress(network: OPNetNetwork, chainId: ChainId): Address {
+        const address = this.metadata[chainId][network]?.router;
+
+        if (!address) {
+            throw new Error(
+                `Router address not found for network ${network} and chainId ${chainId}`,
+            );
+        }
+
+        return address;
+    }
+
+    public getAddresses(network: OPNetNetwork, chainId: ChainId): OPNetTokenMetadata {
+        const metadata = this.metadata[chainId][network];
+
+        if (!metadata) {
+            throw new Error(`Metadata not found for network ${network} and chainId ${chainId}`);
+        }
+
+        return metadata;
+    }
+}
+
+export const OPNetMetadata: OPNetTokenAddressManager = new OPNetTokenAddressManager();