carbon-js-sdk 0.6.8 → 0.6.9

package/lib/modules/cdp.d.ts

@@ -5,7 +5,6 @@ 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>;
@@ -54,10 +53,9 @@ export declare class CDPModule extends BaseModule {
     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, price?: TokenPrice): Promise<BigNumber>;
-    getTotalTokenDebt(denom: string, interestFee?: BigNumber): Promise<BigNumber>;
+    getTotalTokenDebt(denom: string, debtInfo?: DebtInfo, interestFee?: BigNumber, newInterestRate?: 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;

package/lib/modules/cdp.js

@@ -601,14 +601,18 @@ class CDPModule extends base_1.default {
             const cdpAddress = this.getCdpModuleAddress();
             const supplyPromise = sdk.query.bank.SupplyOf(query_2.QuerySupplyOfRequest.fromPartial({ denom: cdpDenom }));
             const balancePromise = sdk.query.bank.Balance(query_2.QueryBalanceRequest.fromPartial({ address: cdpAddress, denom }));
-            const [supplyRsp, balanceRsp] = yield Promise.all([supplyPromise, balancePromise]);
+            const debtInfoPromise = sdk.query.cdp.TokenDebt(query_1.QueryTokenDebtRequest.fromPartial({ denom }));
+            const [supplyRsp, balanceRsp, debtInfoRsp] = yield Promise.all([supplyPromise, balancePromise, debtInfoPromise]);
             const cdpAmountRsp = supplyRsp.amount;
             if (!cdpAmountRsp)
                 throw new Error("unable to retrieve cdp token supply");
             const cdpAmount = (0, number_1.bnOrZero)(cdpAmountRsp.amount);
             if (!balanceRsp.balance)
                 throw new Error("unable to retrieve cdp module balance");
-            const owedAmount = yield this.getTotalTokenDebt(denom, interestFee);
+            const debtInfo = debtInfoRsp.debtInfo;
+            if (!debtInfo)
+                throw new Error("unable to retrieve debt info");
+            const owedAmount = yield this.getTotalTokenDebt(denom, debtInfo, interestFee);
             const actualAmount = (0, number_1.bnOrZero)(balanceRsp.balance.amount).plus(owedAmount);
             if (!owedAmount)
                 throw new Error("unable to retrieve total token debt");
@@ -658,43 +662,47 @@ class CDPModule extends base_1.default {
         });
     }
     getModuleTotalCollateralUsdVal() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const sdk = this.sdkProvider;
             const network = sdk.getConfig().network;
             const collateralPoolAddress = address_1.SWTHAddress.getModuleAddress("collateral_pool", network);
-            const collateralPoolBalances = yield sdk.query.bank.AllBalances({ address: collateralPoolAddress });
-            const cdpTokenBalances = ((_a = collateralPoolBalances === null || collateralPoolBalances === void 0 ? void 0 : collateralPoolBalances.balances) !== null && _a !== void 0 ? _a : []).filter(balance => TokenClient_1.default.isCdpToken(balance.denom));
-            const totalCollateralsUsdValue = (_b = (yield this.getCdpTokensUsdVal(cdpTokenBalances))) !== null && _b !== void 0 ? _b : [];
-            return totalCollateralsUsdValue;
-        });
-    }
-    getCdpTokensUsdVal(cdpTokens) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = this.sdkProvider;
-            const tokenClient = sdk.getTokenClient();
+            const collateralPoolBalancePromise = sdk.query.bank.AllBalances({ address: collateralPoolAddress });
+            const totalSupplyPromise = sdk.query.bank.TotalSupply(query_2.QueryTotalSupplyRequest.fromPartial({}));
             const cdpParamsPromise = sdk.query.cdp.Params(query_1.QueryParamsRequest.fromPartial({}));
             const tokenPriceAllPromise = sdk.query.pricing.TokenPriceAll(codec_1.QueryTokenPriceAllRequest.fromPartial({}));
-            const [cdpParams, tokenPriceAll] = yield Promise.all([cdpParamsPromise, tokenPriceAllPromise]);
+            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 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 cdpTokensBalancePromises = cdpTokens.map(token => (this.getCdpToActualRatio(token.denom, interestFee)
-                .then((ratio) => (0, number_1.bnOrZero)(token.amount).div(ratio))
-                .then(actualAmount => {
-                const denom = this.getUnderlyingDenom(token.denom);
-                const tokenPrice = tokenPrices.find((price) => price.denom === denom);
-                return this.getTokenUsdVal(denom, actualAmount, tokenPrice);
-            })
-                .catch((err) => {
-                console.error(err);
-                return number_1.BN_ZERO;
-            })));
-            const cdpBalances = (_b = (yield Promise.all(cdpTokensBalancePromises))) !== null && _b !== void 0 ? _b : [];
+            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 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)
+                    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);
+                    return this.getTokenUsdVal(underlyingDenom, actualAmount, tokenPrice);
+                });
+            });
+            const cdpBalances = (_c = (yield Promise.all(cdpTokensBalancePromises))) !== null && _c !== void 0 ? _c : [];
             const totalCdpTokensUsdVal = cdpBalances.reduce((prev, curr) => (prev.plus(curr)), number_1.BN_ZERO);
             return totalCdpTokensUsdVal;
         });
@@ -723,7 +731,7 @@ class CDPModule extends base_1.default {
             return amount.multipliedBy(twap).shiftedBy(-decimals);
         });
     }
-    getTotalTokenDebt(denom, interestFee) {
+    getTotalTokenDebt(denom, debtInfo, interestFee, newInterestRate) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!interestFee) {
@@ -732,12 +740,16 @@ class CDPModule extends base_1.default {
             }
             if (!interestFee)
                 throw new Error("unable to retrieve interest fee");
-            const debtInfoRsp = yield this.sdkProvider.query.cdp.TokenDebt(query_1.QueryTokenDebtRequest.fromPartial({ denom }));
-            const debtInfo = debtInfoRsp.debtInfo;
+            if (!debtInfo) {
+                const debtInfoRsp = yield this.sdkProvider.query.cdp.TokenDebt(query_1.QueryTokenDebtRequest.fromPartial({ denom }));
+                debtInfo = debtInfoRsp.debtInfo;
+            }
             if (!debtInfo)
                 throw new Error("unable to retrieve debt info");
-            const cimRsp = yield this.recalculateCIM(denom);
-            const newInterestRate = cimRsp.interest;
+            if (!newInterestRate) {
+                const cimRsp = yield this.recalculateCIM(denom, debtInfo);
+                newInterestRate = cimRsp.interest;
+            }
             const principal = (0, number_1.bnOrZero)(debtInfo.totalPrincipal);
             const accumInterest = (0, number_1.bnOrZero)(debtInfo.totalAccumulatedInterest);
             const newInterest = principal.times(newInterestRate).plus(accumInterest.times(number_1.BN_ONE.plus(newInterestRate)));

package/package.json

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