carbon-js-sdk 0.4.4 → 0.4.6-dev.1

package/lib/clients/TokenClient.js

@@ -12,12 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const pagination_1 = require("../codec/cosmos/base/query/v1beta1/pagination");
+const tendermint_1 = require("../codec/ibc/lightclients/tendermint/v1/tendermint");
 const constant_1 = require("../constant");
 const ibc_1 = require("../constant/ibc");
 const network_1 = require("../constant/network");
-const KeplrAccount_1 = __importDefault(require("../provider/keplr/KeplrAccount"));
 const util_1 = require("../util");
+const blockchain_1 = require("../util/blockchain");
 const number_1 = require("../util/number");
+const query_1 = require("../codec/ibc/applications/transfer/v1/query");
+const stargate_1 = require("@cosmjs/stargate");
+const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
 const long_1 = __importDefault(require("long"));
 const InsightsQueryClient_1 = __importDefault(require("./InsightsQueryClient"));
 const SYMBOL_OVERRIDE = {
@@ -43,11 +48,18 @@ class TokenClient {
         this.wrapperMap = {};
         this.poolTokens = {};
         this.cdpTokens = {};
+        this.bridges = { polynetwork: [], ibc: [] };
         this.symbols = {};
         this.usdValues = {};
         this.commonAssetNames = constant_1.CommonAssetName;
         this.geckoTokenNames = constant_1.CoinGeckoTokenNames;
+        // ibc apis
+        this.denomTraces = {};
         this.additionalGeckoDenoms = {};
+        this.getIbcChainFromBlockchainV2 = (blockchain) => {
+            const ibcBridge = this.bridges.ibc.find(bridge => (bridge.chainName === blockchain || bridge.chainName.toLowerCase() === blockchain));
+            return ibcBridge === null || ibcBridge === void 0 ? void 0 : ibcBridge.chain_id_name;
+        };
     }
     static instance(query, configProvider) {
         return new TokenClient(query, configProvider);
@@ -58,6 +70,8 @@ class TokenClient {
             yield this.reloadWrapperMap();
             yield this.reloadTokens();
             yield this.reloadDenomGeckoMap();
+            yield this.reloadDenomTraces();
+            yield this.getBridges();
             // non-blocking reload
             try {
                 this.reloadUSDValues();
@@ -80,10 +94,11 @@ class TokenClient {
         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;
+        var _a, _b;
         const networkConfig = this.configProvider.getConfig();
+        const tokenData = this.tokens[denom];
         // 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;
+        let chainId = (_b = (_a = tokenData === null || tokenData === void 0 ? void 0 : tokenData.chainId) === null || _a === void 0 ? void 0 : _a.toNumber()) !== null && _b !== void 0 ? _b : 3;
         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
@@ -95,6 +110,18 @@ class TokenClient {
         const blockchain = util_1.BlockchainUtils.blockchainForChainId(chainId, networkConfig.network);
         return blockchain;
     }
+    getBlockchainV2(denom) {
+        if (!denom)
+            return undefined;
+        let token = this.tokens[denom];
+        if (this.isNativeToken(denom) || this.isNativeStablecoin(denom) || TokenClient.isPoolToken(denom) || TokenClient.isCdpToken(denom) || this.isGroupedToken(denom)) {
+            // native denoms "swth" and "usc" should be native.
+            // pool and cdp tokens are on the Native blockchain, hence 0
+            return 'Native';
+        }
+        const bridge = this.getBridgeFromToken(token);
+        return bridge === null || bridge === void 0 ? void 0 : bridge.chainName;
+    }
     getSymbol(denom) {
         var _a, _b;
         if (TokenClient.isCdpToken(denom)) {
@@ -117,10 +144,18 @@ class TokenClient {
         return (_a = util_1.NumberUtils.toUnitless(humanAmt, decimals)) !== null && _a !== void 0 ? _a : number_1.BN_ZERO;
     }
     tokenForId(id) {
-        return Object.values(this.tokens).find((token) => token.id === id);
+        let tokensList = Object.values(this.tokens);
+        if (TokenClient.isPoolToken(id)) {
+            tokensList = Object.values(this.poolTokens);
+        }
+        else if (TokenClient.isCdpToken(id)) {
+            tokensList = Object.values(this.cdpTokens);
+        }
+        return tokensList.find((token) => token.id === id);
     }
     tokenForDenom(denom) {
-        return this.tokens[denom];
+        var _a, _b;
+        return (_b = (_a = this.poolTokens[denom]) !== null && _a !== void 0 ? _a : this.cdpTokens[denom]) !== null && _b !== void 0 ? _b : this.tokens[denom];
     }
     getFeeInfo(denom) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -229,7 +264,7 @@ class TokenClient {
         }
         return result;
     }
-    getWrappedToken(denom, blockchain) {
+    getWrappedToken(denom, blockchain, version = 'V1') {
         const networkConfig = this.configProvider.getConfig();
         // if denom is already a wrapped denom or no blockchain was specified,
         // just return the input denom.
@@ -245,9 +280,15 @@ class TokenClient {
                 }
                 // check if wrapped denom is of correct blockchain
                 const token = this.tokens[wrappedDenom];
-                let tokenChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
-                if (TokenClient.isIBCDenom(wrappedDenom)) {
-                    tokenChain = util_1.IBCUtils.BlockchainMap[wrappedDenom];
+                let tokenChain = '';
+                if (version === "V1") {
+                    tokenChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber());
+                    if (TokenClient.isIBCDenom(token.denom)) {
+                        tokenChain = util_1.IBCUtils.BlockchainMap[wrappedDenom];
+                    }
+                }
+                else {
+                    tokenChain = this.getBlockchainV2(token.denom);
                 }
                 if (!tokenChain) {
                     continue; // unknown chain! just ignore this source token
@@ -283,21 +324,34 @@ class TokenClient {
     isNativeStablecoin(denom) {
         return denom === "usc";
     }
-    getDepositTokenFor(tokenDenom, chain) {
+    isGroupedToken(denom) {
+        const groupedTokenRegex = new RegExp(/^cgt\/\d+$/);
+        return groupedTokenRegex.test(denom);
+    }
+    isCarbonToken(token) {
+        return Boolean(token && (this.isNativeToken(token.denom) || token.bridgeId.eq(0)));
+    }
+    getDepositTokenFor(tokenDenom, chain, version = "V1") {
         const networkConfig = this.configProvider.getConfig();
         const token = this.tokenForDenom(tokenDenom);
         if (!token) {
             console.error("getDepositTokenFor token not found for", tokenDenom);
             return;
         }
+        let targetChain = "";
         // check if selected token is a source token
-        let targetChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
-        if (TokenClient.isIBCDenom(token.denom)) {
-            targetChain = util_1.IBCUtils.BlockchainMap[token.denom];
+        if (version === "V1") {
+            targetChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
+            if (TokenClient.isIBCDenom(token.denom)) {
+                targetChain = util_1.IBCUtils.BlockchainMap[token.denom];
+            }
+        }
+        else {
+            targetChain = this.getBlockchainV2(token.denom);
         }
         const isSourceToken = targetChain === chain && token.denom !== "swth";
         // if not source token find wrapped token for chain
-        const depositToken = isSourceToken ? token : this.getWrappedToken(token.denom, chain);
+        const depositToken = isSourceToken ? token : this.getWrappedToken(token.denom, chain, version);
         if (!depositToken) {
             console.error(`getDepositTokenFor wrapped token not found for "${token.denom}"`);
             return;
@@ -341,52 +395,211 @@ class TokenClient {
                     this.symbols[token.denom] = token.symbol;
                 }
             }
-            const networkConfig = this.configProvider.getConfig();
-            if (networkConfig.network === network_1.Network.MainNet) {
-                const symbolDenoms = Object.keys(this.symbols);
-                const symbolMap = Object.values(this.symbols);
-                const carbonIbc = this.getCarbonIbcTokens();
-                carbonIbc.forEach((token) => {
-                    const index = symbolMap.indexOf("swth");
-                    if (!this.tokens[token.denom])
-                        this.tokens[token.denom] = token;
-                    if (!this.symbols[token.denom])
-                        this.symbols[token.denom] = token.symbol;
-                    if (index > -1) {
-                        const similarDenom = symbolDenoms[index];
-                        if (similarDenom && !this.wrapperMap[token.denom] && similarDenom !== token.denom) {
-                            this.wrapperMap[token.denom] = similarDenom;
+            return this.tokens;
+        });
+    }
+    reloadDenomTraces() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.query.ibc.transfer.DenomTraces({
+                pagination: {
+                    limit: new long_1.default(1000000),
+                    offset: long_1.default.UZERO,
+                    key: new Uint8Array(),
+                    countTotal: false,
+                    reverse: false,
+                },
+            });
+            result.denomTraces.forEach((denomTrace) => {
+                const ibcDenom = util_1.IBCUtils.makeIBCMinimalDenom(denomTrace.path, denomTrace.baseDenom);
+                const token = this.tokenForDenom(ibcDenom);
+                this.denomTraces[ibcDenom] = Object.assign(Object.assign({}, denomTrace), { token });
+            });
+            const swthTraces = yield this.getCarbonDenomTraces();
+            return Object.assign(Object.assign({}, this.denomTraces), swthTraces);
+        });
+    }
+    getDenomTraceData(denom) {
+        return this.denomTraces[denom];
+    }
+    getBridges() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const allBridges = yield this.query.coin.BridgeAll({
+                pagination: {
+                    key: new Uint8Array(),
+                    limit: new long_1.default(10000),
+                    offset: long_1.default.UZERO,
+                    countTotal: true,
+                    reverse: false,
+                },
+            });
+            const unmatchedIbcBridgeList = allBridges.bridges.filter(bridge => {
+                if (!bridge.enabled)
+                    return;
+                return bridge.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.ibc;
+            });
+            const ibcBridges = yield this.matchChainsWithDifferentChainIds(unmatchedIbcBridgeList);
+            const polynetworkBridges = allBridges.bridges.reduce((prev, bridge) => {
+                if (!bridge.enabled || bridge.bridgeId.toNumber() !== blockchain_1.BRIDGE_IDS.polynetwork)
+                    return prev;
+                prev.push(Object.assign(Object.assign({}, bridge), { isEvmChain: util_1.BlockchainUtils.isEvmChain(bridge.chainName) }));
+                return prev;
+            }, []);
+            Object.assign(this.bridges, {
+                polynetwork: polynetworkBridges,
+                ibc: ibcBridges
+            });
+            return this.bridges;
+        });
+    }
+    matchChainsWithDifferentChainIds(bridges) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let newBridges = [];
+            try {
+                const channels_to_connection = yield this.query.ibc.channel.Channels({
+                    pagination: pagination_1.PageRequest.fromPartial({
+                        limit: new long_1.default(1000000)
+                    })
+                });
+                const connection_to_clientId = yield this.query.ibc.connection.Connections({
+                    pagination: pagination_1.PageRequest.fromPartial({
+                        limit: new long_1.default(1000000)
+                    })
+                });
+                const clientId_to_chainIdName = yield this.query.ibc.client.ClientStates({
+                    pagination: pagination_1.PageRequest.fromPartial({
+                        limit: new long_1.default(1000000)
+                    })
+                });
+                const clientStates = clientId_to_chainIdName.clientStates.map(s => ({
+                    clientState: Object.assign({}, tendermint_1.ClientState.decode(s.clientState.value)),
+                    clientId: s.clientId,
+                }));
+                newBridges = bridges.map(bridge => {
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+                    const connection = channels_to_connection.channels.find(channel => channel.channelId === ("channel-" + (bridge.chainId.toNumber() - 1)));
+                    const connectionId = connection === null || connection === void 0 ? void 0 : connection.connectionHops[0];
+                    const src_channel = (_a = connection === null || connection === void 0 ? void 0 : connection.channelId) !== null && _a !== void 0 ? _a : "";
+                    const dst_channel = (_c = (_b = connection === null || connection === void 0 ? void 0 : connection.counterparty) === null || _b === void 0 ? void 0 : _b.channelId) !== null && _c !== void 0 ? _c : "";
+                    const cosmRegexArr = (_e = (_d = connection === null || connection === void 0 ? void 0 : connection.counterparty) === null || _d === void 0 ? void 0 : _d.portId) === null || _e === void 0 ? void 0 : _e.match(ibc_1.cosmBridgeRegex);
+                    const portId = (_f = cosmRegexArr === null || cosmRegexArr === void 0 ? void 0 : cosmRegexArr[1]) !== null && _f !== void 0 ? _f : "transfer";
+                    const clientId = (_g = connection_to_clientId.connections.find(connection => connection.id === connectionId)) === null || _g === void 0 ? void 0 : _g.clientId;
+                    const chainIdName = (_j = ((_h = clientStates.find(client => client.clientId === clientId)) === null || _h === void 0 ? void 0 : _h.clientState)) === null || _j === void 0 ? void 0 : _j.chainId;
+                    return Object.assign(Object.assign({}, bridge), { chain_id_name: chainIdName !== null && chainIdName !== void 0 ? chainIdName : "", channels: { src_channel, dst_channel, port_id: portId } });
+                });
+            }
+            finally {
+                const checkedBefore = new Array(newBridges.length).fill(false);
+                const chainMap = {};
+                for (let i = 0; i < newBridges.length; i++) {
+                    if (checkedBefore[i])
+                        continue;
+                    const bridge = newBridges[i];
+                    const chainId = bridge.chain_id_name;
+                    if (chainMap[chainId]) {
+                        const chainName = chainMap[chainId];
+                        for (let j = i; j < newBridges.length; j++) {
+                            const subBridge = newBridges[j];
+                            if (subBridge.chain_id_name === chainId) {
+                                subBridge.chainName = chainName;
+                                checkedBefore[j] = true;
+                            }
                         }
                     }
-                });
+                    else {
+                        chainMap[chainId] = bridge.chainName;
+                    }
+                }
+                return newBridges;
             }
-            return this.tokens;
         });
     }
-    getCarbonIbcTokens() {
-        const swthTokens = ibc_1.swthIbcWhitelist.map((chainId) => {
-            var _a, _b, _c;
-            const blockchain = util_1.IBCUtils.BlockchainMap[chainId];
-            const carbonBlockchain = util_1.IBCUtils.ChainIdBlockchainMap[blockchain !== null && blockchain !== void 0 ? blockchain : ""];
-            const blockchainNum = (_a = util_1.BlockchainUtils.CHAIN_IDS[carbonBlockchain !== null && carbonBlockchain !== void 0 ? carbonBlockchain : ""]) !== null && _a !== void 0 ? _a : 0;
-            const swthChannel = (_b = ibc_1.swthChannels[chainId]) === null || _b === void 0 ? void 0 : _b.ibc;
-            const assetDenom = util_1.IBCUtils.makeIBCMinimalDenom((_c = swthChannel === null || swthChannel === void 0 ? void 0 : swthChannel.dstChannel) !== null && _c !== void 0 ? _c : "channel-0", KeplrAccount_1.default.SWTH_CURRENCY.coinMinimalDenom);
-            return {
-                id: assetDenom,
-                creator: "",
-                denom: assetDenom,
-                name: "Carbon",
-                symbol: KeplrAccount_1.default.SWTH_CURRENCY.coinDenom,
-                decimals: new long_1.default(KeplrAccount_1.default.SWTH_CURRENCY.coinDecimals),
-                bridgeId: new long_1.default(util_1.BlockchainUtils.BRIDGE_IDS.ibc),
-                chainId: new long_1.default(blockchainNum),
-                tokenAddress: "",
-                bridgeAddress: "",
-                isActive: true,
-                isCollateral: false,
-            };
+    getIbcBlockchainNames() {
+        return this.bridges.ibc.map(bridge => bridge.chainName);
+    }
+    getPolynetworkBlockchainNames() {
+        return this.bridges.polynetwork.map(bridge => bridge.chainName);
+    }
+    getAllBlockchainNames() {
+        return this.getIbcBlockchainNames().concat(this.getPolynetworkBlockchainNames());
+    }
+    getBridgesFromBridgeId(bridgeId) {
+        switch (bridgeId) {
+            case blockchain_1.BRIDGE_IDS.polynetwork:
+                return this.bridges.polynetwork;
+            case blockchain_1.BRIDGE_IDS.ibc:
+                return this.bridges.ibc;
+            default:
+                return this.bridges.polynetwork;
+        }
+    }
+    getIbcTokens() {
+        const ibcTokens = Object.values(this.tokens).reduce((prev, token) => {
+            const newPrev = prev;
+            if (token.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.ibc) {
+                newPrev[token.denom] = token;
+            }
+            return newPrev;
+        }, {});
+        return ibcTokens;
+    }
+    getPolyNetworkTokens() {
+        const polynetworkTokens = Object.values(this.tokens).reduce((prev, token) => {
+            const newPrev = prev;
+            if (token.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.polynetwork) {
+                newPrev[token.denom] = token;
+            }
+            return newPrev;
+        }, {});
+        return polynetworkTokens;
+    }
+    getBlockchainV2FromIDs(chainId, bridgeId) {
+        var _a, _b;
+        const chainIdNum = Number(chainId);
+        const bridgeIdNum = Number(bridgeId);
+        if ((chainIdNum === 5 && bridgeIdNum === 1) || (chainIdNum === 0 && bridgeIdNum === 2))
+            return "Carbon";
+        const bridgeList = this.getBridgesFromBridgeId(bridgeIdNum);
+        return (_b = (_a = bridgeList.find(bridge => bridge.chainId.toNumber() === chainIdNum)) === null || _a === void 0 ? void 0 : _a.chainName) !== null && _b !== void 0 ? _b : undefined;
+    }
+    getBridgeFromToken(token) {
+        if (!token || !token.bridgeId)
+            return undefined;
+        const bridgeList = this.getBridgesFromBridgeId(token.bridgeId.toNumber());
+        return bridgeList.find(bridge => token.chainId.equals(bridge.chainId));
+    }
+    getIbcChainIdFromToken(token) {
+        if (!token)
+            return undefined;
+        const bridge = this.getBridgeFromToken(token);
+        if (!bridge || !blockchain_1.isIbcBridge(bridge))
+            return undefined;
+        return bridge.chain_id_name;
+    }
+    getCarbonDenomTraces() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // get swth on osmosis
+            const osmoTmClient = yield tendermint_rpc_1.Tendermint34Client.connect(network_1.publicRpcNodes.Osmosis);
+            const osmoClient = new stargate_1.QueryClient(osmoTmClient);
+            const osmosRpcClient = stargate_1.createProtobufRpcClient(osmoClient);
+            const osmoIbcClient = new query_1.QueryClientImpl(osmosRpcClient);
+            const osmoDenomTraces = yield osmoIbcClient.DenomTraces({
+                pagination: pagination_1.PageRequest.fromPartial({
+                    limit: new long_1.default(1000000),
+                }),
+            });
+            const osmoSwthDenomTrace = osmoDenomTraces.denomTraces.filter((trace) => {
+                return trace.baseDenom === "swth";
+            });
+            return osmoSwthDenomTrace.reduce((prev, trace) => {
+                var _a;
+                const coinMinimalDenom = util_1.IBCUtils.makeIBCMinimalDenom(trace.path, trace.baseDenom);
+                const token = (_a = this.tokenForDenom(coinMinimalDenom)) !== null && _a !== void 0 ? _a : this.tokenForDenom(trace.baseDenom);
+                const traceExtended = Object.assign(Object.assign({}, trace), { token });
+                this.denomTraces[coinMinimalDenom] = traceExtended;
+                prev[coinMinimalDenom] = traceExtended;
+                return prev;
+            }, {});
         });
-        return swthTokens;
     }
     getCdpUnderlyingToken(cdpDenom) {
         if (!this.cdpTokens[cdpDenom]) {
@@ -459,7 +672,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

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

package/lib/clients/ZILClient.js

@@ -69,15 +69,20 @@ class ZILClient {
         }
         return new ZILClient(configProvider, blockchain);
     }
-    getExternalBalances(sdk, address, whitelistDenoms) {
+    getExternalBalances(sdk, address, whitelistDenoms, version = "V1") {
         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(), sdk.network) == this.blockchain &&
-                token.tokenAddress.length == 40 &&
-                (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
+            const tokens = tokenQueryResults.filter((token) => {
+                const isCorrectBlockchain = version === "V2"
+                    ?
+                        !!sdk.token.getBlockchainV2(token.denom) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[sdk.token.getBlockchainV2(token.denom)] == this.blockchain)
+                    :
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                return isCorrectBlockchain && 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));
+                ? 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 +107,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 +153,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 +171,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 +189,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) {
@@ -206,13 +211,13 @@ class ZILClient {
             }
             const carbonNetwork = networkConfig.network;
             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, 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 feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === "string") {
@@ -227,7 +232,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);
             }
@@ -304,13 +309,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());
@@ -324,7 +329,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);
             }
@@ -409,7 +414,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/cdp/e_mode_category.d.ts

@@ -0,0 +1,23 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+export declare const protobufPackage = "Switcheo.carbon.cdp";
+export interface EModeCategory {
+    name: string;
+    denoms: string[];
+    loanToValue: string;
+    liquidationThreshold: string;
+    liquidationDiscount: string;
+    isActive: boolean;
+}
+export declare const EModeCategory: {
+    encode(message: EModeCategory, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): EModeCategory;
+    fromJSON(object: any): EModeCategory;
+    toJSON(message: EModeCategory): unknown;
+    fromPartial(object: DeepPartial<EModeCategory>): EModeCategory;
+};
+declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : Partial<T>;
+export {};