@defisaver/positions-sdk 1.0.3-dev → 1.0.4

package/cjs/aaveV3/index.js

@@ -13,17 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports.getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.getAaveV3MarketData = exports.aaveV3EmodeCategoriesMapping = exports.aaveV3CalculateDiscountRate = exports.test = void 0;
-const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
-const contracts_1 = require("../contracts");
-const utils_1 = require("../services/utils");
-const common_1 = require("../types/common");
-const staking_1 = require("../staking");
-const multicall_1 = require("../multicall");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const assets_1 = require("../assets");
-const moneymarket_1 = require("../moneymarket");
+const contracts_1 = require("../contracts");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const aave_1 = require("../markets/aave");
+const moneymarket_1 = require("../moneymarket");
+const multicall_1 = require("../multicall");
+const utils_1 = require("../services/utils");
+const staking_1 = require("../staking");
+const common_1 = require("../types/common");
 const test = (web3, network) => {
     const contract = (0, contracts_1.AaveV3ViewContract)(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();

package/cjs/fluid/index.d.ts

@@ -78,6 +78,8 @@ export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user
         leveragedAsset?: string | undefined;
         liquidationPrice?: string | undefined;
         leveragedLsdAssetRatio?: string | undefined;
+        minCollRatio?: string | undefined;
+        collLiquidationRatio?: string | undefined;
         owner: string;
         vaultId: number;
         usedAssets: FluidUsedAssets;

package/cjs/helpers/aaveHelpers/index.js

@@ -134,6 +134,12 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    payload.healthRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
+        .toString();
+    payload.healthLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
+        .toString();
     return payload;
 };
 exports.aaveAnyGetAggregatedPositionData = aaveAnyGetAggregatedPositionData;

package/cjs/helpers/compoundHelpers/index.js

@@ -135,6 +135,8 @@ const getCompoundV3AggregatedData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     // TO DO: handle strategies
     /* const subscribedStrategies = rest.compoundStrategies
       ? compoundV3GetSubscribedStrategies({ selectedMarket, compoundStrategies: rest.compoundStrategies })

package/cjs/helpers/eulerHelpers/index.js

@@ -151,6 +151,8 @@ const getEulerV2AggregatedData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.getEulerV2AggregatedData = getEulerV2AggregatedData;

package/cjs/helpers/fluidHelpers/index.js

@@ -36,6 +36,8 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.getFluidAggregatedData = getFluidAggregatedData;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -57,6 +57,8 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInf
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.getMorphoBlueAggregatedPositionData = getMorphoBlueAggregatedPositionData;

package/cjs/helpers/sparkHelpers/index.js

@@ -98,6 +98,8 @@ const sparkGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.sparkGetAggregatedPositionData = sparkGetAggregatedPositionData;

package/cjs/markets/compound/marketsAssets.js

@@ -27,7 +27,7 @@ exports.v3USDCeCollAssets = {
     [common_1.NetworkNumber.Base]: [],
 };
 exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC', 'ETHx'];
-exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
+exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC', 'wsuperOETHb'];
 exports.v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 exports.v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/cjs/markets/spark/marketAssets.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
 const common_1 = require("../../types/common");
-exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS'];
+exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.sparkAssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,

package/cjs/staking/staking.d.ts

@@ -1,7 +1,8 @@
 import Web3 from 'web3';
+import memoize from 'memoizee';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>;
+export declare const getStakingApy: ((asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>) & memoize.Memoized<(asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;

package/cjs/staking/staking.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const memoizee_1 = __importDefault(require("memoizee"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const constants_1 = require("../constants");
@@ -110,14 +111,10 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     if (!res.ok)
         throw new Error(`Failed to fetch APY for ${asset}`);
     const data = yield res.json();
-    // if our server returns apr, transform it into apy
-    if (['weETH'].includes(asset)) {
-        return (0, moneymarket_1.aprToApy)(data.apy);
-    }
     return String(data.apy);
 });
 exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
-const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getStakingApy = (0, memoizee_1.default)((asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
             return yield getStETHApy(web3, fromBlock, blockNumber);
@@ -150,8 +147,7 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
         console.error(`Failed to fetch APY for ${asset}`);
     }
     return '0';
-});
-exports.getStakingApy = getStakingApy;
+}), { promise: true, maxAge: 2 * 60 * 1000 });
 const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;
     if (+interest === 0)

package/cjs/types/aave.d.ts

@@ -229,6 +229,10 @@ export interface AaveV3AggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
+    healthRatio?: string;
+    healthLiquidationRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

package/cjs/types/compound.d.ts

@@ -96,6 +96,8 @@ export interface CompoundAggregatedPositionData {
     minRatio: string;
     debtTooLow: boolean;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;

package/cjs/types/euler.d.ts

@@ -146,4 +146,6 @@ export interface EulerV2AggregatedPositionData {
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }

package/cjs/types/fluid.d.ts

@@ -240,6 +240,8 @@ export interface FluidAggregatedVaultData {
     leveragedAsset?: string;
     liquidationPrice?: string;
     leveragedLsdAssetRatio?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface BaseFluidVaultData {
     owner: string;

package/cjs/types/morphoBlue.d.ts

@@ -122,6 +122,8 @@ export interface MorphoBlueAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBluePositionData {
     usedAssets: MMUsedAssets;

package/cjs/types/spark.d.ts

@@ -97,6 +97,8 @@ export interface SparkAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface SparkPositionData extends MMPositionData {
     ratio: string;

package/esm/aaveV3/index.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
-import { addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
-import { NetworkNumber, } from '../types/common';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { multicall } from '../multicall';
+import Dec from 'decimal.js';
 import { getAssetsBalances } from '../assets';
-import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
+import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
+import { multicall } from '../multicall';
+import { addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { NetworkNumber, } from '../types/common';
 export const test = (web3, network) => {
     const contract = AaveV3ViewContract(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();

package/esm/fluid/index.d.ts

@@ -78,6 +78,8 @@ export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user
         leveragedAsset?: string | undefined;
         liquidationPrice?: string | undefined;
         leveragedLsdAssetRatio?: string | undefined;
+        minCollRatio?: string | undefined;
+        collLiquidationRatio?: string | undefined;
         owner: string;
         vaultId: number;
         usedAssets: FluidUsedAssets;

package/esm/helpers/aaveHelpers/index.js

@@ -117,6 +117,12 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    payload.healthRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
+        .toString();
+    payload.healthLiquidationRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
+        .toString();
     return payload;
 };
 const getApyAfterValuesEstimationInner = (selectedMarket, actions, viewContract, network) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/helpers/compoundHelpers/index.js

@@ -125,6 +125,8 @@ export const getCompoundV3AggregatedData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     // TO DO: handle strategies
     /* const subscribedStrategies = rest.compoundStrategies
       ? compoundV3GetSubscribedStrategies({ selectedMarket, compoundStrategies: rest.compoundStrategies })

package/esm/helpers/eulerHelpers/index.js

@@ -143,6 +143,8 @@ export const getEulerV2AggregatedData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 export const getEulerV2BorrowRate = (interestRate) => {

package/esm/helpers/fluidHelpers/index.js

@@ -30,5 +30,7 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, })
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };

package/esm/helpers/morphoBlueHelpers/index.js

@@ -51,6 +51,8 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 const compound = (ratePerSeconds) => {

package/esm/helpers/sparkHelpers/index.js

@@ -87,6 +87,8 @@ export const sparkGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 export const getApyAfterValuesEstimation = (selectedMarket, actions, web3) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/markets/compound/marketsAssets.js

@@ -24,7 +24,7 @@ export const v3USDCeCollAssets = {
     [NetworkNumber.Base]: [],
 };
 export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC', 'ETHx'];
-export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
+export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC', 'wsuperOETHb'];
 export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/esm/markets/spark/marketAssets.js

@@ -1,5 +1,5 @@
 import { NetworkNumber } from '../../types/common';
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS'];
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const sparkAssetsDefaultMarket = {
     [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,

package/esm/staking/staking.d.ts

@@ -1,7 +1,8 @@
 import Web3 from 'web3';
+import memoize from 'memoizee';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>;
+export declare const getStakingApy: ((asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>) & memoize.Memoized<(asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;

package/esm/staking/staking.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
+import memoize from 'memoizee';
 import { CbEthContract, LidoContract, PotContract, REthContract, wstETHContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
@@ -104,14 +105,10 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     if (!res.ok)
         throw new Error(`Failed to fetch APY for ${asset}`);
     const data = yield res.json();
-    // if our server returns apr, transform it into apy
-    if (['weETH'].includes(asset)) {
-        return aprToApy(data.apy);
-    }
     return String(data.apy);
 });
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
-export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
+export const getStakingApy = memoize((asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
             return yield getStETHApy(web3, fromBlock, blockNumber);
@@ -144,7 +141,7 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
         console.error(`Failed to fetch APY for ${asset}`);
     }
     return '0';
-});
+}), { promise: true, maxAge: 2 * 60 * 1000 });
 export const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;
     if (+interest === 0)

package/esm/types/aave.d.ts

@@ -229,6 +229,10 @@ export interface AaveV3AggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
+    healthRatio?: string;
+    healthLiquidationRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

package/esm/types/compound.d.ts

@@ -96,6 +96,8 @@ export interface CompoundAggregatedPositionData {
     minRatio: string;
     debtTooLow: boolean;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;

package/esm/types/euler.d.ts

@@ -146,4 +146,6 @@ export interface EulerV2AggregatedPositionData {
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }

package/esm/types/fluid.d.ts

@@ -240,6 +240,8 @@ export interface FluidAggregatedVaultData {
     leveragedAsset?: string;
     liquidationPrice?: string;
     leveragedLsdAssetRatio?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface BaseFluidVaultData {
     owner: string;

package/esm/types/morphoBlue.d.ts

@@ -122,6 +122,8 @@ export interface MorphoBlueAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBluePositionData {
     usedAssets: MMUsedAssets;

package/esm/types/spark.d.ts

@@ -97,6 +97,8 @@ export interface SparkAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface SparkPositionData extends MMPositionData {
     ratio: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.3-dev",
+  "version": "1.0.4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -27,8 +27,10 @@
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
     "@types/lodash": "^4.17.15",
+    "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.4.3",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.17"
   },
   "devDependencies": {
     "@defisaver/eslint-config": "^1.0.1",

package/src/aaveV3/index.ts

@@ -1,6 +1,7 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
+import Dec from 'decimal.js';
+import Web3 from 'web3';
+import { getAssetsBalances } from '../assets';
 import {
   AaveIncentiveDataProviderV3Contract,
   AaveV3ViewContract,
@@ -9,9 +10,14 @@ import {
   getConfigContractAddress,
   GhoTokenContract,
 } from '../contracts';
+import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
+import { AAVE_V3 } from '../markets/aave';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
+import { multicall } from '../multicall';
 import {
   addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress,
 } from '../services/utils';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import {
   AaveMarketInfo,
   AaveV3AssetData,
@@ -21,7 +27,6 @@ import {
   AaveV3PositionData,
   AaveV3UsedAsset,
   AaveV3UsedAssets,
-  AaveVersions,
   EModeCategoriesData,
   EModeCategoryData,
   EModeCategoryDataMapping,
@@ -29,13 +34,7 @@ import {
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
-import { getAssetsBalances } from '../assets';
-import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
-import { AAVE_V3 } from '../markets/aave';
 
 export const test = (web3: Web3, network: NetworkNumber) => {
   const contract = AaveV3ViewContract(web3, 1);

package/src/helpers/aaveHelpers/index.ts

@@ -148,6 +148,12 @@ export const aaveAnyGetAggregatedPositionData = ({
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  payload.healthRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
+    .toString();
+  payload.healthLiquidationRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
+    .toString();
   return payload;
 };
 

package/src/helpers/compoundHelpers/index.ts

@@ -162,6 +162,8 @@ export const getCompoundV3AggregatedData = ({
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
 
   // TO DO: handle strategies
   /* const subscribedStrategies = rest.compoundStrategies

package/src/helpers/eulerHelpers/index.ts

@@ -147,6 +147,8 @@ export const getEulerV2AggregatedData = ({
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
   return payload;
 };
 

package/src/helpers/fluidHelpers/index.ts

@@ -50,5 +50,8 @@ export const getFluidAggregatedData = ({
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
 
+  payload.minCollRatio = new Dec(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+
   return payload;
 };

package/src/helpers/morphoBlueHelpers/index.ts

@@ -64,6 +64,8 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
 
   return payload;
 };

package/src/helpers/sparkHelpers/index.ts

@@ -110,6 +110,8 @@ export const sparkGetAggregatedPositionData = ({
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
   return payload;
 };
 

package/src/markets/compound/marketsAssets.ts

@@ -30,7 +30,7 @@ export const v3USDCeCollAssets = {
 } as const;
 
 export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC', 'ETHx'];
-export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
+export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC', 'wsuperOETHb'];
 export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
 

package/src/markets/spark/marketAssets.ts

@@ -1,6 +1,6 @@
 import { NetworkNumber } from '../../types/common';
 
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS'];
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const sparkAssetsDefaultMarket = {

package/src/staking/staking.ts

@@ -1,5 +1,6 @@
 import Dec from 'decimal.js';
 import Web3 from 'web3';
+import memoize from 'memoizee';
 import {
   CbEthContract, LidoContract, PotContract, REthContract, wstETHContract,
 } from '../contracts';
@@ -105,16 +106,12 @@ const getApyFromDfsApi = async (asset: string) => {
   const res = await fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`);
   if (!res.ok) throw new Error(`Failed to fetch APY for ${asset}`);
   const data = await res.json();
-  // if our server returns apr, transform it into apy
-  if (['weETH'].includes(asset)) {
-    return aprToApy(data.apy);
-  }
   return String(data.apy);
 };
 
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
 
-export const getStakingApy = async (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
+export const getStakingApy = memoize(async (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
   try {
     if (asset === 'stETH' || asset === 'wstETH') return await getStETHApy(web3, fromBlock, blockNumber);
     if (asset === 'cbETH') return await getCbETHApy(web3, blockNumber);
@@ -133,7 +130,7 @@ export const getStakingApy = async (asset: string, web3: Web3, blockNumber: 'lat
     console.error(`Failed to fetch APY for ${asset}`);
   }
   return '0';
-};
+}, { promise: true, maxAge: 2 * 60 * 1000 });
 
 export const calculateInterestEarned = (principal: string, interest: string, type: string, apy = false) => {
   let interval = 1;

package/src/types/aave.ts

@@ -252,6 +252,10 @@ export interface AaveV3AggregatedPositionData {
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,
+  minCollRatio?: string,
+  collLiquidationRatio?: string,
+  healthRatio?: string,
+  healthLiquidationRatio?: string,
 }
 
 export interface AaveHelperCommon {

package/src/types/compound.ts

@@ -110,6 +110,8 @@ export interface CompoundAggregatedPositionData {
   minRatio: string,
   debtTooLow: boolean,
   minDebt: string,
+  minCollRatio: string,
+  collLiquidationRatio: string,
 }
 
 export interface CompoundPositionData extends MMPositionData {

package/src/types/euler.ts

@@ -169,4 +169,6 @@ export interface EulerV2AggregatedPositionData {
   liquidationPrice?: string,
   minRatio: string,
   minDebt: string,
+  minCollRatio: string,
+  collLiquidationRatio: string,
 }

package/src/types/fluid.ts

@@ -253,6 +253,8 @@ export interface FluidAggregatedVaultData {
   leveragedAsset?: string,
   liquidationPrice?: string,
   leveragedLsdAssetRatio?: string,
+  minCollRatio?: string,
+  collLiquidationRatio?: string,
 }
 
 export interface BaseFluidVaultData {

package/src/types/morphoBlue.ts

@@ -136,6 +136,8 @@ export interface MorphoBlueAggregatedPositionData {
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,
+  minCollRatio?: string,
+  collLiquidationRatio?: string,
 }
 
 export interface MorphoBluePositionData {

package/src/types/spark.ts

@@ -109,6 +109,8 @@ export interface SparkAggregatedPositionData {
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,
+  minCollRatio: string,
+  collLiquidationRatio: string,
 }
 
 export interface SparkPositionData extends MMPositionData {