@defisaver/positions-sdk 0.0.186 → 0.0.188-dev-markets

package/esm/compoundV3/index.js

@@ -17,10 +17,20 @@ import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { formatBaseData, formatMarketData, getCompoundV3AggregatedData, getIncentiveApys, } from '../helpers/compoundHelpers';
 import { COMPOUND_V3_ETH, COMPOUND_V3_USDBC, COMPOUND_V3_USDC, COMPOUND_V3_USDCe, COMPOUND_V3_USDT, } from '../markets/compound';
-import { getEthPrice, getCompPrice, getUSDCPrice } from '../services/priceService';
+import { getEthPrice, getCompPrice, getUSDCPrice, getWstETHPrice, } from '../services/priceService';
 const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => getAssetInfo(ethToWeth(asset), network)).map(addr => addr.address.toLowerCase());
+const getBaseAssetPriceFunction = (asset) => {
+    switch (asset) {
+        case 'wstETH':
+            return getWstETHPrice;
+        case 'ETH':
+            return getEthPrice;
+        default:
+            return getUSDCPrice;
+    }
+};
 export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
-    const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield getEthPrice(defaultWeb3) : yield getUSDCPrice(defaultWeb3);
+    const baseAssetPrice = yield getBaseAssetPriceFunction(selectedMarket.baseAsset)(defaultWeb3);
     const compPrice = yield getCompPrice(defaultWeb3);
     const contract = CompV3ViewContract(web3, network);
     const CompV3ViewAddress = contract.options.address;
@@ -170,14 +180,9 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;
         usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
-        if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
-            usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
-                .mul(assetsData[baseAssetSymbol].price)
-                .toString();
-        }
-        else {
-            usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
-        }
+        usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
+            .mul(assetsData[baseAssetSymbol].price)
+            .toString();
     }
     const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
     loanData.collAddr.forEach((coll, i) => {