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

package/esm/helpers/aaveHelpers/index.js

@@ -54,13 +54,17 @@ export const aaveAnyGetSuppliableAsCollAssets = (_a) => {
 export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
     const asset = 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 Dec(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/esm/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
 export const 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'];
 export const 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',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/esm/spark/index.js

@@ -80,6 +80,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
             collateralFactor: new Dec(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/esm/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.45",
+  "version": "2.1.46-aave-v3-6-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.17",
+    "@defisaver/tokens": "^1.7.18",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV3/index.ts

@@ -84,7 +84,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
   const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
   const marketAddress = market.providerAddress;
   const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea, NetworkNumber.Plasma];
-
   // eslint-disable-next-line prefer-const
   let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = await Promise.all([
     loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses as EthAddress[]], setViemBlockNumber(blockNumber)),
@@ -96,20 +95,29 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
   ]);
   isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
 
+  // same break logic as view contract
+  let missCounter = 0;
   const eModeCategoriesData: 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) {
@@ -128,6 +136,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
       for (const eModeIndex in eModeCategoriesData) {
         if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId))) 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();
@@ -326,6 +335,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     collateralFactor: '0',
     collateralAssets: assetsData.map((a) => a.symbol),
     borrowAssets: assetsData.map((a) => a.symbol),
+    ltvZeroAssets: [],
   };
 
   return { assetsData: payload, eModeCategoriesData };