@defisaver/positions-sdk 2.1.52-aave-v4 → 2.1.52-aave-v4-1-dev

package/cjs/fluid/index.d.ts

@@ -130,10 +130,10 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         collRatio: string;
         minRatio: string;
         totalInterestUsd: string;
-        leveragedType?: string;
+        leveragedType?: import("../types").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: 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?: string;
+        leveragedType?: import("../types").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: 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?: string;
+        leveragedType?: import("../types").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
-        leveragedLsdAssetRatio?: string;
+        currentVolatilePairRatio?: string;
         minCollRatio?: string;
         collLiquidationRatio?: string;
         owner: string;

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

@@ -1,4 +1,4 @@
-import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAssets, AaveVersions } from '../../types';
+import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, 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;
-}) => import("../../types").AaveV3UsedAsset[];
+}) => AaveV3UsedAsset[];
 export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;

package/cjs/helpers/aaveHelpers/index.js

@@ -31,6 +31,7 @@ const utils_1 = require("../../services/utils");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
 const constants_1 = require("../../constants");
+const common_1 = require("../../types/common");
 const contracts_1 = require("../../contracts");
 const viem_1 = require("../../services/viem");
 exports.AAVE_V3_MARKETS = [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi];
@@ -103,12 +104,22 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.liquidationPrice = '';
     if (leveragedType !== '') {
         let assetPrice = data.assetsData[leveragedAsset].price;
-        if (leveragedType === 'lsd-leverage') {
-            // 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/helpers/aaveV4Helpers/index.d.ts

@@ -1,8 +1,8 @@
 import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets } from '../../types';
-import { NetworkNumber } from '../../types/common';
+import { LeverageType, NetworkNumber } from '../../types/common';
 export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
 export declare const isLeveragedPosAaveV4: (usedAssets: AaveV4UsedReserveAssets, dustLimit?: number) => {
-    leveragedType: string;
+    leveragedType: LeverageType;
     leveragedAsset: string;
 };
 export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, useUserCollateralFactor, }: {

package/cjs/helpers/aaveV4Helpers/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aaveV4GetAggregatedPositionData = exports.isLeveragedPosAaveV4 = exports.aaveV4GetCollateralFactor = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
+const common_1 = require("../../types/common");
 const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
 exports.aaveV4GetCollateralFactor = aaveV4GetCollateralFactor;
 const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
@@ -34,34 +35,32 @@ const isLeveragedPosAaveV4 = (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 {
-            leveragedType: 'long',
+            leveragedType: common_1.LeverageType.Long,
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: 'short',
+            leveragedType: common_1.LeverageType.Short,
             leveragedAsset: shortAsset,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: 'lsd-leverage',
+            leveragedType: common_1.LeverageType.VolatilePair,
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: '',
+        leveragedType: common_1.LeverageType.None,
         leveragedAsset: '',
     };
 };
 exports.isLeveragedPosAaveV4 = isLeveragedPosAaveV4;
 const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useUserCollateralFactor = false, }) => {
-    var _a;
     const payload = {};
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
@@ -83,13 +82,22 @@ const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useU
     if (leveragedType !== '') {
         const leveragedAssetData = assetsData[leveragedAsset];
         let assetPrice = (leveragedAssetData === null || leveragedAssetData === void 0 ? void 0 : leveragedAssetData.price) || '0';
-        if (leveragedType === 'lsd-leverage') {
-            // Treat ETH like a stablecoin in a long stETH position
-            const ethPrice = ((_a = Object.values(assetsData).find((asset) => asset.symbol === 'ETH')) === null || _a === void 0 ? void 0 : _a.price) || '0';
-            payload.leveragedLsdAssetRatio = new decimal_js_1.default((leveragedAssetData === null || leveragedAssetData === void 0 ? void 0 : leveragedAssetData.price) || '0').div(ethPrice).toDP(18).toString();
-            assetPrice = new decimal_js_1.default(assetPrice).div(ethPrice).toString();
+        if (leveragedType === common_1.LeverageType.VolatilePair) {
+            const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
+            const borrowedAssetPrice = assetsData[`${borrowedAsset.symbol}-${borrowedAsset.reserveId}`].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/compoundHelpers/index.js

@@ -150,28 +150,25 @@ const getCompoundV3AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === 'lsd-leverage') {
-            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.d.ts

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

package/cjs/helpers/eulerHelpers/index.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEulerV2SubAccounts = exports.getApyAfterValuesEstimationEulerV2 = exports.getEulerV2SupplyRate = exports.getUtilizationRate = exports.getEulerV2BorrowRate = exports.getEulerV2AggregatedData = exports.isLeveragedPos = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
+const common_1 = require("../../types/common");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
 const contracts_1 = require("../../contracts");
@@ -59,31 +60,30 @@ 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: 'long',
+            leveragedType: common_1.LeverageType.Long,
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     if (isShort) {
         return {
-            leveragedType: 'short',
+            leveragedType: common_1.LeverageType.Short,
             leveragedAsset: shortAsset,
             leveragedVault: leverageAssetVault,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: 'lsd-leverage',
+            leveragedType: common_1.LeverageType.VolatilePair,
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     return {
-        leveragedType: '',
+        leveragedType: common_1.LeverageType.None,
         leveragedAsset: '',
         leveragedVault: '',
     };
@@ -113,14 +113,22 @@ const getEulerV2AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-        if (leveragedType === 'lsd-leverage') {
-            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

@@ -9,6 +9,7 @@ const tokens_1 = require("@defisaver/tokens");
 const types_1 = require("../../types");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
+const common_1 = require("../../types/common");
 const utils_1 = require("../../services/utils");
 const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
     const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
@@ -55,12 +56,22 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === 'lsd-leverage') {
-            // 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 === 'lsd-leverage') {
-            // 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 === 'lsd-leverage') {
-            // 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/markets/aaveV4/index.d.ts

@@ -1,13 +1,16 @@
-import { AaveV4HubInfo, AaveV4HubsType, AaveV4SpokeInfo, AaveV4SpokesType } from '../../types';
-import { NetworkNumber } from '../../types/common';
-export declare const AAVE_V4_CORE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
-export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
-    readonly aave_v4_core_spoke: AaveV4SpokeInfo;
-};
-export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;
+import { AaveV4HubInfo, AaveV4HubsType, AaveV4SpokeInfo, AaveV4SpokesType, NetworkNumber } from '../../types';
 export declare const AAVE_V4_CORE_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
+export declare const AAVE_V4_YIELD_SEEKING_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AaveV4Hubs: (networkId: NetworkNumber) => {
     readonly aave_v4_core_hub: AaveV4HubInfo;
+    readonly aave_v4_yield_seeking_hub: AaveV4HubInfo;
 };
 export declare const getAaveV4HubTypeInfo: (type: AaveV4HubsType, network?: NetworkNumber) => AaveV4HubInfo;
 export declare const getAaveV4HubByAddress: (networkId: NetworkNumber, address: string) => AaveV4HubInfo | undefined;
+export declare const AAVE_V4_CORE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
+export declare const AAVE_V4_YIELD_SEEKING_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
+export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
+    readonly aave_v4_core_spoke: AaveV4SpokeInfo;
+    readonly aave_v4_yield_seeking_spoke: AaveV4SpokeInfo;
+};
+export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;

package/cjs/markets/aaveV4/index.js

@@ -1,39 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV4HubByAddress = exports.getAaveV4HubTypeInfo = exports.AaveV4Hubs = exports.AAVE_V4_CORE_HUB = exports.getAaveV4SpokeTypeInfo = exports.AaveV4Spokes = exports.AAVE_V4_CORE_SPOKE = void 0;
+exports.getAaveV4SpokeTypeInfo = exports.AaveV4Spokes = exports.AAVE_V4_YIELD_SEEKING_SPOKE = exports.AAVE_V4_CORE_SPOKE = exports.getAaveV4HubByAddress = exports.getAaveV4HubTypeInfo = exports.AaveV4Hubs = exports.AAVE_V4_YIELD_SEEKING_HUB = exports.AAVE_V4_CORE_HUB = void 0;
 const types_1 = require("../../types");
-const common_1 = require("../../types/common");
+// HUBS
+const AAVE_V4_CORE_HUB = (networkId) => ({
+    chainIds: [types_1.NetworkNumber.Eth],
+    label: 'Core Hub',
+    value: types_1.AaveV4HubsType.AaveV4CoreHub,
+    address: '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+});
+exports.AAVE_V4_CORE_HUB = AAVE_V4_CORE_HUB;
+const AAVE_V4_YIELD_SEEKING_HUB = (networkId) => ({
+    chainIds: [types_1.NetworkNumber.Eth],
+    label: 'Yield Seeking Hub',
+    value: types_1.AaveV4HubsType.AaveV4YieldSeekingHub,
+    address: '0x86F37ba3b480c5fE22A7eb1ba2B2D49c94089FBB',
+});
+exports.AAVE_V4_YIELD_SEEKING_HUB = AAVE_V4_YIELD_SEEKING_HUB;
+const AaveV4Hubs = (networkId) => ({
+    [types_1.AaveV4HubsType.AaveV4CoreHub]: (0, exports.AAVE_V4_CORE_HUB)(networkId),
+    [types_1.AaveV4HubsType.AaveV4YieldSeekingHub]: (0, exports.AAVE_V4_YIELD_SEEKING_HUB)(networkId),
+});
+exports.AaveV4Hubs = AaveV4Hubs;
+const getAaveV4HubTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Hubs)(network !== null && network !== void 0 ? network : types_1.NetworkNumber.Eth))[type]);
+exports.getAaveV4HubTypeInfo = getAaveV4HubTypeInfo;
+const getAaveV4HubByAddress = (networkId, address) => Object.values((0, exports.AaveV4Hubs)(networkId)).find(hub => hub.address.toLowerCase() === address.toLowerCase());
+exports.getAaveV4HubByAddress = getAaveV4HubByAddress;
 // SPOKES
 const AAVE_V4_CORE_SPOKE = (networkId) => ({
-    chainIds: [common_1.NetworkNumber.Eth],
+    chainIds: [types_1.NetworkNumber.Eth],
     label: 'Core Spoke',
     value: types_1.AaveV4SpokesType.AaveV4CoreSpoke,
     url: 'core',
     address: '0xBa97c5E52cd5BC3D7950Ae70779F8FfE92d40CdC',
     hubs: [
-        '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+        (0, exports.AAVE_V4_CORE_HUB)(types_1.NetworkNumber.Eth).address,
     ],
 });
 exports.AAVE_V4_CORE_SPOKE = AAVE_V4_CORE_SPOKE;
+const AAVE_V4_YIELD_SEEKING_SPOKE = (networkId) => ({
+    chainIds: [types_1.NetworkNumber.Eth],
+    label: 'Yield Seeking Spoke',
+    value: types_1.AaveV4SpokesType.AaveV4YieldSeekingSpoke,
+    url: 'yield-seeking',
+    address: '0x2559e4e04f2ca7180e5f20c2872d22ec89601b56',
+    hubs: [
+        (0, exports.AAVE_V4_CORE_HUB)(types_1.NetworkNumber.Eth).address,
+        (0, exports.AAVE_V4_YIELD_SEEKING_HUB)(types_1.NetworkNumber.Eth).address,
+    ],
+});
+exports.AAVE_V4_YIELD_SEEKING_SPOKE = AAVE_V4_YIELD_SEEKING_SPOKE;
 const AaveV4Spokes = (networkId) => ({
     [types_1.AaveV4SpokesType.AaveV4CoreSpoke]: (0, exports.AAVE_V4_CORE_SPOKE)(networkId),
+    [types_1.AaveV4SpokesType.AaveV4YieldSeekingSpoke]: (0, exports.AAVE_V4_YIELD_SEEKING_SPOKE)(networkId),
 });
 exports.AaveV4Spokes = AaveV4Spokes;
-const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Spokes)(network !== null && network !== void 0 ? network : common_1.NetworkNumber.Eth))[type]);
+const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Spokes)(network !== null && network !== void 0 ? network : types_1.NetworkNumber.Eth))[type]);
 exports.getAaveV4SpokeTypeInfo = getAaveV4SpokeTypeInfo;
-// HUBS
-const AAVE_V4_CORE_HUB = (networkId) => ({
-    chainIds: [common_1.NetworkNumber.Eth],
-    label: 'Core Hub',
-    value: types_1.AaveV4HubsType.AaveV4CoreHub,
-    address: '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
-});
-exports.AAVE_V4_CORE_HUB = AAVE_V4_CORE_HUB;
-const AaveV4Hubs = (networkId) => ({
-    [types_1.AaveV4HubsType.AaveV4CoreHub]: (0, exports.AAVE_V4_CORE_HUB)(networkId),
-});
-exports.AaveV4Hubs = AaveV4Hubs;
-const getAaveV4HubTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Hubs)(network !== null && network !== void 0 ? network : common_1.NetworkNumber.Eth))[type]);
-exports.getAaveV4HubTypeInfo = getAaveV4HubTypeInfo;
-const getAaveV4HubByAddress = (networkId, address) => Object.values((0, exports.AaveV4Hubs)(networkId)).find(hub => hub.address.toLowerCase() === address.toLowerCase());
-exports.getAaveV4HubByAddress = getAaveV4HubByAddress;

package/cjs/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/cjs/moneymarket/moneymarketCommonService.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aprToApy = exports.isLeveragedPos = exports.STABLE_ASSETS = exports.calculateBorrowingAssetLimit = exports.calcLeverageLiqPrice = exports.calcShortLiqPrice = exports.calcLongLiqPrice = exports.getAssetsTotal = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const constants_1 = require("../constants");
+const common_1 = require("../types/common");
 const getAssetsTotal = (assets, filter, transform) => Object.values(assets)
     .filter(filter)
     .map(transform)
@@ -17,9 +18,9 @@ exports.calcLongLiqPrice = calcLongLiqPrice;
 const calcShortLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => new decimal_js_1.default(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
 exports.calcShortLiqPrice = calcShortLiqPrice;
 const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
-    if (leverageType === 'short')
+    if (leverageType === common_1.LeverageType.Short || leverageType === common_1.LeverageType.VolatilePairReverse)
         return (0, exports.calcShortLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === 'long' || leverageType === 'lsd-leverage')
+    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';
@@ -58,28 +59,27 @@ 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 {
-            leveragedType: 'long',
+            leveragedType: common_1.LeverageType.Long,
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: 'short',
+            leveragedType: common_1.LeverageType.Short,
             leveragedAsset: shortAsset,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: 'lsd-leverage',
+            leveragedType: common_1.LeverageType.VolatilePair,
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: '',
+        leveragedType: common_1.LeverageType.None,
         leveragedAsset: '',
     };
 };