carbon-js-sdk 0.3.16-beta.1 → 0.3.17

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.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/NEOClient.js

@@ -64,13 +64,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) {
@@ -111,8 +111,8 @@ class NEOClient {
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
             const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
-            const zeroAddressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+            const zeroAddressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
             const amount = ethers_1.ethers.BigNumber.from(token.externalBalance);
             const feeAmount = ethers_1.ethers.BigNumber.from(feeAmountInput !== null && feeAmountInput !== void 0 ? feeAmountInput : "100000000");
             const feeAddress = feeAmount.isZero() ? zeroAddressHex : networkConfig.feeAddress;
@@ -159,7 +159,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");
@@ -195,7 +195,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)) {
@@ -315,7 +315,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/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/cosmos/gov/v1beta1/query.js

@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
         const message = Object.assign({}, baseQueryProposalsRequest);
         message.proposalStatus =
             object.proposalStatus !== undefined && object.proposalStatus !== null
-                ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
+                ? 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 = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
+            (obj.proposalStatus = 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
-                ? (0, gov_1.voteOptionFromJSON)(object.option)
+                ? 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 = (0, gov_1.voteOptionToJSON)(message.option));
+            (obj.option = gov_1.voteOptionToJSON(message.option));
         return obj;
     },
     fromPartial(object) {

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

@@ -618,13 +618,13 @@ exports.ModeInfo_Single = {
         const message = Object.assign({}, baseModeInfo_Single);
         message.mode =
             object.mode !== undefined && object.mode !== null
-                ? (0, signing_1.signModeFromJSON)(object.mode)
+                ? signing_1.signModeFromJSON(object.mode)
                 : 0;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.mode !== undefined && (obj.mode = (0, signing_1.signModeToJSON)(message.mode));
+        message.mode !== undefined && (obj.mode = signing_1.signModeToJSON(message.mode));
         return obj;
     },
     fromPartial(object) {

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: (0, proto_signing_1.coins)(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
+    amount: proto_signing_1.coins(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
     gas: exports.DEFAULT_GAS.toString(10),
 };
 exports.CURRENT_GAS_PRICE = 769.23077;

package/lib/modules/cdp.js

@@ -429,7 +429,7 @@ class CDPModule extends base_1.default {
             let availableBorrowsUsd = number_1.BN_ZERO;
             let currLiquidationThreshold = number_1.BN_ZERO;
             for (let i = 0; i < collaterals.length; i++) {
-                const amount = (0, number_1.bnOrZero)(collaterals[i].collateralAmount);
+                const amount = number_1.bnOrZero(collaterals[i].collateralAmount);
                 if (amount.isZero()) {
                     continue; // no collateral for denom
                 }
@@ -446,9 +446,9 @@ class CDPModule extends base_1.default {
                 if (!assetParam) {
                     continue;
                 }
-                const ltv = (0, number_1.bnOrZero)(assetParam.loanToValue).div(number_1.BN_10000);
+                const ltv = number_1.bnOrZero(assetParam.loanToValue).div(number_1.BN_10000);
                 const availableBorrowUsd = collateralUsdVal.times(ltv);
-                const liquidationThreshold = (0, number_1.bnOrZero)(assetParam.liquidationThreshold).div(number_1.BN_10000);
+                const liquidationThreshold = number_1.bnOrZero(assetParam.liquidationThreshold).div(number_1.BN_10000);
                 const liquidationThresholdVal = collateralUsdVal.times(liquidationThreshold);
                 totalCollateralsUsd = totalCollateralsUsd.plus(collateralUsdVal);
                 availableBorrowsUsd = availableBorrowsUsd.plus(availableBorrowUsd);
@@ -459,7 +459,7 @@ class CDPModule extends base_1.default {
             const debts = debtsRsp.debts;
             let totalDebtsUsd = number_1.BN_ZERO;
             for (let i = 0; i < debts.length; i++) {
-                const amount = (0, number_1.bnOrZero)(debts[i].principalDebt);
+                const amount = number_1.bnOrZero(debts[i].principalDebt);
                 const denom = debts[i].denom;
                 if (amount.isZero()) {
                     continue;
@@ -481,7 +481,7 @@ class CDPModule extends base_1.default {
             if (stablecoinDebtInfo) {
                 const accountStablecoin = yield sdk.query.cdp.AccountStablecoin({ address: account });
                 const stablecoinDecimals = (_a = yield this.sdkProvider.getTokenClient().getDecimals(stablecoinDebtInfo.denom)) !== null && _a !== void 0 ? _a : number_1.BN_ZERO;
-                const stablecoinDebtAmount = (0, number_1.bnOrZero)(accountStablecoin.principalDebt).plus((0, number_1.bnOrZero)(accountStablecoin.interestDebt));
+                const stablecoinDebtAmount = number_1.bnOrZero(accountStablecoin.principalDebt).plus(number_1.bnOrZero(accountStablecoin.interestDebt));
                 stablecoinDebtUsd = stablecoinDebtAmount.shiftedBy(-stablecoinDecimals);
                 totalDebtsUsd = totalDebtsUsd.plus(stablecoinDebtUsd);
             }
@@ -502,7 +502,7 @@ class CDPModule extends base_1.default {
             const sdk = this.sdkProvider;
             const cdpAddress = this.getCdpModuleAddress();
             const balanceRsp = yield sdk.query.bank.Balance(query_2.QueryBalanceRequest.fromPartial({ address: cdpAddress, denom }));
-            return (0, number_1.bnOrZero)((_a = balanceRsp.balance) === null || _a === void 0 ? void 0 : _a.amount);
+            return number_1.bnOrZero((_a = balanceRsp.balance) === null || _a === void 0 ? void 0 : _a.amount);
         });
     }
     getCdpToActualRatio(cdpDenom) {
@@ -513,13 +513,13 @@ class CDPModule extends base_1.default {
             const cdpAmountRsp = supplyRsp.amount;
             if (!cdpAmountRsp)
                 throw new Error("unable to retrieve cdp token supply");
-            const cdpAmount = (0, number_1.bnOrZero)(cdpAmountRsp.amount);
+            const cdpAmount = number_1.bnOrZero(cdpAmountRsp.amount);
             const cdpAddress = this.getCdpModuleAddress();
             const balanceRsp = yield sdk.query.bank.Balance(query_2.QueryBalanceRequest.fromPartial({ address: cdpAddress, denom }));
             if (!balanceRsp.balance)
                 throw new Error("unable to retrieve cdp module balance");
             const owedAmount = yield this.getTotalTokenDebt(denom);
-            const actualAmount = (0, number_1.bnOrZero)(balanceRsp.balance.amount).plus(owedAmount);
+            const actualAmount = number_1.bnOrZero(balanceRsp.balance.amount).plus(owedAmount);
             if (!owedAmount)
                 throw new Error("unable to retrieve total token debt");
             return cdpAmount.div(actualAmount);
@@ -541,8 +541,8 @@ class CDPModule extends base_1.default {
             const allDebts = allDebtsRes.debtInfosAll;
             for (let i = 0; i < allDebts.length; i++) {
                 const denom = allDebts[i].denom;
-                const interest = (0, number_1.bnOrZero)(allDebts[i].totalAccumulatedInterest);
-                const principal = (0, number_1.bnOrZero)(allDebts[i].totalPrincipal);
+                const interest = number_1.bnOrZero(allDebts[i].totalAccumulatedInterest);
+                const principal = number_1.bnOrZero(allDebts[i].totalPrincipal);
                 const debtAmt = interest.plus(principal);
                 const debtUsdVal = yield this.getTokenUsdVal(denom, debtAmt);
                 if (!debtUsdVal) {
@@ -554,7 +554,7 @@ class CDPModule extends base_1.default {
             const stablecoinDebtRes = yield this.sdkProvider.query.cdp.StablecoinDebt({});
             if (stablecoinDebtRes.stablecoinDebtInfo) {
                 const debtInfo = stablecoinDebtRes.stablecoinDebtInfo;
-                const debtAmt = (0, number_1.bnOrZero)(debtInfo.totalPrincipal).plus((0, number_1.bnOrZero)(debtInfo.totalAccumulatedInterest));
+                const debtAmt = number_1.bnOrZero(debtInfo.totalPrincipal).plus(number_1.bnOrZero(debtInfo.totalAccumulatedInterest));
                 const stablecoinDecimals = (_a = yield sdk.getTokenClient().getDecimals(debtInfo.denom)) !== null && _a !== void 0 ? _a : 0;
                 const debtUsdVal = (debtAmt).shiftedBy(-stablecoinDecimals);
                 totalDebt = totalDebt.plus(debtUsdVal);
@@ -572,7 +572,7 @@ class CDPModule extends base_1.default {
                 if (!TokenClient_1.default.isCdpToken(balance.denom)) {
                     continue;
                 }
-                const amount = (0, number_1.bnOrZero)(balance.amount);
+                const amount = number_1.bnOrZero(balance.amount);
                 const collateralUsdValue = yield this.getCdpTokenUsdVal(balance.denom, amount);
                 allCollateralsUsdValue = allCollateralsUsdValue.plus(collateralUsdValue);
             }
@@ -596,7 +596,7 @@ class CDPModule extends base_1.default {
             const priceResult = yield sdk.query.pricing.TokenPrice(codec_1.QueryTokenPriceRequest.fromPartial({ denom }));
             if (!priceResult.tokenPrice)
                 throw new Error("unable to retrieve token price for " + denom);
-            const twap = (0, number_1.bnOrZero)(priceResult.tokenPrice.twap).shiftedBy(-18);
+            const twap = number_1.bnOrZero(priceResult.tokenPrice.twap).shiftedBy(-18);
             return amount.multipliedBy(twap).shiftedBy(-decimals);
         });
     }
@@ -611,11 +611,11 @@ class CDPModule extends base_1.default {
                 throw new Error("unable to retrieve debt info");
             const cimRsp = yield this.recalculateCIM(denom, debtInfo);
             const newInterestRate = cimRsp.interest;
-            const principal = (0, number_1.bnOrZero)(debtInfo.totalPrincipal);
-            const accumInterest = (0, number_1.bnOrZero)(debtInfo.totalAccumulatedInterest);
+            const principal = number_1.bnOrZero(debtInfo.totalPrincipal);
+            const accumInterest = number_1.bnOrZero(debtInfo.totalAccumulatedInterest);
             const newInterest = principal.times(newInterestRate).plus(accumInterest.times(number_1.BN_ONE.plus(newInterestRate)));
             const cdpParamsRsp = yield this.sdkProvider.query.cdp.Params(query_1.QueryParamsRequest.fromPartial({}));
-            const interestFee = (0, number_1.bnOrZero)((_a = cdpParamsRsp.params) === null || _a === void 0 ? void 0 : _a.interestFee);
+            const interestFee = number_1.bnOrZero((_a = cdpParamsRsp.params) === null || _a === void 0 ? void 0 : _a.interestFee);
             const interest = newInterest.times(number_1.BN_10000.minus(interestFee)).dividedToIntegerBy(number_1.BN_10000);
             return principal.plus(interest);
         });
@@ -633,8 +633,8 @@ class CDPModule extends base_1.default {
                 const debtRes = yield sdk.query.cdp.AccountDebt({ address: account, denom: denom });
                 debt = debtRes.debt;
             }
-            const principalAmount = (0, number_1.bnOrZero)(debt === null || debt === void 0 ? void 0 : debt.principalDebt);
-            const initialCIM = (0, number_1.bnOrZero)(debt === null || debt === void 0 ? void 0 : debt.initialCumulativeInterestMultiplier);
+            const principalAmount = number_1.bnOrZero(debt === null || debt === void 0 ? void 0 : debt.principalDebt);
+            const initialCIM = number_1.bnOrZero(debt === null || debt === void 0 ? void 0 : debt.initialCumulativeInterestMultiplier);
             if (principalAmount.isZero() || initialCIM.isZero())
                 return number_1.BN_ZERO;
             const cimRsp = yield this.recalculateCIM(denom, debtInfo);
@@ -660,8 +660,8 @@ class CDPModule extends base_1.default {
                 const debtResp = yield sdk.query.cdp.AccountStablecoin(query_1.QueryAccountStablecoinRequest.fromPartial({ address: account }));
                 debt = debtResp;
             }
-            principalAmount = (0, number_1.bnOrZero)(debt.principalDebt);
-            const initialCIM = (0, number_1.bnOrZero)(debt.initialCumulativeInterestMultiplier);
+            principalAmount = number_1.bnOrZero(debt.principalDebt);
+            const initialCIM = number_1.bnOrZero(debt.initialCumulativeInterestMultiplier);
             const cim = yield this.recalculateStablecoinCIM(debtInfo);
             if (!cim)
                 throw new Error("unable to retrieve account debt");
@@ -702,7 +702,7 @@ class CDPModule extends base_1.default {
             return number_1.BN_ZERO;
         }
         const diffSeconds = new bignumber_js_1.BigNumber(diffMs).shiftedBy(-3).dp(0, bignumber_js_1.BigNumber.ROUND_CEIL);
-        const secondsAYear = (0, number_1.bnOrZero)(31536000);
+        const secondsAYear = number_1.bnOrZero(31536000);
         const numPeriods = secondsAYear.div(diffSeconds).dp(18);
         return apy.div(numPeriods).dp(18); // carbon backend sdk.dec max 18 dp
     }
@@ -726,8 +726,8 @@ class CDPModule extends base_1.default {
                     throw new Error("unable to retrieve cdp params for " + denom);
                 }
             }
-            const interestFeeRate = (0, number_1.bnOrZero)(params.interestFee).div(number_1.BN_10000);
-            const utilizationRate = (0, number_1.bnOrZero)(debtInfo.utilizationRate).shiftedBy(-18);
+            const interestFeeRate = number_1.bnOrZero(params.interestFee).div(number_1.BN_10000);
+            const utilizationRate = number_1.bnOrZero(debtInfo.utilizationRate).shiftedBy(-18);
             return borrowInterest.times(utilizationRate).times(number_1.BN_ONE.minus(interestFeeRate));
         });
     }
@@ -742,7 +742,7 @@ class CDPModule extends base_1.default {
                     return { cim: number_1.BN_ZERO, interest: number_1.BN_ZERO };
                 }
             }
-            const cim = (0, number_1.bnOrZero)(debtInfo.cumulativeInterestMultiplier);
+            const cim = number_1.bnOrZero(debtInfo.cumulativeInterestMultiplier);
             const apy = yield this.calculateAPY(denom, debtInfo);
             const newInterest = CDPModule.calculateInterestForTimePeriod(apy, (_a = debtInfo.lastUpdatedTime) !== null && _a !== void 0 ? _a : new Date(0), new Date());
             const newCIM = cim.times(newInterest.plus(1));
@@ -761,8 +761,8 @@ class CDPModule extends base_1.default {
                 }
             }
             const paramsResponse = yield sdk.query.cdp.Params(codec_1.QueryCdpParamsRequest.fromPartial({}));
-            const cim = (0, number_1.bnOrZero)(debtInfo.cumulativeInterestMultiplier);
-            const apy = (0, number_1.bnOrZero)((_a = paramsResponse.params) === null || _a === void 0 ? void 0 : _a.stablecoinInterestRate);
+            const cim = number_1.bnOrZero(debtInfo.cumulativeInterestMultiplier);
+            const apy = number_1.bnOrZero((_a = paramsResponse.params) === null || _a === void 0 ? void 0 : _a.stablecoinInterestRate);
             if (!apy) {
                 return number_1.BN_ZERO;
             }
@@ -788,7 +788,7 @@ class CDPModule extends base_1.default {
             const availableBorrowsUsd = accountData.AvailableBorrowsUsd.minus(accountData.TotalDebtsUsd);
             const unlockableUsd = availableBorrowsUsd.multipliedBy(number_1.BN_10000).div(unlockRatio);
             const tokenPrice = yield sdk.query.pricing.TokenPrice({ denom });
-            const tokenTwap = (0, number_1.bnOrZero)((_b = tokenPrice.tokenPrice) === null || _b === void 0 ? void 0 : _b.twap);
+            const tokenTwap = number_1.bnOrZero((_b = tokenPrice.tokenPrice) === null || _b === void 0 ? void 0 : _b.twap);
             if (tokenTwap.isZero())
                 throw new Error("unable to retrieve token price for " + denom);
             const tokenAmt = unlockableUsd.div(tokenTwap.shiftedBy(-18)).shiftedBy(tokenDecimals);
@@ -799,7 +799,7 @@ class CDPModule extends base_1.default {
                 address: account,
                 cdpDenom: cdpDenom
             });
-            const lockedAmount = (0, number_1.bnOrZero)((_e = (_d = accountCollateral.collateral) === null || _d === void 0 ? void 0 : _d.collateralAmount) !== null && _e !== void 0 ? _e : "0");
+            const lockedAmount = number_1.bnOrZero((_e = (_d = accountCollateral.collateral) === null || _d === void 0 ? void 0 : _d.collateralAmount) !== null && _e !== void 0 ? _e : "0");
             return lockedAmount.lt(cdpTokenAmt) ? lockedAmount : cdpTokenAmt;
         });
     }
@@ -817,7 +817,7 @@ class CDPModule extends base_1.default {
             const denom = this.getUnderlyingDenom(cdpDenom);
             const cdpToActualRatio = (_a = yield this.getCdpToActualRatio(cdpDenom)) !== null && _a !== void 0 ? _a : number_1.BN_ZERO;
             const tokenPrice = yield sdk.query.pricing.TokenPrice({ denom: denom });
-            const tokenTwap = (0, number_1.bnOrZero)((_b = tokenPrice.tokenPrice) === null || _b === void 0 ? void 0 : _b.twap).shiftedBy(-18);
+            const tokenTwap = number_1.bnOrZero((_b = tokenPrice.tokenPrice) === null || _b === void 0 ? void 0 : _b.twap).shiftedBy(-18);
             return tokenTwap.multipliedBy(cdpToActualRatio);
         });
     }
@@ -838,26 +838,26 @@ class CDPModule extends base_1.default {
             });
             if (!asset.assetParams)
                 throw new Error("unable to retrieve asset param for " + cdpActualDenom);
-            const bonus = (0, number_1.bnOrZero)(asset.assetParams.liquidationDiscount).div(number_1.BN_10000);
+            const bonus = number_1.bnOrZero(asset.assetParams.liquidationDiscount).div(number_1.BN_10000);
             const cdpTokenPrice = yield this.getCdpTokenPrice(cdpDenom);
             const cdpTokenDiscountedPrice = cdpTokenPrice.multipliedBy(number_1.BN_ONE.minus(bonus));
             // get close factor
             const debtorAccountData = yield sdk.query.cdp.AccountData({
                 address: debtor
             });
-            const debtorTotalCollateralVal = (0, number_1.bnOrZero)(debtorAccountData.totalCollateralsUsd);
-            const debtorTotalDebtVal = (0, number_1.bnOrZero)(debtorAccountData.totalDebtsUsd);
-            const currentLiqThreshold = (0, number_1.bnOrZero)(debtorAccountData.currLiquidationThreshold);
+            const debtorTotalCollateralVal = number_1.bnOrZero(debtorAccountData.totalCollateralsUsd);
+            const debtorTotalDebtVal = number_1.bnOrZero(debtorAccountData.totalDebtsUsd);
+            const currentLiqThreshold = number_1.bnOrZero(debtorAccountData.currLiquidationThreshold);
             const params = yield sdk.query.cdp.Params({});
             if (!params.params) {
                 throw new Error("unable to retrieve cdp params");
             }
-            const smallLiqSize = (0, number_1.bnOrZero)(params.params.smallLiquidationSize);
-            const minCloseFactor = (0, number_1.bnOrZero)(params.params.minimumCloseFactor);
-            const completeLiqThreshold = (0, number_1.bnOrZero)(params.params.completeLiquidationThreshold);
+            const smallLiqSize = number_1.bnOrZero(params.params.smallLiquidationSize);
+            const minCloseFactor = number_1.bnOrZero(params.params.minimumCloseFactor);
+            const completeLiqThreshold = number_1.bnOrZero(params.params.completeLiquidationThreshold);
             const closeFactor = this.computeCloseFactor(debtorTotalDebtVal, debtorTotalCollateralVal, currentLiqThreshold, smallLiqSize, minCloseFactor, completeLiqThreshold);
             // get max repayable amount given the debtor's debt and how much liquidator wants to repay
-            const debtDecimals = (0, number_1.bnOrZero)(yield sdk.getTokenClient().getDecimals(debtDenom));
+            const debtDecimals = number_1.bnOrZero(yield sdk.getTokenClient().getDecimals(debtDenom));
             const maxRepayableValue = debtorTotalDebtVal.multipliedBy(closeFactor);
             const maxRepayableAmt = maxRepayableValue.shiftedBy(debtDecimals.toNumber());
             if (debtRepaymentAmount.isGreaterThan(maxRepayableAmt)) {
@@ -865,7 +865,7 @@ class CDPModule extends base_1.default {
             }
             // calculate collateral amount that can be obtained given that debt amount and debtor's collateral balance
             // AND, recalculate debt repay amount if needed
-            const cdpTokenDecimals = (0, number_1.bnOrZero)(yield sdk.getTokenClient().getDecimals(cdpActualDenom));
+            const cdpTokenDecimals = number_1.bnOrZero(yield sdk.getTokenClient().getDecimals(cdpActualDenom));
             let collateralAmtToLiquidate = this.calculateCollateralRequiredForDebt(number_1.BN_ONE, // assumes USC is $1
             cdpTokenDiscountedPrice, debtRepaymentAmount, cdpTokenDecimals, debtDecimals);
             const debtorAccountCollateral = yield sdk.query.cdp.AccountCollateral({
@@ -938,11 +938,11 @@ class CDPModule extends base_1.default {
 }
 exports.CDPModule = CDPModule;
 CDPModule.calculateInterestAPY = (debtInfo, rateStrategy) => {
-    const utilizationRate = (0, number_1.bnOrZero)(debtInfo.utilizationRate).shiftedBy(-18);
-    const optimalUsage = (0, number_1.bnOrZero)(rateStrategy.optimalUsage).shiftedBy(-4);
-    const variableRate1 = (0, number_1.bnOrZero)(rateStrategy.variableRateSlope1).shiftedBy(-4);
-    const variableRate2 = (0, number_1.bnOrZero)(rateStrategy.variableRateSlope2).shiftedBy(-4);
-    const baseVariableBorrowRate = (0, number_1.bnOrZero)(rateStrategy.baseVariableBorrowRate).shiftedBy(-4);
+    const utilizationRate = number_1.bnOrZero(debtInfo.utilizationRate).shiftedBy(-18);
+    const optimalUsage = number_1.bnOrZero(rateStrategy.optimalUsage).shiftedBy(-4);
+    const variableRate1 = number_1.bnOrZero(rateStrategy.variableRateSlope1).shiftedBy(-4);
+    const variableRate2 = number_1.bnOrZero(rateStrategy.variableRateSlope2).shiftedBy(-4);
+    const baseVariableBorrowRate = number_1.bnOrZero(rateStrategy.baseVariableBorrowRate).shiftedBy(-4);
     if (utilizationRate.lte(optimalUsage)) {
         const vRate = utilizationRate.times(variableRate1).div(optimalUsage).dp(4, bignumber_js_1.BigNumber.ROUND_CEIL);
         return vRate.plus(baseVariableBorrowRate);