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

@@ -18,7 +18,7 @@ exports.aaveV3AssetsDefaultMarketOpt = [
 exports.aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
 exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
 exports.aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC', 'mUSD'];
-exports.aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL'];
+exports.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`
 exports.aaveV3AssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,

package/cjs/moneymarket/moneymarketCommonService.js

@@ -31,7 +31,7 @@ exports.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',
 ];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

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

@@ -72,7 +72,7 @@ exports.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',
 ];
 exports.getStakingApy = (0, memoizee_1.default)((asset_1, ...args_1) => __awaiter(void 0, [asset_1, ...args_1], void 0, function* (asset, network = common_1.NetworkNumber.Eth) {
     try {
@@ -136,6 +136,10 @@ exports.getStakingApy = (0, memoizee_1.default)((asset_1, ...args_1) => __awaite
             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/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 };
     });