@defisaver/positions-sdk 2.1.144-dev → 2.1.144

package/cjs/fluid/index.js

@@ -1282,8 +1282,12 @@ const getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaite
 exports.getAllUserEarnPositionsWithFTokens = getAllUserEarnPositionsWithFTokens;
 const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
-    const data = yield view.read.getUserPositions([user]);
-    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); }))));
+    const [data, merklCampaigns] = yield Promise.all([
+        view.read.getUserPositions([user]),
+        (0, merkl_1.getFluidMerklCampaigns)(network),
+    ]);
+    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); }))))
+        .map(marketData => (marketData ? (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns) : marketData));
     const userData = data[0].map((position, i) => (parsedMarketData[i] && Object.assign({}, parseUserData(position, parsedMarketData[i]))));
     return parsedMarketData.map((market, i) => ({
         marketData: market,

package/cjs/helpers/fluidHelpers/index.js

@@ -23,10 +23,11 @@ const getUniqueFluidMerklIncentives = (assetsData, side) => {
 };
 exports.getUniqueFluidMerklIncentives = getUniqueFluidMerklIncentives;
 const getMerklIncentiveInterest = (incentives, principal, usedAssets) => incentives.reduce((total, { apy, eligibilityId }) => {
-    const eligibilityCheck = eligibilityId ? staking_1.EligibilityMapping[eligibilityId] : null;
-    const { isEligible, eligibleUSDAmount } = eligibilityCheck
-        ? eligibilityCheck(usedAssets, undefined)
-        : { isEligible: true, eligibleUSDAmount: principal };
+    const { isEligible, eligibleUSDAmount } = (0, staking_1.getIncentiveEligibility)({
+        incentive: { eligibilityId },
+        usedAssets,
+        defaultEligibleUSDAmount: principal,
+    });
     const incentiveInterest = isEligible ? (0, staking_1.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : 0;
     return new decimal_js_1.default(total).add(incentiveInterest).toString();
 }, '0');

package/cjs/staking/eligibility.d.ts

@@ -1,4 +1,4 @@
-import { IncentiveEligibilityId, MMUsedAssets } from '../types/common';
+import { IncentiveData, IncentiveEligibilityId, MMUsedAssets } from '../types/common';
 export declare const isEligibleForEthenaUSDeRewards: (usedAssets: MMUsedAssets, { healthRatio }: {
     healthRatio: string;
 }) => {
@@ -29,3 +29,17 @@ export declare const EligibilityMapping: {
         eligibleUSDAmount: string;
     };
 };
+export type IncentiveEligibilityResult = {
+    isEligible: boolean;
+    eligibleUSDAmount: string;
+};
+/**
+ * Resolves an incentive's position-specific eligibility and rewarded USD principal. Incentives
+ * without a curated eligibility rule apply to the full side amount supplied by the caller.
+ */
+export declare const getIncentiveEligibility: ({ incentive, usedAssets, defaultEligibleUSDAmount, optionalData, }: {
+    incentive: Pick<IncentiveData, "eligibilityId">;
+    usedAssets: MMUsedAssets;
+    defaultEligibleUSDAmount: string;
+    optionalData?: any;
+}) => IncentiveEligibilityResult;

package/cjs/staking/eligibility.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EligibilityMapping = exports.isEligibleForCompoundV3PufEthWethBorrow = exports.isEligibleForAaveV3ArbitrumETHLSBorrow = exports.isEligibleForAaveV3ArbitrumEthSupply = exports.isEligibleForEthenaGHORewards = exports.isEligibleForEthenaUSDeRewards = void 0;
+exports.getIncentiveEligibility = exports.EligibilityMapping = exports.isEligibleForCompoundV3PufEthWethBorrow = exports.isEligibleForAaveV3ArbitrumETHLSBorrow = exports.isEligibleForAaveV3ArbitrumEthSupply = exports.isEligibleForEthenaGHORewards = exports.isEligibleForEthenaUSDeRewards = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const common_1 = require("../types/common");
 const isEligibleForEthenaPairRewards = (usedAssets, { healthRatio }, { baseSymbol, pairSymbol, allowedBorrowAssets, maxHealthRatio, rewardSymbol, }) => {
@@ -87,3 +87,14 @@ exports.EligibilityMapping = {
     [common_1.IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasmaGHO]: exports.isEligibleForEthenaGHORewards,
     [common_1.IncentiveEligibilityId.CompoundV3PufEthWethBorrow]: exports.isEligibleForCompoundV3PufEthWethBorrow,
 };
+/**
+ * Resolves an incentive's position-specific eligibility and rewarded USD principal. Incentives
+ * without a curated eligibility rule apply to the full side amount supplied by the caller.
+ */
+const getIncentiveEligibility = ({ incentive, usedAssets, defaultEligibleUSDAmount, optionalData, }) => {
+    const eligibilityCheck = incentive.eligibilityId ? exports.EligibilityMapping[incentive.eligibilityId] : null;
+    return eligibilityCheck
+        ? eligibilityCheck(usedAssets, optionalData)
+        : { isEligible: true, eligibleUSDAmount: defaultEligibleUSDAmount };
+};
+exports.getIncentiveEligibility = getIncentiveEligibility;

package/cjs/staking/staking.js

@@ -201,17 +201,15 @@ const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             acc.supplyInterest = new decimal_js_1.default(acc.supplyInterest).add(supplyInterest.toString()).toString();
             if (assetData.supplyIncentives) {
                 for (const supplyIncentive of assetData.supplyIncentives) {
-                    const { apy, eligibilityId } = supplyIncentive;
-                    const eligibilityCheck = eligibilityId ? eligibility_1.EligibilityMapping[eligibilityId] : null;
-                    if (eligibilityCheck) {
-                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                        const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
-                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
-                    else {
-                        const incentiveInterest = (0, exports.calculateInterestEarned)(amount, apy, 'year', true);
-                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
+                    const { apy } = supplyIncentive;
+                    const { isEligible, eligibleUSDAmount } = (0, eligibility_1.getIncentiveEligibility)({
+                        incentive: supplyIncentive,
+                        usedAssets,
+                        defaultEligibleUSDAmount: amount,
+                        optionalData,
+                    });
+                    const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
+                    acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
                 }
             }
         }
@@ -223,17 +221,15 @@ const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             acc.borrowInterest = new decimal_js_1.default(acc.borrowInterest).sub(borrowInterest.toString()).toString();
             if (assetData.borrowIncentives) {
                 for (const borrowIncentive of assetData.borrowIncentives) {
-                    const { apy, eligibilityId } = borrowIncentive;
-                    const eligibilityCheck = eligibilityId ? eligibility_1.EligibilityMapping[eligibilityId] : null;
-                    if (eligibilityCheck) {
-                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                        const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
-                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
-                    else {
-                        const incentiveInterest = (0, exports.calculateInterestEarned)(amount, apy, 'year', true);
-                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
+                    const { apy } = borrowIncentive;
+                    const { isEligible, eligibleUSDAmount } = (0, eligibility_1.getIncentiveEligibility)({
+                        incentive: borrowIncentive,
+                        usedAssets,
+                        defaultEligibleUSDAmount: amount,
+                        optionalData,
+                    });
+                    const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
+                    acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
                 }
             }
         }

package/esm/fluid/index.js

@@ -1256,8 +1256,12 @@ export const _getAllUserEarnPositionsWithFTokens = (provider, network, user) =>
 export const getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () { return _getAllUserEarnPositionsWithFTokens(getViemProvider(provider, network), network, user); });
 export const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContractViem(provider, network);
-    const data = yield view.read.getUserPositions([user]);
-    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); }))));
+    const [data, merklCampaigns] = yield Promise.all([
+        view.read.getUserPositions([user]),
+        getFluidMerklCampaigns(network),
+    ]);
+    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); }))))
+        .map(marketData => (marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData));
     const userData = data[0].map((position, i) => (parsedMarketData[i] && Object.assign({}, parseUserData(position, parsedMarketData[i]))));
     return parsedMarketData.map((market, i) => ({
         marketData: market,

package/esm/helpers/fluidHelpers/index.js

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth } from '@defisaver/tokens';
 import { FluidVaultType, IncentiveSource, } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos, } from '../../moneymarket';
-import { calculateInterestEarned, calculateNetApy, EligibilityMapping } from '../../staking';
+import { calculateInterestEarned, calculateNetApy, getIncentiveEligibility } from '../../staking';
 import { IncentiveSide, LeverageType } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 export const getUniqueFluidMerklIncentives = (assetsData, side) => {
@@ -16,10 +16,11 @@ export const getUniqueFluidMerklIncentives = (assetsData, side) => {
         ])).values()];
 };
 const getMerklIncentiveInterest = (incentives, principal, usedAssets) => incentives.reduce((total, { apy, eligibilityId }) => {
-    const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-    const { isEligible, eligibleUSDAmount } = eligibilityCheck
-        ? eligibilityCheck(usedAssets, undefined)
-        : { isEligible: true, eligibleUSDAmount: principal };
+    const { isEligible, eligibleUSDAmount } = getIncentiveEligibility({
+        incentive: { eligibilityId },
+        usedAssets,
+        defaultEligibleUSDAmount: principal,
+    });
     const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : 0;
     return new Dec(total).add(incentiveInterest).toString();
 }, '0');

package/esm/staking/eligibility.d.ts

@@ -1,4 +1,4 @@
-import { IncentiveEligibilityId, MMUsedAssets } from '../types/common';
+import { IncentiveData, IncentiveEligibilityId, MMUsedAssets } from '../types/common';
 export declare const isEligibleForEthenaUSDeRewards: (usedAssets: MMUsedAssets, { healthRatio }: {
     healthRatio: string;
 }) => {
@@ -29,3 +29,17 @@ export declare const EligibilityMapping: {
         eligibleUSDAmount: string;
     };
 };
+export type IncentiveEligibilityResult = {
+    isEligible: boolean;
+    eligibleUSDAmount: string;
+};
+/**
+ * Resolves an incentive's position-specific eligibility and rewarded USD principal. Incentives
+ * without a curated eligibility rule apply to the full side amount supplied by the caller.
+ */
+export declare const getIncentiveEligibility: ({ incentive, usedAssets, defaultEligibleUSDAmount, optionalData, }: {
+    incentive: Pick<IncentiveData, "eligibilityId">;
+    usedAssets: MMUsedAssets;
+    defaultEligibleUSDAmount: string;
+    optionalData?: any;
+}) => IncentiveEligibilityResult;

package/esm/staking/eligibility.js

@@ -76,3 +76,13 @@ export const EligibilityMapping = {
     [IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasmaGHO]: isEligibleForEthenaGHORewards,
     [IncentiveEligibilityId.CompoundV3PufEthWethBorrow]: isEligibleForCompoundV3PufEthWethBorrow,
 };
+/**
+ * Resolves an incentive's position-specific eligibility and rewarded USD principal. Incentives
+ * without a curated eligibility rule apply to the full side amount supplied by the caller.
+ */
+export const getIncentiveEligibility = ({ incentive, usedAssets, defaultEligibleUSDAmount, optionalData, }) => {
+    const eligibilityCheck = incentive.eligibilityId ? EligibilityMapping[incentive.eligibilityId] : null;
+    return eligibilityCheck
+        ? eligibilityCheck(usedAssets, optionalData)
+        : { isEligible: true, eligibleUSDAmount: defaultEligibleUSDAmount };
+};

package/esm/staking/staking.js

@@ -12,7 +12,7 @@ import memoize from 'memoizee';
 import { NetworkNumber, } from '../types/common';
 import { BLOCKS_IN_A_YEAR } from '../constants';
 import { DEFAULT_TIMEOUT } from '../services/utils';
-import { EligibilityMapping } from './eligibility';
+import { getIncentiveEligibility } from './eligibility';
 const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const res = yield fetch('https://fe.defisaver.com/api/sky/data', { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
@@ -194,17 +194,15 @@ export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
             if (assetData.supplyIncentives) {
                 for (const supplyIncentive of assetData.supplyIncentives) {
-                    const { apy, eligibilityId } = supplyIncentive;
-                    const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-                    if (eligibilityCheck) {
-                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                        const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
-                    else {
-                        const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
+                    const { apy } = supplyIncentive;
+                    const { isEligible, eligibleUSDAmount } = getIncentiveEligibility({
+                        incentive: supplyIncentive,
+                        usedAssets,
+                        defaultEligibleUSDAmount: amount,
+                        optionalData,
+                    });
+                    const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+                    acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
                 }
             }
         }
@@ -216,17 +214,15 @@ export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
             if (assetData.borrowIncentives) {
                 for (const borrowIncentive of assetData.borrowIncentives) {
-                    const { apy, eligibilityId } = borrowIncentive;
-                    const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-                    if (eligibilityCheck) {
-                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                        const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
-                    else {
-                        const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-                    }
+                    const { apy } = borrowIncentive;
+                    const { isEligible, eligibleUSDAmount } = getIncentiveEligibility({
+                        incentive: borrowIncentive,
+                        usedAssets,
+                        defaultEligibleUSDAmount: amount,
+                        optionalData,
+                    });
+                    const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+                    acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.144-dev",
+  "version": "2.1.144",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/fluid/index.ts

@@ -1689,9 +1689,13 @@ export const getAllUserEarnPositionsWithFTokens = async (
 export const _getUserPositions = async (provider: PublicClient, network: NetworkNumber, user: EthAddress) => {
   const view = FluidViewContractViem(provider, network);
 
-  const data = await view.read.getUserPositions([user]);
+  const [data, merklCampaigns] = await Promise.all([
+    view.read.getUserPositions([user]),
+    getFluidMerklCampaigns(network),
+  ]);
 
-  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network))));
+  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network))))
+    .map(marketData => (marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData));
 
   const userData = data[0].map((position, i) => (parsedMarketData[i] && { ...parseUserData(position, parsedMarketData[i]) }));
 

package/src/helpers/fluidHelpers/index.ts

@@ -12,7 +12,7 @@ import {
 import {
   calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos,
 } from '../../moneymarket';
-import { calculateInterestEarned, calculateNetApy, EligibilityMapping } from '../../staking';
+import { calculateInterestEarned, calculateNetApy, getIncentiveEligibility } from '../../staking';
 import { IncentiveSide, LeverageType, MMAssetsData } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 
@@ -33,10 +33,11 @@ const getMerklIncentiveInterest = (
   principal: string,
   usedAssets: FluidUsedAssets,
 ) => incentives.reduce((total, { apy, eligibilityId }) => {
-  const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-  const { isEligible, eligibleUSDAmount } = eligibilityCheck
-    ? eligibilityCheck(usedAssets, undefined)
-    : { isEligible: true, eligibleUSDAmount: principal };
+  const { isEligible, eligibleUSDAmount } = getIncentiveEligibility({
+    incentive: { eligibilityId },
+    usedAssets,
+    defaultEligibleUSDAmount: principal,
+  });
   const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : 0;
 
   return new Dec(total).add(incentiveInterest).toString();

package/src/staking/eligibility.ts

@@ -1,5 +1,5 @@
 import Dec from 'decimal.js';
-import { IncentiveEligibilityId, MMUsedAssets } from '../types/common';
+import { IncentiveData, IncentiveEligibilityId, MMUsedAssets } from '../types/common';
 
 type EthenaPairEligibilityConfig = {
   baseSymbol: string;
@@ -113,4 +113,31 @@ export const EligibilityMapping: { [key in IncentiveEligibilityId]: (usedAssets:
   [IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasma]: isEligibleForEthenaUSDeRewards,
   [IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasmaGHO]: isEligibleForEthenaGHORewards,
   [IncentiveEligibilityId.CompoundV3PufEthWethBorrow]: isEligibleForCompoundV3PufEthWethBorrow,
-};
+};
+
+export type IncentiveEligibilityResult = {
+  isEligible: boolean;
+  eligibleUSDAmount: string;
+};
+
+/**
+ * Resolves an incentive's position-specific eligibility and rewarded USD principal. Incentives
+ * without a curated eligibility rule apply to the full side amount supplied by the caller.
+ */
+export const getIncentiveEligibility = ({
+  incentive,
+  usedAssets,
+  defaultEligibleUSDAmount,
+  optionalData,
+}: {
+  incentive: Pick<IncentiveData, 'eligibilityId'>;
+  usedAssets: MMUsedAssets;
+  defaultEligibleUSDAmount: string;
+  optionalData?: any;
+}): IncentiveEligibilityResult => {
+  const eligibilityCheck = incentive.eligibilityId ? EligibilityMapping[incentive.eligibilityId] : null;
+
+  return eligibilityCheck
+    ? eligibilityCheck(usedAssets, optionalData)
+    : { isEligible: true, eligibleUSDAmount: defaultEligibleUSDAmount };
+};

package/src/staking/staking.ts

@@ -7,7 +7,7 @@ import {
 } from '../types/common';
 import { BLOCKS_IN_A_YEAR } from '../constants';
 import { DEFAULT_TIMEOUT } from '../services/utils';
-import { EligibilityMapping } from './eligibility';
+import { getIncentiveEligibility } from './eligibility';
 
 const getSsrApy = async () => {
   try {
@@ -153,16 +153,15 @@ export const calculateNetApy = ({
 
       if (assetData.supplyIncentives) {
         for (const supplyIncentive of assetData.supplyIncentives) {
-          const { apy, eligibilityId } = supplyIncentive;
-          const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-          if (eligibilityCheck) {
-            const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-            const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-          } else {
-            const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-          }
+          const { apy } = supplyIncentive;
+          const { isEligible, eligibleUSDAmount } = getIncentiveEligibility({
+            incentive: supplyIncentive,
+            usedAssets,
+            defaultEligibleUSDAmount: amount,
+            optionalData,
+          });
+          const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+          acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
         }
       }
     }
@@ -176,16 +175,15 @@ export const calculateNetApy = ({
 
       if (assetData.borrowIncentives) {
         for (const borrowIncentive of assetData.borrowIncentives) {
-          const { apy, eligibilityId } = borrowIncentive;
-          const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-          if (eligibilityCheck) {
-            const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-            const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-          } else {
-            const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-          }
+          const { apy } = borrowIncentive;
+          const { isEligible, eligibleUSDAmount } = getIncentiveEligibility({
+            incentive: borrowIncentive,
+            usedAssets,
+            defaultEligibleUSDAmount: amount,
+            optionalData,
+          });
+          const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+          acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
         }
       }
     }
@@ -204,4 +202,4 @@ export const calculateNetApy = ({
   const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
 
   return { netApy, totalInterestUsd, incentiveUsd };
-};
+};