@defisaver/positions-sdk 2.1.98 → 2.1.102-aave-v4-merkl-dev

package/src/helpers/aaveV4Helpers/index.ts

@@ -1,4 +1,6 @@
 import Dec from 'decimal.js';
+import { assetAmountInWei } from '@defisaver/tokens';
+import { Client } from 'viem';
 import {
   aprToApy,
   calcLeverageLiqPrice,
@@ -10,11 +12,16 @@ import {
   AaveV4AggregatedPositionData,
   AaveV4AssetsData,
   AaveV4ReserveAssetData,
+  AaveV4SpokeInfo,
   AaveV4UsedReserveAsset,
   AaveV4UsedReserveAssets,
+  EthereumProvider,
   LeverageType,
   NetworkNumber,
 } from '../../types';
+import { borrowOperations } from '../../constants';
+import { AaveV4ViewContractViem } from '../../contracts';
+import { getViemProvider } from '../../services/viem';
 
 export const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData): number => {
   type CollateralInfo = { riskBps: number; valueUsd: Dec };
@@ -83,31 +90,6 @@ export const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, asse
   return riskPremiumBps.toNumber();
 };
 
-export const getApyAfterValuesEstimation = (
-  usedAssets: AaveV4UsedReserveAssets,
-  assetsData: AaveV4AssetsData,
-): Record<string, { borrowRate: string; supplyRate: string }> => {
-  const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, assetsData);
-  const riskPremiumFraction = new Dec(riskPremiumBps).div(10000); // bps to fraction
-
-  const result: Record<string, { borrowRate: string; supplyRate: string }> = {};
-
-  Object.entries(assetsData).forEach(([identifier, assetData]) => {
-    const drawnRate = new Dec(assetData.drawnRate);
-    const baseBorrowApr = drawnRate.mul(100);
-    // finalBorrowRate = baseBorrowRate * (1 + riskPremiumFraction)
-    const userBorrowApr = baseBorrowApr.mul(new Dec(1).add(riskPremiumFraction));
-
-    result[identifier] = {
-      borrowRate: aprToApy(userBorrowApr.toString()),
-      // Supply rate is market-level (not user-specific), use existing value
-      supplyRate: assetData.supplyRate,
-    };
-  });
-
-  return result;
-};
-
 export const calculateNetApyAaveV4 = ({
   usedAssets,
   assetsData,
@@ -288,4 +270,55 @@ export const aaveV4GetAggregatedPositionData = ({
   payload.incentiveUsd = incentiveUsd;
   payload.totalInterestUsd = totalInterestUsd;
   return payload;
-};
+};
+
+const getAaveV4ApyAfterValuesEstimationInner = async (selectedSpoke: AaveV4SpokeInfo, assetsData: AaveV4AssetsData, actions: { action: string, amount: string, asset: string }[], client: Client, network: NetworkNumber) => {
+  const params = actions.map(({ action, asset, amount }) => {
+    const isDebtAsset = borrowOperations.includes(action);
+    const assetData = assetsData[asset];
+    const amountInWei = assetAmountInWei(amount, assetData.symbol);
+    let liquidityAdded;
+    let liquidityTaken;
+    if (isDebtAsset) {
+      liquidityAdded = action === 'payback' ? amountInWei : '0';
+      liquidityTaken = action === 'borrow' ? amountInWei : '0';
+    } else {
+      liquidityAdded = action === 'collateral' ? amountInWei : '0';
+      liquidityTaken = action === 'withdraw' ? amountInWei : '0';
+    }
+    return {
+      reserveId: BigInt(assetData.reserveId),
+      liquidityAdded: BigInt(liquidityAdded),
+      liquidityTaken: BigInt(liquidityTaken),
+      isDebtAsset,
+    };
+  });
+  const viewContract = AaveV4ViewContractViem(client, network);
+  const data = await viewContract.read.getApyAfterValuesEstimation([selectedSpoke.address, params]);
+
+  const rates: { [key: string]: { supplyRate: string, borrowRate: string } } = {};
+  data.forEach((item: any) => {
+    const {
+      hubDrawnRateEstimation, hubTotalDrawnEstimation, hubTotalLiquidityEstimation, hubSwept, reserveId,
+    } = item;
+    const drawnRate = new Dec(hubDrawnRateEstimation.toString()).div(new Dec(10).pow(27));
+    const borrowApr = drawnRate.mul(100);
+
+    const assetData = Object.values(assetsData).find(({ reserveId: rId }) => rId === Number(reserveId));
+
+    const totalDrawn = new Dec(hubTotalDrawnEstimation.toString());
+    const swept = new Dec(hubSwept.toString());
+    const hubUtilizationDenominator = totalDrawn.add(swept).add(hubTotalLiquidityEstimation.toString());
+    const hubUtilization = hubUtilizationDenominator.isZero() ? new Dec(0) : totalDrawn.div(hubUtilizationDenominator);
+
+    const supplyApr = borrowApr.mul(hubUtilization).mul(assetData?.premiumMultiplier || '1').mul(new Dec(1).minus(assetData?.liquidityFee || '0'));
+
+    rates[`${assetData?.symbol}-${assetData?.reserveId}`] = {
+      borrowRate: aprToApy(borrowApr.toString()),
+      supplyRate: aprToApy(supplyApr.toString()),
+    };
+  });
+  return rates;
+};
+
+export const getAaveV4ApyAfterValuesEstimation = async (selectedSpoke: AaveV4SpokeInfo, assetsData: AaveV4AssetsData, actions: { action: string, amount: string, asset: string }[], provider: EthereumProvider, network: NetworkNumber) => getAaveV4ApyAfterValuesEstimationInner(selectedSpoke, assetsData, actions, getViemProvider(provider, network), network);

package/src/types/aaveV4.ts

@@ -111,6 +111,16 @@ export interface AaveV4ReserveAssetData {
   borrowRate: string,
   supplyIncentives: IncentiveData[];
   borrowIncentives: IncentiveData[];
+  /**
+   * Intrinsic incentives pre-combined with scope-specific Merkl rewards, ready to render per surface:
+   *   - spoke* → spoke supply/borrow (Create page + dashboard market table)
+   *   - hub*   → hub supply/borrow (Lend page)
+   * `supplyIncentives`/`borrowIncentives` above remain intrinsic-only so the net-APY calc is unaffected.
+   */
+  spokeSupplyIncentives?: IncentiveData[];
+  spokeBorrowIncentives?: IncentiveData[];
+  hubSupplyIncentives?: IncentiveData[];
+  hubBorrowIncentives?: IncentiveData[];
   canBeBorrowed: boolean;
   canBeSupplied: boolean;
   canBeWithdrawn: boolean;
@@ -118,6 +128,8 @@ export interface AaveV4ReserveAssetData {
   utilization: string;
   /** Hub `liquidity` for this assetId (underlying amount), used for pool-level borrow/withdraw limits */
   hubLiquidity: string,
+  premiumMultiplier: string;
+  liquidityFee: string;
 }
 
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;

package/src/types/merkl.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from './common';
+import { EthAddress, IncentiveData } from './common';
 
 export enum OpportunityAction {
   LEND = 'LEND',
@@ -68,4 +68,16 @@ export type MerklOpportunity = {
 };
 
 export type MerkleRewardInfo = { apy: string; rewardTokenSymbol: string, description: string, identifier: string };
-export type MerkleRewardMap = Record<EthAddress, { supply?: MerkleRewardInfo; borrow?: MerkleRewardInfo }>;
+export type MerkleRewardMap = Record<EthAddress, { supply?: MerkleRewardInfo; borrow?: MerkleRewardInfo }>;
+
+export type AaveV4MerklScopedReward = { supply?: IncentiveData; borrow?: IncentiveData };
+
+/**
+ * Aave V4 Merkl reward campaigns split by scope:
+ *   - `hub`: keyed by underlying token address (lowercase) — rewards for supplying to a hub
+ *   - `spoke`: keyed by `${spokeAddress}_${underlyingAddress}` (both lowercase) — rewards for supplying/borrowing on a spoke
+ */
+export type AaveV4MerklRewardMap = {
+  hub: Record<string, AaveV4MerklScopedReward>;
+  spoke: Record<string, AaveV4MerklScopedReward>;
+};