@defisaver/positions-sdk 2.1.45 → 2.1.46-aave-v3-6-dev

package/cjs/helpers/aaveHelpers/index.js

@@ -67,13 +67,17 @@ exports.aaveAnyGetSuppliableAsCollAssets = aaveAnyGetSuppliableAsCollAssets;
 const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
     const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
     const assetData = assetsData[asset];
-    const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
+    const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || {
+        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0',
+    };
     if (eModeCategory === 0
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
+    if (eModeCategoryData.ltvZeroAssets.includes(asset))
+        return ({ liquidationRatio: '0', collateralFactor: '0' });
     const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };

package/cjs/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 exports.aaveV3AssetsDefaultMarketEth = [
     'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT', 'USDG',
 ];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/cjs/spark/index.js

@@ -87,6 +87,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
             collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
             borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
+            ltvZeroAssets: [],
         };
         return ({
             symbol: selectedMarket.assets[i],

package/cjs/types/aave.d.ts

@@ -38,6 +38,8 @@ export interface EModeCategoryData {
     collateralBitmap?: string;
     collateralAssets: string[];
     borrowAssets: string[];
+    ltvzeroBitmap?: string;
+    ltvZeroAssets: string[];
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];

package/esm/aaveV3/index.js

@@ -63,21 +63,31 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             getMeritCampaigns(network, market.value),
         ]);
         isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
+        // same break logic as view contract
+        let missCounter = 0;
         const eModeCategoriesData = {};
         for (let i = 0; i < eModesInfo.length; i++) {
-            if (!eModesInfo[i].label)
-                break;
-            eModeCategoriesData[i + 1] = {
-                label: eModesInfo[i].label,
-                id: i + 1,
-                liquidationBonus: new Dec(eModesInfo[i].liquidationBonus).div(10000).toString(),
-                liquidationRatio: new Dec(eModesInfo[i].liquidationThreshold).div(10000).toString(),
-                collateralFactor: new Dec(eModesInfo[i].ltv).div(10000).toString(),
-                borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
-                collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
-                borrowAssets: [],
-                collateralAssets: [],
-            };
+            if (eModesInfo[i].liquidationThreshold !== 0) {
+                eModeCategoriesData[i + 1] = {
+                    label: eModesInfo[i].label,
+                    id: i + 1,
+                    liquidationBonus: new Dec(eModesInfo[i].liquidationBonus).div(10000).toString(),
+                    liquidationRatio: new Dec(eModesInfo[i].liquidationThreshold).div(10000).toString(),
+                    collateralFactor: new Dec(eModesInfo[i].ltv).div(10000).toString(),
+                    borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
+                    collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
+                    ltvzeroBitmap: eModesInfo[i].ltvzeroBitmap.toString(),
+                    borrowAssets: [],
+                    collateralAssets: [],
+                    ltvZeroAssets: [],
+                };
+                missCounter = 0;
+            }
+            else {
+                ++missCounter;
+                if (missCounter > 2)
+                    break;
+            }
         }
         if (networksWithIncentives.includes(network) && rewardInfo) {
             rewardInfo = rewardInfo.reduce((all, _market) => {
@@ -95,6 +105,8 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eModeCategoriesData[eModeIndex].collateralAssets.push(symbol);
                 if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].borrowableBitmap), Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].borrowAssets.push(symbol);
+                if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].ltvzeroBitmap), Number(tokenMarket.assetId)))
+                    eModeCategoriesData[eModeIndex].ltvZeroAssets.push(symbol);
             }
             const borrowCap = tokenMarket.borrowCap.toString();
             const borrowCapInWei = new Dec(assetAmountInWei(borrowCap, symbol));
@@ -279,6 +291,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralFactor: '0',
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
+            ltvZeroAssets: [],
         };
         return { assetsData: payload, eModeCategoriesData };
     });