carbon-js-sdk 0.2.17 → 0.2.18-dev.0

package/lib/CarbonSDK.d.ts

@@ -2,6 +2,7 @@
 import { Network, Network as _Network, NetworkConfig } from "./constant";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { CarbonQueryClient, ETHClient, HydrogenClient, InsightsQueryClient, NEOClient, TokenClient, ZILClient } from "./clients";
+import * as clients from "./clients";
 import N3Client from "./clients/N3Client";
 import { AdminModule, BankModule, BrokerModule, CDPModule, CoinModule, FeeModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PositionModule, ProfileModule, SubAccountModule, XChainModule } from "./modules";
 import { StakingModule } from "./modules/staking";
@@ -9,6 +10,7 @@ import { CosmosLedger, Keplr } from "./provider";
 import { CarbonSigner, CarbonWallet, CarbonWalletGenericOpts } from "./wallet";
 export { CarbonTx } from "./util";
 export { CarbonSigner, CarbonSignerTypes, CarbonWallet, CarbonWalletGenericOpts, CarbonWalletInitOpts } from "./wallet";
+export { DenomPrefix } from "./constant";
 export interface CarbonSDKOpts {
     network: Network;
     tmClient: Tendermint34Client;
@@ -31,7 +33,10 @@ export interface CarbonSDKInitOpts {
  */
 declare class CarbonSDK {
     static DEFAULT_NETWORK: Network;
-    static TokenClient: typeof TokenClient;
+    static DenomPrefix: {
+        LPToken: string;
+        CDPToken: string;
+    };
     readonly query: CarbonQueryClient;
     insights: InsightsQueryClient;
     hydrogen: HydrogenClient;
@@ -98,5 +103,12 @@ export declare class ConnectedCarbonSDK extends CarbonSDK {
 }
 declare namespace CarbonSDK {
     export import Network = _Network;
+    export import CarbonQueryClient = clients.CarbonQueryClient;
+    export import ETHClient = clients.ETHClient;
+    export import HydrogenClient = clients.HydrogenClient;
+    export import InsightsQueryClient = clients.InsightsQueryClient;
+    export import NEOClient = clients.NEOClient;
+    export import TokenClient = clients.TokenClient;
+    export import ZILClient = clients.ZILClient;
 }
 export default CarbonSDK;

package/lib/CarbonSDK.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,11 +31,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectedCarbonSDK = exports.CarbonWallet = exports.CarbonSignerTypes = exports.CarbonTx = void 0;
+exports.ConnectedCarbonSDK = exports.DenomPrefix = exports.CarbonWallet = exports.CarbonSignerTypes = exports.CarbonTx = void 0;
 const constant_1 = require("./constant");
 const util_1 = require("./util");
 const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
 const clients_1 = require("./clients");
+const clients = __importStar(require("./clients"));
 const N3Client_1 = __importDefault(require("./clients/N3Client"));
 const modules_1 = require("./modules");
 const staking_1 = require("./modules/staking");
@@ -28,6 +48,8 @@ Object.defineProperty(exports, "CarbonTx", { enumerable: true, get: function ()
 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 constant_2 = require("./constant");
+Object.defineProperty(exports, "DenomPrefix", { enumerable: true, get: function () { return constant_2.DenomPrefix; } });
 const DEFAULT_SDK_INIT_OPTS = {
     network: constant_1.DEFAULT_NETWORK,
 };
@@ -253,7 +275,7 @@ class CarbonSDK {
     }
 }
 CarbonSDK.DEFAULT_NETWORK = constant_1.DEFAULT_NETWORK;
-CarbonSDK.TokenClient = clients_1.TokenClient;
+CarbonSDK.DenomPrefix = constant_1.DenomPrefix;
 CarbonSDK.parseNetwork = util_1.NetworkUtils.parseNetwork;
 class ConnectedCarbonSDK extends CarbonSDK {
     constructor(wallet, opts) {
@@ -267,5 +289,12 @@ class ConnectedCarbonSDK extends CarbonSDK {
 exports.ConnectedCarbonSDK = ConnectedCarbonSDK;
 (function (CarbonSDK) {
     CarbonSDK.Network = constant_1.Network;
+    CarbonSDK.CarbonQueryClient = clients.CarbonQueryClient;
+    CarbonSDK.ETHClient = clients.ETHClient;
+    CarbonSDK.HydrogenClient = clients.HydrogenClient;
+    CarbonSDK.InsightsQueryClient = clients.InsightsQueryClient;
+    CarbonSDK.NEOClient = clients.NEOClient;
+    CarbonSDK.TokenClient = clients.TokenClient;
+    CarbonSDK.ZILClient = clients.ZILClient;
 })(CarbonSDK || (CarbonSDK = {}));
 exports.default = CarbonSDK;

package/lib/clients/CarbonQueryClient.js

@@ -44,7 +44,7 @@ class CarbonQueryClient {
     constructor(tmClient) {
         this.tmClient = tmClient;
         this.baseClient = new stargate_1.QueryClient(this.tmClient);
-        const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
         this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
         this.book = new query_2.QueryClientImpl(rpcClient);
@@ -85,7 +85,7 @@ class CarbonQueryClient {
         };
     }
     getProtobufRpcClient() {
-        return (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        return stargate_1.createProtobufRpcClient(this.baseClient);
     }
 }
 exports.default = CarbonQueryClient;

package/lib/clients/ETHClient.d.ts

@@ -55,7 +55,7 @@ export declare class ETHClient {
         eth: string;
     };
     private constructor();
-    static instance(opts: ETHClientOpts): ETHClient;
+    static instance(opts: ETHClientOpts): CarbonSDK.ETHClient;
     getExternalBalances(api: CarbonSDK, address: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
     approveERC20(params: ApproveERC20Params): Promise<EthersTransactionResponse>;
     checkAllowanceERC20(token: Models.Token, owner: string, spender: string): Promise<BigNumber>;

package/lib/clients/ETHClient.js

@@ -40,13 +40,13 @@ class ETHClient {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield api.token.getAllTokens();
             const lockProxyAddress = this.getLockProxyAddress().toLowerCase();
-            const tokens = tokenQueryResults.filter((token) => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 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();
@@ -95,14 +95,14 @@ class ETHClient {
                 throw new Error("Invalid recovery address");
             }
             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, CarbonSDK_1.default.Network.MainNet));
             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 rpcProvider.getTransactionCount(fromAddress);
             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, CarbonSDK_1.default.Network.MainNet);
             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.blockchain) {
+            if (blockchain_1.blockchainForChainId(token.chainId.toNumber()) !== 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);
 };
 const formatCrossChainTransfer = (value) => {
     var _a, _b;

package/lib/clients/N3Client.js

@@ -65,9 +65,10 @@ class N3Client {
                     continue;
                 if (whitelistDenoms && !whitelistDenoms.includes(token.denom))
                     continue;
-                if (!balances[token.tokenAddress])
+                const tokenScriptHash = neon_core_next_1.u.reverseHex(token.tokenAddress);
+                if (!balances[tokenScriptHash])
                     continue;
-                tokensWithBalance.push(Object.assign(Object.assign({}, token), { externalBalance: balances[token.tokenAddress] }));
+                tokensWithBalance.push(Object.assign(Object.assign({}, token), { externalBalance: balances[tokenScriptHash] }));
             }
             return tokensWithBalance;
         });

package/lib/clients/NEOClient.d.ts

@@ -34,7 +34,7 @@ export declare class NEOClient {
         neo: string;
     };
     private constructor();
-    static instance(opts: NEOClientOpts): NEOClient;
+    static instance(opts: NEOClientOpts): CarbonSDK.NEOClient;
     static parseHexNum(hex: string, exp?: number): string;
     getExternalBalances(sdk: CarbonSDK, address: string, url: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
     lockDeposit(token: TokensWithExternalBalance, feeAmountInput: string, swthAddress: string, neoPrivateKey: string): Promise<false | import("@cityofzion/neon-api/lib/funcs/types").DoInvokeConfig>;

package/lib/clients/NEOClient.js

@@ -37,8 +37,8 @@ const util_1 = require("../util");
 const address_1 = require("../util/address");
 const blockchain_1 = require("../util/blockchain");
 const generic_1 = require("../util/generic");
-const neon_js_1 = require("@cityofzion/neon-js");
 const Neon = __importStar(require("@cityofzion/neon-core"));
+const neon_js_1 = require("@cityofzion/neon-js");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const ethers_1 = require("ethers");
 const lodash_1 = require("lodash");
@@ -63,13 +63,13 @@ class NEOClient {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
             const account = new Neon.wallet.Account(address);
-            const tokens = tokenQueryResults.filter(token => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter(token => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 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) {
@@ -110,7 +110,7 @@ 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 toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
             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 = networkConfig.feeAddress;
@@ -157,7 +157,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");
@@ -193,7 +193,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

@@ -11,6 +11,7 @@ declare class TokenClient {
     readonly tokens: TypeUtils.SimpleMap<Token>;
     readonly wrapperMap: TypeUtils.SimpleMap<string>;
     readonly poolTokens: TypeUtils.SimpleMap<Token>;
+    readonly cdpTokens: TypeUtils.SimpleMap<Token>;
     readonly symbols: TypeUtils.SimpleMap<string>;
     readonly usdValues: TypeUtils.SimpleMap<BigNumber>;
     readonly commonAssetNames: TypeUtils.SimpleMap<string>;
@@ -34,6 +35,7 @@ declare class TokenClient {
     getTokenDesc(denom: string): string;
     static isPoolTokenNew(denom: string): boolean;
     static isPoolTokenLegacy(denom: string): boolean;
+    static isCdpToken(denom: string): boolean;
     static isPoolToken(denom: string): boolean;
     static isIBCDenom(denom: string): boolean;
     isWrappedToken(denom?: string): boolean;
@@ -42,11 +44,14 @@ declare class TokenClient {
     getWrappedToken(denom: string, blockchain?: BlockchainUtils.Blockchain): Token | null;
     getSourceToken(denom: string): Token | null;
     getNativeToken(): Token | undefined;
+    getNativeStablecoin(): Token | undefined;
     isNativeToken(denom: string): boolean;
+    isNativeStablecoin(denom: string): boolean;
     getDepositTokenFor(tokenDenom: string, chain: BlockchainUtils.Blockchain): Token | undefined;
     getAllTokens(): Promise<Token[]>;
     reloadTokens(): Promise<TypeUtils.SimpleMap<Token>>;
     getCarbonIbcTokens(): Token[];
+    getCdpUnderlyingToken(cdpDenom: string): Token | undefined;
     reloadWrapperMap(): Promise<TypeUtils.SimpleMap<string>>;
     reloadDenomGeckoMap(): Promise<void>;
     reloadUSDValues(denoms?: string[]): Promise<TypeUtils.SimpleMap<BigNumber>>;

package/lib/clients/TokenClient.js

@@ -32,6 +32,8 @@ const SYMBOL_OVERRIDE = {
     AVA1: 'AVA',
     TSWTH: 'tSWTH',
 };
+const regexCdpDenom = RegExp(`^${constant_1.DenomPrefix.CDPToken}/`, "i");
+const regexLPDenom = RegExp(`^${constant_1.DenomPrefix.LPToken}/(\\d+)$`, "i");
 class TokenClient {
     constructor(query, configProvider) {
         this.query = query;
@@ -39,6 +41,7 @@ class TokenClient {
         this.tokens = {};
         this.wrapperMap = {};
         this.poolTokens = {};
+        this.cdpTokens = {};
         this.symbols = {};
         this.usdValues = {};
         this.commonAssetNames = constant_1.CommonAssetName;
@@ -72,16 +75,16 @@ class TokenClient {
         return (_a = this.commonAssetNames[denom]) !== null && _a !== void 0 ? _a : denom;
     }
     getDecimals(denom) {
-        var _a, _b;
-        return (_b = ((_a = this.tokens[denom]) !== null && _a !== void 0 ? _a : this.poolTokens[denom])) === null || _b === void 0 ? void 0 : _b.decimals.toNumber();
+        var _a, _b, _c;
+        return (_c = ((_b = (_a = this.tokens[denom]) !== null && _a !== void 0 ? _a : this.poolTokens[denom]) !== null && _b !== void 0 ? _b : this.cdpTokens[denom])) === null || _c === void 0 ? void 0 : _c.decimals.toNumber();
     }
     getBlockchain(denom) {
         var _a, _b, _c;
         // chainId defaults to 3 so that blockchain will be undefined
         let chainId = (_c = (_b = (_a = this.tokens[denom]) === null || _a === void 0 ? void 0 : _a.chainId) === null || _b === void 0 ? void 0 : _b.toNumber()) !== null && _c !== void 0 ? _c : 3;
-        if (this.isNativeToken(denom) || TokenClient.isPoolToken(denom)) {
-            // native denom "swth" should be native.
-            // pool tokens are on the Native blockchain, hence 0
+        if (this.isNativeToken(denom) || this.isNativeStablecoin(denom) || TokenClient.isPoolToken(denom) || TokenClient.isCdpToken(denom)) {
+            // native denoms "swth" and "usc" should be native.
+            // pool and cdp tokens are on the Native blockchain, hence 0
             chainId = 0;
         }
         if (TokenClient.isIBCDenom(denom)) {
@@ -91,9 +94,12 @@ class TokenClient {
         return blockchain;
     }
     getSymbol(denom) {
-        var _a;
+        var _a, _b;
+        if (TokenClient.isCdpToken(denom)) {
+            return (_a = this.symbols[denom]) !== null && _a !== void 0 ? _a : denom;
+        }
         const commonDenom = this.getCommonDenom(denom);
-        return (_a = this.symbols[commonDenom]) !== null && _a !== void 0 ? _a : commonDenom.toUpperCase();
+        return (_b = this.symbols[commonDenom]) !== null && _b !== void 0 ? _b : commonDenom.toUpperCase();
     }
     getUSDValue(denom) {
         return this.usdValues[denom];
@@ -155,7 +161,7 @@ class TokenClient {
         return symbol;
     }
     getTokenDesc(denom) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (typeof denom !== 'string')
             return '';
         denom = denom.toLowerCase();
@@ -172,14 +178,20 @@ class TokenClient {
             const symbolB = this.getTokenName(denomB);
             return `${weightA}% ${symbolA} / ${weightB}% ${symbolB}`;
         }
-        return (_b = (_a = this.tokens[denom]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.getSymbol(denom);
+        if (TokenClient.isCdpToken(denom)) {
+            return (_b = (_a = this.cdpTokens[denom]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.getSymbol(denom);
+        }
+        return (_d = (_c = this.tokens[denom]) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : this.getSymbol(denom);
     }
     static isPoolTokenNew(denom) {
-        return denom.match(/^clpt\/(\d+)$/i) !== null;
+        return denom.match(regexLPDenom) !== null;
     }
     static isPoolTokenLegacy(denom) {
         return denom.match(/^([a-z\d.-]+)-(\d+)-([a-z\d.-]+)-(\d+)-lp\d+$/i) !== null;
     }
+    static isCdpToken(denom) {
+        return denom.match(regexCdpDenom) !== null;
+    }
     static isPoolToken(denom) {
         return this.isPoolTokenNew(denom) || this.isPoolTokenLegacy(denom);
     }
@@ -252,9 +264,15 @@ class TokenClient {
     getNativeToken() {
         return this.tokenForId("swth");
     }
+    getNativeStablecoin() {
+        return this.tokenForId("usc");
+    }
     isNativeToken(denom) {
         return denom === "swth";
     }
+    isNativeStablecoin(denom) {
+        return denom === "usc";
+    }
     getDepositTokenFor(tokenDenom, chain) {
         const token = this.tokenForDenom(tokenDenom);
         if (!token) {
@@ -300,6 +318,10 @@ class TokenClient {
                 if (TokenClient.isPoolToken(token.denom)) {
                     this.poolTokens[token.denom] = token;
                 }
+                else if (TokenClient.isCdpToken(token.denom)) {
+                    this.cdpTokens[token.denom] = token;
+                    this.symbols[token.denom] = token.symbol;
+                }
                 else {
                     if (this.isNativeToken(token.denom)) {
                         // Change token name to Carbon
@@ -356,6 +378,12 @@ class TokenClient {
         });
         return swthTokens;
     }
+    getCdpUnderlyingToken(cdpDenom) {
+        if (!this.cdpTokens[cdpDenom])
+            throw new Error("not a CDP denom");
+        const tokenDenom = cdpDenom.replace(regexCdpDenom, "");
+        return this.tokenForDenom(tokenDenom);
+    }
     reloadWrapperMap() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/clients/ZILClient.d.ts

@@ -76,7 +76,7 @@ export declare class ZILClient {
     };
     private walletProvider?;
     private constructor();
-    static instance(opts: ZILClientOpts): ZILClient;
+    static instance(opts: ZILClientOpts): CarbonSDK.ZILClient;
     getExternalBalances(sdk: CarbonSDK, address: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
     formatWithdrawalAddress(bech32Address: string): Promise<string>;
     private callContract;

package/lib/clients/ZILClient.js

@@ -74,10 +74,10 @@ class ZILClient {
     getExternalBalances(sdk, address, whitelistDenoms) {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
-            const tokens = tokenQueryResults.filter(token => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter(token => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
-            const requests = tokens.map(token => token.tokenAddress === zeroAddress ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, "")) : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
+            const requests = tokens.map(token => token.tokenAddress === zeroAddress ? exports.balanceBatchRequest(address.replace(/^0x/i, "")) : exports.tokenBalanceBatchRequest(token.tokenAddress, address));
             const response = yield fetch(this.getProviderUrl(), {
                 method: "post",
                 headers: { "content-type": "application/json" },
@@ -102,7 +102,7 @@ class ZILClient {
             // if (!isValidAddress) {
             //   throw new Error("invalid address")
             // }
-            return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
+            return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
         });
     }
     // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -148,7 +148,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -166,7 +166,7 @@ class ZILClient {
                     vname: 'spender',
                     type: 'ByStr20',
                     // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : generic_1.appendHexPrefix(token.bridgeAddress),
                 },
                 {
                     vname: 'amount',
@@ -184,7 +184,7 @@ class ZILClient {
     }
     checkAllowanceZRC2(token, owner, spender) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.tokenAddress);
             const zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             const resp = yield zilliqa.blockchain.getSmartContractSubState(contractAddress, "allowances", [owner, spender]);
             if (resp.error !== undefined) {
@@ -204,13 +204,13 @@ class ZILClient {
                 throw new Error("Invalid recovery address");
             }
             const fromTokenId = fromToken.id;
-            const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
             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 feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === 'string') {
@@ -225,7 +225,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(fromAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -302,13 +302,13 @@ class ZILClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { address, amount, token, gasPrice, gasLimit, zilAddress, signer } = params;
             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);
             // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.bridgeAddress);
             let zilliqa;
             if (typeof signer === 'string') {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -322,7 +322,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -407,7 +407,7 @@ class ZILClient {
     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/codec/book/genesis.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { OrderBook, StopBook } from "../book/book";
+import { OrderBook, StopBook } from "./book";
 export declare const protobufPackage = "Switcheo.carbon.book";
 /** GenesisState defines the book module's genesis state. */
 export interface GenesisState {

package/lib/codec/book/genesis.js

@@ -7,7 +7,7 @@ exports.GenesisState = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const book_1 = require("../book/book");
+const book_1 = require("./book");
 exports.protobufPackage = "Switcheo.carbon.book";
 const baseGenesisState = {};
 exports.GenesisState = {

package/lib/codec/book/query.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { OrderBook } from "../book/book";
+import { OrderBook } from "./book";
 import { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination";
 export declare const protobufPackage = "Switcheo.carbon.book";
 /** this line is used by starport scaffolding # 3 */

package/lib/codec/book/query.js

@@ -7,7 +7,7 @@ exports.QueryClientImpl = exports.QueryAllBookResponse = exports.QueryAllBookReq
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const book_1 = require("../book/book");
+const book_1 = require("./book");
 const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
 exports.protobufPackage = "Switcheo.carbon.book";
 const baseQueryGetBookRequest = { market: "" };