@defisaver/positions-sdk 2.1.52 → 2.1.53-aave-v4

package/esm/index.d.ts

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

package/esm/index.js

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

package/esm/markets/aaveV4/index.d.ts

@@ -0,0 +1,13 @@
+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;
+export declare const AAVE_V4_CORE_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
+export declare const AaveV4Hubs: (networkId: NetworkNumber) => {
+    readonly aave_v4_core_hub: AaveV4HubInfo;
+};
+export declare const getAaveV4HubTypeInfo: (type: AaveV4HubsType, network?: NetworkNumber) => AaveV4HubInfo;
+export declare const getAaveV4HubByAddress: (networkId: NetworkNumber, address: string) => AaveV4HubInfo | undefined;

package/esm/markets/aaveV4/index.js

@@ -0,0 +1,29 @@
+import { AaveV4HubsType, AaveV4SpokesType, } from '../../types';
+import { NetworkNumber } from '../../types/common';
+// SPOKES
+export const AAVE_V4_CORE_SPOKE = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Core Spoke',
+    value: AaveV4SpokesType.AaveV4CoreSpoke,
+    url: 'core',
+    address: '0xBa97c5E52cd5BC3D7950Ae70779F8FfE92d40CdC',
+    hubs: [
+        '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+    ],
+});
+export const AaveV4Spokes = (networkId) => ({
+    [AaveV4SpokesType.AaveV4CoreSpoke]: AAVE_V4_CORE_SPOKE(networkId),
+});
+export const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, AaveV4Spokes(network !== null && network !== void 0 ? network : NetworkNumber.Eth))[type]);
+// HUBS
+export const AAVE_V4_CORE_HUB = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Core Hub',
+    value: AaveV4HubsType.AaveV4CoreHub,
+    address: '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+});
+export const AaveV4Hubs = (networkId) => ({
+    [AaveV4HubsType.AaveV4CoreHub]: AAVE_V4_CORE_HUB(networkId),
+});
+export const getAaveV4HubTypeInfo = (type, network) => (Object.assign({}, AaveV4Hubs(network !== null && network !== void 0 ? network : NetworkNumber.Eth))[type]);
+export const getAaveV4HubByAddress = (networkId, address) => Object.values(AaveV4Hubs(networkId)).find(hub => hub.address.toLowerCase() === address.toLowerCase());

package/esm/markets/index.d.ts

@@ -7,3 +7,4 @@ 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,3 +7,4 @@ 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.VolatilePair)
         return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -47,28 +48,27 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     });
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-    // lsd -> liquid staking derivative
-    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
+    const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
-            leveragedType: 'long',
+            leveragedType: LeverageType.Long,
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: 'short',
+            leveragedType: LeverageType.Short,
             leveragedAsset: shortAsset,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: 'lsd-leverage',
+            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, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, 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,6 +34,7 @@ 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;
@@ -50,6 +51,7 @@ 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);
@@ -64,6 +66,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
         const liquityV2MarketsData = {};
+        const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
             compoundV3MarketsData,
@@ -75,6 +78,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             crvUsdMarketsData,
             llamaLendMarketsData,
             liquityV2MarketsData,
+            aaveV4SpokesData,
         };
         const positions = {};
         const stakingPositions = {};
@@ -83,6 +87,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
                 aaveV3: {},
+                aaveV4: {},
                 morphoBlue: {},
                 compoundV3: {},
                 spark: {},
@@ -148,6 +153,10 @@ 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;
@@ -417,6 +426,17 @@ 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,14 +161,14 @@ export interface AaveV3AggregatedPositionData {
     totalInterestUsd: string;
     liqRatio: string;
     liqPercent: string;
-    leveragedType: string;
+    leveragedType: LeverageType;
     leveragedAsset?: string;
-    leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
     minCollRatio?: string;
     collLiquidationRatio?: string;
     healthRatio?: string;
     minHealthRatio?: string;
+    currentVolatilePairRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

package/esm/types/aaveV4.d.ts

@@ -0,0 +1,137 @@
+import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
+export declare enum AaveV4SpokesType {
+    AaveV4CoreSpoke = "aave_v4_core_spoke"
+}
+export declare enum AaveV4HubsType {
+    AaveV4CoreHub = "aave_v4_core_hub"
+}
+export interface AaveV4SpokeInfo {
+    chainIds: NetworkNumber[];
+    label: string;
+    value: AaveV4SpokesType;
+    url: string;
+    address: EthAddress;
+    hubs: EthAddress[];
+}
+export interface AaveV4HubInfo {
+    chainIds: NetworkNumber[];
+    label: string;
+    value: AaveV4HubsType;
+    address: EthAddress;
+}
+export interface AaveV4HubAssetOnChainData {
+    assetId: number;
+    drawnRate: bigint;
+}
+export interface AaveV4HubOnChainData {
+    assets: Record<number, AaveV4HubAssetOnChainData>;
+}
+export interface AaveV4ReserveAssetOnChain {
+    underlying: EthAddress;
+    hub: EthAddress;
+    assetId: number;
+    decimals: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    maxLiquidationBonus: number;
+    liquidationFee: number;
+    price: bigint;
+    totalSupplied: bigint;
+    totalDrawn: bigint;
+    totalPremium: bigint;
+    totalDebt: bigint;
+    supplyCap: bigint;
+    borrowCap: bigint;
+    deficitRay: bigint;
+    spokeActive: boolean;
+    spokePaused: boolean;
+}
+export interface AaveV4ReserveAssetData {
+    symbol: string;
+    underlying: EthAddress;
+    hub: EthAddress;
+    hubName: string;
+    assetId: number;
+    reserveId: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    liquidationFee: number;
+    price: string;
+    totalSupplied: string;
+    totalDrawn: string;
+    totalPremium: string;
+    totalDebt: string;
+    supplyCap: string;
+    borrowCap: string;
+    spokeActive: boolean;
+    spokePaused: boolean;
+    drawnRate: string;
+    supplyRate: string;
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
+    canBeBorrowed: boolean;
+    canBeSupplied: boolean;
+    canBeWithdrawn: boolean;
+    canBePayBacked: boolean;
+    utilization: string;
+}
+export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
+export interface AaveV4SpokeData {
+    assetsData: AaveV4AssetsData;
+    oracle: EthAddress;
+    oracleDecimals: number;
+    address: EthAddress;
+}
+export interface AaveV4UsedReserveAsset {
+    symbol: string;
+    hubName: string;
+    assetId: number;
+    reserveId: number;
+    supplied: string;
+    suppliedUsd: string;
+    drawn: string;
+    drawnUsd: string;
+    premium: string;
+    premiumUsd: string;
+    borrowed: string;
+    borrowedUsd: string;
+    isSupplied: boolean;
+    isBorrowed: boolean;
+    collateral: boolean;
+    collateralFactor: number;
+}
+export interface AaveV4AggregatedPositionData {
+    suppliedUsd: string;
+    suppliedCollateralUsd: string;
+    borrowLimitUsd: string;
+    liquidationLimitUsd: string;
+    borrowedUsd: string;
+    drawnUsd: string;
+    premiumUsd: string;
+    leftToBorrowUsd: string;
+    ratio: string;
+    collRatio: string;
+    liqRatio: string;
+    liqPercent: string;
+    leveragedType: LeverageType;
+    leveragedAsset: string;
+    liquidationPrice: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
+    minHealthRatio: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
+    currentVolatilePairRatio?: string;
+}
+export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
+export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
+    usedAssets: AaveV4UsedReserveAssets;
+    healthFactor: string;
+}

package/esm/types/aaveV4.js

@@ -0,0 +1,8 @@
+export var AaveV4SpokesType;
+(function (AaveV4SpokesType) {
+    AaveV4SpokesType["AaveV4CoreSpoke"] = "aave_v4_core_spoke";
+})(AaveV4SpokesType || (AaveV4SpokesType = {}));
+export var AaveV4HubsType;
+(function (AaveV4HubsType) {
+    AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
+})(AaveV4HubsType || (AaveV4HubsType = {}));

package/esm/types/common.d.ts

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

package/esm/types/common.js

@@ -10,6 +10,14 @@ export var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
     IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (IncentiveEligibilityId = {}));
+export var LeverageType;
+(function (LeverageType) {
+    LeverageType["Long"] = "long";
+    LeverageType["Short"] = "short";
+    LeverageType["VolatilePair"] = "volatile-pair";
+    LeverageType["VolatilePairReverse"] = "volatile-pair-reverse";
+    LeverageType["None"] = "";
+})(LeverageType || (LeverageType = {}));
 export var NetworkNumber;
 (function (NetworkNumber) {
     NetworkNumber[NetworkNumber["Eth"] = 1] = "Eth";

package/esm/types/compound.d.ts

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

package/esm/types/curveUsd.d.ts

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

package/esm/types/euler.d.ts

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

package/esm/types/fluid.d.ts

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

package/esm/types/fluid.js

@@ -1,4 +1,4 @@
-import { NetworkNumber } from './common';
+import { NetworkNumber, } from './common';
 export var FluidMainnetVersion;
 (function (FluidMainnetVersion) {
     FluidMainnetVersion["FLUID_ETH_USDC_1"] = "FLUID_ETH_USDC_1";

package/esm/types/index.d.ts

@@ -13,3 +13,5 @@ export * from './portfolio';
 export * from './merit';
 export * from './merkl';
 export * from './savings';
+export * from './common';
+export * from './aaveV4';

package/esm/types/index.js

@@ -13,3 +13,5 @@ export * from './portfolio';
 export * from './merit';
 export * from './merkl';
 export * from './savings';
+export * from './common';
+export * from './aaveV4';

package/esm/types/liquityV2.d.ts

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

package/esm/types/llamaLend.d.ts

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

package/esm/types/morphoBlue.d.ts

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

package/esm/types/portfolio.d.ts

@@ -1,4 +1,5 @@
 import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
 import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
 import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
@@ -51,6 +52,9 @@ export interface PortfolioPositionsDataForAddress {
             [key: string]: FluidVaultData;
         };
     };
+    aaveV4: {
+        [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
+    };
 }
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;