Refactor atomex builder, network option

src/atomexBuilder/atomexBuilder.ts

@@ -3,10 +3,10 @@ import type { AtomexBlockchainOptions } from '../atomex/models/index';
 import type { AuthorizationManager } from '../authorization/index';
 import { AtomexBlockchainProvider, SignersManager } from '../blockchain/index';
 import type { DeepReadonly } from '../core/index';
-import { EthereumBalancesProvider, EthereumBlockchainToolkitProvider, ethereumMainnetCurrencies, EthereumSwapTransactionsProvider, ethereumTestnetCurrencies } from '../ethereum/index';
+import { createDefaultEthereumBlockchainOptions } from '../ethereum/index';
 import { ExchangeManager, InMemoryExchangeSymbolsProvider } from '../exchange/index';
 import { SwapManager } from '../swaps/swapManager';
-import { TezosBalancesProvider, TezosBlockchainToolkitProvider, tezosMainnetCurrencies, TezosSwapTransactionsProvider, tezosTestnetCurrencies } from '../tezos/index';
+import { createDefaultTezosBlockchainOptions } from '../tezos/index';
 import type { AtomexBuilderOptions } from './atomexBuilderOptions';
 import { createDefaultExchangeService } from './atomexComponents/exchangeService';
 import { AuthorizationManagerDefaultComponentOptions, createDefaultAuthorizationManager } from './atomexComponents/index';
@@ -106,58 +106,8 @@ export class AtomexBuilder {
 
   protected createDefaultBlockchainOptions(): Record<string, AtomexBlockchainOptions> {
     return {
-      tezos: this.createDefaultTezosBlockchainOptions(),
-      ethereum: this.createDefaultEthereumBlockchainOptions()
+      tezos: createDefaultTezosBlockchainOptions(),
+      ethereum: createDefaultEthereumBlockchainOptions()
     };
   }
-
-  protected createDefaultTezosBlockchainOptions(): AtomexBlockchainOptions {
-    const balancesProvider = new TezosBalancesProvider();
-    const swapTransactionsProvider = new TezosSwapTransactionsProvider();
-    const blockchainToolkitProvider = new TezosBlockchainToolkitProvider();
-
-    const tezosOptions: AtomexBlockchainOptions = {
-      mainnet: {
-        currencies: tezosMainnetCurrencies,
-        balancesProvider,
-        swapTransactionsProvider,
-        blockchainToolkitProvider,
-        currencyOptions: {}
-      },
-      testnet: {
-        currencies: tezosTestnetCurrencies,
-        balancesProvider,
-        swapTransactionsProvider,
-        blockchainToolkitProvider,
-        currencyOptions: {}
-      }
-    };
-
-    return tezosOptions;
-  }
-
-  protected createDefaultEthereumBlockchainOptions(): AtomexBlockchainOptions {
-    const balancesProvider = new EthereumBalancesProvider();
-    const swapTransactionsProvider = new EthereumSwapTransactionsProvider();
-    const blockchainToolkitProvider = new EthereumBlockchainToolkitProvider();
-
-    const ethereumOptions: AtomexBlockchainOptions = {
-      mainnet: {
-        currencies: ethereumMainnetCurrencies,
-        balancesProvider,
-        swapTransactionsProvider,
-        blockchainToolkitProvider,
-        currencyOptions: {}
-      },
-      testnet: {
-        currencies: ethereumTestnetCurrencies,
-        balancesProvider,
-        swapTransactionsProvider,
-        blockchainToolkitProvider,
-        currencyOptions: {}
-      }
-    };
-
-    return ethereumOptions;
-  }
 }

src/ethereum/currencies.ts → src/ethereum/config/currencies.ts

@@ -1,5 +1,5 @@
-import type { AtomexBlockchainNetworkOptions } from '../atomex/models/atomexOptions';
-import type { EthereumCurrency } from './models/currency';
+import type { AtomexBlockchainNetworkOptions } from '../../atomex/models/atomexOptions';
+import type { EthereumCurrency } from '../models/currency';
 
 const ethereumNativeCurrency: EthereumCurrency = {
   id: 'ETH',

src/ethereum/config/defaultOptions.ts

@@ -0,0 +1,31 @@
+import type { AtomexBlockchainOptions } from '../../atomex/models/index';
+import { EthereumBalancesProvider } from '../balancesProviders/index';
+import { Web3BlockchainToolkitProvider } from '../blockchainToolkitProviders/index';
+import { EthereumSwapTransactionsProvider } from '../swapTransactionsProviders/index';
+import { ethereumMainnetCurrencies, ethereumTestnetCurrencies } from './currencies';
+
+export const createDefaultEthereumBlockchainOptions = (): AtomexBlockchainOptions => {
+  const mainnetRpcUrl = 'https://mainnet.infura.io/v3/';
+  const testNetRpcUrl = 'https://goerli.infura.io/v3/';
+  const balancesProvider = new EthereumBalancesProvider();
+  const swapTransactionsProvider = new EthereumSwapTransactionsProvider();
+
+  const tezosOptions: AtomexBlockchainOptions = {
+    mainnet: {
+      currencies: ethereumMainnetCurrencies,
+      currencyOptions: {},
+      blockchainToolkitProvider: new Web3BlockchainToolkitProvider(mainnetRpcUrl),
+      balancesProvider,
+      swapTransactionsProvider,
+    },
+    testnet: {
+      currencies: ethereumTestnetCurrencies,
+      currencyOptions: {},
+      blockchainToolkitProvider: new Web3BlockchainToolkitProvider(testNetRpcUrl),
+      balancesProvider,
+      swapTransactionsProvider,
+    }
+  };
+
+  return tezosOptions;
+};

src/ethereum/config/index.ts

@@ -0,0 +1,2 @@
+export { ethereumMainnetCurrencies, ethereumTestnetCurrencies } from './currencies';
+export { createDefaultEthereumBlockchainOptions } from './defaultOptions';

src/ethereum/index.ts

@@ -1,5 +1,5 @@
 export { Web3EthereumSigner } from './signers';
-export { ethereumMainnetCurrencies, ethereumTestnetCurrencies } from './currencies';
+export { ethereumMainnetCurrencies, ethereumTestnetCurrencies, createDefaultEthereumBlockchainOptions } from './config/index';
 export { EthereumBalancesProvider } from './balancesProviders';
 export { EthereumSwapTransactionsProvider } from './swapTransactionsProviders';
-export { EthereumBlockchainToolkitProvider } from './blockchainToolkitProviders';
+export { Web3BlockchainToolkitProvider } from './blockchainToolkitProviders';

src/tezos/currencies.ts → src/tezos/config/currencies.ts

@@ -1,5 +1,5 @@
-import type { AtomexBlockchainNetworkOptions } from '../atomex/models/atomexOptions';
-import type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from './models/index';
+import type { AtomexBlockchainNetworkOptions } from '../../atomex/models/atomexOptions';
+import type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from '../models/index';
 
 const tezosNativeCurrency: TezosCurrency = {
   id: 'XTZ',

src/tezos/config/defaultOptions.ts

@@ -0,0 +1,31 @@
+import type { AtomexBlockchainOptions } from '../../atomex/models/index';
+import { TezosBalancesProvider } from '../balancesProviders/index';
+import { TezosBlockchainToolkitProvider } from '../blockchainToolkitProviders/index';
+import { TezosSwapTransactionsProvider } from '../swapTransactionsProviders/index';
+import { tezosMainnetCurrencies, tezosTestnetCurrencies } from './currencies';
+
+export const createDefaultTezosBlockchainOptions = (): AtomexBlockchainOptions => {
+  const mainnetRpcUrl = 'https://mainnet.api.tez.ie';
+  const testNetRpcUrl = 'https://jakartanet.ecadinfra.com';
+  const balancesProvider = new TezosBalancesProvider();
+  const swapTransactionsProvider = new TezosSwapTransactionsProvider();
+
+  const tezosOptions: AtomexBlockchainOptions = {
+    mainnet: {
+      currencies: tezosMainnetCurrencies,
+      currencyOptions: {},
+      blockchainToolkitProvider: new TezosBlockchainToolkitProvider(mainnetRpcUrl),
+      balancesProvider,
+      swapTransactionsProvider,
+    },
+    testnet: {
+      currencies: tezosTestnetCurrencies,
+      currencyOptions: {},
+      blockchainToolkitProvider: new TezosBlockchainToolkitProvider(testNetRpcUrl),
+      balancesProvider,
+      swapTransactionsProvider,
+    }
+  };
+
+  return tezosOptions;
+};

src/tezos/config/index.ts

@@ -0,0 +1,2 @@
+export { tezosMainnetCurrencies, tezosTestnetCurrencies } from './currencies';
+export { createDefaultTezosBlockchainOptions } from './defaultOptions';

src/tezos/index.ts

@@ -1,7 +1,7 @@
 export { WalletTezosSigner } from './walletTezosSigner/index';
 export { InMemoryTezosSigner } from './inMemoryTezosSigner';
 export type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from './models/index';
-export { tezosMainnetCurrencies, tezosTestnetCurrencies } from './currencies';
+export { tezosMainnetCurrencies, tezosTestnetCurrencies, createDefaultTezosBlockchainOptions } from './config/index';
 export { TezosBalancesProvider } from './balancesProviders';
 export { TezosSwapTransactionsProvider } from './swapTransactionsProviders';
 export { TezosBlockchainToolkitProvider } from './blockchainToolkitProviders';