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

package/esm/contracts.js

@@ -132,4 +132,3 @@ export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');
 export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView');
 export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr');
 export const SkySavingsContractView = createViemContractFromConfigFunc('SkySavings');
-export const AaveV4ViewContractViem = createViemContractFromConfigFunc('AaveV4View');

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?: string;
+        leveragedType?: import("../types/common").LeverageType;
         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?: string;
+        leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
         leveragedLsdAssetRatio?: string;
@@ -192,7 +192,7 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         collRatio: string;
         minRatio: string;
         totalInterestUsd: string;
-        leveragedType?: string;
+        leveragedType?: import("../types/common").LeverageType;
         leveragedAsset?: string;
         liquidationPrice?: string;
         leveragedLsdAssetRatio?: string;

package/esm/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/esm/helpers/aaveHelpers/index.js

@@ -25,6 +25,7 @@ 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];
@@ -89,12 +90,27 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     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();
         }
-        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+        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.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, NetworkNumber, } from '../../types/common';
+import { IncentiveKind, LeverageType, 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 === '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/esm/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/esm/helpers/eulerHelpers/index.js

@@ -20,6 +20,7 @@ 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';
@@ -57,27 +58,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: '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: '',
     };
@@ -106,7 +107,7 @@ export const getEulerV2AggregatedData = (_a) => {
     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/esm/helpers/fluidHelpers/index.js

@@ -3,6 +3,7 @@ import { assetAmountInEth } from '@defisaver/tokens';
 import { FluidVaultType, } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
+import { LeverageType } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
     const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
@@ -49,7 +50,7 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
     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/index.d.ts

@@ -8,4 +8,3 @@ export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';
 export * as fluidHelpers from './fluidHelpers';
-export * as aaveV4Helpers from './aaveV4Helpers';

package/esm/helpers/index.js

@@ -8,4 +8,3 @@ export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';
 export * as fluidHelpers from './fluidHelpers';
-export * as aaveV4Helpers from './aaveV4Helpers';

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();
@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     return { borrowRate, supplyRate };
 });
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

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/index.d.ts

@@ -1,6 +1,5 @@
 import './setup';
 import * as fluid from './fluid';
-import * as aaveV4 from './aaveV4';
 import * as aaveV3 from './aaveV3';
 import * as aaveV2 from './aaveV2';
 import * as compoundV3 from './compoundV3';
@@ -22,4 +21,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -1,6 +1,5 @@
 import './setup';
 import * as fluid from './fluid';
-import * as aaveV4 from './aaveV4';
 import * as aaveV3 from './aaveV3';
 import * as aaveV2 from './aaveV2';
 import * as compoundV3 from './compoundV3';
@@ -22,4 +21,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/markets/index.d.ts

@@ -7,4 +7,3 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
-export { AaveV4Spokes } from './aaveV4';

package/esm/markets/index.js

@@ -7,4 +7,3 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
-export { AaveV4Spokes } from './aaveV4';

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')
+    if (leverageType === LeverageType.Long || leverageType === LeverageType.LsdLeverage || leverageType === LeverageType.VolatilePair)
         return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -49,26 +50,33 @@ export 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: '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: LeverageType.VolatilePair,
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: '',
+        leveragedType: LeverageType.None,
         leveragedAsset: '',
     };
 };

package/esm/portfolio/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
-import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
@@ -34,7 +34,6 @@ import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
 import { getKingRewards } from '../claiming/king';
 import { fetchEthenaAirdropRewards } from '../claiming/ethena';
-import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
 export function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
         const isMainnet = network === NetworkNumber.Eth;
@@ -51,7 +50,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
         const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
         const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
-        const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
         const args = [network, { batch: { multicall: { batchSize: isSim ? 500000 : 2500000 } } }];
         const client = getViemProvider(provider, ...args);
         const defaultClient = getViemProvider(defaultProvider, ...args);
@@ -66,7 +64,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
         const liquityV2MarketsData = {};
-        const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
             compoundV3MarketsData,
@@ -78,7 +75,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             crvUsdMarketsData,
             llamaLendMarketsData,
             liquityV2MarketsData,
-            aaveV4SpokesData,
         };
         const positions = {};
         const stakingPositions = {};
@@ -87,7 +83,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
                 aaveV3: {},
-                aaveV4: {},
                 morphoBlue: {},
                 compoundV3: {},
                 spark: {},
@@ -153,10 +148,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 const marketData = yield _getAaveV3MarketData(client, network, market);
                 aaveV3MarketsData[market.value] = marketData;
             })),
-            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
-                const spokeData = yield _getAaveV4SpokeData(client, network, spoke);
-                aaveV4SpokesData[spoke.value] = spokeData;
-            })),
             ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield _getAaveV2MarketsData(client, network, market);
                 aaveV2MarketsData[market.value] = marketData;
@@ -426,17 +417,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...aaveV4Spokes.map((spoke) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield _getAaveV4AccountData(client, network, aaveV4SpokesData[spoke.value], address);
-                    if (new Dec(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
-                    positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
-                }
-            }))).flat(),
             ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const [accDataPromise, earnDataPromise] = yield Promise.allSettled([

package/esm/savings/morphoVaults/index.js

@@ -14,23 +14,23 @@ import * as morphoVaultsOptions from './options';
 import { getViemProvider } from '../../services/viem';
 import { getMorphoVaultContractViem } from '../../contracts';
 export { morphoVaultsOptions, };
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
-    }
-}
+const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
+vaultByAddress(chainId: 1, address: "${vaultAddress}") {
+    id,
+    dailyApy,
+    dailyApys {
+    apy, netApy
+    },
+    monthlyApys {
+    apy, netApy
+    },
+    liquidity {
+    underlying, usd,
+    },
+    asset {
+    priceUsd
+    }
+}
 }`;
 const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
 export const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {

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;
@@ -169,6 +169,7 @@ export interface AaveV3AggregatedPositionData {
     collLiquidationRatio?: string;
     healthRatio?: string;
     minHealthRatio?: string;
+    currentVolatilePairRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

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;