From 8d6eff44736794392866ea7ceaf1688e2e2a89f1 Mon Sep 17 00:00:00 2001
From: Nick Papirniy <nikolaspapirniywork@gmail.com>
Date: Thu, 10 Feb 2022 08:26:37 +0100
Subject: [PATCH] refactor: moved currency to api-client (#371)

Co-authored-by: Nick Papirniy <nick.papirnyi@tatum.io>
---
 examples/bch-example/src/app/bch.ledger.example.ts       | 2 +-
 examples/bch-example/src/app/bch.root.example.ts         | 2 +-
 examples/bsc-example/src/app/bsc.ledger.example.ts       | 2 +-
 examples/bsc-example/src/app/bsc.nft.example.ts          | 2 +-
 examples/bsc-example/src/app/bsc.root.example.ts         | 2 +-
 examples/btc-example/src/app/btc.ledger.example.ts       | 3 +--
 examples/btc-example/src/app/btc.root.example.ts         | 2 +-
 examples/celo-example/src/app/celo.api.example.ts        | 2 --
 examples/celo-example/src/app/celo.ledger.example.ts     | 3 +--
 examples/celo-example/src/app/celo.nft.example.ts        | 2 +-
 examples/celo-example/src/app/celo.root.example.ts       | 2 +-
 examples/doge-example/src/app/doge.ledger.example.ts     | 3 +--
 examples/doge-example/src/app/doge.root.example.ts       | 2 +-
 examples/eth-example/src/app/eth.ledger.example.ts       | 3 +--
 examples/eth-example/src/app/eth.nft.example.ts          | 2 +-
 examples/eth-example/src/app/eth.root.example.ts         | 2 +-
 examples/kcs-example/src/app/kcs.ledger.example.ts       | 3 +--
 examples/kcs-example/src/app/kcs.nft.example.ts          | 2 +-
 examples/kcs-example/src/app/kcs.root.example.ts         | 2 +-
 examples/ltc-example/src/app/ltc.ledger.example.ts       | 3 +--
 examples/ltc-example/src/app/ltc.root.example.ts         | 2 +-
 examples/one-example/src/app/one.ledger.example.ts       | 3 +--
 examples/one-example/src/app/one.nft.example.ts          | 2 +-
 examples/one-example/src/app/one.root.example.ts         | 2 +-
 examples/polygon-example/src/app/polygon.api.example.ts  | 2 --
 .../polygon-example/src/app/polygon.ledger.example.ts    | 3 +--
 examples/polygon-example/src/app/polygon.nft.example.ts  | 2 +-
 examples/polygon-example/src/app/polygon.root.example.ts | 2 +-
 examples/sdk-example/src/app/sdk.ledger.example.ts       | 3 +--
 examples/sdk-example/src/app/sdk.log.example.ts          | 2 +-
 examples/sdk-example/src/app/sdk.multitoken.example.ts   | 2 +-
 examples/sdk-example/src/app/sdk.nft.example.ts          | 2 +-
 examples/sdk-example/src/app/sdk.offchain.example.ts     | 2 +-
 examples/sdk-example/src/app/sdk.root.example.ts         | 2 +-
 examples/sdk-example/src/app/sdk.wallet.example.ts       | 2 +-
 examples/tron-example/src/app/tron.ledger.example.ts     | 2 +-
 examples/tron-example/src/app/tron.nft.example.ts        | 2 +-
 examples/tron-example/src/app/tron.root.example.ts       | 2 +-
 examples/xlm-example/src/app/xlm.ledger.example.ts       | 3 +--
 examples/xlm-example/src/app/xlm.root.example.ts         | 2 +-
 examples/xrp-example/src/app/xrp.ledger.example.ts       | 3 +--
 examples/xrp-example/src/app/xrp.root.example.ts         | 2 +-
 packages/api-client/src/index.ts                         | 2 ++
 .../core => api-client}/src/lib/models/Currency.ts       | 0
 .../{shared/core => api-client}/src/lib/models/Fiat.ts   | 0
 packages/blockchain/bsc/src/lib/__tests__/bsc.tx.spec.ts | 3 ++-
 .../blockchain/celo/src/lib/transactions/erc721/index.ts | 9 ++++-----
 packages/blockchain/celo/src/lib/utils/celo.utils.ts     | 2 +-
 packages/blockchain/eth/src/lib/__tests__/eth.tx.spec.ts | 3 ++-
 packages/blockchain/kcs/src/lib/__tests__/kcs.tx.spec.ts | 3 ++-
 packages/blockchain/one/src/lib/__tests__/one.tx.spec.ts | 3 ++-
 .../polygon/src/lib/__tests__/polygon.tx.spec.ts         | 3 ++-
 packages/blockchain/xlm/src/lib/services/xlm.offchain.ts | 4 ++--
 packages/blockchain/xrp/src/lib/services/xrp.offchain.ts | 3 ++-
 packages/sdk/src/lib/sdk.ts                              | 3 ++-
 packages/sdk/src/lib/services/sdk.httpDriver.ts          | 3 ++-
 packages/sdk/src/lib/services/sdk.wallet.ts              | 4 ++--
 .../abstract/src/lib/abstract-blockchain.sdk.ts          | 7 ++++++-
 packages/shared/core/src/index.ts                        | 2 --
 packages/shared/core/src/lib/blockchain.common.ts        | 2 +-
 packages/shared/core/src/lib/contract.common.ts          | 2 +-
 .../core/src/lib/models/BlockchainCurrencyMapping.ts     | 2 +-
 62 files changed, 76 insertions(+), 79 deletions(-)
 rename packages/{shared/core => api-client}/src/lib/models/Currency.ts (100%)
 rename packages/{shared/core => api-client}/src/lib/models/Fiat.ts (100%)

diff --git a/examples/bch-example/src/app/bch.ledger.example.ts b/examples/bch-example/src/app/bch.ledger.example.ts
index ac930d8505..3f190f2fa0 100644
--- a/examples/bch-example/src/app/bch.ledger.example.ts
+++ b/examples/bch-example/src/app/bch.ledger.example.ts
@@ -1,6 +1,6 @@
 import { TatumBchSDK } from '@tatumio/bch'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 const bchSDK = TatumBchSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/bch-example/src/app/bch.root.example.ts b/examples/bch-example/src/app/bch.root.example.ts
index 92b0c5fbd1..060eecc20e 100644
--- a/examples/bch-example/src/app/bch.root.example.ts
+++ b/examples/bch-example/src/app/bch.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { TatumBchSDK } from '@tatumio/bch'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
diff --git a/examples/bsc-example/src/app/bsc.ledger.example.ts b/examples/bsc-example/src/app/bsc.ledger.example.ts
index 546ee1ca0d..024e440c69 100644
--- a/examples/bsc-example/src/app/bsc.ledger.example.ts
+++ b/examples/bsc-example/src/app/bsc.ledger.example.ts
@@ -1,6 +1,6 @@
 import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
 import { TatumBscSDK } from '@tatumio/bsc'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const bscSDK = TatumBscSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/bsc-example/src/app/bsc.nft.example.ts b/examples/bsc-example/src/app/bsc.nft.example.ts
index 573bd4f540..b8bb404e2d 100644
--- a/examples/bsc-example/src/app/bsc.nft.example.ts
+++ b/examples/bsc-example/src/app/bsc.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumBscSDK } from '@tatumio/bsc'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const bscSDK = TatumBscSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/bsc-example/src/app/bsc.root.example.ts b/examples/bsc-example/src/app/bsc.root.example.ts
index 9539517db5..460c511f92 100644
--- a/examples/bsc-example/src/app/bsc.root.example.ts
+++ b/examples/bsc-example/src/app/bsc.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumBscSDK } from '@tatumio/bsc'
 
diff --git a/examples/btc-example/src/app/btc.ledger.example.ts b/examples/btc-example/src/app/btc.ledger.example.ts
index de9141c923..3b1f4598fc 100644
--- a/examples/btc-example/src/app/btc.ledger.example.ts
+++ b/examples/btc-example/src/app/btc.ledger.example.ts
@@ -1,7 +1,6 @@
 import { TatumBtcSDK } from '@tatumio/btc'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 
 const btcSDK = TatumBtcSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/btc-example/src/app/btc.root.example.ts b/examples/btc-example/src/app/btc.root.example.ts
index c2f82876ac..6f6d7110c5 100644
--- a/examples/btc-example/src/app/btc.root.example.ts
+++ b/examples/btc-example/src/app/btc.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { TatumBtcSDK } from '@tatumio/btc'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
diff --git a/examples/celo-example/src/app/celo.api.example.ts b/examples/celo-example/src/app/celo.api.example.ts
index 48fe711c97..5205dcd4ff 100644
--- a/examples/celo-example/src/app/celo.api.example.ts
+++ b/examples/celo-example/src/app/celo.api.example.ts
@@ -1,6 +1,4 @@
-import { TransferCeloBlockchain } from '@tatumio/api-client'
 import { TatumCeloSDK } from '@tatumio/celo'
-import { Currency } from '@tatumio/shared-core'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const celoSDK = TatumCeloSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/celo-example/src/app/celo.ledger.example.ts b/examples/celo-example/src/app/celo.ledger.example.ts
index 80602067a5..a6dd25f6b9 100644
--- a/examples/celo-example/src/app/celo.ledger.example.ts
+++ b/examples/celo-example/src/app/celo.ledger.example.ts
@@ -1,6 +1,5 @@
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 import { TatumCeloSDK } from '@tatumio/celo'
-import { Currency } from '@tatumio/shared-core'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const celoSDK = TatumCeloSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/celo-example/src/app/celo.nft.example.ts b/examples/celo-example/src/app/celo.nft.example.ts
index 45579b9571..1d1d89dbc5 100644
--- a/examples/celo-example/src/app/celo.nft.example.ts
+++ b/examples/celo-example/src/app/celo.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumCeloSDK } from '@tatumio/celo'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const celoSDK = TatumCeloSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/celo-example/src/app/celo.root.example.ts b/examples/celo-example/src/app/celo.root.example.ts
index 5bea81228b..c61dc36e1a 100644
--- a/examples/celo-example/src/app/celo.root.example.ts
+++ b/examples/celo-example/src/app/celo.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumCeloSDK } from '@tatumio/celo'
 
diff --git a/examples/doge-example/src/app/doge.ledger.example.ts b/examples/doge-example/src/app/doge.ledger.example.ts
index b376662378..6f7638d607 100644
--- a/examples/doge-example/src/app/doge.ledger.example.ts
+++ b/examples/doge-example/src/app/doge.ledger.example.ts
@@ -1,7 +1,6 @@
 import { TatumDogeSDK } from '@tatumio/doge'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 
 const dogeSDK = TatumDogeSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/doge-example/src/app/doge.root.example.ts b/examples/doge-example/src/app/doge.root.example.ts
index 8e7a9a7ada..5e279130e5 100644
--- a/examples/doge-example/src/app/doge.root.example.ts
+++ b/examples/doge-example/src/app/doge.root.example.ts
@@ -1,4 +1,4 @@
-import { Currency, Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { TatumDogeSDK } from '@tatumio/doge'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
diff --git a/examples/eth-example/src/app/eth.ledger.example.ts b/examples/eth-example/src/app/eth.ledger.example.ts
index 020c03d5c5..1bbece8921 100644
--- a/examples/eth-example/src/app/eth.ledger.example.ts
+++ b/examples/eth-example/src/app/eth.ledger.example.ts
@@ -1,6 +1,5 @@
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
 import { TatumEthSDK } from '@tatumio/eth'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const ethSDK = TatumEthSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/eth-example/src/app/eth.nft.example.ts b/examples/eth-example/src/app/eth.nft.example.ts
index 36ec8b7481..01676c3f11 100644
--- a/examples/eth-example/src/app/eth.nft.example.ts
+++ b/examples/eth-example/src/app/eth.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumEthSDK } from '@tatumio/eth'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const ethSDK = TatumEthSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/eth-example/src/app/eth.root.example.ts b/examples/eth-example/src/app/eth.root.example.ts
index 9fe1ce5d4c..a178961b63 100644
--- a/examples/eth-example/src/app/eth.root.example.ts
+++ b/examples/eth-example/src/app/eth.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumEthSDK } from '@tatumio/eth'
 
diff --git a/examples/kcs-example/src/app/kcs.ledger.example.ts b/examples/kcs-example/src/app/kcs.ledger.example.ts
index f1eb02a573..306b19eace 100644
--- a/examples/kcs-example/src/app/kcs.ledger.example.ts
+++ b/examples/kcs-example/src/app/kcs.ledger.example.ts
@@ -1,6 +1,5 @@
-import { CreateTrade } from '@tatumio/api-client'
 import { TatumKcsSDK } from '@tatumio/kcs'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const kcsSDK = TatumKcsSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/kcs-example/src/app/kcs.nft.example.ts b/examples/kcs-example/src/app/kcs.nft.example.ts
index 41296e896a..1580dfcf52 100644
--- a/examples/kcs-example/src/app/kcs.nft.example.ts
+++ b/examples/kcs-example/src/app/kcs.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumKcsSDK } from '@tatumio/kcs'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const kcsSDK = TatumKcsSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/kcs-example/src/app/kcs.root.example.ts b/examples/kcs-example/src/app/kcs.root.example.ts
index 1194cfcb7c..6f3dd4a1db 100644
--- a/examples/kcs-example/src/app/kcs.root.example.ts
+++ b/examples/kcs-example/src/app/kcs.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumKcsSDK } from '@tatumio/kcs'
 
diff --git a/examples/ltc-example/src/app/ltc.ledger.example.ts b/examples/ltc-example/src/app/ltc.ledger.example.ts
index 1bb3e5dd78..9f6e3468d2 100644
--- a/examples/ltc-example/src/app/ltc.ledger.example.ts
+++ b/examples/ltc-example/src/app/ltc.ledger.example.ts
@@ -1,7 +1,6 @@
 import { TatumLtcSDK } from '@tatumio/ltc'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 
 const ltcSDK = TatumLtcSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/ltc-example/src/app/ltc.root.example.ts b/examples/ltc-example/src/app/ltc.root.example.ts
index eeecec37d5..2647b73798 100644
--- a/examples/ltc-example/src/app/ltc.root.example.ts
+++ b/examples/ltc-example/src/app/ltc.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { TatumLtcSDK } from '@tatumio/ltc'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
diff --git a/examples/one-example/src/app/one.ledger.example.ts b/examples/one-example/src/app/one.ledger.example.ts
index ea43b445a7..5a51c60d9c 100644
--- a/examples/one-example/src/app/one.ledger.example.ts
+++ b/examples/one-example/src/app/one.ledger.example.ts
@@ -1,6 +1,5 @@
-import { CreateTrade } from '@tatumio/api-client'
 import { TatumOneSDK } from '@tatumio/one'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const oneSDK = TatumOneSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/one-example/src/app/one.nft.example.ts b/examples/one-example/src/app/one.nft.example.ts
index bb7405acda..0c43b46780 100644
--- a/examples/one-example/src/app/one.nft.example.ts
+++ b/examples/one-example/src/app/one.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumOneSDK } from '@tatumio/one'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const oneSDK = TatumOneSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/one-example/src/app/one.root.example.ts b/examples/one-example/src/app/one.root.example.ts
index 84657dfe10..7da5b2f298 100644
--- a/examples/one-example/src/app/one.root.example.ts
+++ b/examples/one-example/src/app/one.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumOneSDK } from '@tatumio/one'
 
diff --git a/examples/polygon-example/src/app/polygon.api.example.ts b/examples/polygon-example/src/app/polygon.api.example.ts
index 36d36ae132..35a5f15a3e 100644
--- a/examples/polygon-example/src/app/polygon.api.example.ts
+++ b/examples/polygon-example/src/app/polygon.api.example.ts
@@ -1,6 +1,4 @@
-import { TransferPolygonBlockchain } from '@tatumio/api-client'
 import { TatumPolygonSDK } from '@tatumio/polygon'
-import { Currency } from '@tatumio/shared-core'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const polygonSDK = TatumPolygonSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/polygon-example/src/app/polygon.ledger.example.ts b/examples/polygon-example/src/app/polygon.ledger.example.ts
index c7e7bc6f7e..cb19f62a81 100644
--- a/examples/polygon-example/src/app/polygon.ledger.example.ts
+++ b/examples/polygon-example/src/app/polygon.ledger.example.ts
@@ -1,6 +1,5 @@
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
 import { TatumPolygonSDK } from '@tatumio/polygon'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const polygonSDK = TatumPolygonSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/polygon-example/src/app/polygon.nft.example.ts b/examples/polygon-example/src/app/polygon.nft.example.ts
index bf3ad58a14..40b498fa59 100644
--- a/examples/polygon-example/src/app/polygon.nft.example.ts
+++ b/examples/polygon-example/src/app/polygon.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumPolygonSDK } from '@tatumio/polygon'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const polygonSDK = TatumPolygonSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/polygon-example/src/app/polygon.root.example.ts b/examples/polygon-example/src/app/polygon.root.example.ts
index fa914fabca..0940ca9532 100644
--- a/examples/polygon-example/src/app/polygon.root.example.ts
+++ b/examples/polygon-example/src/app/polygon.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumPolygonSDK } from '@tatumio/polygon'
 
diff --git a/examples/sdk-example/src/app/sdk.ledger.example.ts b/examples/sdk-example/src/app/sdk.ledger.example.ts
index 4271aa3439..1f7838bc6d 100644
--- a/examples/sdk-example/src/app/sdk.ledger.example.ts
+++ b/examples/sdk-example/src/app/sdk.ledger.example.ts
@@ -1,7 +1,6 @@
 import { TatumSDK } from '@tatumio/sdk'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/sdk-example/src/app/sdk.log.example.ts b/examples/sdk-example/src/app/sdk.log.example.ts
index e0f6df6e66..37c2386bc8 100644
--- a/examples/sdk-example/src/app/sdk.log.example.ts
+++ b/examples/sdk-example/src/app/sdk.log.example.ts
@@ -1,6 +1,6 @@
 import { TatumSDK } from '@tatumio/sdk'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/sdk-example/src/app/sdk.multitoken.example.ts b/examples/sdk-example/src/app/sdk.multitoken.example.ts
index 20e4eb2e2e..a7c2777087 100644
--- a/examples/sdk-example/src/app/sdk.multitoken.example.ts
+++ b/examples/sdk-example/src/app/sdk.multitoken.example.ts
@@ -1,6 +1,6 @@
 import { TatumSDK } from '@tatumio/sdk'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/sdk-example/src/app/sdk.nft.example.ts b/examples/sdk-example/src/app/sdk.nft.example.ts
index f32ff05e0f..72a84eb5a1 100644
--- a/examples/sdk-example/src/app/sdk.nft.example.ts
+++ b/examples/sdk-example/src/app/sdk.nft.example.ts
@@ -1,6 +1,6 @@
 import { TatumSDK } from '@tatumio/sdk'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/sdk-example/src/app/sdk.offchain.example.ts b/examples/sdk-example/src/app/sdk.offchain.example.ts
index 0e3e8e84ff..fead80d2e0 100644
--- a/examples/sdk-example/src/app/sdk.offchain.example.ts
+++ b/examples/sdk-example/src/app/sdk.offchain.example.ts
@@ -1,6 +1,6 @@
 import { TatumSDK } from '@tatumio/sdk'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/sdk-example/src/app/sdk.root.example.ts b/examples/sdk-example/src/app/sdk.root.example.ts
index 530fb4a19c..54da3aa572 100644
--- a/examples/sdk-example/src/app/sdk.root.example.ts
+++ b/examples/sdk-example/src/app/sdk.root.example.ts
@@ -1,6 +1,6 @@
 import { TatumSDK } from '@tatumio/sdk'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/sdk-example/src/app/sdk.wallet.example.ts b/examples/sdk-example/src/app/sdk.wallet.example.ts
index 63bc486763..4b7c34fc81 100644
--- a/examples/sdk-example/src/app/sdk.wallet.example.ts
+++ b/examples/sdk-example/src/app/sdk.wallet.example.ts
@@ -1,5 +1,5 @@
 import { TatumSDK } from '@tatumio/sdk'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY, TEST_DATA } from '@tatumio/shared-testing-common'
 
 const tatumSDK = TatumSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/tron-example/src/app/tron.ledger.example.ts b/examples/tron-example/src/app/tron.ledger.example.ts
index 2f847e71ff..d4c40e4916 100644
--- a/examples/tron-example/src/app/tron.ledger.example.ts
+++ b/examples/tron-example/src/app/tron.ledger.example.ts
@@ -1,5 +1,5 @@
 import { TatumTronSDK } from '@tatumio/tron'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const tronSDK = TatumTronSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/tron-example/src/app/tron.nft.example.ts b/examples/tron-example/src/app/tron.nft.example.ts
index 21a1701f35..1baf389260 100644
--- a/examples/tron-example/src/app/tron.nft.example.ts
+++ b/examples/tron-example/src/app/tron.nft.example.ts
@@ -1,5 +1,5 @@
 import { TatumTronSDK } from '@tatumio/tron'
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 
 const tronSDK = TatumTronSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/examples/tron-example/src/app/tron.root.example.ts b/examples/tron-example/src/app/tron.root.example.ts
index f3e23da883..0729091148 100644
--- a/examples/tron-example/src/app/tron.root.example.ts
+++ b/examples/tron-example/src/app/tron.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumTronSDK } from '@tatumio/tron'
 
diff --git a/examples/xlm-example/src/app/xlm.ledger.example.ts b/examples/xlm-example/src/app/xlm.ledger.example.ts
index e89bd62e04..b24c4b2781 100644
--- a/examples/xlm-example/src/app/xlm.ledger.example.ts
+++ b/examples/xlm-example/src/app/xlm.ledger.example.ts
@@ -1,7 +1,6 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumXlmSDK } from '@tatumio/xlm'
-import { Currency } from '@tatumio/shared-core'
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 
 const xlmSDK = TatumXlmSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/xlm-example/src/app/xlm.root.example.ts b/examples/xlm-example/src/app/xlm.root.example.ts
index ef159d7105..1d4eb1a686 100644
--- a/examples/xlm-example/src/app/xlm.root.example.ts
+++ b/examples/xlm-example/src/app/xlm.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumXlmSDK } from '@tatumio/xlm'
 
diff --git a/examples/xrp-example/src/app/xrp.ledger.example.ts b/examples/xrp-example/src/app/xrp.ledger.example.ts
index 7a04738639..eb91e6298e 100644
--- a/examples/xrp-example/src/app/xrp.ledger.example.ts
+++ b/examples/xrp-example/src/app/xrp.ledger.example.ts
@@ -1,7 +1,6 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumXrpSDK } from '@tatumio/xrp'
-import { Currency } from '@tatumio/shared-core'
-import { CreateTrade, VirtualCurrency } from '@tatumio/api-client'
+import { Currency } from '@tatumio/api-client'
 
 const xrpSDK = TatumXrpSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
 
diff --git a/examples/xrp-example/src/app/xrp.root.example.ts b/examples/xrp-example/src/app/xrp.root.example.ts
index 5c1b8ad412..3231f132d9 100644
--- a/examples/xrp-example/src/app/xrp.root.example.ts
+++ b/examples/xrp-example/src/app/xrp.root.example.ts
@@ -1,4 +1,4 @@
-import { Fiat } from '@tatumio/shared-core'
+import { Fiat } from '@tatumio/api-client'
 import { REPLACE_ME_WITH_TATUM_API_KEY } from '@tatumio/shared-testing-common'
 import { TatumXrpSDK } from '@tatumio/xrp'
 
diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
index 5350ccb652..84089aece4 100644
--- a/packages/api-client/src/index.ts
+++ b/packages/api-client/src/index.ts
@@ -3,3 +3,5 @@ export * from './generated/core/OpenAPI'
 export * from './generated/core/ApiError'
 export * from './generated'
 export * from './lib/api-client'
+export * from './lib/models/Currency'
+export * from './lib/models/Fiat'
diff --git a/packages/shared/core/src/lib/models/Currency.ts b/packages/api-client/src/lib/models/Currency.ts
similarity index 100%
rename from packages/shared/core/src/lib/models/Currency.ts
rename to packages/api-client/src/lib/models/Currency.ts
diff --git a/packages/shared/core/src/lib/models/Fiat.ts b/packages/api-client/src/lib/models/Fiat.ts
similarity index 100%
rename from packages/shared/core/src/lib/models/Fiat.ts
rename to packages/api-client/src/lib/models/Fiat.ts
diff --git a/packages/blockchain/bsc/src/lib/__tests__/bsc.tx.spec.ts b/packages/blockchain/bsc/src/lib/__tests__/bsc.tx.spec.ts
index dbc305fa09..c792568d56 100644
--- a/packages/blockchain/bsc/src/lib/__tests__/bsc.tx.spec.ts
+++ b/packages/blockchain/bsc/src/lib/__tests__/bsc.tx.spec.ts
@@ -1,6 +1,6 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY, TEST_DATA } from '@tatumio/shared-testing-common'
 import { TatumBscSDK } from '../bsc.sdk'
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
 import { bscTxService } from '../services/bsc.tx'
 import {
   erc20TestFactory,
@@ -8,6 +8,7 @@ import {
   erc721TestFactory,
   multiTokenTestFactory,
 } from '@tatumio/shared-testing-evm-based'
+import { Currency } from '@tatumio/api-client'
 
 describe('BscSDK - tx', () => {
   const sdk = TatumBscSDK({ apiKey: REPLACE_ME_WITH_TATUM_API_KEY })
diff --git a/packages/blockchain/celo/src/lib/transactions/erc721/index.ts b/packages/blockchain/celo/src/lib/transactions/erc721/index.ts
index f0591c40ac..b32e62593d 100644
--- a/packages/blockchain/celo/src/lib/transactions/erc721/index.ts
+++ b/packages/blockchain/celo/src/lib/transactions/erc721/index.ts
@@ -1,10 +1,9 @@
-import { Currency, EvmBasedBlockchain } from '@tatumio/shared-core'
+import { EvmBasedBlockchain } from '@tatumio/shared-core'
+import { MintNftCelo } from '@tatumio/api-client'
 import BigNumber from 'bignumber.js'
-import { MintNftCelo, TATUM_API_CONSTANTS } from '@tatumio/api-client'
-import { Erc721Token, Erc721_Provenance } from '@tatumio/shared-blockchain-evm-based'
+import { Erc721_Provenance, Erc721Token } from '@tatumio/shared-blockchain-evm-based'
 import { BroadcastFunction } from '@tatumio/shared-blockchain-abstract'
-import { BigNumber as BN } from '@ethersproject/bignumber'
-import { CeloProvider, CeloWallet } from '@celo-tools/celo-ethers-wrapper'
+import { CeloWallet } from '@celo-tools/celo-ethers-wrapper'
 import {
   CeloTransactionConfig,
   celoUtils,
diff --git a/packages/blockchain/celo/src/lib/utils/celo.utils.ts b/packages/blockchain/celo/src/lib/utils/celo.utils.ts
index dedae9ce83..ca1c4a3207 100644
--- a/packages/blockchain/celo/src/lib/utils/celo.utils.ts
+++ b/packages/blockchain/celo/src/lib/utils/celo.utils.ts
@@ -1,4 +1,4 @@
-import { Currency } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { FromPrivateKeyOrSignatureId } from '@tatumio/shared-blockchain-abstract'
 import {
   BurnMultiTokenBatchCelo,
diff --git a/packages/blockchain/eth/src/lib/__tests__/eth.tx.spec.ts b/packages/blockchain/eth/src/lib/__tests__/eth.tx.spec.ts
index 16c9023d75..63ffe2640d 100644
--- a/packages/blockchain/eth/src/lib/__tests__/eth.tx.spec.ts
+++ b/packages/blockchain/eth/src/lib/__tests__/eth.tx.spec.ts
@@ -1,13 +1,14 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY, TEST_DATA } from '@tatumio/shared-testing-common'
 import { TatumEthSDK } from '../eth.sdk'
 import { ethTx } from '../services/eth.tx'
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
 import {
   erc20TestFactory,
   ganacheHelper,
   erc721TestFactory,
   multiTokenTestFactory,
 } from '@tatumio/shared-testing-evm-based'
+import { Currency } from '@tatumio/api-client'
 
 const blockchain = Blockchain.ETH
 
diff --git a/packages/blockchain/kcs/src/lib/__tests__/kcs.tx.spec.ts b/packages/blockchain/kcs/src/lib/__tests__/kcs.tx.spec.ts
index 7d3dcff099..e65c4ae717 100644
--- a/packages/blockchain/kcs/src/lib/__tests__/kcs.tx.spec.ts
+++ b/packages/blockchain/kcs/src/lib/__tests__/kcs.tx.spec.ts
@@ -1,6 +1,6 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY, TEST_DATA } from '@tatumio/shared-testing-common'
 import { TatumKcsSDK } from '../kcs.sdk'
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
 import { kcsTxService } from '../services/kcs.tx'
 import {
   erc20TestFactory,
@@ -8,6 +8,7 @@ import {
   erc721TestFactory,
   multiTokenTestFactory,
 } from '@tatumio/shared-testing-evm-based'
+import { Currency } from '@tatumio/api-client'
 const blockchain = Blockchain.KCS
 
 describe('KcsSDK - tx', () => {
diff --git a/packages/blockchain/one/src/lib/__tests__/one.tx.spec.ts b/packages/blockchain/one/src/lib/__tests__/one.tx.spec.ts
index 115f1526ab..776de25bfe 100644
--- a/packages/blockchain/one/src/lib/__tests__/one.tx.spec.ts
+++ b/packages/blockchain/one/src/lib/__tests__/one.tx.spec.ts
@@ -1,6 +1,6 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY, TEST_DATA } from '@tatumio/shared-testing-common'
 import { TatumOneSDK } from '../one.sdk'
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
 import { oneTxService } from '../services/one.tx'
 import {
   erc20TestFactory,
@@ -8,6 +8,7 @@ import {
   erc721TestFactory,
   multiTokenTestFactory,
 } from '@tatumio/shared-testing-evm-based'
+import { Currency } from '@tatumio/api-client'
 
 const blockchain = Blockchain.HARMONY
 
diff --git a/packages/blockchain/polygon/src/lib/__tests__/polygon.tx.spec.ts b/packages/blockchain/polygon/src/lib/__tests__/polygon.tx.spec.ts
index f2ba63ea84..8807fb335d 100644
--- a/packages/blockchain/polygon/src/lib/__tests__/polygon.tx.spec.ts
+++ b/packages/blockchain/polygon/src/lib/__tests__/polygon.tx.spec.ts
@@ -1,5 +1,5 @@
 import { REPLACE_ME_WITH_TATUM_API_KEY, TEST_DATA } from '@tatumio/shared-testing-common'
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
 import { polygonTxService } from '../services/polygon.tx'
 import { TatumPolygonSDK } from '../polygon.sdk'
 import {
@@ -8,6 +8,7 @@ import {
   erc721TestFactory,
   multiTokenTestFactory,
 } from '@tatumio/shared-testing-evm-based'
+import { Currency } from '@tatumio/api-client'
 
 const blockchain = Blockchain.POLYGON
 
diff --git a/packages/blockchain/xlm/src/lib/services/xlm.offchain.ts b/packages/blockchain/xlm/src/lib/services/xlm.offchain.ts
index 5cb62624db..3087f23f3c 100644
--- a/packages/blockchain/xlm/src/lib/services/xlm.offchain.ts
+++ b/packages/blockchain/xlm/src/lib/services/xlm.offchain.ts
@@ -1,6 +1,6 @@
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
+import { ApiServices, Currency, TransferXlm, Withdrawal } from '@tatumio/api-client'
 import { abstractBlockchainOffchain } from '@tatumio/shared-blockchain-abstract'
-import { ApiServices, TransferXlm, Withdrawal } from '@tatumio/api-client'
 import { Account, Asset, Keypair, Memo, Networks, Operation, TransactionBuilder } from 'stellar-sdk'
 
 export const xlmOffchainService = (args: { blockchain: Blockchain }) => {
diff --git a/packages/blockchain/xrp/src/lib/services/xrp.offchain.ts b/packages/blockchain/xrp/src/lib/services/xrp.offchain.ts
index 1591cb480a..344c41483a 100644
--- a/packages/blockchain/xrp/src/lib/services/xrp.offchain.ts
+++ b/packages/blockchain/xrp/src/lib/services/xrp.offchain.ts
@@ -1,6 +1,7 @@
 import { BigNumber } from 'bignumber.js'
 import { ApiServices, TransferXrp, Withdrawal } from '@tatumio/api-client'
-import { Blockchain, Currency } from '@tatumio/shared-core'
+import { Blockchain } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { RippleAPI } from 'ripple-lib'
 import { abstractBlockchainOffchain } from '@tatumio/shared-blockchain-abstract'
 
diff --git a/packages/sdk/src/lib/sdk.ts b/packages/sdk/src/lib/sdk.ts
index 870de6757a..85a77ebb67 100644
--- a/packages/sdk/src/lib/sdk.ts
+++ b/packages/sdk/src/lib/sdk.ts
@@ -4,7 +4,8 @@ import { BlockchainRecordService, TatumUrl } from '@tatumio/api-client'
 import { abstractSdk } from '@tatumio/shared-abstract-sdk'
 import { sdkKms } from './services/sdk.kms'
 import { TatumEthSDK } from '@tatumio/eth'
-import { Currency, Web3Request, Web3Response } from '@tatumio/shared-core'
+import { Web3Request, Web3Response } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 import { sdkMultiToken } from './services/sdk.multitoken'
 import { SDKS } from './sdk.common'
 import { httpDriver } from './services/sdk.httpDriver'
diff --git a/packages/sdk/src/lib/services/sdk.httpDriver.ts b/packages/sdk/src/lib/services/sdk.httpDriver.ts
index cdc6454028..e3ffcb6186 100644
--- a/packages/sdk/src/lib/services/sdk.httpDriver.ts
+++ b/packages/sdk/src/lib/services/sdk.httpDriver.ts
@@ -1,5 +1,6 @@
 import { SDKS } from '../sdk.common'
-import { Blockchain, blockchainHelper, Currency, Web3Request, Web3Response } from '@tatumio/shared-core'
+import { Blockchain, blockchainHelper, Web3Request, Web3Response } from '@tatumio/shared-core'
+import { Currency } from '@tatumio/api-client'
 
 // @TODO replace with evm
 export const httpDriver = (sdks: SDKS, currency: Currency, request: Web3Request): Promise<Web3Response> => {
diff --git a/packages/sdk/src/lib/services/sdk.wallet.ts b/packages/sdk/src/lib/services/sdk.wallet.ts
index a7e8e88092..7fb3a8c0e3 100644
--- a/packages/sdk/src/lib/services/sdk.wallet.ts
+++ b/packages/sdk/src/lib/services/sdk.wallet.ts
@@ -1,7 +1,7 @@
-import { blockchainHelper, Currency } from '@tatumio/shared-core'
+import { blockchainHelper } from '@tatumio/shared-core'
+import { Currency, TronWallet } from '@tatumio/api-client'
 import { btcBasedWalletUtils } from '@tatumio/shared-blockchain-btc-based'
 import { evmBasedUtils } from '@tatumio/shared-blockchain-evm-based'
-import { TronWallet } from '@tatumio/api-client'
 
 export const walletSdk = {
   /**
diff --git a/packages/shared/blockchain/abstract/src/lib/abstract-blockchain.sdk.ts b/packages/shared/blockchain/abstract/src/lib/abstract-blockchain.sdk.ts
index e11e10ceaa..4d66e96b48 100644
--- a/packages/shared/blockchain/abstract/src/lib/abstract-blockchain.sdk.ts
+++ b/packages/shared/blockchain/abstract/src/lib/abstract-blockchain.sdk.ts
@@ -11,6 +11,7 @@ import {
   DeployMultiToken,
   DeployNft,
   ExchangeRate,
+  Fiat,
   MintErc721,
   MintMultipleNft,
   MintMultiToken,
@@ -28,7 +29,7 @@ import {
   XlmWallet,
   XrpWallet,
 } from '@tatumio/api-client'
-import { Blockchain, blockchainHelper, Fiat } from '@tatumio/shared-core'
+import { Blockchain, blockchainHelper } from '@tatumio/shared-core'
 import { abstractSdk } from '@tatumio/shared-abstract-sdk'
 import { abstractBlockchainKms } from './services/kms.abstract-blockchain'
 import { abstractBlockchainOffchain } from './services/offchain.abstract-blockchain'
@@ -50,8 +51,11 @@ export const abstractBlockchainSdk = (args: { apiKey: string; url?: TatumUrl; bl
 
 export interface SdkWithWalletFunctions {
   generateAddressFromXPub(xpub: string, i: number, options?: { testnet: boolean }): string
+
   generatePrivateKeyFromMnemonic(mnemonic: string, i: number, options?: { testnet: boolean }): Promise<string>
+
   generateAddressFromPrivateKey(privateKey: string, options?: { testnet: boolean }): string
+
   generateWallet(mnemonic?: string, options?: { testnet: boolean }): Promise<TronWallet>
 }
 
@@ -106,6 +110,7 @@ export type ChainDeployMultiToken = FromPrivateKeyOrSignatureId<DeployMultiToken
 
 export interface SdkWithErc20Functions {
   decimals(contractAddress: string, provider?: string): any
+
   prepare: {
     deploySignedTransaction(body: ChainDeployErc20, provider?: string): Promise<string>
     transferSignedTransaction(body: ChainTransferErc20, provider?: string): Promise<string>
diff --git a/packages/shared/core/src/index.ts b/packages/shared/core/src/index.ts
index 9f1a51878d..85ede7751a 100644
--- a/packages/shared/core/src/index.ts
+++ b/packages/shared/core/src/index.ts
@@ -1,8 +1,6 @@
 import { getDerivationPath } from './lib/derivation-path.common'
 import { getNetworkConfig } from './lib/btc-based.network.common'
 
-export * from './lib/models/Currency'
-export * from './lib/models/Fiat'
 export * from './lib/models/Blockchain'
 export * from './lib/models/Web3'
 export * from './lib/models/ChainTransactionKMS'
diff --git a/packages/shared/core/src/lib/blockchain.common.ts b/packages/shared/core/src/lib/blockchain.common.ts
index 94795cc893..a18cd60880 100644
--- a/packages/shared/core/src/lib/blockchain.common.ts
+++ b/packages/shared/core/src/lib/blockchain.common.ts
@@ -6,7 +6,7 @@ import {
   EvmBasedBlockchains,
 } from './models/Blockchain'
 
-import { Currency, NativeCurrency } from './models/Currency'
+import { Currency, NativeCurrency } from '@tatumio/api-client'
 import {
   BlockchainToNativeCurrencyMapping,
   CurrencyToBlockchainMapping,
diff --git a/packages/shared/core/src/lib/contract.common.ts b/packages/shared/core/src/lib/contract.common.ts
index e3d425f9f9..1608681ddf 100644
--- a/packages/shared/core/src/lib/contract.common.ts
+++ b/packages/shared/core/src/lib/contract.common.ts
@@ -1,4 +1,4 @@
-import { Currency } from './models/Currency'
+import { Currency } from '@tatumio/api-client'
 
 export const CONTRACT_ADDRESSES = {
   [Currency.USDT.toString()]: '0xdac17f958d2ee523a2206206994597c13d831ec7',
diff --git a/packages/shared/core/src/lib/models/BlockchainCurrencyMapping.ts b/packages/shared/core/src/lib/models/BlockchainCurrencyMapping.ts
index 3f9ccc48d7..ca826f50bf 100644
--- a/packages/shared/core/src/lib/models/BlockchainCurrencyMapping.ts
+++ b/packages/shared/core/src/lib/models/BlockchainCurrencyMapping.ts
@@ -8,7 +8,7 @@ import {
   MATIC_BASED_CURRENCIES,
   NativeCurrency,
   TRON_CURRENCIES,
-} from './Currency'
+} from '@tatumio/api-client'
 
 export const BlockchainCurrencyMapping: Record<
   Blockchain,