carbon-js-sdk 0.6.6 → 0.6.8

package/lib/CarbonSDK.js

@@ -72,7 +72,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" ? grpc_web_node_http_transport_1.NodeHttpTransport() : undefined;
+            const transport = typeof window === "undefined" ? (0, 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,
             });

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 = rpcclient_1.hasProtocol(endpoint) ? endpoint : "http://" + endpoint;
+            this.url = (0, 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);
-        http_1.http("POST", this.url, this.headers, requests).then((raw) => {
+        (0, 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 = json_rpc_1.parseJsonRpcResponse(el);
-                if (json_rpc_1.isJsonRpcErrorResponse(response)) {
+                const response = (0, json_rpc_1.parseJsonRpcResponse)(el);
+                if ((0, json_rpc_1.isJsonRpcErrorResponse)(response)) {
                     reject(new Error(JSON.stringify(response.error)));
                 }
                 else {

package/lib/clients/CarbonQueryClient.js

@@ -52,7 +52,7 @@ const BlockchainClient_1 = __importDefault(require("./BlockchainClient"));
 class CarbonQueryClient {
     constructor(opts) {
         var _a;
-        const rpcClient = (_a = opts.grpcClient) !== null && _a !== void 0 ? _a : stargate_1.createProtobufRpcClient(new stargate_1.QueryClient(opts.tmClient));
+        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;
         this.chain = BlockchainClient_1.default.connectWithTm(opts.tmClient);

package/lib/clients/ETHClient.js

@@ -44,15 +44,15 @@ class ETHClient {
                     ?
                         this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
                     :
-                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
+                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
                 return isCorrectBlockchain &&
                     token.tokenAddress.length == 40 &&
-                    token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
+                    token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
                     (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                    this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+                    this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
             });
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+                return this.verifyChecksum((0, 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 = generic_1.appendHexPrefix(fromToken.tokenAddress);
+            const fromTokenAddress = (0, 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 = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const feeAddress = (0, 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 = generic_1.appendHexPrefix(token.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            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 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 = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            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 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(generic_1.appendHexPrefix(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify((0, 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 (blockchain_1.blockchainForChainId(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
+            if ((0, 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 = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, 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 dayjs_1.default(value);
+    return (0, 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: dayjs_1.default(entry.time),
+                time: (0, dayjs_1.default)(entry.time),
                 volumeValue: new bignumber_js_1.default(entry.volumeValue)
             }));
             const parsedMeta = {
-                from: dayjs_1.default(meta.from),
-                until: dayjs_1.default(meta.until),
+                from: (0, dayjs_1.default)(meta.from),
+                until: (0, dayjs_1.default)(meta.until),
                 interval: meta.interval,
             };
             return { result: { entries: parsedEntries, meta: parsedMeta } };

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)
                     :
-                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                        (0, 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 = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
+            const promises = (0, 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 = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
-            const zeroAddressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
+            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 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 = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = (0, 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 = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = (0, 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 = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/clients/TokenClient.js

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

package/lib/clients/ZILClient.js

@@ -77,12 +77,12 @@ class ZILClient {
                     ?
                         !!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;
+                        (0, 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
-                ? exports.balanceBatchRequest(address.replace(/^0x/i, ""))
-                : exports.tokenBalanceBatchRequest(token.tokenAddress, address));
+                ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, ""))
+                : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
             const response = yield fetch(this.getProviderUrl(), {
                 method: "post",
                 headers: { "content-type": "application/json" },
@@ -107,7 +107,7 @@ class ZILClient {
             // if (!isValidAddress) {
             //   throw new Error("invalid address")
             // }
-            return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
+            return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
         });
     }
     // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -153,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(generic_1.stripHexPrefix(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -171,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 : generic_1.appendHexPrefix(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
                 },
                 {
                     vname: "amount",
@@ -189,7 +189,7 @@ class ZILClient {
     }
     checkAllowanceZRC2(token, owner, spender) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contractAddress = generic_1.appendHexPrefix(token.tokenAddress);
+            const contractAddress = (0, 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) {
@@ -211,13 +211,13 @@ class ZILClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
+            const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
+            const targetProxyHash = (0, 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 = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === "string") {
@@ -232,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(generic_1.stripHexPrefix(fromAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -309,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 = generic_1.appendHexPrefix(token.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            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 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 = generic_1.appendHexPrefix(token.bridgeAddress);
+            const contractAddress = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
             let zilliqa;
             if (typeof signer === "string") {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -329,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(generic_1.stripHexPrefix(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -414,7 +414,7 @@ class ZILClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/codec/cosmos/gov/v1/query.js

@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
         const message = Object.assign({}, baseQueryProposalsRequest);
         message.proposalStatus =
             object.proposalStatus !== undefined && object.proposalStatus !== null
-                ? gov_1.proposalStatusFromJSON(object.proposalStatus)
+                ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
                 : 0;
         message.voter =
             object.voter !== undefined && object.voter !== null
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
     toJSON(message) {
         const obj = {};
         message.proposalStatus !== undefined &&
-            (obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
+            (obj.proposalStatus = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
         message.voter !== undefined && (obj.voter = message.voter);
         message.depositor !== undefined && (obj.depositor = message.depositor);
         message.pagination !== undefined &&

package/lib/codec/cosmos/gov/v1/tx.js

@@ -300,7 +300,7 @@ exports.MsgVote = {
                 : "";
         message.option =
             object.option !== undefined && object.option !== null
-                ? gov_1.voteOptionFromJSON(object.option)
+                ? (0, gov_1.voteOptionFromJSON)(object.option)
                 : 0;
         message.metadata =
             object.metadata !== undefined && object.metadata !== null
@@ -314,7 +314,7 @@ exports.MsgVote = {
             (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
         message.voter !== undefined && (obj.voter = message.voter);
         message.option !== undefined &&
-            (obj.option = gov_1.voteOptionToJSON(message.option));
+            (obj.option = (0, gov_1.voteOptionToJSON)(message.option));
         message.metadata !== undefined && (obj.metadata = message.metadata);
         return obj;
     },

package/lib/codec/cosmos/gov/v1beta1/query.js

@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
         const message = Object.assign({}, baseQueryProposalsRequest);
         message.proposalStatus =
             object.proposalStatus !== undefined && object.proposalStatus !== null
-                ? gov_1.proposalStatusFromJSON(object.proposalStatus)
+                ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
                 : 0;
         message.voter =
             object.voter !== undefined && object.voter !== null
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
     toJSON(message) {
         const obj = {};
         message.proposalStatus !== undefined &&
-            (obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
+            (obj.proposalStatus = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
         message.voter !== undefined && (obj.voter = message.voter);
         message.depositor !== undefined && (obj.depositor = message.depositor);
         message.pagination !== undefined &&

package/lib/codec/cosmos/gov/v1beta1/tx.js

@@ -185,7 +185,7 @@ exports.MsgVote = {
                 : "";
         message.option =
             object.option !== undefined && object.option !== null
-                ? gov_1.voteOptionFromJSON(object.option)
+                ? (0, gov_1.voteOptionFromJSON)(object.option)
                 : 0;
         return message;
     },
@@ -195,7 +195,7 @@ exports.MsgVote = {
             (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
         message.voter !== undefined && (obj.voter = message.voter);
         message.option !== undefined &&
-            (obj.option = gov_1.voteOptionToJSON(message.option));
+            (obj.option = (0, gov_1.voteOptionToJSON)(message.option));
         return obj;
     },
     fromPartial(object) {

package/lib/codec/cosmos/group/v1/events.js

@@ -384,7 +384,7 @@ exports.EventExec = {
                 : long_1.default.UZERO;
         message.result =
             object.result !== undefined && object.result !== null
-                ? types_1.proposalExecutorResultFromJSON(object.result)
+                ? (0, types_1.proposalExecutorResultFromJSON)(object.result)
                 : 0;
         message.logs =
             object.logs !== undefined && object.logs !== null
@@ -397,7 +397,7 @@ exports.EventExec = {
         message.proposalId !== undefined &&
             (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
         message.result !== undefined &&
-            (obj.result = types_1.proposalExecutorResultToJSON(message.result));
+            (obj.result = (0, types_1.proposalExecutorResultToJSON)(message.result));
         message.logs !== undefined && (obj.logs = message.logs);
         return obj;
     },

package/lib/codec/cosmos/group/v1/tx.js

@@ -1474,7 +1474,7 @@ exports.MsgVote = {
                 : "";
         message.option =
             object.option !== undefined && object.option !== null
-                ? types_1.voteOptionFromJSON(object.option)
+                ? (0, types_1.voteOptionFromJSON)(object.option)
                 : 0;
         message.metadata =
             object.metadata !== undefined && object.metadata !== null
@@ -1492,7 +1492,7 @@ exports.MsgVote = {
             (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
         message.voter !== undefined && (obj.voter = message.voter);
         message.option !== undefined &&
-            (obj.option = types_1.voteOptionToJSON(message.option));
+            (obj.option = (0, types_1.voteOptionToJSON)(message.option));
         message.metadata !== undefined && (obj.metadata = message.metadata);
         message.exec !== undefined && (obj.exec = execToJSON(message.exec));
         return obj;
@@ -1633,14 +1633,14 @@ exports.MsgExecResponse = {
         const message = Object.assign({}, baseMsgExecResponse);
         message.result =
             object.result !== undefined && object.result !== null
-                ? types_1.proposalExecutorResultFromJSON(object.result)
+                ? (0, types_1.proposalExecutorResultFromJSON)(object.result)
                 : 0;
         return message;
     },
     toJSON(message) {
         const obj = {};
         message.result !== undefined &&
-            (obj.result = types_1.proposalExecutorResultToJSON(message.result));
+            (obj.result = (0, types_1.proposalExecutorResultToJSON)(message.result));
         return obj;
     },
     fromPartial(object) {

package/lib/codec/cosmos/tx/v1beta1/tx.js

@@ -763,13 +763,13 @@ exports.ModeInfo_Single = {
         const message = Object.assign({}, baseModeInfo_Single);
         message.mode =
             object.mode !== undefined && object.mode !== null
-                ? signing_1.signModeFromJSON(object.mode)
+                ? (0, signing_1.signModeFromJSON)(object.mode)
                 : 0;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.mode !== undefined && (obj.mode = signing_1.signModeToJSON(message.mode));
+        message.mode !== undefined && (obj.mode = (0, signing_1.signModeToJSON)(message.mode));
         return obj;
     },
     fromPartial(object) {
@@ -1052,7 +1052,7 @@ exports.AuxSignerData = {
                 : undefined;
         message.mode =
             object.mode !== undefined && object.mode !== null
-                ? signing_1.signModeFromJSON(object.mode)
+                ? (0, signing_1.signModeFromJSON)(object.mode)
                 : 0;
         message.sig =
             object.sig !== undefined && object.sig !== null
@@ -1067,7 +1067,7 @@ exports.AuxSignerData = {
             (obj.signDoc = message.signDoc
                 ? exports.SignDocDirectAux.toJSON(message.signDoc)
                 : undefined);
-        message.mode !== undefined && (obj.mode = signing_1.signModeToJSON(message.mode));
+        message.mode !== undefined && (obj.mode = (0, signing_1.signModeToJSON)(message.mode));
         message.sig !== undefined &&
             (obj.sig = base64FromBytes(message.sig !== undefined ? message.sig : new Uint8Array()));
         return obj;

package/lib/constant/generic.js

@@ -12,7 +12,7 @@ exports.DEFAULT_FEE_DENOM = "swth";
 exports.DEFAULT_GAS_PRICE = new bignumber_js_1.default(10);
 exports.DEFAULT_GAS = new bignumber_js_1.default(10000000);
 exports.DEFAULT_FEE = {
-    amount: proto_signing_1.coins(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
+    amount: (0, proto_signing_1.coins)(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
     gas: exports.DEFAULT_GAS.toString(10),
 };
 exports.CARBON_GAS_PRICE = {

package/lib/modules/cdp.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="long" />
-import { AssetParams, DebtInfo, RateStrategyParams, StablecoinDebtInfo } from "../codec";
+import { AssetParams, DebtInfo, RateStrategyParams, StablecoinDebtInfo, TokenPrice } from "../codec";
 import { Params } from "../codec/cdp/params";
 import { CarbonTx } from "../util";
 import { BigNumber } from "bignumber.js";
 import { Debt } from "./../codec/cdp/query";
 import BaseModule from "./base";
+import { Coin } from "../codec/cosmos/base/v1beta1/coin";
 export declare class CDPModule extends BaseModule {
     private cdpModuleAddress;
     supplyAsset(params: CDPModule.SupplyAssetParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
@@ -49,13 +50,14 @@ export declare class CDPModule extends BaseModule {
         HealthFactor: BigNumber;
     }>;
     getAssetBorrowableSupply(denom: string): Promise<BigNumber>;
-    getCdpToActualRatio(cdpDenom: string): Promise<BigNumber>;
+    getCdpToActualRatio(cdpDenom: string, interestFee?: BigNumber): Promise<BigNumber>;
     getTotalAccountTokenDebtUsdVal(account: string, denom: string, debt?: Debt, debtInfo?: DebtInfo): Promise<BigNumber>;
     getModuleTotalDebtUsdVal(): Promise<BigNumber>;
     getModuleTotalCollateralUsdVal(): Promise<BigNumber>;
+    getCdpTokensUsdVal(cdpTokens: Coin[]): Promise<BigNumber>;
     getCdpTokenUsdVal(cdpDenom: string, amount: BigNumber): Promise<BigNumber>;
-    getTokenUsdVal(denom: string, amount: BigNumber): Promise<BigNumber>;
-    getTotalTokenDebt(denom: string, debtInfo?: DebtInfo): Promise<BigNumber>;
+    getTokenUsdVal(denom: string, amount: BigNumber, price?: TokenPrice): Promise<BigNumber>;
+    getTotalTokenDebt(denom: string, interestFee?: BigNumber): Promise<BigNumber>;
     getTotalAccountTokenDebt(account: string, denom: string, debt?: Debt, debtInfo?: DebtInfo): Promise<BigNumber>;
     getTotalAccountStablecoinDebt(account: string, debt?: CDPModule.StablecoinDebt, debtInfo?: StablecoinDebtInfo): Promise<BigNumber>;
     static calculateInterestAPY: (debtInfo: DebtInfo, rateStrategy: RateStrategyParams) => BigNumber;