@defisaver/positions-sdk 0.0.32 → 0.0.34-dev

package/cjs/compoundV3/index.js

@@ -17,13 +17,12 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const multicall_1 = require("../multicall");
-const compound_1 = require("../types/compound");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const constants_1 = require("../constants");
 const moneymarket_1 = require("../moneymarket");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
-const compound_2 = require("../markets/compound");
+const compound_1 = require("../markets/compound");
 const priceService_1 = require("../services/priceService");
 const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield (0, priceService_1.getEthPrice)(defaultWeb3) : yield (0, priceService_1.getUSDCPrice)(defaultWeb3);
@@ -44,35 +43,33 @@ const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) =>
     ];
     const data = yield (0, multicall_1.multicall)(calls, web3, network);
     const colls = data[1].colls.map((coll) => (0, compoundHelpers_1.formatMarketData)(coll, network, baseAssetPrice));
-    if (selectedMarket.value === compound_1.CompoundVersions.CompoundV3ETH) {
-        for (const coll of colls) {
-            if (coll.symbol === 'wstETH') {
-                // eslint-disable-next-line no-await-in-loop
-                const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
-                    (0, staking_1.getStETHByWstETHMultiple)([
-                        (0, tokens_1.assetAmountInWei)(coll.totalSupply, 'wstETH'),
-                        (0, tokens_1.assetAmountInWei)(coll.supplyCap, 'wstETH'),
-                    ], defaultWeb3),
-                    (0, staking_1.getWstETHByStETH)((0, tokens_1.assetAmountInWei)(1, 'stETH'), defaultWeb3),
-                ]);
-                coll.totalSupplyAlternative = (0, tokens_1.assetAmountInEth)(totalSupplyAlternative, 'stETH');
-                coll.supplyCapAlternative = (0, tokens_1.assetAmountInEth)(supplyCapAlternative, 'stETH');
-                coll.priceAlternative = (0, tokens_1.assetAmountInEth)(priceAlternative, 'wstETH');
-                // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(defaultWeb3);
-                coll.incentiveSupplyToken = 'wstETH';
-            }
-            if (coll.symbol === 'cbETH') {
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(defaultWeb3);
-                coll.incentiveSupplyToken = 'cbETH';
-            }
-            if (coll.symbol === 'rETH') {
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield (0, staking_1.getREthApr)(defaultWeb3);
-                coll.incentiveSupplyToken = 'rETH';
-            }
+    for (const coll of colls) {
+        if (coll.symbol === 'wstETH') {
+            // eslint-disable-next-line no-await-in-loop
+            const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
+                (0, staking_1.getStETHByWstETHMultiple)([
+                    (0, tokens_1.assetAmountInWei)(coll.totalSupply, 'wstETH'),
+                    (0, tokens_1.assetAmountInWei)(coll.supplyCap, 'wstETH'),
+                ], defaultWeb3),
+                (0, staking_1.getWstETHByStETH)((0, tokens_1.assetAmountInWei)(1, 'stETH'), defaultWeb3),
+            ]);
+            coll.totalSupplyAlternative = (0, tokens_1.assetAmountInEth)(totalSupplyAlternative, 'stETH');
+            coll.supplyCapAlternative = (0, tokens_1.assetAmountInEth)(supplyCapAlternative, 'stETH');
+            coll.priceAlternative = (0, tokens_1.assetAmountInEth)(priceAlternative, 'wstETH');
+            // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(defaultWeb3);
+            coll.incentiveSupplyToken = 'wstETH';
+        }
+        if (coll.symbol === 'cbETH') {
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(defaultWeb3);
+            coll.incentiveSupplyToken = 'cbETH';
+        }
+        if (coll.symbol === 'rETH') {
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield (0, staking_1.getREthApr)(defaultWeb3);
+            coll.incentiveSupplyToken = 'rETH';
         }
     }
     const base = (0, compoundHelpers_1.formatBaseData)(data[0].baseToken, network, baseAssetPrice);
@@ -127,9 +124,9 @@ const getCompoundV3AccountBalances = (web3, network, block, addressMapping, addr
         return balances;
     }
     const market = ({
-        [(0, compound_2.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_ETH)(network),
-        [(0, compound_2.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDC)(network),
-        [(0, compound_2.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDBC)(network),
+        [(0, compound_1.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_ETH)(network),
+        [(0, compound_1.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_USDC)(network),
+        [(0, compound_1.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_USDBC)(network),
     })[marketAddress.toLowerCase()];
     const loanInfoContract = (0, contracts_1.CompV3ViewContract)(web3, network, block);
     const loanInfo = yield loanInfoContract.methods.getLoanData(market.baseMarketAddress, address).call({}, block);
@@ -182,7 +179,7 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;
         usedAssets[baseAssetSymbol].borrowed = (0, tokens_1.assetAmountInEth)(loanData.borrowAmount, baseAssetInfo.symbol);
-        if (selectedMarket.value === (0, compound_2.COMPOUND_V3_ETH)(network).value) {
+        if (selectedMarket.value === (0, compound_1.COMPOUND_V3_ETH)(network).value) {
             usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
                 .mul(assetsData[baseAssetSymbol].price)
                 .toString();