@defisaver/positions-sdk 2.1.43-aave-v4-dev-1 → 2.1.43-aave-v4-dev-2

package/cjs/aaveV4/index.d.ts

@@ -1,7 +1,7 @@
 import { Client } from 'viem';
-import { AaveV4SpokeData, AaveV4SpokeInfo } from '../types';
+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, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;
+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>;

package/cjs/aaveV4/index.js

@@ -19,10 +19,13 @@ exports.getAaveV4AccountData = getAaveV4AccountData;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const viem_1 = require("../services/viem");
+const common_1 = require("../types/common");
 const contracts_1 = require("../contracts");
+const staking_1 = require("../staking");
+const utils_1 = require("../services/utils");
+const aaveV4Helpers_1 = require("../helpers/aaveV4Helpers");
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
-    console.log('hubData', hubData);
     return {
         assets: hubData.reduce((acc, assetOnChainData) => {
             acc[assetOnChainData.assetId] = {
@@ -33,10 +36,32 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
         }, {}),
     };
 });
-const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals) => {
-    const assetInfo = (0, tokens_1.getAssetInfoByAddress)(reserveAsset.underlying);
+const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const assetInfo = (0, tokens_1.getAssetInfoByAddress)(reserveAsset.underlying, network);
+    const symbol = (0, utils_1.wethToEth)(assetInfo.symbol);
+    const isStakingAsset = staking_1.STAKING_ASSETS.includes(symbol);
+    const supplyIncentives = [];
+    const borrowIncentives = [];
+    if (isStakingAsset) {
+        const yieldApy = yield (0, staking_1.getStakingApy)(symbol, network);
+        supplyIncentives.push({
+            apy: yieldApy,
+            token: symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${symbol} yield.`,
+        });
+        if (reserveAsset.borrowable) {
+            // when borrowing assets whose value increases over time
+            borrowIncentives.push({
+                apy: new decimal_js_1.default(yieldApy).mul(-1).toString(),
+                token: symbol,
+                incentiveKind: common_1.IncentiveKind.Reward,
+                description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
+            });
+        }
+    }
     return ({
-        symbol: assetInfo.symbol,
+        symbol,
         underlying: reserveAsset.underlying,
         hub: reserveAsset.hub,
         assetId: reserveAsset.assetId,
@@ -47,17 +72,20 @@ const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals) => {
         collateralFactor: new decimal_js_1.default(reserveAsset.collateralFactor).div(10000).toNumber(),
         liquidationFee: new decimal_js_1.default(reserveAsset.liquidationFee).div(10000).toNumber(),
         price: new decimal_js_1.default(reserveAsset.price).div(new decimal_js_1.default(10).pow(oracleDecimals)).toString(),
-        totalSupplied: (0, tokens_1.assetAmountInEth)(reserveAsset.totalSupplied.toString(), assetInfo.symbol),
-        totalDrawn: (0, tokens_1.assetAmountInEth)(reserveAsset.totalDrawn.toString(), assetInfo.symbol),
-        totalPremium: (0, tokens_1.assetAmountInEth)(reserveAsset.totalPremium.toString(), assetInfo.symbol),
-        totalDebt: (0, tokens_1.assetAmountInEth)(reserveAsset.totalDebt.toString(), assetInfo.symbol),
-        supplyCap: (0, tokens_1.assetAmountInEth)(reserveAsset.supplyCap.toString(), assetInfo.symbol),
-        borrowCap: (0, tokens_1.assetAmountInEth)(reserveAsset.borrowCap.toString(), assetInfo.symbol),
+        totalSupplied: (0, tokens_1.assetAmountInEth)(reserveAsset.totalSupplied.toString(), symbol),
+        totalDrawn: (0, tokens_1.assetAmountInEth)(reserveAsset.totalDrawn.toString(), symbol),
+        totalPremium: (0, tokens_1.assetAmountInEth)(reserveAsset.totalPremium.toString(), symbol),
+        totalDebt: (0, tokens_1.assetAmountInEth)(reserveAsset.totalDebt.toString(), symbol),
+        supplyCap: (0, tokens_1.assetAmountInEth)(reserveAsset.supplyCap.toString(), symbol),
+        borrowCap: (0, tokens_1.assetAmountInEth)(reserveAsset.borrowCap.toString(), symbol),
         spokeActive: reserveAsset.spokeActive,
         spokePaused: reserveAsset.spokePaused,
         drawnRate: new decimal_js_1.default(hubAsset.drawnRate).div(new decimal_js_1.default(10).pow(27)).toString(),
+        supplyRate: '0', // To be implemented
+        supplyIncentives,
+        borrowIncentives,
     });
-};
+});
 function _getAaveV4SpokeData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
@@ -68,7 +96,7 @@ function _getAaveV4SpokeData(provider_1, network_1, market_1) {
                 hubsData[hubAddress] = yield fetchHubData(viewContract, hubAddress);
             })),
         ]);
-        const reserveAssetsArray = spokeData[1].map((reserveAssetOnChain) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString()));
+        const reserveAssetsArray = yield Promise.all(spokeData[1].map((reserveAssetOnChain) => __awaiter(this, void 0, void 0, function* () { return formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString(), network); })));
         return {
             assetsData: reserveAssetsArray.reduce((acc, reserveAsset) => {
                 acc[reserveAsset.symbol] = reserveAsset;
@@ -85,11 +113,40 @@ function getAaveV4SpokeData(provider_1, network_1, spoke_1) {
         return _getAaveV4SpokeData((0, viem_1.getViemProvider)(provider, network), network, spoke, blockNumber);
     });
 }
-function _getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, marketData, address, blockNumber = 'latest') {
+function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, spokeData, address, blockNumber = 'latest') {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
-        const loanData = yield viewContract.read.getLoanData([marketData.address, address]);
-        console.log('loanData', loanData);
+        const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
+        const healthFactor = new decimal_js_1.default(loanData.healthFactor).div(1e18).toString();
+        const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
+            const reserveData = spokeData.assetsData[(0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(usedReserveAsset.underlying, network).symbol)];
+            const price = reserveData.price;
+            const supplied = (0, tokens_1.assetAmountInEth)(usedReserveAsset.supplied.toString(), reserveData.symbol);
+            const drawn = (0, tokens_1.assetAmountInEth)(usedReserveAsset.drawn.toString(), reserveData.symbol);
+            const premium = (0, tokens_1.assetAmountInEth)(usedReserveAsset.premium.toString(), reserveData.symbol);
+            const borrowed = (0, tokens_1.assetAmountInEth)(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+            acc[reserveData.symbol] = {
+                symbol: reserveData.symbol,
+                supplied,
+                suppliedUsd: new decimal_js_1.default(supplied).mul(price).toString(),
+                drawn,
+                drawnUsd: new decimal_js_1.default(drawn).mul(price).toString(),
+                premium,
+                premiumUsd: new decimal_js_1.default(premium).mul(price).toString(),
+                borrowed,
+                borrowedUsd: new decimal_js_1.default(borrowed).mul(price).toString(),
+                isSupplied: !new decimal_js_1.default(supplied).eq(0),
+                isBorrowed: usedReserveAsset.isBorrowing,
+                collateral: usedReserveAsset.isUsingAsCollateral,
+            };
+            return acc;
+        }, {});
+        return Object.assign({ usedAssets,
+            healthFactor }, (0, aaveV4Helpers_1.aaveV4GetAggregatedPositionData)({
+            usedAssets,
+            assetsData: spokeData.assetsData,
+            network,
+        }));
     });
 }
 function getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {

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

@@ -0,0 +1,7 @@
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4UsedReserveAssets } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, }: {
+    usedAssets: AaveV4UsedReserveAssets;
+    assetsData: AaveV4AssetsData;
+    network: NetworkNumber;
+}) => AaveV4AggregatedPositionData;

package/cjs/helpers/aaveV4Helpers/index.js

@@ -0,0 +1,54 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aaveV4GetAggregatedPositionData = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const moneymarket_1 = require("../../moneymarket");
+const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, }) => {
+    const payload = {};
+    payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
+    payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
+    payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => new decimal_js_1.default(suppliedUsd).mul(assetsData[symbol].collateralFactor));
+    payload.liquidationLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, 
+    // TODO: Verify if liquidation factor is available in Aave V4, currently using collateralFactor as placeholder
+    ({ symbol, suppliedUsd }) => new decimal_js_1.default(suppliedUsd).mul(assetsData[symbol].collateralFactor));
+    payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    payload.drawnUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ drawnUsd }) => drawnUsd);
+    payload.premiumUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ premiumUsd }) => premiumUsd);
+    const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+    payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+    payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
+    payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
+    payload.leveragedType = leveragedType;
+    payload.leveragedAsset = leveragedAsset;
+    payload.liquidationPrice = '';
+    if (leveragedType !== '') {
+        let assetPrice = assetsData[leveragedAsset].price;
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        }
+        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();
+    //   payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
+    payload.minHealthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
+    // TODO: Re-implement netApy calculation
+    //   const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({
+    //     usedAssets,
+    //     assetsData,
+    //     optionalData: { healthRatio: payload.healthRatio },
+    //   });
+    payload.netApy = '0';
+    payload.incentiveUsd = '0';
+    payload.totalInterestUsd = '0';
+    return payload;
+};
+exports.aaveV4GetAggregatedPositionData = aaveV4GetAggregatedPositionData;

package/cjs/helpers/index.d.ts

@@ -8,3 +8,4 @@ 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/cjs/helpers/index.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fluidHelpers = exports.eulerV2Helpers = exports.liquityV2Helpers = exports.llamaLendHelpers = exports.morphoBlueHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
+exports.aaveV4Helpers = exports.fluidHelpers = exports.eulerV2Helpers = exports.liquityV2Helpers = exports.llamaLendHelpers = exports.morphoBlueHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
 exports.aaveHelpers = __importStar(require("./aaveHelpers"));
 exports.compoundHelpers = __importStar(require("./compoundHelpers"));
 exports.sparkHelpers = __importStar(require("./sparkHelpers"));
@@ -44,3 +44,4 @@ exports.llamaLendHelpers = __importStar(require("./llamaLendHelpers"));
 exports.liquityV2Helpers = __importStar(require("./liquityV2Helpers"));
 exports.eulerV2Helpers = __importStar(require("./eulerHelpers"));
 exports.fluidHelpers = __importStar(require("./fluidHelpers"));
+exports.aaveV4Helpers = __importStar(require("./aaveV4Helpers"));

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, network, defaultProvider, addresses, summerFiAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === common_1.NetworkNumber.Eth;
@@ -56,6 +57,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
         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 client = (0, viem_1.getViemProvider)(provider, network, {
             batch: {
                 multicall: {
@@ -81,6 +83,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
         const liquityV2MarketsData = {};
+        const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
             compoundV3MarketsData,
@@ -92,6 +95,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
             crvUsdMarketsData,
             llamaLendMarketsData,
             liquityV2MarketsData,
+            aaveV4SpokesData,
         };
         const positions = {};
         const stakingPositions = {};
@@ -100,6 +104,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
                 aaveV3: {},
+                aaveV4: {},
                 morphoBlue: {},
                 compoundV3: {},
                 spark: {},
@@ -165,6 +170,10 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                 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;
@@ -434,6 +443,17 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                     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/aaveV4.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
 export declare enum AaveV4SpokesType {
     AaveV4CoreSpoke = "aave_v4_core_spoke"
 }
@@ -64,10 +64,57 @@ export interface AaveV4ReserveAssetData {
     spokeActive: boolean;
     spokePaused: boolean;
     drawnRate: string;
+    supplyRate: string;
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
 }
+export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4SpokeData {
-    assetsData: Record<string, AaveV4ReserveAssetData>;
+    assetsData: AaveV4AssetsData;
     oracle: EthAddress;
     oracleDecimals: number;
     address: EthAddress;
 }
+export interface AaveV4UsedReserveAsset {
+    symbol: string;
+    supplied: string;
+    suppliedUsd: string;
+    drawn: string;
+    drawnUsd: string;
+    premium: string;
+    premiumUsd: string;
+    borrowed: string;
+    borrowedUsd: string;
+    isSupplied: boolean;
+    isBorrowed: boolean;
+    collateral: boolean;
+}
+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: string;
+    leveragedAsset: string;
+    liquidationPrice: string;
+    leveragedLsdAssetRatio?: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
+    minHealthRatio: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
+}
+export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
+export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
+    usedAssets: AaveV4UsedReserveAssets;
+    healthFactor: 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/esm/aaveV4/index.d.ts

@@ -1,7 +1,7 @@
 import { Client } from 'viem';
-import { AaveV4SpokeData, AaveV4SpokeInfo } from '../types';
+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, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;
+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>;

package/esm/aaveV4/index.js

@@ -10,10 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { getViemProvider } from '../services/viem';
+import { IncentiveKind, } from '../types/common';
 import { AaveV4ViewContractViem } from '../contracts';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { wethToEth } from '../services/utils';
+import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
-    console.log('hubData', hubData);
     return {
         assets: hubData.reduce((acc, assetOnChainData) => {
             acc[assetOnChainData.assetId] = {
@@ -24,10 +27,32 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
         }, {}),
     };
 });
-const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals) => {
-    const assetInfo = getAssetInfoByAddress(reserveAsset.underlying);
+const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
+    const symbol = wethToEth(assetInfo.symbol);
+    const isStakingAsset = STAKING_ASSETS.includes(symbol);
+    const supplyIncentives = [];
+    const borrowIncentives = [];
+    if (isStakingAsset) {
+        const yieldApy = yield getStakingApy(symbol, network);
+        supplyIncentives.push({
+            apy: yieldApy,
+            token: symbol,
+            incentiveKind: IncentiveKind.Staking,
+            description: `Native ${symbol} yield.`,
+        });
+        if (reserveAsset.borrowable) {
+            // when borrowing assets whose value increases over time
+            borrowIncentives.push({
+                apy: new Dec(yieldApy).mul(-1).toString(),
+                token: symbol,
+                incentiveKind: IncentiveKind.Reward,
+                description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
+            });
+        }
+    }
     return ({
-        symbol: assetInfo.symbol,
+        symbol,
         underlying: reserveAsset.underlying,
         hub: reserveAsset.hub,
         assetId: reserveAsset.assetId,
@@ -38,17 +63,20 @@ const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals) => {
         collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
         liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
         price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-        totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), assetInfo.symbol),
-        totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), assetInfo.symbol),
-        totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), assetInfo.symbol),
-        totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), assetInfo.symbol),
-        supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), assetInfo.symbol),
-        borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), assetInfo.symbol),
+        totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), symbol),
+        totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), symbol),
+        totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), symbol),
+        totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), symbol),
+        supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), symbol),
+        borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), symbol),
         spokeActive: reserveAsset.spokeActive,
         spokePaused: reserveAsset.spokePaused,
         drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
+        supplyRate: '0', // To be implemented
+        supplyIncentives,
+        borrowIncentives,
     });
-};
+});
 export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
@@ -59,7 +87,7 @@ export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
                 hubsData[hubAddress] = yield fetchHubData(viewContract, hubAddress);
             })),
         ]);
-        const reserveAssetsArray = spokeData[1].map((reserveAssetOnChain) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString()));
+        const reserveAssetsArray = yield Promise.all(spokeData[1].map((reserveAssetOnChain) => __awaiter(this, void 0, void 0, function* () { return formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString(), network); })));
         return {
             assetsData: reserveAssetsArray.reduce((acc, reserveAsset) => {
                 acc[reserveAsset.symbol] = reserveAsset;
@@ -76,11 +104,40 @@ export function getAaveV4SpokeData(provider_1, network_1, spoke_1) {
         return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
     });
 }
-export function _getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, marketData, address, blockNumber = 'latest') {
+export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, spokeData, address, blockNumber = 'latest') {
         const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
-        const loanData = yield viewContract.read.getLoanData([marketData.address, address]);
-        console.log('loanData', loanData);
+        const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
+        const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
+        const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
+            const reserveData = spokeData.assetsData[wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)];
+            const price = reserveData.price;
+            const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
+            const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
+            const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
+            const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+            acc[reserveData.symbol] = {
+                symbol: reserveData.symbol,
+                supplied,
+                suppliedUsd: new Dec(supplied).mul(price).toString(),
+                drawn,
+                drawnUsd: new Dec(drawn).mul(price).toString(),
+                premium,
+                premiumUsd: new Dec(premium).mul(price).toString(),
+                borrowed,
+                borrowedUsd: new Dec(borrowed).mul(price).toString(),
+                isSupplied: !new Dec(supplied).eq(0),
+                isBorrowed: usedReserveAsset.isBorrowing,
+                collateral: usedReserveAsset.isUsingAsCollateral,
+            };
+            return acc;
+        }, {});
+        return Object.assign({ usedAssets,
+            healthFactor }, aaveV4GetAggregatedPositionData({
+            usedAssets,
+            assetsData: spokeData.assetsData,
+            network,
+        }));
     });
 }
 export function getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {

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

@@ -0,0 +1,7 @@
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4UsedReserveAssets } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, }: {
+    usedAssets: AaveV4UsedReserveAssets;
+    assetsData: AaveV4AssetsData;
+    network: NetworkNumber;
+}) => AaveV4AggregatedPositionData;

package/esm/helpers/aaveV4Helpers/index.js

@@ -0,0 +1,47 @@
+import Dec from 'decimal.js';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+export const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, }) => {
+    const payload = {};
+    payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
+    payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
+    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => new Dec(suppliedUsd).mul(assetsData[symbol].collateralFactor));
+    payload.liquidationLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, 
+    // TODO: Verify if liquidation factor is available in Aave V4, currently using collateralFactor as placeholder
+    ({ symbol, suppliedUsd }) => new Dec(suppliedUsd).mul(assetsData[symbol].collateralFactor));
+    payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ drawnUsd }) => drawnUsd);
+    payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ premiumUsd }) => premiumUsd);
+    const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+    payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+    payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
+    payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+    payload.leveragedType = leveragedType;
+    payload.leveragedAsset = leveragedAsset;
+    payload.liquidationPrice = '';
+    if (leveragedType !== '') {
+        let assetPrice = assetsData[leveragedAsset].price;
+        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();
+        }
+        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();
+    //   payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
+    payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
+    // TODO: Re-implement netApy calculation
+    //   const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({
+    //     usedAssets,
+    //     assetsData,
+    //     optionalData: { healthRatio: payload.healthRatio },
+    //   });
+    payload.netApy = '0';
+    payload.incentiveUsd = '0';
+    payload.totalInterestUsd = '0';
+    return payload;
+};

package/esm/helpers/index.d.ts

@@ -8,3 +8,4 @@ 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,3 +8,4 @@ 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/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, network, defaultProvider, addresses, summerFiAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === NetworkNumber.Eth;
@@ -50,6 +51,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         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 client = getViemProvider(provider, network, {
             batch: {
                 multicall: {
@@ -75,6 +77,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
         const liquityV2MarketsData = {};
+        const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
             compoundV3MarketsData,
@@ -86,6 +89,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
             crvUsdMarketsData,
             llamaLendMarketsData,
             liquityV2MarketsData,
+            aaveV4SpokesData,
         };
         const positions = {};
         const stakingPositions = {};
@@ -94,6 +98,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
                 aaveV3: {},
+                aaveV4: {},
                 morphoBlue: {},
                 compoundV3: {},
                 spark: {},
@@ -159,6 +164,10 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 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;
@@ -428,6 +437,17 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                     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/types/aaveV4.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
 export declare enum AaveV4SpokesType {
     AaveV4CoreSpoke = "aave_v4_core_spoke"
 }
@@ -64,10 +64,57 @@ export interface AaveV4ReserveAssetData {
     spokeActive: boolean;
     spokePaused: boolean;
     drawnRate: string;
+    supplyRate: string;
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
 }
+export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4SpokeData {
-    assetsData: Record<string, AaveV4ReserveAssetData>;
+    assetsData: AaveV4AssetsData;
     oracle: EthAddress;
     oracleDecimals: number;
     address: EthAddress;
 }
+export interface AaveV4UsedReserveAsset {
+    symbol: string;
+    supplied: string;
+    suppliedUsd: string;
+    drawn: string;
+    drawnUsd: string;
+    premium: string;
+    premiumUsd: string;
+    borrowed: string;
+    borrowedUsd: string;
+    isSupplied: boolean;
+    isBorrowed: boolean;
+    collateral: boolean;
+}
+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: string;
+    leveragedAsset: string;
+    liquidationPrice: string;
+    leveragedLsdAssetRatio?: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
+    minHealthRatio: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
+}
+export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
+export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
+    usedAssets: AaveV4UsedReserveAssets;
+    healthFactor: 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.43-aave-v4-dev-1",
+  "version": "2.1.43-aave-v4-dev-2",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -12,7 +12,7 @@
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint src/ --fix",
     "lint-check": "eslint src/",
-    "test": "mocha tests/aaveV4.ts",
+    "test": "mocha tests/portfolio.ts",
     "test-single": "mocha ./tests/$npm_config_name.ts",
     "test:debugger": "mocha --inspect-brk tests/*",
     "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""

package/src/aaveV4/index.ts

@@ -3,16 +3,22 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { getViemProvider } from '../services/viem';
 import {
+  AaveV4AccountData,
   AaveV4HubAssetOnChainData,
   AaveV4HubOnChainData,
   AaveV4ReserveAssetData, AaveV4ReserveAssetOnChain, AaveV4SpokeData, AaveV4SpokeInfo,
+  AaveV4UsedReserveAssets,
 } from '../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import {
+  EthAddress, EthereumProvider, IncentiveData, IncentiveKind, NetworkNumber,
+} from '../types/common';
 import { AaveV4ViewContractViem } from '../contracts';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { wethToEth } from '../services/utils';
+import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
 
 const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
   const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
-  console.log('hubData', hubData);
   return {
     assets: hubData.reduce((acc: Record<number, AaveV4HubAssetOnChainData>, assetOnChainData) => {
       acc[assetOnChainData.assetId] = {
@@ -24,10 +30,35 @@ const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractVi
   };
 };
 
-const formatReserveAsset = (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, oracleDecimals: number): AaveV4ReserveAssetData => {
-  const assetInfo = getAssetInfoByAddress(reserveAsset.underlying);
+const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, oracleDecimals: number, network: NetworkNumber): Promise<AaveV4ReserveAssetData> => {
+  const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
+  const symbol = wethToEth(assetInfo.symbol);
+
+  const isStakingAsset = STAKING_ASSETS.includes(symbol);
+  const supplyIncentives: IncentiveData[] = [];
+  const borrowIncentives: IncentiveData[] = [];
+
+  if (isStakingAsset) {
+    const yieldApy = await getStakingApy(symbol, network as NetworkNumber);
+    supplyIncentives.push({
+      apy: yieldApy,
+      token: symbol,
+      incentiveKind: IncentiveKind.Staking,
+      description: `Native ${symbol} yield.`,
+    });
+    if (reserveAsset.borrowable) {
+      // when borrowing assets whose value increases over time
+      borrowIncentives.push({
+        apy: new Dec(yieldApy).mul(-1).toString(),
+        token: symbol,
+        incentiveKind: IncentiveKind.Reward,
+        description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
+      });
+    }
+  }
+
   return ({
-    symbol: assetInfo.symbol,
+    symbol,
     underlying: reserveAsset.underlying,
     hub: reserveAsset.hub,
     assetId: reserveAsset.assetId,
@@ -38,15 +69,18 @@ const formatReserveAsset = (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: A
     collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
     liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
     price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-    totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), assetInfo.symbol),
-    totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), assetInfo.symbol),
-    totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), assetInfo.symbol),
-    totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), assetInfo.symbol),
-    supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), assetInfo.symbol),
-    borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), assetInfo.symbol),
+    totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), symbol),
+    totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), symbol),
+    totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), symbol),
+    totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), symbol),
+    supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), symbol),
+    borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), symbol),
     spokeActive: reserveAsset.spokeActive,
     spokePaused: reserveAsset.spokePaused,
     drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
+    supplyRate: '0', // To be implemented
+    supplyIncentives,
+    borrowIncentives,
   });
 };
 
@@ -61,7 +95,7 @@ export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumb
     }),
   ]);
 
-  const reserveAssetsArray = spokeData[1].map((reserveAssetOnChain: AaveV4ReserveAssetOnChain) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString()));
+  const reserveAssetsArray = await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString(), network)));
 
   return {
     assetsData: reserveAssetsArray.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
@@ -78,11 +112,46 @@ export async function getAaveV4SpokeData(provider: EthereumProvider, network: Ne
   return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
 }
 
-export async function _getAaveV4AccountData(provider: Client, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<any> {
+export async function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4AccountData> {
   const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
 
-  const loanData = await viewContract.read.getLoanData([marketData.address, address]);
-  console.log('loanData', loanData);
+  const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
+
+  const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
+
+  const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
+    const reserveData = spokeData.assetsData[wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)];
+    const price = reserveData.price;
+    const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
+    const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
+    const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
+    const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+    acc[reserveData.symbol] = {
+      symbol: reserveData.symbol,
+      supplied,
+      suppliedUsd: new Dec(supplied).mul(price).toString(),
+      drawn,
+      drawnUsd: new Dec(drawn).mul(price).toString(),
+      premium,
+      premiumUsd: new Dec(premium).mul(price).toString(),
+      borrowed,
+      borrowedUsd: new Dec(borrowed).mul(price).toString(),
+      isSupplied: !new Dec(supplied).eq(0),
+      isBorrowed: usedReserveAsset.isBorrowing,
+      collateral: usedReserveAsset.isUsingAsCollateral,
+    };
+    return acc;
+  }, {});
+
+  return {
+    usedAssets,
+    healthFactor,
+    ...aaveV4GetAggregatedPositionData({
+      usedAssets,
+      assetsData: spokeData.assetsData,
+      network,
+    }),
+  };
 }
 
 export async function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<any> {

package/src/helpers/aaveV4Helpers/index.ts

@@ -0,0 +1,66 @@
+import Dec from 'decimal.js';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4UsedReserveAssets } from '../../types';
+import { NetworkNumber } from '../../types/common';
+
+export const aaveV4GetAggregatedPositionData = ({
+  usedAssets,
+  assetsData,
+  network,
+}: {
+  usedAssets: AaveV4UsedReserveAssets,
+  assetsData: AaveV4AssetsData,
+  network: NetworkNumber,
+}): AaveV4AggregatedPositionData => {
+  const payload = {} as AaveV4AggregatedPositionData;
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowLimitUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[symbol].collateralFactor),
+  );
+  payload.liquidationLimitUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
+    // TODO: Verify if liquidation factor is available in Aave V4, currently using collateralFactor as placeholder
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[symbol].collateralFactor),
+  );
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+  payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ drawnUsd }: { drawnUsd: string }) => drawnUsd);
+  payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ premiumUsd }: { premiumUsd: string }) => premiumUsd);
+  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+  payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
+  payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+  payload.leveragedType = leveragedType;
+  payload.leveragedAsset = leveragedAsset;
+  payload.liquidationPrice = '';
+  if (leveragedType !== '') {
+    let assetPrice = assetsData[leveragedAsset].price;
+    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();
+    }
+    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();
+  //   payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
+  payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
+
+  // TODO: Re-implement netApy calculation
+  //   const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({
+  //     usedAssets,
+  //     assetsData,
+  //     optionalData: { healthRatio: payload.healthRatio },
+  //   });
+  payload.netApy = '0';
+  payload.incentiveUsd = '0';
+  payload.totalInterestUsd = '0';
+  return payload;
+};

package/src/helpers/index.ts

@@ -8,3 +8,4 @@ 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/src/portfolio/index.ts

@@ -2,6 +2,7 @@ import Dec from 'decimal.js';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
 import {
   AaveMarkets,
+  AaveV4Spokes,
   CompoundMarkets,
   CrvUsdMarkets,
   EulerV2Markets,
@@ -14,6 +15,7 @@ import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } fr
 import {
   AaveV2MarketData,
   AaveV3MarketData,
+  AaveV4SpokeData,
   AaveVersions,
   CdpInfo,
   CompoundV2MarketsData,
@@ -49,6 +51,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 async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], summerFiAddresses: EthAddress[]): Promise<{
   positions: PortfolioPositionsData;
@@ -71,6 +74,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   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 client = getViemProvider(provider, network, {
     batch: {
@@ -98,6 +102,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData> = {};
   const llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData> = {};
   const liquityV2MarketsData: Record<string, LiquityV2MarketData> = {};
+  const aaveV4SpokesData: Record<string, AaveV4SpokeData> = {};
 
   const markets = {
     morphoMarketsData,
@@ -110,6 +115,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     crvUsdMarketsData,
     llamaLendMarketsData,
     liquityV2MarketsData,
+    aaveV4SpokesData,
   };
 
   const positions: PortfolioPositionsData = {};
@@ -120,6 +126,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   for (const address of allAddresses) {
     positions[address.toLowerCase() as EthAddress] = {
       aaveV3: {},
+      aaveV4: {},
       morphoBlue: {},
       compoundV3: {},
       spark: {},
@@ -188,6 +195,10 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       const marketData = await _getAaveV3MarketData(client, network, market);
       aaveV3MarketsData[market.value] = marketData;
     }),
+    ...aaveV4Spokes.map(async (spoke) => {
+      const spokeData = await _getAaveV4SpokeData(client, network, spoke);
+      aaveV4SpokesData[spoke.value] = spokeData;
+    }),
     ...aaveV2Markets.map(async (market) => {
       const marketData = await _getAaveV2MarketsData(client, network, market);
       aaveV2MarketsData[market.value] = marketData;
@@ -441,6 +452,15 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         positions[address.toLowerCase() as EthAddress].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
       }
     })).flat(),
+    ...aaveV4Spokes.map((spoke) => allAddresses.map(async (address) => {
+      try {
+        const accData = await _getAaveV4AccountData(client, network, aaveV4SpokesData[spoke.value], address);
+        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].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() as EthAddress].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
+      }
+    })).flat(),
     ...morphoMarkets.map((market) => addresses.map(async (address) => {
       try {
         const [accDataPromise, earnDataPromise] = await Promise.allSettled([

package/src/types/aaveV4.ts

@@ -1,4 +1,4 @@
-import { EthAddress, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, NetworkNumber } from './common';
 
 export enum AaveV4SpokesType {
   AaveV4CoreSpoke = 'aave_v4_core_spoke',
@@ -71,11 +71,63 @@ export interface AaveV4ReserveAssetData {
   spokeActive: boolean,
   spokePaused: boolean,
   drawnRate: string,
+  supplyRate: string,
+  supplyIncentives: IncentiveData[];
+  borrowIncentives: IncentiveData[];
 }
 
+export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
+
 export interface AaveV4SpokeData {
-  assetsData: Record<string, AaveV4ReserveAssetData>,
+  assetsData: AaveV4AssetsData,
   oracle: EthAddress,
   oracleDecimals: number,
   address: EthAddress,
 }
+
+export interface AaveV4UsedReserveAsset {
+  symbol: string,
+  supplied: string,
+  suppliedUsd: string,
+  drawn: string,
+  drawnUsd: string,
+  premium: string,
+  premiumUsd: string,
+  borrowed: string,
+  borrowedUsd: string,
+  isSupplied: boolean,
+  isBorrowed: boolean,
+  collateral: boolean,
+}
+
+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: string,
+  leveragedAsset: string,
+  liquidationPrice: string,
+  leveragedLsdAssetRatio?: string,
+  minCollRatio: string,
+  collLiquidationRatio: string,
+  minHealthRatio: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+}
+
+export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
+
+export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
+  usedAssets: AaveV4UsedReserveAssets,
+  healthFactor: string,
+}

package/src/types/portfolio.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';
@@ -54,6 +55,9 @@ export interface PortfolioPositionsDataForAddress {
       [key: string]: FluidVaultData;
     };
   };
+  aaveV4: {
+    [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
+  };
 }
 
 export interface PortfolioPositionsData {