carbon-js-sdk 0.6.9 → 0.6.10

package/lib/modules/cdp.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="long" />
 import { AssetParams, DebtInfo, RateStrategyParams, StablecoinDebtInfo, TokenPrice } from "../codec";
 import { Params } from "../codec/cdp/params";
 import { CarbonTx } from "../util";
 import { BigNumber } from "bignumber.js";
+import Long from "long";
 import { Debt } from "./../codec/cdp/query";
 import BaseModule from "./base";
 export declare class CDPModule extends BaseModule {

package/lib/modules/cdp.js

@@ -18,11 +18,13 @@ const codec_1 = require("../codec");
 const query_1 = require("../codec/cdp/query");
 const tx_1 = require("../codec/cdp/tx");
 const query_2 = require("../codec/cosmos/bank/v1beta1/query");
+const pagination_1 = require("../codec/cosmos/base/query/v1beta1/pagination");
 const constant_1 = require("../constant");
 const util_1 = require("../util");
 const address_1 = require("../util/address");
 const number_1 = require("../util/number");
 const bignumber_js_1 = require("bignumber.js");
+const long_1 = __importDefault(require("long"));
 const query_3 = require("./../codec/cdp/query");
 const base_1 = __importDefault(require("./base"));
 class CDPModule extends base_1.default {
@@ -667,38 +669,47 @@ class CDPModule extends base_1.default {
             const sdk = this.sdkProvider;
             const network = sdk.getConfig().network;
             const collateralPoolAddress = address_1.SWTHAddress.getModuleAddress("collateral_pool", network);
-            const collateralPoolBalancePromise = sdk.query.bank.AllBalances({ address: collateralPoolAddress });
-            const totalSupplyPromise = sdk.query.bank.TotalSupply(query_2.QueryTotalSupplyRequest.fromPartial({}));
+            const cdpModuleBalancesAddress = this.getCdpModuleAddress();
+            const maxPageLimit = { pagination: pagination_1.PageRequest.fromPartial({ limit: new long_1.default(10000) }) };
+            const collateralPoolBalancePromise = sdk.query.bank.AllBalances(Object.assign(Object.assign({}, maxPageLimit), { address: collateralPoolAddress }));
+            const cdpModuleBalancesPromise = sdk.query.bank.AllBalances(Object.assign(Object.assign({}, maxPageLimit), { address: cdpModuleBalancesAddress }));
+            const totalSupplyPromise = sdk.query.bank.TotalSupply(query_2.QueryTotalSupplyRequest.fromPartial(Object.assign({}, maxPageLimit)));
             const cdpParamsPromise = sdk.query.cdp.Params(query_1.QueryParamsRequest.fromPartial({}));
-            const tokenPriceAllPromise = sdk.query.pricing.TokenPriceAll(codec_1.QueryTokenPriceAllRequest.fromPartial({}));
-            const debtInfosPromise = sdk.query.cdp.TokenDebtAll(query_3.QueryTokenDebtAllRequest.fromPartial({}));
-            const assetParamsPromise = sdk.query.cdp.AssetAll(query_3.QueryAssetAllRequest.fromPartial({}));
-            const rateStrategyPromise = sdk.query.cdp.RateStrategyAll(codec_1.QueryRateStrategyAllRequest.fromPartial({}));
-            const [collateralPoolBalances, totalSupply, cdpParams, tokenPriceAll, debtInfosAll, assetParamsAll, rateStrategies] = yield Promise.all([collateralPoolBalancePromise, totalSupplyPromise, cdpParamsPromise, tokenPriceAllPromise, debtInfosPromise, assetParamsPromise, rateStrategyPromise]);
+            const tokenPriceAllPromise = sdk.query.pricing.TokenPriceAll(codec_1.QueryTokenPriceAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
+            const debtInfosPromise = sdk.query.cdp.TokenDebtAll(query_3.QueryTokenDebtAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
+            const assetParamsPromise = sdk.query.cdp.AssetAll(query_3.QueryAssetAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
+            const rateStrategyPromise = sdk.query.cdp.RateStrategyAll(codec_1.QueryRateStrategyAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
+            const [collateralPoolBalances, totalSupply, cdpParams, tokenPriceAll, debtInfosAll, assetParamsAll, rateStrategies, cdpModuleBalances] = yield Promise.all([collateralPoolBalancePromise, totalSupplyPromise, cdpParamsPromise, tokenPriceAllPromise, debtInfosPromise, assetParamsPromise, rateStrategyPromise, cdpModuleBalancesPromise]);
             const interestFee = (0, number_1.bnOrZero)((_a = cdpParams.params) === null || _a === void 0 ? void 0 : _a.interestFee);
             if (!interestFee)
                 throw new Error("unable to retrieve interest fee");
             const tokenPrices = tokenPriceAll.tokenPrices;
             if (!tokenPrices)
                 throw new Error("unable to retrieve token prices");
+            const moduleBalancesMap = cdpModuleBalances.balances.reduce((prev, moduleBalance) => {
+                if (!prev[moduleBalance.denom]) {
+                    prev[moduleBalance.denom] = moduleBalance;
+                }
+                return prev;
+            }, {});
             const cdpTokenBalances = ((_b = collateralPoolBalances === null || collateralPoolBalances === void 0 ? void 0 : collateralPoolBalances.balances) !== null && _b !== void 0 ? _b : []).filter(balance => TokenClient_1.default.isCdpToken(balance.denom));
             const cdpTokensBalancePromises = cdpTokenBalances.map(token => {
                 var _a, _b;
                 const underlyingDenom = this.getUnderlyingDenom(token.denom);
                 const tokenPrice = tokenPrices.find((price) => price.denom === underlyingDenom);
                 const supply = (_a = totalSupply.supply.find((supply) => supply.denom === token.denom)) === null || _a === void 0 ? void 0 : _a.amount;
-                const balance = token.amount;
+                const balance = moduleBalancesMap[underlyingDenom].amount;
                 const debtInfo = debtInfosAll.debtInfosAll.find((debtInfo) => debtInfo.denom === underlyingDenom);
                 const assetParam = assetParamsAll.assetParamsAll.find((assetParam) => assetParam.denom === underlyingDenom);
                 const rateStrategy = rateStrategies.rateStrategyParamsAll.find((rateStrategy) => rateStrategy.name === (assetParam === null || assetParam === void 0 ? void 0 : assetParam.rateStrategyName));
-                if (!debtInfo || !supply || !tokenPrice || !rateStrategy)
+                if (!debtInfo || !supply || !tokenPrice || !rateStrategy || !balance)
                     throw new Error("unable to retrieve token info");
                 const apy = CDPModule.calculateInterestAPY(debtInfo, rateStrategy);
                 const newInterestRate = CDPModule.calculateInterestForTimePeriod(apy, (_b = debtInfo.lastUpdatedTime) !== null && _b !== void 0 ? _b : new Date(0), new Date());
                 return this.getTotalTokenDebt(underlyingDenom, debtInfo, interestFee, newInterestRate)
                     .then((totalDebt) => {
-                    const ratio = (0, number_1.bnOrZero)(supply).div((0, number_1.bnOrZero)(totalDebt));
-                    const actualAmount = (0, number_1.bnOrZero)(balance).div(ratio);
+                    const ratio = (0, number_1.bnOrZero)(supply).div((0, number_1.bnOrZero)(balance).plus((0, number_1.bnOrZero)(totalDebt)));
+                    const actualAmount = (0, number_1.bnOrZero)(token.amount).div(ratio);
                     return this.getTokenUsdVal(underlyingDenom, actualAmount, tokenPrice);
                 });
             });

package/lib/modules/test.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",