@defisaver/positions-sdk 2.1.47 → 2.1.49-pt-apr-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

@@ -15,7 +15,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
 export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
 export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC', 'mUSD'];
-export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL'];
+export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL', 'PT USDe Apr', 'PT sUSDe Apr'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {
     [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,

package/esm/moneymarket/moneymarketCommonService.js

@@ -20,7 +20,7 @@ export const STABLE_ASSETS = [
     'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
     'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
     'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
-    'PT sUSDe Feb', 'PT USDe Feb',
+    'PT sUSDe Feb', 'PT USDe Feb', 'PT USDe Apr', 'PT sUSDe Apr',
 ];
 export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

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/staking/staking.js

@@ -66,7 +66,7 @@ export const STAKING_ASSETS = [
     'cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH',
     'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
     'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
-    'PT sUSDe Feb', 'PT USDe Feb',
+    'PT sUSDe Feb', 'PT USDe Feb', 'PT USDe Apr', 'PT sUSDe Apr',
 ];
 export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [asset_1, ...args_1], void 0, function* (asset, network = NetworkNumber.Eth) {
     try {
@@ -130,6 +130,10 @@ export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [
             return yield getApyFromDfsApi('PT sUSDe Feb', network);
         if (asset === 'PT USDe Feb')
             return yield getApyFromDfsApi('PT USDe Feb', network);
+        if (asset === 'PT sUSDe Apr')
+            return yield getApyFromDfsApi('PT sUSDe Apr', network);
+        if (asset === 'PT USDe Apr')
+            return yield getApyFromDfsApi('PT USDe Apr', network);
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

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.47",
+  "version": "2.1.49-pt-apr-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.18",
+    "@defisaver/tokens": "1.7.19-pt-apr-1-dev",
     "@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 };