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

package/cjs/fluid/index.d.ts

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

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

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

package/cjs/helpers/aaveHelpers/index.js

@@ -31,7 +31,6 @@ 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];
@@ -104,27 +103,12 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.liquidationPrice = '';
     if (leveragedType !== '') {
         let assetPrice = data.assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
+        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)(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
     payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
     payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();

package/cjs/helpers/compoundHelpers/index.js

@@ -150,7 +150,7 @@ const getCompoundV3AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
+        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();
         }

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

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

package/cjs/helpers/eulerHelpers/index.js

@@ -26,7 +26,6 @@ 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");
@@ -64,27 +63,27 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
     if (isLong) {
         return {
-            leveragedType: common_1.LeverageType.Long,
+            leveragedType: 'long',
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     if (isShort) {
         return {
-            leveragedType: common_1.LeverageType.Short,
+            leveragedType: 'short',
             leveragedAsset: shortAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     if (isLsdLeveraged) {
         return {
-            leveragedType: common_1.LeverageType.LsdLeverage,
+            leveragedType: 'lsd-leverage',
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     return {
-        leveragedType: common_1.LeverageType.None,
+        leveragedType: '',
         leveragedAsset: '',
         leveragedVault: '',
     };
@@ -114,7 +113,7 @@ const getEulerV2AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
+        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();

package/cjs/helpers/fluidHelpers/index.js

@@ -9,7 +9,6 @@ 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;
@@ -56,7 +55,7 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
+        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();

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -51,7 +51,7 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInf
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
+        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();

package/cjs/helpers/sparkHelpers/index.js

@@ -92,7 +92,7 @@ const sparkGetAggregatedPositionData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-        if (leveragedType === common_1.LeverageType.LsdLeverage) {
+        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();

package/cjs/moneymarket/moneymarketCommonService.d.ts

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

package/cjs/moneymarket/moneymarketCommonService.js

@@ -6,7 +6,6 @@ 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)
@@ -18,9 +17,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 === common_1.LeverageType.Short || leverageType === common_1.LeverageType.VolatilePairReverse)
+    if (leverageType === 'short')
         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 === 'long' || leverageType === 'lsd-leverage')
         return (0, exports.calcLongLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -61,33 +60,26 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     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: common_1.LeverageType.Long,
+            leveragedType: 'long',
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: common_1.LeverageType.Short,
+            leveragedType: 'short',
             leveragedAsset: shortAsset,
         };
     }
     if (isLsdLeveraged) {
         return {
-            leveragedType: common_1.LeverageType.LsdLeverage,
-            leveragedAsset: longAsset,
-        };
-    }
-    if (isVolatilePair) {
-        return {
-            leveragedType: common_1.LeverageType.VolatilePair,
+            leveragedType: 'lsd-leverage',
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: common_1.LeverageType.None,
+        leveragedType: '',
         leveragedAsset: '',
     };
 };

package/cjs/types/aave.d.ts

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

package/cjs/types/common.d.ts

@@ -8,14 +8,6 @@ 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/cjs/types/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkNumber = exports.LeverageType = exports.IncentiveEligibilityId = exports.IncentiveKind = void 0;
+exports.NetworkNumber = exports.IncentiveEligibilityId = exports.IncentiveKind = void 0;
 var IncentiveKind;
 (function (IncentiveKind) {
     IncentiveKind["Staking"] = "staking";
@@ -13,15 +13,6 @@ var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
     IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (exports.IncentiveEligibilityId = IncentiveEligibilityId = {}));
-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 || (exports.LeverageType = LeverageType = {}));
 var NetworkNumber;
 (function (NetworkNumber) {
     NetworkNumber[NetworkNumber["Eth"] = 1] = "Eth";

package/cjs/types/compound.d.ts

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

package/cjs/types/curveUsd.d.ts

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

package/cjs/types/euler.d.ts

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

package/cjs/types/fluid.d.ts

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

package/cjs/types/liquityV2.d.ts

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

package/cjs/types/llamaLend.d.ts

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

package/cjs/types/morphoBlue.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, MMUsedAssets, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, 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: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
@@ -142,7 +142,7 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    leveragedType: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;

package/cjs/types/spark.d.ts

@@ -1,5 +1,5 @@
 import { EModeCategoriesData } from './aave';
-import { EthAddress, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { EthAddress, 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: LeverageType;
+    leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;

package/esm/fluid/index.d.ts

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

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

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

package/esm/helpers/aaveHelpers/index.js

@@ -25,7 +25,6 @@ import { getNativeAssetFromWrapped, getWrappedNativeAssetFromUnwrapped } from '.
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { borrowOperations } from '../../constants';
-import { LeverageType, } from '../../types/common';
 import { AaveLoanInfoV2ContractViem, AaveV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
 export const AAVE_V3_MARKETS = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi];
@@ -90,27 +89,12 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.liquidationPrice = '';
     if (leveragedType !== '') {
         let assetPrice = data.assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
+        if (leveragedType === 'lsd-leverage') {
             // Treat ETH like a stablecoin in a long stETH position
             payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
             assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }
-        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(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
     payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
     payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();

package/esm/helpers/compoundHelpers/index.js

@@ -25,7 +25,7 @@ import { addToArrayIf, getEthAmountForDecimals, handleWbtcLegacy, wethToEth, } f
 import { BLOCKS_IN_A_YEAR, borrowOperations, SECONDS_PER_YEAR } from '../../constants';
 import { aprToApy, calcLeverageLiqPrice, calculateBorrowingAssetLimit, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../../staking';
-import { IncentiveKind, LeverageType, NetworkNumber, } from '../../types/common';
+import { IncentiveKind, NetworkNumber, } from '../../types/common';
 import { CompoundLoanInfoContractViem, CompV3ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
 export const formatMarketData = (data, network, baseAssetPrice) => {
@@ -140,7 +140,7 @@ export const getCompoundV3AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedAsset].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
+        if (leveragedType === 'lsd-leverage') {
             payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toString();
             assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
         }

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

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

package/esm/helpers/eulerHelpers/index.js

@@ -20,7 +20,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import Dec from 'decimal.js';
 import { assetAmountInWei } from '@defisaver/tokens';
-import { LeverageType, } from '../../types/common';
 import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { EulerV2ViewContractViem } from '../../contracts';
@@ -58,27 +57,27 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
     if (isLong) {
         return {
-            leveragedType: LeverageType.Long,
+            leveragedType: 'long',
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     if (isShort) {
         return {
-            leveragedType: LeverageType.Short,
+            leveragedType: 'short',
             leveragedAsset: shortAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     if (isLsdLeveraged) {
         return {
-            leveragedType: LeverageType.LsdLeverage,
+            leveragedType: 'lsd-leverage',
             leveragedAsset: longAsset,
             leveragedVault: leverageAssetVault,
         };
     }
     return {
-        leveragedType: LeverageType.None,
+        leveragedType: '',
         leveragedAsset: '',
         leveragedVault: '',
     };
@@ -107,7 +106,7 @@ export const getEulerV2AggregatedData = (_a) => {
     if (leveragedType !== '') {
         payload.leveragedAsset = leveragedAsset;
         let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-        if (leveragedType === LeverageType.LsdLeverage) {
+        if (leveragedType === 'lsd-leverage') {
             const ethAsset = Object.values(assetsData).find((asset) => ['WETH', 'ETH'].includes(asset.symbol));
             if (ethAsset) {
                 payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedVault.toLowerCase()].price).div(ethAsset.price).toString();