Update the currency types. Add the union of the specific types

src/ethereum/config/currencies.ts

@@ -1,7 +1,6 @@
-import type { AtomexBlockchainNetworkOptions } from '../../atomex/models/atomexOptions';
-import type { EthereumCurrency } from '../models/currency';
+import type { EthereumCurrency, NativeEthereumCurrency } from '../models/currency';
 
-const ethereumNativeCurrency: EthereumCurrency = {
+const nativeEthereumCurrency: NativeEthereumCurrency = {
   id: 'ETH',
   name: 'Ethereum',
   symbol: 'ETH',
@@ -11,9 +10,9 @@ const ethereumNativeCurrency: EthereumCurrency = {
 };
 
 export const ethereumMainnetCurrencies: EthereumCurrency[] = [
-  ethereumNativeCurrency
+  nativeEthereumCurrency
 ];
 
 export const ethereumTestnetCurrencies: EthereumCurrency[] = [
-  ethereumNativeCurrency
+  nativeEthereumCurrency
 ];

src/ethereum/models/currency.ts

@@ -1,6 +1,6 @@
 import type { Currency } from '../../common/index';
 
-export interface EthereumCurrency extends Currency {
+export interface NativeEthereumCurrency extends Currency {
   readonly name: 'Ethereum';
   readonly symbol: 'ETH';
   readonly blockchain: 'ethereum';
@@ -13,3 +13,7 @@ export interface ERC20EthereumCurrency extends Currency {
   readonly type: 'erc-20';
   readonly contractAddress: string;
 }
+
+export type EthereumCurrency =
+  | NativeEthereumCurrency
+  | ERC20EthereumCurrency;

src/ethereum/models/index.ts

@@ -1,2 +1,2 @@
-export type { EthereumCurrency, ERC20EthereumCurrency } from './currency';
+export type { EthereumCurrency, NativeEthereumCurrency, ERC20EthereumCurrency } from './currency';
 export type { EthereumWeb3AtomexProtocolV1Options, ERC20EthereumWeb3AtomexProtocolV1Options } from './atomexProtocolOptions';

src/index.ts

@@ -25,6 +25,6 @@ export type { AtomexClient } from './clients/index';
 export type { AtomexNetwork, Currency, Side, CurrenciesProvider, CollectionSelector } from './common/index';
 export type { AtomexStore, AuthorizationManagerStore } from './stores/index';
 export type { Swap, SwapParticipant, SwapParticipantRequisites, SwapParticipantStatus } from './swaps/index';
-export type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from './tezos/index';
+export type { TezosCurrency, NativeTezosCurrency, FA12TezosCurrency, FA2TezosCurrency } from './tezos/index';
 
 export * as legacy from './legacy/index';

src/tezos/config/currencies.ts

@@ -1,7 +1,6 @@
-import type { AtomexBlockchainNetworkOptions } from '../../atomex/models/atomexOptions';
-import type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from '../models/index';
+import type { NativeTezosCurrency, TezosCurrency, FA12TezosCurrency, FA2TezosCurrency } from '../models/index';
 
-const tezosNativeCurrency: TezosCurrency = {
+const nativeTezosCurrency: NativeTezosCurrency = {
   id: 'XTZ',
   name: 'Tezos',
   symbol: 'XTZ',
@@ -10,7 +9,7 @@ const tezosNativeCurrency: TezosCurrency = {
   type: 'native'
 };
 
-const tzBtcCurrency: TezosFA12Currency = {
+const tzBtcCurrency: FA12TezosCurrency = {
   id: 'TZBTC',
   name: 'tzBTC',
   symbol: 'tzBTC',
@@ -20,7 +19,7 @@ const tzBtcCurrency: TezosFA12Currency = {
   decimals: 8,
 };
 
-const usdtCurrency: TezosFA2Currency = {
+const usdtCurrency: FA2TezosCurrency = {
   id: 'USDT_XTZ',
   name: 'Tether USD',
   symbol: 'USDt',
@@ -31,14 +30,14 @@ const usdtCurrency: TezosFA2Currency = {
   decimals: 6,
 };
 
-export const tezosMainnetCurrencies: AtomexBlockchainNetworkOptions['currencies'] = [
-  tezosNativeCurrency,
+export const tezosMainnetCurrencies: TezosCurrency[] = [
+  nativeTezosCurrency,
   tzBtcCurrency,
   usdtCurrency
 ];
 
-export const tezosTestnetCurrencies: AtomexBlockchainNetworkOptions['currencies'] = [
-  tezosNativeCurrency,
-  ({ ...tzBtcCurrency, contractAddress: 'KT1DM4k79uSx5diQnwqDiF4XeA86aCBxBD35' } as TezosFA12Currency),
-  ({ ...usdtCurrency, contractAddress: 'KT1BWvRQnVVowZZLGkct9A7sdj5YEe8CdUhR' } as TezosFA2Currency)
+export const tezosTestnetCurrencies: TezosCurrency[] = [
+  nativeTezosCurrency,
+  ({ ...tzBtcCurrency, contractAddress: 'KT1DM4k79uSx5diQnwqDiF4XeA86aCBxBD35' } as FA12TezosCurrency),
+  ({ ...usdtCurrency, contractAddress: 'KT1BWvRQnVVowZZLGkct9A7sdj5YEe8CdUhR' } as FA2TezosCurrency)
 ];

src/tezos/index.ts

@@ -1,5 +1,5 @@
 export { TaquitoBlockchainWallet } from './wallets/index';
-export type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from './models/index';
+export type { TezosCurrency, NativeTezosCurrency, FA12TezosCurrency, FA2TezosCurrency } from './models/index';
 export { tezosMainnetCurrencies, tezosTestnetCurrencies, createDefaultTezosBlockchainOptions } from './config/index';
 export { TezosBalancesProvider } from './balancesProviders';
 export { TezosSwapTransactionsProvider } from './swapTransactionsProviders';

src/tezos/models/currency.ts

@@ -1,22 +1,27 @@
 import type { Currency } from '../../common/index';
 
-export interface TezosCurrency extends Currency {
+export interface NativeTezosCurrency extends Currency {
   readonly name: 'Tezos';
   readonly symbol: 'XTZ';
   readonly blockchain: 'tezos';
   readonly type: 'native';
   readonly decimals: 6;
 }
 
-export interface TezosFA12Currency extends Currency {
+export interface FA12TezosCurrency extends Currency {
   readonly blockchain: 'tezos';
   readonly type: 'fa1.2';
   readonly contractAddress: string;
 }
 
-export interface TezosFA2Currency extends Currency {
+export interface FA2TezosCurrency extends Currency {
   readonly blockchain: 'tezos';
   readonly type: 'fa2';
   readonly contractAddress: string;
   readonly tokenId: number;
 }
+
+export type TezosCurrency =
+  | NativeTezosCurrency
+  | FA12TezosCurrency
+  | FA2TezosCurrency;

src/tezos/models/index.ts

@@ -1,4 +1,4 @@
 export { TezosAtomexSigningDataType } from './tezosAtomexSigningDataType';
 
 export type { SigPrefix } from './sigPrefix';
-export type { TezosCurrency, TezosFA12Currency, TezosFA2Currency } from './currency';
+export type { TezosCurrency, NativeTezosCurrency, FA12TezosCurrency, FA2TezosCurrency } from './currency';

tests/testHelpers/testCurrenciesProvider.ts

@@ -1,7 +1,7 @@
 import { InMemoryCurrenciesProvider } from '../../src/common/index';
 import { ethereumMainnetCurrencies } from '../../src/ethereum/index';
 import type { ERC20EthereumCurrency } from '../../src/ethereum/models/index';
-import type { Currency, TezosFA12Currency } from '../../src/index';
+import type { Currency, FA12TezosCurrency } from '../../src/index';
 import { tezosMainnetCurrencies } from '../../src/tezos/index';
 
 const btcCurrency: Currency = {
@@ -22,7 +22,7 @@ const ltcCurrency: Currency = {
   decimals: 8,
 };
 
-const kusdCurrency: TezosFA12Currency = {
+const kusdCurrency: FA12TezosCurrency = {
   id: 'KUSD',
   name: 'Kolibri USD',
   blockchain: 'tezos',