@defisaver/positions-sdk 2.1.52-dev-3 → 2.1.52

package/esm/fluid/index.d.ts

@@ -130,10 +130,10 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         collRatio: string;
         minRatio: string;
         totalInterestUsd: string;
-        leveragedType?: import("../types/common").LeverageType;
+        leveragedType?: string;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        currentVolatilePairRatio?: string;
+        leveragedLsdAssetRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;
@@ -161,10 +161,10 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         collRatio: string;
         minRatio: string;
         totalInterestUsd: string;
-        leveragedType?: import("../types/common").LeverageType;
+        leveragedType?: string;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        currentVolatilePairRatio?: string;
+        leveragedLsdAssetRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;
@@ -192,10 +192,10 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         collRatio: string;
         minRatio: string;
         totalInterestUsd: string;
-        leveragedType?: import("../types/common").LeverageType;
+        leveragedType?: string;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        currentVolatilePairRatio?: string;
+        leveragedLsdAssetRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;

package/esm/helpers/aaveHelpers/index.d.ts

@@ -1,4 +1,4 @@
-import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions } from '../../types';
+import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAssets, AaveVersions } from '../../types';
 import { EthereumProvider, NetworkNumber } from '../../types/common';
 export declare const AAVE_V3_MARKETS: AaveVersions[];
 export declare const isAaveV2: ({ selectedMarket }: {
@@ -17,7 +17,7 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
 }) => boolean;
 export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: AaveV3UsedAssets;
-}) => AaveV3UsedAsset[];
+}) => import("../../types").AaveV3UsedAsset[];
 export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;

package/esm/helpers/aaveHelpers/index.js

@@ -25,7 +25,6 @@ import { getNativeAssetFromWrapped, getWrappedNativeAssetFromUnwrapped } from '.
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { borrowOperations } from '../../constants';
-import { LeverageType, } from '../../types/common';
 import { AaveLoanInfoV2ContractViem, AaveV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
 export const AAVE_V3_MARKETS = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi];
@@ -90,22 +89,12 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.liquidationPrice = '';
     if (leveragedType !== '') {
         let assetPrice = data.assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.VolatilePair) {
-            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
-            const borrowedAssetPrice = data.assetsData[borrowedAsset.symbol].price;
-            const leveragedAssetPrice = data.assetsData[leveragedAsset].price;
-            const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-            if (isReverse) {
-                payload.leveragedType = LeverageType.VolatilePairReverse;
-                payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-                assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-            }
-            else {
-                assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-                payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
-            }
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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();

package/esm/helpers/compoundHelpers/index.js

@@ -25,7 +25,7 @@ import { addToArrayIf, getEthAmountForDecimals, handleWbtcLegacy, wethToEth, } f
 import { BLOCKS_IN_A_YEAR, borrowOperations, SECONDS_PER_YEAR } from '../../constants';
 import { aprToApy, calcLeverageLiqPrice, calculateBorrowingAssetLimit, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../../staking';
-import { IncentiveKind, LeverageType, NetworkNumber, } from '../../types/common';
+import { IncentiveKind, NetworkNumber, } from '../../types/common';
 import { CompoundLoanInfoContractViem, CompV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
 export const formatMarketData = (data, network, baseAssetPrice) => {
@@ -140,25 +140,28 @@ export const getCompoundV3AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.VolatilePair) {
-            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
-            const borrowedAssetPrice = assetsData[borrowedAsset.symbol].price;
-            const leveragedAssetPrice = assetsData[leveragedAsset].price;
-            const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-            if (isReverse) {
-                payload.leveragedType = LeverageType.VolatilePairReverse;
-                payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-                assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-            }
-            else {
-                assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-                payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
-            }
+        if (leveragedType === 'lsd-leverage') {
+            payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toString();
+            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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 })
+      : []; */
+    // TODO possibly move to global helper, since every protocol has the same graphData?
+    // payload.ratioTooLow = false;
+    // payload.ratioTooHigh = false;
+    // TO DO: handle strategies
+    /* if (subscribedStrategies.length) {
+      subscribedStrategies.forEach(({ graphData }) => {
+        payload.ratioTooLow = parseFloat(payload.ratio) < parseFloat(graphData.minRatio);
+        payload.ratioTooHigh = graphData.boostEnabled && parseFloat(payload.ratio) > parseFloat(graphData.maxRatio);
+      });
+    } */
     return payload;
 };
 export const getApyAfterValuesEstimationCompoundV2 = (actions, provider) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/helpers/eulerHelpers/index.d.ts

@@ -1,7 +1,7 @@
-import { EthAddress, EthereumProvider, LeverageType, NetworkNumber } from '../../types/common';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
 import { EulerV2AggregatedPositionData, EulerV2AssetsData, EulerV2UsedAssets } from '../../types';
 export declare const isLeveragedPos: (usedAssets: EulerV2UsedAssets, dustLimit?: number) => {
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset: string;
     leveragedVault: string;
 };

package/esm/helpers/eulerHelpers/index.js

@@ -20,7 +20,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import Dec from 'decimal.js';
 import { assetAmountInWei } from '@defisaver/tokens';
-import { LeverageType, } from '../../types/common';
 import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { EulerV2ViewContractViem } from '../../contracts';
@@ -54,30 +53,31 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     });
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-    const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+    // lsd -> liquid staking derivative
+    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
     if (isLong) {
         return {
-            leveragedType: LeverageType.Long,
+            leveragedType: 'long',
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     if (isShort) {
         return {
-            leveragedType: LeverageType.Short,
+            leveragedType: 'short',
             leveragedAsset: shortAsset,
             leveragedVault: leverageAssetVault,
         };
     }
-    if (isVolatilePair) {
+    if (isLsdLeveraged) {
         return {
-            leveragedType: LeverageType.VolatilePair,
+            leveragedType: 'lsd-leverage',
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     return {
-        leveragedType: LeverageType.None,
+        leveragedType: '',
         leveragedAsset: '',
         leveragedVault: '',
     };
@@ -106,22 +106,14 @@ export const getEulerV2AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-        if (leveragedType === LeverageType.VolatilePair) {
-            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
-            const borrowedAssetPrice = assetsData[borrowedAsset.vaultAddress.toLowerCase()].price;
-            const leveragedAssetPrice = assetsData[leveragedVault.toLowerCase()].price;
-            const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-            if (isReverse) {
-                payload.leveragedType = LeverageType.VolatilePairReverse;
-                payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-                assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-            }
-            else {
-                assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-                payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+        if (leveragedType === 'lsd-leverage') {
+            const ethAsset = Object.values(assetsData).find((asset) => ['WETH', 'ETH'].includes(asset.symbol));
+            if (ethAsset) {
+                payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedVault.toLowerCase()].price).div(ethAsset.price).toString();
+                assetPrice = new Dec(assetPrice).div(ethAsset.price).toString();
             }
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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();

package/esm/helpers/fluidHelpers/index.js

@@ -3,7 +3,6 @@ import { assetAmountInEth } from '@defisaver/tokens';
 import { FluidVaultType, } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-import { LeverageType } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
     const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
@@ -50,22 +49,12 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.VolatilePair) {
-            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
-            const borrowedAssetPrice = assetsData[borrowedAsset.symbol].price;
-            const leveragedAssetPrice = assetsData[leveragedAsset].price;
-            const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-            if (isReverse) {
-                payload.leveragedType = LeverageType.VolatilePairReverse;
-                payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-                assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-            }
-            else {
-                assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-                payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
-            }
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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();

package/esm/helpers/morphoBlueHelpers/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-import { LeverageType, NetworkNumber, } from '../../types/common';
+import { NetworkNumber, } from '../../types/common';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContractViem } from '../../contracts';
 import { compareAddresses, DEFAULT_TIMEOUT, wethToEth } from '../../services/utils';
@@ -45,22 +45,12 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.VolatilePair) {
-            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
-            const borrowedAssetPrice = assetsData[borrowedAsset.symbol].price;
-            const leveragedAssetPrice = assetsData[leveragedAsset].price;
-            const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-            if (isReverse) {
-                payload.leveragedType = LeverageType.VolatilePairReverse;
-                payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-                assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-            }
-            else {
-                assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-                payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
-            }
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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();

package/esm/helpers/sparkHelpers/index.d.ts

@@ -1,4 +1,4 @@
-import { SparkAggregatedPositionData, SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAsset, SparkUsedAssets } from '../../types';
+import { SparkAggregatedPositionData, SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAssets } from '../../types';
 import { EthereumProvider } from '../../types/common';
 export declare const sparkIsInIsolationMode: ({ usedAssets, assetsData }: {
     usedAssets: SparkUsedAssets;
@@ -6,7 +6,7 @@ export declare const sparkIsInIsolationMode: ({ usedAssets, assetsData }: {
 }) => boolean;
 export declare const sparkGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: SparkUsedAssets;
-}) => SparkUsedAsset[];
+}) => import("../../types").SparkUsedAsset[];
 export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;

package/esm/helpers/sparkHelpers/index.js

@@ -24,7 +24,7 @@ import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from
 import { calculateNetApy } from '../../staking';
 import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
 import { SparkViewContractViem } from '../../contracts';
-import { LeverageType, NetworkNumber, } from '../../types/common';
+import { NetworkNumber } from '../../types/common';
 import { borrowOperations } from '../../constants';
 import { getViemProvider } from '../../services/viem';
 export const sparkIsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
@@ -81,22 +81,12 @@ export const sparkGetAggregatedPositionData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-        if (leveragedType === LeverageType.VolatilePair) {
-            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
-            const borrowedAssetPrice = data.assetsData[borrowedAsset.symbol].price;
-            const leveragedAssetPrice = data.assetsData[leveragedAsset].price;
-            const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-            if (isReverse) {
-                payload.leveragedType = LeverageType.VolatilePairReverse;
-                payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-                assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-            }
-            else {
-                assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-                payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
-            }
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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();

package/esm/moneymarket/moneymarketCommonService.d.ts

@@ -1,12 +1,12 @@
-import { LeverageType, MMUsedAssets } from '../types/common';
+import { MMUsedAssets } from '../types/common';
 export declare const getAssetsTotal: (assets: object, filter: any, transform: any) => any;
 export declare const calcLongLiqPrice: (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => string;
 export declare const calcShortLiqPrice: (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => string;
-export declare const calcLeverageLiqPrice: (leverageType: LeverageType, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => string;
+export declare const calcLeverageLiqPrice: (leverageType: string, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => string;
 export declare const calculateBorrowingAssetLimit: (assetBorrowedUsd: string, borrowLimitUsd: string) => string;
 export declare const STABLE_ASSETS: string[];
 export declare const isLeveragedPos: (usedAssets: MMUsedAssets, dustLimit?: number) => {
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset: string;
 };
 export declare const aprToApy: (interest: string | number, frequency?: number) => string;

package/esm/moneymarket/moneymarketCommonService.js

@@ -1,6 +1,5 @@
 import Dec from 'decimal.js';
 import { BLOCKS_IN_A_YEAR } from '../constants';
-import { LeverageType } from '../types/common';
 export const getAssetsTotal = (assets, filter, transform) => Object.values(assets)
     .filter(filter)
     .map(transform)
@@ -9,9 +8,9 @@ export const getAssetsTotal = (assets, filter, transform) => Object.values(asset
 export const calcLongLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => new Dec(assetPrice).mul(borrowedUsd).div(borrowLimitUsd).toString();
 export const calcShortLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => new Dec(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
 export const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
-    if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse)
+    if (leverageType === 'short')
         return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair)
+    if (leverageType === 'long' || leverageType === 'lsd-leverage')
         return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -48,27 +47,28 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     });
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-    const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+    // lsd -> liquid staking derivative
+    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
     if (isLong) {
         return {
-            leveragedType: LeverageType.Long,
+            leveragedType: 'long',
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: LeverageType.Short,
+            leveragedType: 'short',
             leveragedAsset: shortAsset,
         };
     }
-    if (isVolatilePair) {
+    if (isLsdLeveraged) {
         return {
-            leveragedType: LeverageType.VolatilePair,
+            leveragedType: 'lsd-leverage',
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: LeverageType.None,
+        leveragedType: '',
         leveragedAsset: '',
     };
 };

package/esm/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -161,14 +161,14 @@ export interface AaveV3AggregatedPositionData {
     totalInterestUsd: string;
     liqRatio: string;
     liqPercent: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
+    leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
     healthRatio?: string;
     minHealthRatio?: string;
-    currentVolatilePairRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

package/esm/types/common.d.ts

@@ -8,13 +8,6 @@ export declare enum IncentiveEligibilityId {
     AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
     AaveV3EthenaLiquidLeveragePlasma = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL"
 }
-export declare enum LeverageType {
-    Long = "long",
-    Short = "short",
-    VolatilePair = "volatile-pair",
-    VolatilePairReverse = "volatile-pair-reverse",
-    None = ""
-}
 export interface IncentiveData {
     token: string;
     apy: string;

package/esm/types/common.js

@@ -10,14 +10,6 @@ export var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
     IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (IncentiveEligibilityId = {}));
-export var LeverageType;
-(function (LeverageType) {
-    LeverageType["Long"] = "long";
-    LeverageType["Short"] = "short";
-    LeverageType["VolatilePair"] = "volatile-pair";
-    LeverageType["VolatilePairReverse"] = "volatile-pair-reverse";
-    LeverageType["None"] = "";
-})(LeverageType || (LeverageType = {}));
 export var NetworkNumber;
 (function (NetworkNumber) {
     NetworkNumber[NetworkNumber["Eth"] = 1] = "Eth";

package/esm/types/compound.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { EthAddress, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum CompoundVersions {
     'CompoundV2' = "v2",
     'CompoundV3USDC' = "v3-USDC",
@@ -94,9 +94,9 @@ export interface CompoundAggregatedPositionData {
     totalInterestUsd: string;
     liqRatio: string;
     liqPercent: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
-    currentVolatilePairRatio?: string;
+    leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
     minRatio: string;
     debtTooLow: boolean;

package/esm/types/curveUsd.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, LeverageType, NetworkNumber } from './common';
+import { EthAddress, NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
     'crvUSDwstETH' = "wstETH",
     'crvUSDWBTC' = "WBTC",
@@ -71,7 +71,7 @@ export interface CrvUSDAggregatedPositionData {
     borrowLimitUsd: string;
     minAllowedRatio: number;
     collFactor: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }

package/esm/types/euler.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, MMPositionData, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, MMPositionData, NetworkNumber } from './common';
 export declare enum EulerV2Versions {
     eUSDC2 = "eUSDC-2",
     eWETH2 = "eWETH-2"
@@ -141,9 +141,9 @@ export interface EulerV2AggregatedPositionData {
     totalInterestUsd: string;
     liqRatio: string;
     liqPercent: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
-    currentVolatilePairRatio?: string;
+    leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;

package/esm/types/fluid.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
 export interface FluidMarketInfo {
     chainIds: number[];
     label: string;
@@ -323,10 +323,10 @@ export interface FluidAggregatedVaultData {
     collRatio: string;
     minRatio: string;
     totalInterestUsd: string;
-    leveragedType?: LeverageType;
+    leveragedType?: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
-    currentVolatilePairRatio?: string;
+    leveragedLsdAssetRatio?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
 }

package/esm/types/fluid.js

@@ -1,4 +1,4 @@
-import { NetworkNumber, } from './common';
+import { NetworkNumber } from './common';
 export var FluidMainnetVersion;
 (function (FluidMainnetVersion) {
     FluidMainnetVersion["FLUID_ETH_USDC_1"] = "FLUID_ETH_USDC_1";

package/esm/types/liquityV2.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
 export declare enum LiquityV2Versions {
     LiquityV2Eth = "liquityv2eth",
     LiquityV2WstEth = "liquityv2wsteth",
@@ -88,7 +88,7 @@ export interface LiquityV2AggregatedTroveData {
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset: string;
     liquidationPrice: string;
     ratio: string;
@@ -110,7 +110,7 @@ export interface LiquityV2TroveData {
     totalInterestUsd: string;
     interestBatchManager: EthAddress;
     troveStatus: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset: string;
     liquidationPrice: string;
     debtInFront: string;

package/esm/types/llamaLend.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
 import { BandData, UserBandData } from './curveUsd';
 export declare enum LLVersionsEth {
     LLWstethCrvusd = "llamaLendwstETHcrvUSD",
@@ -112,7 +112,7 @@ export interface LlamaLendAggregatedPositionData {
     borrowLimitUsd: string;
     minAllowedRatio: number;
     collFactor: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
     netApy: string;