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

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -35,3 +35,5 @@ Object.defineProperty(exports, "getFluidVersionsDataForNetwork", { enumerable: t
 Object.defineProperty(exports, "getFluidMarketInfoById", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoById; } });
 Object.defineProperty(exports, "getFTokenAddress", { enumerable: true, get: function () { return fluid_1.getFTokenAddress; } });
 Object.defineProperty(exports, "getFluidMarketInfoByAddress", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoByAddress; } });
+var aaveV4_1 = require("./aaveV4");
+Object.defineProperty(exports, "AaveV4Spokes", { enumerable: true, get: function () { return aaveV4_1.AaveV4Spokes; } });

package/cjs/moneymarket/moneymarketCommonService.d.ts

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

package/cjs/moneymarket/moneymarketCommonService.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aprToApy = exports.isLeveragedPos = exports.STABLE_ASSETS = exports.calculateBorrowingAssetLimit = exports.calcLeverageLiqPrice = exports.calcShortLiqPrice = exports.calcLongLiqPrice = exports.getAssetsTotal = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const constants_1 = require("../constants");
+const common_1 = require("../types/common");
 const getAssetsTotal = (assets, filter, transform) => Object.values(assets)
     .filter(filter)
     .map(transform)
@@ -17,9 +18,9 @@ exports.calcLongLiqPrice = calcLongLiqPrice;
 const calcShortLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => new decimal_js_1.default(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
 exports.calcShortLiqPrice = calcShortLiqPrice;
 const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
-    if (leverageType === 'short')
+    if (leverageType === common_1.LeverageType.Short || leverageType === common_1.LeverageType.VolatilePairReverse)
         return (0, exports.calcShortLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === 'long' || leverageType === 'lsd-leverage')
+    if (leverageType === common_1.LeverageType.Long || leverageType === common_1.LeverageType.VolatilePair)
         return (0, exports.calcLongLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -58,28 +59,27 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     });
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-    // lsd -> liquid staking derivative
-    const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
+    const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
-            leveragedType: 'long',
+            leveragedType: common_1.LeverageType.Long,
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: 'short',
+            leveragedType: common_1.LeverageType.Short,
             leveragedAsset: shortAsset,
         };
     }
-    if (isLsdLeveraged) {
+    if (isVolatilePair) {
         return {
-            leveragedType: 'lsd-leverage',
+            leveragedType: common_1.LeverageType.VolatilePair,
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: '',
+        leveragedType: common_1.LeverageType.None,
         leveragedAsset: '',
     };
 };

package/cjs/portfolio/index.js

@@ -40,6 +40,7 @@ const spark_2 = require("../claiming/spark");
 const morphoBlue_2 = require("../claiming/morphoBlue");
 const king_1 = require("../claiming/king");
 const ethena_1 = require("../claiming/ethena");
+const aaveV4_1 = require("../aaveV4");
 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 === common_1.NetworkNumber.Eth;
@@ -56,6 +57,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
         const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
         const liquityV2MarketsStaking = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)).filter(market => !market.isLegacy) : [];
+        const aaveV4Spokes = Object.values((0, markets_1.AaveV4Spokes)(network)).filter((market) => market.chainIds.includes(network));
         const args = [network, { batch: { multicall: { batchSize: isSim ? 500000 : 2500000 } } }];
         const client = (0, viem_1.getViemProvider)(provider, ...args);
         const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
@@ -70,6 +72,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
         const liquityV2MarketsData = {};
+        const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
             compoundV3MarketsData,
@@ -81,6 +84,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
             crvUsdMarketsData,
             llamaLendMarketsData,
             liquityV2MarketsData,
+            aaveV4SpokesData,
         };
         const positions = {};
         const stakingPositions = {};
@@ -89,6 +93,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
                 aaveV3: {},
+                aaveV4: {},
                 morphoBlue: {},
                 compoundV3: {},
                 spark: {},
@@ -154,6 +159,10 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                 const marketData = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, market);
                 aaveV3MarketsData[market.value] = marketData;
             })),
+            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
+                const spokeData = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke);
+                aaveV4SpokesData[spoke.value] = spokeData;
+            })),
             ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
                 aaveV2MarketsData[market.value] = marketData;
@@ -423,6 +432,17 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     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 (0, aaveV4_1._getAaveV4AccountData)(client, network, aaveV4SpokesData[spoke.value], address);
+                    if (new decimal_js_1.default(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/cjs/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/cjs/types/aaveV4.d.ts

@@ -0,0 +1,139 @@
+import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common';
+export declare enum AaveV4SpokesType {
+    AaveV4CoreSpoke = "aave_v4_core_spoke",
+    AaveV4YieldSeekingSpoke = "aave_v4_yield_seeking_spoke"
+}
+export declare enum AaveV4HubsType {
+    AaveV4CoreHub = "aave_v4_core_hub",
+    AaveV4YieldSeekingHub = "aave_v4_yield_seeking_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/cjs/types/aaveV4.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AaveV4HubsType = exports.AaveV4SpokesType = void 0;
+var AaveV4SpokesType;
+(function (AaveV4SpokesType) {
+    AaveV4SpokesType["AaveV4CoreSpoke"] = "aave_v4_core_spoke";
+    AaveV4SpokesType["AaveV4YieldSeekingSpoke"] = "aave_v4_yield_seeking_spoke";
+})(AaveV4SpokesType || (exports.AaveV4SpokesType = AaveV4SpokesType = {}));
+var AaveV4HubsType;
+(function (AaveV4HubsType) {
+    AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
+    AaveV4HubsType["AaveV4YieldSeekingHub"] = "aave_v4_yield_seeking_hub";
+})(AaveV4HubsType || (exports.AaveV4HubsType = AaveV4HubsType = {}));

package/cjs/types/common.d.ts

@@ -3,11 +3,18 @@ export declare enum IncentiveKind {
     Reward = "reward"
 }
 export declare enum IncentiveEligibilityId {
-    AaveV3EthenaLiquidLeverage = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL",
+    AaveV3EthenaLiquidLeverage = "0x8014e0076e5393e62c49a7134070d8fccc922e46BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
     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/cjs/types/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkNumber = exports.IncentiveEligibilityId = exports.IncentiveKind = void 0;
+exports.NetworkNumber = exports.LeverageType = exports.IncentiveEligibilityId = exports.IncentiveKind = void 0;
 var IncentiveKind;
 (function (IncentiveKind) {
     IncentiveKind["Staking"] = "staking";
@@ -8,11 +8,19 @@ var IncentiveKind;
 })(IncentiveKind || (exports.IncentiveKind = IncentiveKind = {}));
 var IncentiveEligibilityId;
 (function (IncentiveEligibilityId) {
-    IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL";
+    IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x8014e0076e5393e62c49a7134070d8fccc922e46BORROW_BL";
     IncentiveEligibilityId["AaveV3ArbitrumEthSupply"] = "0x5d16261c6715a653248269861bbacf68a9774cde";
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
     IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (exports.IncentiveEligibilityId = IncentiveEligibilityId = {}));
+var LeverageType;
+(function (LeverageType) {
+    LeverageType["Long"] = "long";
+    LeverageType["Short"] = "short";
+    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, 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/cjs/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/cjs/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/cjs/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/cjs/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/cjs/types/index.js

@@ -29,3 +29,5 @@ __exportStar(require("./portfolio"), exports);
 __exportStar(require("./merit"), exports);
 __exportStar(require("./merkl"), exports);
 __exportStar(require("./savings"), exports);
+__exportStar(require("./common"), exports);
+__exportStar(require("./aaveV4"), exports);

package/cjs/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/cjs/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/cjs/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/cjs/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;

package/cjs/types/spark.d.ts

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

package/esm/aaveV4/index.d.ts

@@ -0,0 +1,7 @@
+import { Client } from 'viem';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo } from '../types';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
+export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
+export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;
+export declare function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;