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

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 { NetworkNumber, } from '../../types/common';
+import { LeverageType, 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,7 +45,7 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === 'lsd-leverage') {
+        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();

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 { NetworkNumber } from '../../types/common';
+import { LeverageType, 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,7 +81,7 @@ export const sparkGetAggregatedPositionData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-        if (leveragedType === 'lsd-leverage') {
+        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();

package/esm/moneymarket/moneymarketCommonService.d.ts

@@ -1,12 +1,12 @@
-import { MMUsedAssets } from '../types/common';
+import { LeverageType, 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: string, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => string;
+export declare const calcLeverageLiqPrice: (leverageType: LeverageType, 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: string;
+    leveragedType: LeverageType;
     leveragedAsset: string;
 };
 export declare const aprToApy: (interest: string | number, frequency?: number) => string;

package/esm/moneymarket/moneymarketCommonService.js

@@ -1,5 +1,6 @@
 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)
@@ -8,9 +9,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 === 'short')
+    if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse)
         return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === 'long' || leverageType === 'lsd-leverage' || leverageType === 'volatile-pair')
+    if (leverageType === LeverageType.Long || leverageType === LeverageType.LsdLeverage || leverageType === LeverageType.VolatilePair)
         return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -52,30 +53,30 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
-            leveragedType: 'long',
+            leveragedType: LeverageType.Long,
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: 'short',
+            leveragedType: LeverageType.Short,
             leveragedAsset: shortAsset,
         };
     }
     if (isLsdLeveraged) {
         return {
-            leveragedType: 'lsd-leverage',
+            leveragedType: LeverageType.LsdLeverage,
             leveragedAsset: longAsset,
         };
     }
     if (isVolatilePair) {
         return {
-            leveragedType: 'volatile-pair',
+            leveragedType: LeverageType.VolatilePair,
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: '',
+        leveragedType: LeverageType.None,
         leveragedAsset: '',
     };
 };

package/esm/types/aave.d.ts

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

package/esm/types/common.d.ts

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

package/esm/types/common.js

@@ -10,6 +10,15 @@ export var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
     IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (IncentiveEligibilityId = {}));
+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"] = "";
+})(LeverageType || (LeverageType = {}));
 export var NetworkNumber;
 (function (NetworkNumber) {
     NetworkNumber[NetworkNumber["Eth"] = 1] = "Eth";

package/esm/types/compound.d.ts

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

package/esm/types/curveUsd.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, NetworkNumber } from './common';
+import { EthAddress, LeverageType, 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: string;
+    leveragedType: LeverageType;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }

package/esm/types/euler.d.ts

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

package/esm/types/fluid.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
 export interface FluidMarketInfo {
     chainIds: number[];
     label: string;
@@ -323,7 +323,7 @@ export interface FluidAggregatedVaultData {
     collRatio: string;
     minRatio: string;
     totalInterestUsd: string;
-    leveragedType?: string;
+    leveragedType?: LeverageType;
     leveragedAsset?: string;
     liquidationPrice?: string;
     leveragedLsdAssetRatio?: 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, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, 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: string;
+    leveragedType: LeverageType;
     leveragedAsset: string;
     liquidationPrice: string;
     ratio: string;
@@ -110,7 +110,7 @@ export interface LiquityV2TroveData {
     totalInterestUsd: string;
     interestBatchManager: EthAddress;
     troveStatus: string;
-    leveragedType: string;
+    leveragedType: LeverageType;
     leveragedAsset: string;
     liquidationPrice: string;
     debtInFront: string;

package/esm/types/llamaLend.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, 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: string;
+    leveragedType: LeverageType;
     leveragedAsset?: string;
     liquidationPrice?: string;
     netApy: string;

package/esm/types/morphoBlue.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, MMUsedAssets, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
     MorphoBlueWstEthUSDC = "morphobluewstethusdc",// wstETH/USDC
     MorphoBlueSDAIUSDC = "morphobluesdaiusdc",// sDAI/USDC
@@ -121,7 +121,7 @@ export interface MorphoBlueAggregatedPositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    leveragedType: string;
+    leveragedType: LeverageType;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
@@ -142,7 +142,7 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    leveragedType: string;
+    leveragedType: LeverageType;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;

package/esm/types/spark.d.ts

@@ -1,5 +1,5 @@
 import { EModeCategoriesData } from './aave';
-import { EthAddress, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { EthAddress, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum SparkVersions {
     SparkV1 = "v1default"
 }
@@ -90,7 +90,7 @@ export interface SparkAggregatedPositionData {
     totalInterestUsd: string;
     liqRatio: string;
     liqPercent: string;
-    leveragedType: string;
+    leveragedType: LeverageType;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;

package/package.json

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

package/src/helpers/aaveHelpers/index.ts

@@ -10,7 +10,9 @@ import {
 } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { borrowOperations } from '../../constants';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import {
+  EthAddress, EthereumProvider, LeverageType, NetworkNumber,
+} from '../../types/common';
 import { AaveLoanInfoV2ContractViem, AaveV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
 
@@ -115,18 +117,26 @@ export const aaveAnyGetAggregatedPositionData = ({
   payload.liquidationPrice = '';
   if (leveragedType !== '') {
     let assetPrice = data.assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
+    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 === 'volatile-pair') {
+    if (leveragedType === LeverageType.VolatilePair) {
       const borrowedAsset = (Object.values(usedAssets) as AaveV3UsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
       const borrowedAssetPrice = data.assetsData[borrowedAsset!.symbol].price;
-      assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-      payload.currentVolatilePairRatio = new Dec(assetsData[leveragedAsset].price).div(borrowedAssetPrice).toDP(18).toString();
+      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/helpers/compoundHelpers/index.ts

@@ -12,7 +12,7 @@ import {
 } from '../../moneymarket';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../../staking';
 import {
-  EthAddress, EthereumProvider, IncentiveData, IncentiveKind, NetworkNumber,
+  EthAddress, EthereumProvider, IncentiveData, IncentiveKind, LeverageType, NetworkNumber,
 } from '../../types/common';
 import { CompoundLoanInfoContractViem, CompV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
@@ -189,7 +189,7 @@ export const getCompoundV3AggregatedData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
+    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();
     }

package/src/helpers/eulerHelpers/index.ts

@@ -1,7 +1,7 @@
 import Dec from 'decimal.js';
 import { assetAmountInWei } from '@defisaver/tokens';
 import {
-  EthAddress, EthereumProvider, MMAssetsData, NetworkNumber,
+  EthAddress, EthereumProvider, LeverageType, MMAssetsData, NetworkNumber,
 } from '../../types/common';
 import {
   calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS,
@@ -48,27 +48,27 @@ export const isLeveragedPos = (usedAssets: EulerV2UsedAssets, dustLimit = 5) =>
   const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
   if (isLong) {
     return {
-      leveragedType: 'long',
+      leveragedType: LeverageType.Long,
       leveragedAsset: longAsset,
       leveragedVault: leverageAssetVault,
     };
   }
   if (isShort) {
     return {
-      leveragedType: 'short',
+      leveragedType: LeverageType.Short,
       leveragedAsset: shortAsset,
       leveragedVault: leverageAssetVault,
     };
   }
   if (isLsdLeveraged) {
     return {
-      leveragedType: 'lsd-leverage',
+      leveragedType: LeverageType.LsdLeverage,
       leveragedAsset: longAsset,
       leveragedVault: leverageAssetVault,
     };
   }
   return {
-    leveragedType: '',
+    leveragedType: LeverageType.None,
     leveragedAsset: '',
     leveragedVault: '',
   };
@@ -99,7 +99,7 @@ export const getEulerV2AggregatedData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-    if (leveragedType === 'lsd-leverage') {
+    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();

package/src/helpers/fluidHelpers/index.ts

@@ -9,7 +9,7 @@ import {
 } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-import { MMAssetsData } from '../../types/common';
+import { LeverageType, MMAssetsData } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 
 const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }: { marketData: InnerFluidMarketData, suppliedUsd: string, borrowedUsd: string }) => {
@@ -84,7 +84,7 @@ borrowShares?: string,
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
+    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();

package/src/helpers/morphoBlueHelpers/index.ts

@@ -5,7 +5,7 @@ import {
 } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import {
-  EthereumProvider, MMAssetsData, MMUsedAssets, NetworkNumber,
+  EthereumProvider, LeverageType, MMAssetsData, MMUsedAssets, NetworkNumber,
 } from '../../types/common';
 import {
   MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo,
@@ -58,7 +58,7 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
+    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();

package/src/helpers/sparkHelpers/index.ts

@@ -10,7 +10,9 @@ import {
 import { calculateNetApy } from '../../staking';
 import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
 import { SparkViewContractViem } from '../../contracts';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import {
+  EthAddress, EthereumProvider, LeverageType, NetworkNumber,
+} from '../../types/common';
 import { borrowOperations } from '../../constants';
 import { getViemProvider } from '../../services/viem';
 
@@ -105,7 +107,7 @@ export const sparkGetAggregatedPositionData = ({
   if (leveragedType !== '') {
     payload.leveragedAsset = leveragedAsset;
     let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-    if (leveragedType === 'lsd-leverage') {
+    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();

package/src/moneymarket/moneymarketCommonService.ts

@@ -1,6 +1,6 @@
 import Dec from 'decimal.js';
 import { BLOCKS_IN_A_YEAR } from '../constants';
-import { MMUsedAssets } from '../types/common';
+import { LeverageType, MMUsedAssets } from '../types/common';
 
 export const getAssetsTotal = (assets: object, filter: any, transform: any) => (Object.values(assets) as any)
   .filter(filter)
@@ -11,9 +11,9 @@ export const getAssetsTotal = (assets: object, filter: any, transform: any) => (
 export const calcLongLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).mul(borrowedUsd).div(borrowLimitUsd).toString();
 export const calcShortLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
 
-export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
-  if (leverageType === 'short') return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-  if (leverageType === 'long' || leverageType === 'lsd-leverage' || leverageType === 'volatile-pair') return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+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);
   console.error('invalid leverageType', leverageType);
   return '0';
 };
@@ -57,30 +57,30 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
   if (isLong) {
     return {
-      leveragedType: 'long',
+      leveragedType: LeverageType.Long,
       leveragedAsset: longAsset,
     };
   }
   if (isShort) {
     return {
-      leveragedType: 'short',
+      leveragedType: LeverageType.Short,
       leveragedAsset: shortAsset,
     };
   }
   if (isLsdLeveraged) {
     return {
-      leveragedType: 'lsd-leverage',
+      leveragedType: LeverageType.LsdLeverage,
       leveragedAsset: longAsset,
     };
   }
   if (isVolatilePair) {
     return {
-      leveragedType: 'volatile-pair',
+      leveragedType: LeverageType.VolatilePair,
       leveragedAsset: longAsset,
     };
   }
   return {
-    leveragedType: '',
+    leveragedType: LeverageType.None,
     leveragedAsset: '',
   };
 };

package/src/types/aave.ts

@@ -1,5 +1,6 @@
 import {
   IncentiveData,
+  LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
 } from './common';
 
@@ -177,7 +178,7 @@ export interface AaveV3AggregatedPositionData {
   totalInterestUsd: string,
   liqRatio: string,
   liqPercent: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,

package/src/types/common.ts

@@ -10,6 +10,15 @@ export enum IncentiveEligibilityId {
   AaveV3EthenaLiquidLeveragePlasma = '0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL',
 }
 
+export enum LeverageType {
+  Long = 'long',
+  Short = 'short',
+  LsdLeverage = 'lsd-leverage',
+  VolatilePair = 'volatile-pair',
+  VolatilePairReverse = 'volatile-pair-reverse',
+  None = '',
+}
+
 export interface IncentiveData {
   token: string,
   apy: string,

package/src/types/compound.ts

@@ -1,5 +1,6 @@
 import {
   EthAddress,
+  LeverageType,
   MMAssetData,
   MMPositionData,
   MMUsedAsset,
@@ -113,7 +114,7 @@ export interface CompoundAggregatedPositionData {
   totalInterestUsd: string,
   liqRatio: string,
   liqPercent: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,

package/src/types/curveUsd.ts

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

package/src/types/euler.ts

@@ -1,6 +1,7 @@
 import {
   EthAddress,
   IncentiveData,
+  LeverageType,
   MMPositionData, NetworkNumber,
 } from './common';
 
@@ -165,7 +166,7 @@ export interface EulerV2AggregatedPositionData {
   totalInterestUsd: string,
   liqRatio: string,
   liqPercent: string,
-  leveragedType: string,
+  leveragedType: LeverageType,
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
   liquidationPrice?: string,