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

package/cjs/fluid/index.d.ts

@@ -133,7 +133,7 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;
@@ -164,7 +164,7 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;
@@ -195,7 +195,7 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;

package/cjs/helpers/aaveHelpers/index.js

@@ -104,11 +104,6 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.liquidationPrice = '';
     if (leveragedType !== '') {
         let assetPrice = data.assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
-            // Treat ETH like a stablecoin in a long stETH position
-            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
-        }
         if (leveragedType === common_1.LeverageType.VolatilePair) {
             const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
             const borrowedAssetPrice = data.assetsData[borrowedAsset.symbol].price;

package/cjs/helpers/compoundHelpers/index.js

@@ -150,28 +150,25 @@ const getCompoundV3AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
-            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toString();
-            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        if (leveragedType === common_1.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 decimal_js_1.default(leveragedAssetPrice).lt(borrowedAssetPrice);
+            if (isReverse) {
+                payload.leveragedType = common_1.LeverageType.VolatilePairReverse;
+                payload.currentVolatilePairRatio = new decimal_js_1.default(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+                assetPrice = new decimal_js_1.default(borrowedAssetPrice).div(assetPrice).toString();
+            }
+            else {
+                assetPrice = new decimal_js_1.default(assetPrice).div(borrowedAssetPrice).toString();
+                payload.currentVolatilePairRatio = new decimal_js_1.default(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+            }
         }
-        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(payload.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 })
-      : []; */
-    // 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;
 };
 exports.getCompoundV3AggregatedData = getCompoundV3AggregatedData;

package/cjs/helpers/eulerHelpers/index.js

@@ -60,8 +60,7 @@ 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;
-    // lsd -> liquid staking derivative
-    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
+    const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
             leveragedType: common_1.LeverageType.Long,
@@ -76,9 +75,9 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
             leveragedVault: leverageAssetVault,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: common_1.LeverageType.LsdLeverage,
+            leveragedType: common_1.LeverageType.VolatilePair,
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
@@ -114,14 +113,22 @@ const getEulerV2AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
-            const ethAsset = Object.values(assetsData).find((asset) => ['WETH', 'ETH'].includes(asset.symbol));
-            if (ethAsset) {
-                payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedVault.toLowerCase()].price).div(ethAsset.price).toString();
-                assetPrice = new decimal_js_1.default(assetPrice).div(ethAsset.price).toString();
+        if (leveragedType === common_1.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 decimal_js_1.default(leveragedAssetPrice).lt(borrowedAssetPrice);
+            if (isReverse) {
+                payload.leveragedType = common_1.LeverageType.VolatilePairReverse;
+                payload.currentVolatilePairRatio = new decimal_js_1.default(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+                assetPrice = new decimal_js_1.default(borrowedAssetPrice).div(assetPrice).toString();
+            }
+            else {
+                assetPrice = new decimal_js_1.default(assetPrice).div(borrowedAssetPrice).toString();
+                payload.currentVolatilePairRatio = new decimal_js_1.default(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
             }
         }
-        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(payload.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();

package/cjs/helpers/fluidHelpers/index.js

@@ -56,12 +56,22 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
-            // Treat ETH like a stablecoin in a long stETH position
-            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        if (leveragedType === common_1.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 decimal_js_1.default(leveragedAssetPrice).lt(borrowedAssetPrice);
+            if (isReverse) {
+                payload.leveragedType = common_1.LeverageType.VolatilePairReverse;
+                payload.currentVolatilePairRatio = new decimal_js_1.default(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+                assetPrice = new decimal_js_1.default(borrowedAssetPrice).div(assetPrice).toString();
+            }
+            else {
+                assetPrice = new decimal_js_1.default(assetPrice).div(borrowedAssetPrice).toString();
+                payload.currentVolatilePairRatio = new decimal_js_1.default(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+            }
         }
-        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(payload.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();

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -51,12 +51,22 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInf
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
-            // Treat ETH like a stablecoin in a long stETH position
-            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        if (leveragedType === common_1.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 decimal_js_1.default(leveragedAssetPrice).lt(borrowedAssetPrice);
+            if (isReverse) {
+                payload.leveragedType = common_1.LeverageType.VolatilePairReverse;
+                payload.currentVolatilePairRatio = new decimal_js_1.default(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+                assetPrice = new decimal_js_1.default(borrowedAssetPrice).div(assetPrice).toString();
+            }
+            else {
+                assetPrice = new decimal_js_1.default(assetPrice).div(borrowedAssetPrice).toString();
+                payload.currentVolatilePairRatio = new decimal_js_1.default(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+            }
         }
-        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(payload.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();

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

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

package/cjs/helpers/sparkHelpers/index.js

@@ -92,12 +92,22 @@ const sparkGetAggregatedPositionData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
-            // Treat ETH like a stablecoin in a long stETH position
-            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        if (leveragedType === common_1.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 decimal_js_1.default(leveragedAssetPrice).lt(borrowedAssetPrice);
+            if (isReverse) {
+                payload.leveragedType = common_1.LeverageType.VolatilePairReverse;
+                payload.currentVolatilePairRatio = new decimal_js_1.default(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+                assetPrice = new decimal_js_1.default(borrowedAssetPrice).div(assetPrice).toString();
+            }
+            else {
+                assetPrice = new decimal_js_1.default(assetPrice).div(borrowedAssetPrice).toString();
+                payload.currentVolatilePairRatio = new decimal_js_1.default(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+            }
         }
-        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(payload.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();

package/cjs/moneymarket/moneymarketCommonService.js

@@ -20,7 +20,7 @@ exports.calcShortLiqPrice = calcShortLiqPrice;
 const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
     if (leverageType === common_1.LeverageType.Short || leverageType === common_1.LeverageType.VolatilePairReverse)
         return (0, exports.calcShortLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === common_1.LeverageType.Long || leverageType === common_1.LeverageType.LsdLeverage || leverageType === common_1.LeverageType.VolatilePair)
+    if (leverageType === common_1.LeverageType.Long || leverageType === common_1.LeverageType.VolatilePair)
         return (0, exports.calcLongLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -59,8 +59,6 @@ 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;
-    // lsd -> liquid staking derivative
-    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
@@ -74,12 +72,6 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
             leveragedAsset: shortAsset,
         };
     }
-    if (isLsdLeveraged) {
-        return {
-            leveragedType: common_1.LeverageType.LsdLeverage,
-            leveragedAsset: longAsset,
-        };
-    }
     if (isVolatilePair) {
         return {
             leveragedType: common_1.LeverageType.VolatilePair,

package/cjs/types/aave.d.ts

@@ -163,7 +163,6 @@ export interface AaveV3AggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;

package/cjs/types/common.d.ts

@@ -11,7 +11,6 @@ export declare enum IncentiveEligibilityId {
 export declare enum LeverageType {
     Long = "long",
     Short = "short",
-    LsdLeverage = "lsd-leverage",
     VolatilePair = "volatile-pair",
     VolatilePairReverse = "volatile-pair-reverse",
     None = ""

package/cjs/types/common.js

@@ -17,7 +17,6 @@ var LeverageType;
 (function (LeverageType) {
     LeverageType["Long"] = "long";
     LeverageType["Short"] = "short";
-    LeverageType["LsdLeverage"] = "lsd-leverage";
     LeverageType["VolatilePair"] = "volatile-pair";
     LeverageType["VolatilePairReverse"] = "volatile-pair-reverse";
     LeverageType["None"] = "";

package/cjs/types/compound.d.ts

@@ -96,7 +96,7 @@ export interface CompoundAggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minRatio: string;
     debtTooLow: boolean;

package/cjs/types/euler.d.ts

@@ -143,7 +143,7 @@ export interface EulerV2AggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;

package/cjs/types/fluid.d.ts

@@ -326,7 +326,7 @@ export interface FluidAggregatedVaultData {
     leveragedType?: LeverageType;
     leveragedAsset?: string;
     liquidationPrice?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
 }

package/cjs/types/morphoBlue.d.ts

@@ -123,7 +123,7 @@ export interface MorphoBlueAggregatedPositionData {
     ratio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
@@ -144,7 +144,7 @@ export interface MorphoBluePositionData {
     ratio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     supplyShares: string;
     borrowShares: string;

package/cjs/types/spark.d.ts

@@ -92,7 +92,7 @@ export interface SparkAggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minCollRatio: string;
     collLiquidationRatio: string;

package/esm/fluid/index.d.ts

@@ -133,7 +133,7 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;
@@ -164,7 +164,7 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;
@@ -195,7 +195,7 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;

package/esm/helpers/aaveHelpers/index.js

@@ -90,11 +90,6 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.liquidationPrice = '';
     if (leveragedType !== '') {
         let assetPrice = data.assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
-            // 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();
-        }
         if (leveragedType === LeverageType.VolatilePair) {
             const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
             const borrowedAssetPrice = data.assetsData[borrowedAsset.symbol].price;

package/esm/helpers/compoundHelpers/index.js

@@ -140,28 +140,25 @@ export const getCompoundV3AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
-            payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toString();
-            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+        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();
+            }
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = calcLeverageLiqPrice(payload.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.js

@@ -54,8 +54,7 @@ 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;
-    // lsd -> liquid staking derivative
-    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
+    const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
             leveragedType: LeverageType.Long,
@@ -70,9 +69,9 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
             leveragedVault: leverageAssetVault,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: LeverageType.LsdLeverage,
+            leveragedType: LeverageType.VolatilePair,
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
@@ -107,14 +106,22 @@ export const getEulerV2AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
-            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();
+        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();
             }
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = calcLeverageLiqPrice(payload.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

@@ -50,12 +50,22 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
-            // 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();
+        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();
+            }
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = calcLeverageLiqPrice(payload.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

@@ -45,12 +45,22 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
-            // 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();
+        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();
+            }
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = calcLeverageLiqPrice(payload.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, SparkUsedAssets } from '../../types';
+import { SparkAggregatedPositionData, SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAsset, 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;
-}) => import("../../types").SparkUsedAsset[];
+}) => SparkUsedAsset[];
 export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;

package/esm/helpers/sparkHelpers/index.js

@@ -81,12 +81,22 @@ export const sparkGetAggregatedPositionData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-        if (leveragedType === LeverageType.LsdLeverage) {
-            // 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();
+        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();
+            }
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = calcLeverageLiqPrice(payload.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.js

@@ -11,7 +11,7 @@ export const calcShortLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => ne
 export const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
     if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse)
         return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === LeverageType.Long || leverageType === LeverageType.LsdLeverage || leverageType === LeverageType.VolatilePair)
+    if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair)
         return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -48,8 +48,6 @@ 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;
-    // lsd -> liquid staking derivative
-    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
@@ -63,12 +61,6 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
             leveragedAsset: shortAsset,
         };
     }
-    if (isLsdLeveraged) {
-        return {
-            leveragedType: LeverageType.LsdLeverage,
-            leveragedAsset: longAsset,
-        };
-    }
     if (isVolatilePair) {
         return {
             leveragedType: LeverageType.VolatilePair,

package/esm/types/aave.d.ts

@@ -163,7 +163,6 @@ export interface AaveV3AggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;

package/esm/types/common.d.ts

@@ -11,7 +11,6 @@ export declare enum IncentiveEligibilityId {
 export declare enum LeverageType {
     Long = "long",
     Short = "short",
-    LsdLeverage = "lsd-leverage",
     VolatilePair = "volatile-pair",
     VolatilePairReverse = "volatile-pair-reverse",
     None = ""

package/esm/types/common.js

@@ -14,7 +14,6 @@ export var LeverageType;
 (function (LeverageType) {
     LeverageType["Long"] = "long";
     LeverageType["Short"] = "short";
-    LeverageType["LsdLeverage"] = "lsd-leverage";
     LeverageType["VolatilePair"] = "volatile-pair";
     LeverageType["VolatilePairReverse"] = "volatile-pair-reverse";
     LeverageType["None"] = "";

package/esm/types/compound.d.ts

@@ -96,7 +96,7 @@ export interface CompoundAggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minRatio: string;
     debtTooLow: boolean;

package/esm/types/euler.d.ts

@@ -143,7 +143,7 @@ export interface EulerV2AggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;

package/esm/types/fluid.d.ts

@@ -326,7 +326,7 @@ export interface FluidAggregatedVaultData {
     leveragedType?: LeverageType;
     leveragedAsset?: string;
     liquidationPrice?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
 }

package/esm/types/morphoBlue.d.ts

@@ -123,7 +123,7 @@ export interface MorphoBlueAggregatedPositionData {
     ratio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
@@ -144,7 +144,7 @@ export interface MorphoBluePositionData {
     ratio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     supplyShares: string;
     borrowShares: string;

package/esm/types/spark.d.ts

@@ -92,7 +92,7 @@ export interface SparkAggregatedPositionData {
     liqPercent: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
+    currentVolatilePairRatio?: string;
     liquidationPrice?: string;
     minCollRatio: string;
     collLiquidationRatio: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.52-dev-2",
+  "version": "2.1.52-dev-3",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/helpers/aaveHelpers/index.ts

@@ -117,11 +117,6 @@ export const aaveAnyGetAggregatedPositionData = ({
   payload.liquidationPrice = '';
   if (leveragedType !== '') {
     let assetPrice = data.assetsData[leveragedAsset].price;
-    if (leveragedType === LeverageType.LsdLeverage) {
-      // 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();
-    }
     if (leveragedType === LeverageType.VolatilePair) {
       const borrowedAsset = (Object.values(usedAssets) as AaveV3UsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
       const borrowedAssetPrice = data.assetsData[borrowedAsset!.symbol].price;

package/src/helpers/compoundHelpers/index.ts

@@ -1,7 +1,7 @@
 import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import {
-  BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarketData, CompoundV2AssetsData, CompoundV2UsedAssets, CompoundV3AssetData, CompoundV3AssetsData, CompoundV3UsedAssets, CompoundVersions,
+  BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarketData, CompoundV2AssetsData, CompoundV2UsedAssets, CompoundV3AssetData, CompoundV3AssetsData, CompoundV3UsedAsset, CompoundV3UsedAssets, CompoundVersions,
 } from '../../types';
 import {
   addToArrayIf, getEthAmountForDecimals, handleWbtcLegacy, wethToEth,
@@ -189,32 +189,25 @@ export const getCompoundV3AggregatedData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === LeverageType.LsdLeverage) {
-      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toString();
-      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as CompoundV3UsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +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();
+      }
     }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.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;
 };
 

package/src/helpers/eulerHelpers/index.ts

@@ -10,6 +10,7 @@ import { calculateNetApy } from '../../staking';
 import {
   EulerV2AggregatedPositionData,
   EulerV2AssetsData,
+  EulerV2UsedAsset,
   EulerV2UsedAssets,
 } from '../../types';
 import { EulerV2ViewContractViem } from '../../contracts';
@@ -44,8 +45,7 @@ export const isLeveragedPos = (usedAssets: EulerV2UsedAssets, dustLimit = 5) =>
   });
   const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
   const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-  // lsd -> liquid staking derivative
-  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
+  const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
   if (isLong) {
     return {
       leveragedType: LeverageType.Long,
@@ -60,9 +60,9 @@ export const isLeveragedPos = (usedAssets: EulerV2UsedAssets, dustLimit = 5) =>
       leveragedVault: leverageAssetVault,
     };
   }
-  if (isLsdLeveraged) {
+  if (isVolatilePair) {
     return {
-      leveragedType: LeverageType.LsdLeverage,
+      leveragedType: LeverageType.VolatilePair,
       leveragedAsset: longAsset,
       leveragedVault: leverageAssetVault,
     };
@@ -99,14 +99,21 @@ export const getEulerV2AggregatedData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-    if (leveragedType === LeverageType.LsdLeverage) {
-      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();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as EulerV2UsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +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();
       }
     }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.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/src/helpers/fluidHelpers/index.ts

@@ -84,12 +84,21 @@ borrowShares?: string,
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === LeverageType.LsdLeverage) {
-      // 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();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as FluidUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +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();
+      }
     }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
 
   payload.minCollRatio = new Dec(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();

package/src/helpers/morphoBlueHelpers/index.ts

@@ -5,7 +5,7 @@ import {
 } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import {
-  EthereumProvider, LeverageType, MMAssetsData, MMUsedAssets, NetworkNumber,
+  EthereumProvider, LeverageType, MMAssetsData, MMUsedAsset, MMUsedAssets, NetworkNumber,
 } from '../../types/common';
 import {
   MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo,
@@ -58,12 +58,21 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === LeverageType.LsdLeverage) {
-      // 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();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as MMUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +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();
+      }
     }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.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/src/helpers/sparkHelpers/index.ts

@@ -5,7 +5,7 @@ import {
 } from '../../moneymarket';
 import {
   SparkAggregatedPositionData,
-  SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAssets,
+  SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAsset, SparkUsedAssets,
 } from '../../types';
 import { calculateNetApy } from '../../staking';
 import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
@@ -107,12 +107,21 @@ export const sparkGetAggregatedPositionData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-    if (leveragedType === LeverageType.LsdLeverage) {
-      // 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();
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as SparkUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +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();
+      }
     }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.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/src/moneymarket/moneymarketCommonService.ts

@@ -13,7 +13,7 @@ export const calcShortLiqPrice = (assetPrice: string, borrowedUsd: string, borro
 
 export const calcLeverageLiqPrice = (leverageType: LeverageType, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
   if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse) return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-  if (leverageType === LeverageType.Long || leverageType === LeverageType.LsdLeverage || leverageType === LeverageType.VolatilePair) return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+  if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair) return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
   console.error('invalid leverageType', leverageType);
   return '0';
 };
@@ -52,8 +52,6 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   });
   const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
   const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-  // lsd -> liquid staking derivative
-  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
   const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
   if (isLong) {
     return {
@@ -67,12 +65,6 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
       leveragedAsset: shortAsset,
     };
   }
-  if (isLsdLeveraged) {
-    return {
-      leveragedType: LeverageType.LsdLeverage,
-      leveragedAsset: longAsset,
-    };
-  }
   if (isVolatilePair) {
     return {
       leveragedType: LeverageType.VolatilePair,

package/src/types/aave.ts

@@ -180,7 +180,6 @@ export interface AaveV3AggregatedPositionData {
   liqPercent: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,
   minCollRatio?: string,
   collLiquidationRatio?: string,

package/src/types/common.ts

@@ -13,7 +13,6 @@ export enum IncentiveEligibilityId {
 export enum LeverageType {
   Long = 'long',
   Short = 'short',
-  LsdLeverage = 'lsd-leverage',
   VolatilePair = 'volatile-pair',
   VolatilePairReverse = 'volatile-pair-reverse',
   None = '',

package/src/types/compound.ts

@@ -116,7 +116,7 @@ export interface CompoundAggregatedPositionData {
   liqPercent: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   minRatio: string,
   debtTooLow: boolean,

package/src/types/euler.ts

@@ -168,7 +168,7 @@ export interface EulerV2AggregatedPositionData {
   liqPercent: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   minRatio: string,
   minDebt: string,

package/src/types/fluid.ts

@@ -347,7 +347,7 @@ export interface FluidAggregatedVaultData {
   leveragedType?: LeverageType,
   leveragedAsset?: string,
   liquidationPrice?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   minCollRatio?: string,
   collLiquidationRatio?: string,
 }

package/src/types/morphoBlue.ts

@@ -142,7 +142,7 @@ export interface MorphoBlueAggregatedPositionData {
   ratio: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   minCollRatio?: string,
   collLiquidationRatio?: string,
@@ -164,7 +164,7 @@ export interface MorphoBluePositionData {
   ratio: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   supplyShares: string,
   borrowShares: string,

package/src/types/spark.ts

@@ -106,7 +106,7 @@ export interface SparkAggregatedPositionData {
   liqPercent: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
+  currentVolatilePairRatio?: string,
   liquidationPrice?: string,
   minCollRatio: string,
   collLiquidationRatio: string,