carbon-js-sdk 0.6.10 → 0.7.0-beta.2

package/lib/CarbonSDK.d.ts

@@ -5,14 +5,15 @@ import * as clients from "./clients";
 import { CarbonQueryClient, ETHClient, HydrogenClient, InsightsQueryClient, NEOClient, TokenClient, ZILClient } from "./clients";
 import GrpcQueryClient from "./clients/GrpcQueryClient";
 import N3Client from "./clients/N3Client";
-import { AdminModule, AllianceModule, BankModule, BrokerModule, CDPModule, CoinModule, EvmMergeModule, EvmModule, FeeModule, FeemarketModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PositionModule, ProfileModule, SubAccountModule, XChainModule } from "./modules";
+import { AdminModule, AllianceModule, BankModule, BrokerModule, CDPModule, CoinModule, ERC20Module, EvmMergeModule, EvmModule, FeeModule, FeemarketModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PerpspoolModule, PositionModule, ProfileModule, SubAccountModule, XChainModule } from "./modules";
 import { StakingModule } from "./modules/staking";
 import { CosmosLedger, Keplr, LeapExtended } from "./provider";
 import { MetaMask } from "./provider/metamask/MetaMask";
-import { CarbonSigner, CarbonWallet, CarbonWalletGenericOpts, MetaMaskWalletOpts } from "./wallet";
-export { CarbonTx } from "./util";
+import { CarbonWallet, CarbonWalletGenericOpts, CarbonSigner, MetaMaskWalletOpts } from "./wallet";
 export { CarbonSigner, CarbonSignerTypes, CarbonWallet, CarbonWalletGenericOpts, CarbonWalletInitOpts } from "./wallet";
+export { CarbonTx } from "./util";
 export { DenomPrefix } from "./constant";
+export * as Carbon from "./codec/carbon-models";
 export interface CarbonSDKOpts {
     network: Network;
     tmClient: Tendermint34Client;
@@ -62,6 +63,8 @@ declare class CarbonSDK {
     alliance: AllianceModule;
     order: OrderModule;
     lp: LiquidityPoolModule;
+    erc20: ERC20Module;
+    perpspool: PerpspoolModule;
     subaccount: SubAccountModule;
     profile: ProfileModule;
     cdp: CDPModule;

package/lib/CarbonSDK.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectedCarbonSDK = exports.DenomPrefix = exports.CarbonWallet = exports.CarbonSignerTypes = exports.CarbonTx = void 0;
+exports.ConnectedCarbonSDK = exports.Carbon = exports.DenomPrefix = exports.CarbonTx = exports.CarbonWallet = exports.CarbonSignerTypes = void 0;
 const constant_1 = require("./constant");
 const util_1 = require("./util");
 const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
@@ -45,13 +45,14 @@ const staking_1 = require("./modules/staking");
 const provider_1 = require("./provider");
 const blockchain_1 = require("./util/blockchain");
 const wallet_1 = require("./wallet");
-var util_2 = require("./util");
-Object.defineProperty(exports, "CarbonTx", { enumerable: true, get: function () { return util_2.CarbonTx; } });
 var wallet_2 = require("./wallet");
 Object.defineProperty(exports, "CarbonSignerTypes", { enumerable: true, get: function () { return wallet_2.CarbonSignerTypes; } });
 Object.defineProperty(exports, "CarbonWallet", { enumerable: true, get: function () { return wallet_2.CarbonWallet; } });
+var util_2 = require("./util");
+Object.defineProperty(exports, "CarbonTx", { enumerable: true, get: function () { return util_2.CarbonTx; } });
 var constant_2 = require("./constant");
 Object.defineProperty(exports, "DenomPrefix", { enumerable: true, get: function () { return constant_2.DenomPrefix; } });
+exports.Carbon = __importStar(require("./codec/carbon-models"));
 const DEFAULT_SDK_INIT_OPTS = {
     network: constant_1.DEFAULT_NETWORK,
 };
@@ -72,7 +73,7 @@ class CarbonSDK {
         this.evmChainId = (_g = (_f = opts.evmChainId) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[this.network]) !== null && _g !== void 0 ? _g : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
         let grpcClient;
         if (opts.useTmAbciQuery !== true && this.networkConfig.grpcUrl) {
-            const transport = typeof window === "undefined" ? (0, grpc_web_node_http_transport_1.NodeHttpTransport)() : undefined;
+            const transport = typeof window === "undefined" ? grpc_web_node_http_transport_1.NodeHttpTransport() : undefined;
             grpcClient = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
                 transport,
             });
@@ -89,6 +90,8 @@ class CarbonSDK {
         this.alliance = new modules_1.AllianceModule(this);
         this.order = new modules_1.OrderModule(this);
         this.lp = new modules_1.LiquidityPoolModule(this);
+        this.erc20 = new modules_1.ERC20Module(this);
+        this.perpspool = new modules_1.PerpspoolModule(this);
         this.subaccount = new modules_1.SubAccountModule(this);
         this.profile = new modules_1.ProfileModule(this);
         this.cdp = new modules_1.CDPModule(this);
@@ -150,12 +153,23 @@ class CarbonSDK {
         return __awaiter(this, void 0, void 0, function* () {
             const network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
             const configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
-            const networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[network], configOverride);
-            const batchQueryClient = new clients.BatchQueryClient(networkConfig.tmRpcUrl);
-            const tmClient = (_c = opts.tmClient) !== null && _c !== void 0 ? _c : util_1.GenericUtils.modifyTmClient(yield tendermint_rpc_1.Tendermint34Client.create(batchQueryClient));
             const defaultTimeoutBlocks = opts.defaultTimeoutBlocks;
-            const chainId = (_d = (yield tmClient.status())) === null || _d === void 0 ? void 0 : _d.nodeInfo.network;
+            const networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[network], configOverride);
+            const tmClient = (_c = opts.tmClient) !== null && _c !== void 0 ? _c : new tendermint_rpc_1.Tendermint34Client(new clients.BatchQueryClient(networkConfig.tmRpcUrl)); // fallback tmClient
+            let chainId = networkConfig.chainId; // fallback chain ID
+            let normalInit = true;
+            try {
+                chainId = (_d = (yield tmClient.status())) === null || _d === void 0 ? void 0 : _d.nodeInfo.network;
+            }
+            catch (error) {
+                console.warn("tm client init failed");
+                console.error(error);
+                normalInit = false;
+            }
+            console.log("normal init", normalInit);
             const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks, chainId, useTmAbciQuery: opts.useTmAbciQuery });
+            if (!normalInit)
+                return sdk;
             if (opts.wallet) {
                 yield sdk.connect(opts.wallet);
             }
@@ -322,7 +336,7 @@ class CarbonSDK {
             const evmChainId = this.evmChainId;
             const addressOptions = {
                 network: this.networkConfig.network,
-                bech32Prefix: this.networkConfig.Bech32Prefix
+                bech32Prefix: this.networkConfig.Bech32Prefix,
             };
             let publicKeyBase64;
             const address = yield metamask.defaultAccount();

package/lib/clients/BatchQueryClient.js

@@ -29,7 +29,7 @@ class BatchQueryClient {
         };
         if (typeof endpoint === "string") {
             // accept host.name:port and assume http protocol
-            this.url = (0, rpcclient_1.hasProtocol)(endpoint) ? endpoint : "http://" + endpoint;
+            this.url = rpcclient_1.hasProtocol(endpoint) ? endpoint : "http://" + endpoint;
         }
         else {
             this.url = endpoint.url;
@@ -71,7 +71,7 @@ class BatchQueryClient {
             return;
         const requests = batch.map((s) => s.request);
         const requestIds = requests.map((request) => request.id);
-        (0, http_1.http)("POST", this.url, this.headers, requests).then((raw) => {
+        http_1.http("POST", this.url, this.headers, requests).then((raw) => {
             // Requests with a single entry return as an object
             const arr = Array.isArray(raw) ? raw : [raw];
             arr.forEach((el, i) => {
@@ -79,8 +79,8 @@ class BatchQueryClient {
                 if (!req)
                     return;
                 const { reject, resolve } = req;
-                const response = (0, json_rpc_1.parseJsonRpcResponse)(el);
-                if ((0, json_rpc_1.isJsonRpcErrorResponse)(response)) {
+                const response = json_rpc_1.parseJsonRpcResponse(el);
+                if (json_rpc_1.isJsonRpcErrorResponse(response)) {
                     reject(new Error(JSON.stringify(response.error)));
                 }
                 else {

package/lib/clients/CarbonQueryClient.d.ts

@@ -42,6 +42,8 @@ import { QueryClientImpl as PricingQueryClient } from "../codec/pricing/query";
 import { QueryClientImpl as ProfileQueryClient } from "../codec/profile/query";
 import { QueryClientImpl as SubaccountQueryClient } from "../codec/subaccount/query";
 import { QueryClientImpl as AllianceClient } from "../codec/alliance/query";
+import { QueryClientImpl as PerpspoolQueryClient } from "../codec/perpspool/query";
+import { QueryClientImpl as ERC20QueryClient } from "../codec/erc20/query";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import BlockchainClient from "./BlockchainClient";
 import GrpcQueryClient from "./GrpcQueryClient";
@@ -83,6 +85,7 @@ declare class CarbonQueryClient {
     profile: ProfileQueryClient;
     subaccount: SubaccountQueryClient;
     headersync: HeadersyncQueryClient;
+    perpspool: PerpspoolQueryClient;
     auth: AuthQueryClient;
     bank: BankQueryClient;
     nativeBank: NativeBankQueryClient;
@@ -101,8 +104,7 @@ declare class CarbonQueryClient {
     ethermint: EthermintClientGroup;
     evmmerge: EvmMergeQueryClient;
     evmbank: EvmBankQueryClient;
-    private readonly baseClient;
-    private readonly tmClient;
+    erc20: ERC20QueryClient;
     constructor(opts: CarbonQueryClientOpts);
 }
 export default CarbonQueryClient;

package/lib/clients/CarbonQueryClient.js

@@ -47,14 +47,14 @@ const query_41 = require("../codec/pricing/query");
 const query_42 = require("../codec/profile/query");
 const query_43 = require("../codec/subaccount/query");
 const query_44 = require("../codec/alliance/query");
+const query_45 = require("../codec/perpspool/query");
+const query_46 = require("../codec/erc20/query");
 const stargate_1 = require("@cosmjs/stargate");
 const BlockchainClient_1 = __importDefault(require("./BlockchainClient"));
 class CarbonQueryClient {
     constructor(opts) {
         var _a;
-        const rpcClient = (_a = opts.grpcClient) !== null && _a !== void 0 ? _a : (0, stargate_1.createProtobufRpcClient)(new stargate_1.QueryClient(opts.tmClient));
-        this.tmClient = opts.tmClient;
-        this.baseClient = rpcClient;
+        const rpcClient = (_a = opts.grpcClient) !== null && _a !== void 0 ? _a : stargate_1.createProtobufRpcClient(new stargate_1.QueryClient(opts.tmClient));
         this.chain = BlockchainClient_1.default.connectWithTm(opts.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
         this.alliance = new query_44.QueryClientImpl(rpcClient);
@@ -80,6 +80,7 @@ class CarbonQueryClient {
         this.headersync = new query_23.QueryClientImpl(rpcClient);
         this.evmmerge = new query_19.QueryClientImpl(rpcClient);
         this.evmbank = new query_20.QueryClientImpl(rpcClient);
+        this.perpspool = new query_45.QueryClientImpl(rpcClient);
         this.auth = new query_6.QueryClientImpl(rpcClient);
         this.bank = new query_7.QueryClientImpl(rpcClient);
         this.nativeBank = new query_8.QueryClientImpl(rpcClient);
@@ -93,6 +94,7 @@ class CarbonQueryClient {
         this.upgrade = new query_17.QueryClientImpl(rpcClient);
         this.cosmosTm = new query_9.ServiceClientImpl(rpcClient);
         this.alliance = new query_44.QueryClientImpl(rpcClient);
+        this.erc20 = new query_46.QueryClientImpl(rpcClient);
         this.ibc = {
             controller: new query_24.QueryClientImpl(rpcClient),
             host: new query_25.QueryClientImpl(rpcClient),

package/lib/clients/ETHClient.d.ts

@@ -1,6 +1,6 @@
 import CarbonSDK from "../CarbonSDK";
 import { EthNetworkConfig, NetworkConfig, NetworkConfigProvider } from "../constant";
-import { Models } from "../index";
+import { Carbon } from "../CarbonSDK";
 import { Blockchain } from "../util/blockchain";
 import { TokenInitInfo, TokensWithExternalBalance } from "../util/external";
 import BigNumber from "bignumber.js";
@@ -19,8 +19,8 @@ interface ETHTxParams {
     nonce?: number;
 }
 export interface BridgeParams {
-    fromToken: Models.Token;
-    toToken: Models.Token;
+    fromToken: Carbon.Coin.Token;
+    toToken: Carbon.Coin.Token;
     amount: BigNumber;
     fromAddress: string;
     recoveryAddress: string;
@@ -35,11 +35,11 @@ export interface BridgeParams {
 export interface LockParams extends ETHTxParams {
     address: Uint8Array;
     amount: BigNumber;
-    token: Models.Token;
+    token: Carbon.Coin.Token;
     signCompleteCallback?: () => void;
 }
 export interface ApproveERC20Params extends ETHTxParams {
-    token: Models.Token;
+    token: Carbon.Coin.Token;
     spenderAddress?: string;
     amount?: BigNumber;
     signCompleteCallback?: () => void;
@@ -71,7 +71,7 @@ export declare class ETHClient {
     static instance(opts: ETHClientOpts): CarbonSDK.ETHClient;
     getExternalBalances(api: CarbonSDK, address: string, whitelistDenoms?: string[], version?: string): Promise<TokensWithExternalBalance[]>;
     approveERC20(params: ApproveERC20Params): Promise<EthersTransactionResponse>;
-    checkAllowanceERC20(token: Models.Token, owner: string, spender: string): Promise<BigNumber>;
+    checkAllowanceERC20(token: Carbon.Coin.Token, owner: string, spender: string): Promise<BigNumber>;
     bridgeTokens(params: BridgeParams): Promise<EthersTransactionResponse>;
     lockDeposit(params: LockParams): Promise<EthersTransactionResponse>;
     getDepositContractAddress(swthBech32Address: string, ownerEthAddress: string): Promise<string>;
@@ -79,7 +79,7 @@ export declare class ETHClient {
         address: string;
         signature: string;
     }>, overrideFee?: ethers.BigNumber): Promise<Response | "insufficient balance">;
-    getDepositFeeAmount(token: Models.Token, depositAddress: string): Promise<ethers.BigNumber>;
+    getDepositFeeAmount(token: Carbon.Coin.Token, depositAddress: string): Promise<ethers.BigNumber>;
     isContract(address: string): Promise<boolean>;
     retrieveERC20Info(address: string): Promise<TokenInitInfo>;
     formatWithdrawalAddress(address: string): Promise<string>;
@@ -94,7 +94,7 @@ export declare class ETHClient {
      *
      * @param token
      */
-    getTargetProxyHash(token: Models.Token): string;
+    getTargetProxyHash(token: Carbon.Coin.Token): string;
     getProvider(): ethers.providers.JsonRpcProvider;
     getNetworkConfig(): NetworkConfig;
     getConfig(): EthNetworkConfig;

package/lib/clients/ETHClient.js

@@ -44,15 +44,15 @@ class ETHClient {
                     ?
                         this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
                     :
-                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
                 return isCorrectBlockchain &&
                     token.tokenAddress.length == 40 &&
-                    token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
+                    token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
                     (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                    this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
+                    this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
             });
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
+                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
             });
             const provider = this.getProvider();
             const contractAddress = this.getBalanceReaderAddress();
@@ -101,14 +101,14 @@ class ETHClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const nonce = yield this.getTxNonce(fromAddress, params.nonce, rpcProvider);
             const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
             const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -137,9 +137,9 @@ class ETHClient {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             const contractAddress = this.getLockProxyAddress();
@@ -190,16 +190,16 @@ class ETHClient {
                 return "insufficient balance";
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(tokenWithExternalBalances.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(tokenWithExternalBalances));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(tokenWithExternalBalances.id));
             const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
             const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
             // logger("sendDeposit message", message)
             let signatureResult;
             const { address, signature } = yield getSignatureCallback(message);
-            const signatureBytes = ethers_1.ethers.utils.arrayify((0, generic_1.appendHexPrefix)(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
             const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
             // logger("sign result", address, signature)
             signatureResult = {
@@ -238,7 +238,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
+            if (blockchain_1.blockchainForChainId(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
                 throw new Error("unsupported token");
             }
             let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.deposit_fee);
@@ -304,7 +304,7 @@ class ETHClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getProvider() {

package/lib/clients/HydrogenClient.js

@@ -29,7 +29,7 @@ exports.HydrogenEndpoints = {
 const formatDateField = (value) => {
     if (typeof value !== "string")
         return null;
-    return (0, dayjs_1.default)(value);
+    return dayjs_1.default(value);
 };
 // temporary function to parse okt/okc blockchain
 // to remove when automatic deposit/withdraw feature is deployed

package/lib/clients/InsightsQueryClient.js

@@ -101,12 +101,12 @@ class InsightsQueryClient {
             const meta = response.data.result.meta;
             const parsedEntries = rawEntries.map(entry => ({
                 lastHeight: entry.lastHeight,
-                time: (0, dayjs_1.default)(entry.time),
+                time: dayjs_1.default(entry.time),
                 volumeValue: new bignumber_js_1.default(entry.volumeValue)
             }));
             const parsedMeta = {
-                from: (0, dayjs_1.default)(meta.from),
-                until: (0, dayjs_1.default)(meta.until),
+                from: dayjs_1.default(meta.from),
+                until: dayjs_1.default(meta.until),
                 interval: meta.interval,
             };
             return { result: { entries: parsedEntries, meta: parsedMeta } };

package/lib/clients/NEOClient.d.ts

@@ -1,6 +1,6 @@
 import CarbonSDK from "../CarbonSDK";
 import { NeoNetworkConfig, NetworkConfig, NetworkConfigProvider } from "../constant";
-import { Models } from "../index";
+import { Carbon } from "../CarbonSDK";
 import { NeoLedgerAccount } from "../provider/account";
 import { O3Wallet } from "../provider/o3";
 import { Blockchain } from "../util/blockchain";
@@ -49,7 +49,7 @@ export declare class NEOClient {
      *
      * @param token
      */
-    getTargetProxyHash(token: Models.Token): string;
+    getTargetProxyHash(token: Carbon.Coin.Token): string;
     getNetworkConfig(): NetworkConfig;
     getConfig(): NeoNetworkConfig;
     getProviderUrl(): string;

package/lib/clients/NEOClient.js

@@ -68,13 +68,13 @@ class NEOClient {
                     ?
                         !!sdk.token.getBlockchainV2(token.denom) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[sdk.token.getBlockchainV2(token.denom)] == this.blockchain)
                     :
-                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
                 return (isCorrectBlockchain || token.denom === "swth") && token.tokenAddress.length == 40 && token.bridgeAddress.length == 40;
             });
             const client = new Neon.rpc.RPCClient(url, "2.5.2"); // TODO: should we change the RPC version??
             // NOTE: fetching of tokens is chunked in sets of 15 as we may hit
             // the gas limit on the RPC node and error out otherwise
-            const promises = (0, lodash_1.chunk)(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
+            const promises = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c;
                 let acc = {};
                 for (const token of partition) {
@@ -116,8 +116,8 @@ class NEOClient {
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
             const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
-            const zeroAddressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+            const zeroAddressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
             const amount = ethers_1.ethers.BigNumber.from(token.externalBalance);
             const feeAmount = ethers_1.ethers.BigNumber.from(feeAmountInput !== null && feeAmountInput !== void 0 ? feeAmountInput : "100000000");
             const feeAddress = feeAmount.isZero() ? zeroAddressHex : networkConfig.feeAddress;
@@ -162,7 +162,7 @@ class NEOClient {
             const fromAddress = util_1.AddressUtils.NEOAddress.publicKeyToAddress(publicKeyOutput.publicKey);
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
                 throw new Error("Invalid amount");
@@ -198,7 +198,7 @@ class NEOClient {
             const fromAddress = ledger.scriptHash;
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const feeAddress = networkConfig.feeAddress;
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
@@ -313,7 +313,7 @@ class NEOClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/clients/TokenClient.d.ts

@@ -1,4 +1,4 @@
-import { Bridge, Token, TokenPrice } from "../codec";
+import { Carbon } from "../CarbonSDK";
 import { NetworkConfigProvider } from "../constant";
 import { GetFeeQuoteResponse } from "../hydrogen/feeQuote";
 import { BlockchainUtils, TypeUtils } from "../util";
@@ -9,10 +9,10 @@ declare class TokenClient {
     readonly query: CarbonQueryClient;
     readonly configProvider: NetworkConfigProvider;
     static Blacklist: Partial<TypeUtils.NetworkMap<string[]>>;
-    readonly tokens: TypeUtils.SimpleMap<Token>;
+    readonly tokens: TypeUtils.SimpleMap<Carbon.Coin.Token>;
     readonly wrapperMap: TypeUtils.SimpleMap<string>;
-    readonly poolTokens: TypeUtils.SimpleMap<Token>;
-    readonly cdpTokens: TypeUtils.SimpleMap<Token>;
+    readonly poolTokens: TypeUtils.SimpleMap<Carbon.Coin.Token>;
+    readonly cdpTokens: TypeUtils.SimpleMap<Carbon.Coin.Token>;
     readonly bridges: BridgeMap;
     readonly symbols: TypeUtils.SimpleMap<string>;
     readonly usdValues: TypeUtils.SimpleMap<BigNumber>;
@@ -31,8 +31,8 @@ declare class TokenClient {
     getUSDValue(denom: string): BigNumber | undefined;
     toHuman(denom: string, unitlessAmt: BigNumber): BigNumber;
     toUnitless(denom: string, humanAmt: BigNumber): BigNumber;
-    tokenForId(id: string): Token | undefined;
-    tokenForDenom(denom: string): Token | undefined;
+    tokenForId(id: string): Carbon.Coin.Token | undefined;
+    tokenForDenom(denom: string): Carbon.Coin.Token | undefined;
     getFeeInfo(denom: string): Promise<GetFeeQuoteResponse>;
     getTokenName(denom: string, overrideMap?: TypeUtils.SimpleMap<string>): string;
     getTokenDesc(denom: string): string;
@@ -44,36 +44,36 @@ declare class TokenClient {
     static isCdpIbcDenom(denom: string): boolean;
     isWrappedToken(denom?: string): boolean;
     hasWrappedToken(denom?: string): boolean;
-    getWrappedTokens(denom: string): Token[];
-    getWrappedToken(denom: string, blockchain?: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2, version?: string): Token | null;
-    getSourceToken(denom: string): Token | null;
-    getNativeToken(): Token | undefined;
-    getNativeStablecoin(): Token | undefined;
+    getWrappedTokens(denom: string): Carbon.Coin.Token[];
+    getWrappedToken(denom: string, blockchain?: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2, version?: string): Carbon.Coin.Token | null;
+    getSourceToken(denom: string): Carbon.Coin.Token | null;
+    getNativeToken(): Carbon.Coin.Token | undefined;
+    getNativeStablecoin(): Carbon.Coin.Token | undefined;
     isNativeToken(denom: string): boolean;
     isNativeStablecoin(denom: string): boolean;
     isGroupedToken(denom: string): boolean;
-    isCarbonToken(token?: Token | null): boolean;
-    getDepositTokenFor(tokenDenom: string, chain: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2, version?: string): Token | undefined;
-    getAllTokens(): Promise<Token[]>;
-    reloadTokens(): Promise<TypeUtils.SimpleMap<Token>>;
+    isCarbonToken(token?: Carbon.Coin.Token | null): boolean;
+    getDepositTokenFor(tokenDenom: string, chain: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2, version?: string): Carbon.Coin.Token | undefined;
+    getAllTokens(): Promise<Carbon.Coin.Token[]>;
+    reloadTokens(): Promise<TypeUtils.SimpleMap<Carbon.Coin.Token>>;
     getBridges(): Promise<BridgeMap>;
-    matchChainsWithDifferentChainIds(bridges: Bridge[]): Promise<IbcBridge[]>;
+    matchChainsWithDifferentChainIds(bridges: Carbon.Coin.Bridge[]): Promise<IbcBridge[]>;
     getIbcBlockchainNames(): string[];
     getIbcChainFromBlockchainV2: (blockchain: BlockchainV2 | undefined) => string | undefined;
     getPolynetworkBlockchainNames(): string[];
     getAllBlockchainNames(): string[];
-    getBridgesFromBridgeId(bridgeId: number): Bridge[] | IbcBridge[];
-    getIbcTokens(): TypeUtils.SimpleMap<Token>;
-    getPolyNetworkTokens(): TypeUtils.SimpleMap<Token>;
+    getBridgesFromBridgeId(bridgeId: number): Carbon.Coin.Bridge[] | IbcBridge[];
+    getIbcTokens(): TypeUtils.SimpleMap<Carbon.Coin.Token>;
+    getPolyNetworkTokens(): TypeUtils.SimpleMap<Carbon.Coin.Token>;
     getBlockchainV2FromIDs(chainId: number, bridgeId: number): BlockchainV2 | undefined;
-    getBridgeFromToken(token: Token | null): Bridge | IbcBridge | undefined;
-    getIbcChainIdFromToken(token: Token | null): string | undefined;
-    getCdpUnderlyingToken(cdpDenom: string): Token | undefined;
+    getBridgeFromToken(token: Carbon.Coin.Token | null): Carbon.Coin.Bridge | IbcBridge | undefined;
+    getIbcChainIdFromToken(token: Carbon.Coin.Token | null): string | undefined;
+    getCdpUnderlyingToken(cdpDenom: string): Carbon.Coin.Token | undefined;
     reloadWrapperMap(): Promise<TypeUtils.SimpleMap<string>>;
     reloadDenomGeckoMap(): Promise<void>;
     reloadUSDValues(denoms?: string[]): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getUSDValuesFromCoinGecko(geckoIds: string[]): Promise<any>;
-    processTokenPrices(tokenPrices: TokenPrice[]): TypeUtils.SimpleMap<BigNumber>;
+    processTokenPrices(tokenPrices: Carbon.Pricing.TokenPrice[]): TypeUtils.SimpleMap<BigNumber>;
     getUSDValuesFromPricingModule(): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getDenomToGeckoIdMap(): Promise<TypeUtils.SimpleMap<string>>;
     setCommonAssetConfig(): void;

package/lib/clients/TokenClient.js

@@ -544,7 +544,7 @@ class TokenClient {
         if (!token)
             return undefined;
         const bridge = this.getBridgeFromToken(token);
-        if (!bridge || !(0, blockchain_1.isIbcBridge)(bridge))
+        if (!bridge || !blockchain_1.isIbcBridge(bridge))
             return undefined;
         return bridge.chain_id_name;
     }
@@ -620,7 +620,7 @@ class TokenClient {
     processTokenPrices(tokenPrices) {
         return tokenPrices.reduce((prevPrices, price) => {
             const newPrev = prevPrices;
-            newPrev[price.denom] = (0, number_1.bnOrZero)(price.twap).shiftedBy(-constant_1.decTypeDecimals);
+            newPrev[price.denom] = number_1.bnOrZero(price.twap).shiftedBy(-constant_1.decTypeDecimals);
             return newPrev;
         }, {});
     }

package/lib/clients/ZILClient.d.ts

@@ -1,6 +1,6 @@
 import CarbonSDK from "../CarbonSDK";
 import { NetworkConfig, NetworkConfigProvider, ZilNetworkConfig } from "../constant";
-import { Models } from "../index";
+import { Carbon } from "../CarbonSDK";
 import { Blockchain } from "../util/blockchain";
 import { TokensWithExternalBalance } from "../util/external";
 import { Transaction, Wallet } from "@zilliqa-js/account";
@@ -29,12 +29,12 @@ interface ZILTxParams {
 export interface ZILLockParams extends ZILTxParams {
     address: Uint8Array;
     amount: BigNumber;
-    token: Models.Token;
+    token: Carbon.Coin.Token;
     signCompleteCallback?: () => void;
 }
 export interface ZilBridgeParams {
-    fromToken: Models.Token;
-    toToken: Models.Token;
+    fromToken: Carbon.Coin.Token;
+    toToken: Carbon.Coin.Token;
     amount: BigNumber;
     fromAddress: string;
     recoveryAddress: string;
@@ -46,7 +46,7 @@ export interface ZilBridgeParams {
     signCompleteCallback?: () => void;
 }
 export interface ApproveZRC2Params extends ZILTxParams {
-    token: Models.Token;
+    token: Carbon.Coin.Token;
     spenderAddress?: string;
     signCompleteCallback?: () => void;
 }
@@ -81,7 +81,7 @@ export declare class ZILClient {
     formatWithdrawalAddress(bech32Address: string): Promise<string>;
     private callContract;
     approveZRC2(params: ApproveZRC2Params): Promise<Transaction>;
-    checkAllowanceZRC2(token: Models.Token, owner: string, spender: string): Promise<BigNumber>;
+    checkAllowanceZRC2(token: Carbon.Coin.Token, owner: string, spender: string): Promise<BigNumber>;
     bridgeTokens(params: ZilBridgeParams): Promise<Transaction>;
     lockDeposit(params: ZILLockParams): Promise<Transaction>;
     retrieveZRC2Info(address: string): Promise<{
@@ -96,7 +96,7 @@ export declare class ZILClient {
      *
      * @param token
      */
-    getTargetProxyHash(token: Models.Token): string;
+    getTargetProxyHash(token: Carbon.Coin.Token): string;
     getNetworkConfig(): NetworkConfig;
     getConfig(): ZilNetworkConfig;
     getProviderUrl(): string;