@defisaver/positions-sdk 2.1.142 → 2.1.143

package/cjs/claiming/aaveV3.d.ts

@@ -1,5 +1,6 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types';
-import { ClaimableToken } from '../types/claiming';
+import { ClaimableToken, MerklRewardsClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
+export declare function getMerklUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<MerklRewardsClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/cjs/claiming/aaveV3.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUnclaimedRewardsForAllMarkets = getUnclaimedRewardsForAllMarkets;
+exports.getMerklUnclaimedRewards = getMerklUnclaimedRewards;
 exports.getMeritUnclaimedRewards = getMeritUnclaimedRewards;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const claiming_1 = require("../types/claiming");
@@ -95,7 +96,7 @@ function getUnclaimedRewardsForAllMarkets(provider, network, walletAddress, mark
         return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
     });
 }
-function getMeritUnclaimedRewards(account, network) {
+function getMerklUnclaimedRewards(account, network) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
@@ -103,7 +104,7 @@ function getMeritUnclaimedRewards(account, network) {
             data = yield res.json();
         }
         catch (error) {
-            console.error('External API Failure: Aave Merit', error);
+            console.error('External API Failure: Merkl rewards', error);
             data = [];
         }
         const claimableTokens = [];
@@ -121,12 +122,12 @@ function getMeritUnclaimedRewards(account, network) {
                     return;
                 const unclaimed = (0, utils_1.getEthAmountForDecimals)(unclaimedAmount, token.decimals);
                 claimableTokens.push({
-                    claimType: claiming_1.ClaimType.AAVE_MERIT_REWARDS,
+                    claimType: claiming_1.ClaimType.MERKL_REWARDS,
                     amount: unclaimed,
                     symbol: token.symbol,
                     tokenAddress: token.address,
                     walletAddress: account,
-                    label: 'AAVE Merit Rewards',
+                    label: 'Merkl Rewards',
                     underlyingSymbol: (0, aaveHelpers_1.getAaveUnderlyingSymbol)(token.symbol),
                     additionalClaimFields: {
                         accumulated: amount,
@@ -140,3 +141,11 @@ function getMeritUnclaimedRewards(account, network) {
         return claimableTokens;
     });
 }
+function getMeritUnclaimedRewards(account, network) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rewards = yield getMerklUnclaimedRewards(account, network);
+        return rewards
+            .filter(reward => reward.symbol.startsWith('a'))
+            .map(reward => (Object.assign(Object.assign({}, reward), { claimType: claiming_1.ClaimType.AAVE_MERIT_REWARDS, label: 'AAVE Merit Rewards' })));
+    });
+}

package/cjs/fluid/index.d.ts

@@ -22,6 +22,8 @@ export declare const EMPTY_FLUID_DATA: {
     minRatio: string;
     netApy: string;
     incentiveUsd: string;
+    merklSupplyIncentives: never[];
+    merklBorrowIncentives: never[];
     totalInterestUsd: string;
     isSubscribedToAutomation: boolean;
     automationResubscribeRequired: boolean;
@@ -127,6 +129,8 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         leftToBorrowUsd: string;
         netApy: string;
         incentiveUsd: string;
+        merklSupplyIncentives: import("../types").IncentiveData[];
+        merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
         minRatio: string;
@@ -159,6 +163,8 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         leftToBorrowUsd: string;
         netApy: string;
         incentiveUsd: string;
+        merklSupplyIncentives: import("../types").IncentiveData[];
+        merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
         minRatio: string;
@@ -191,6 +197,8 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         leftToBorrowUsd: string;
         netApy: string;
         incentiveUsd: string;
+        merklSupplyIncentives: import("../types").IncentiveData[];
+        merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
         minRatio: string;

package/cjs/fluid/index.js

@@ -922,6 +922,8 @@ exports.EMPTY_FLUID_DATA = {
     minRatio: '0',
     netApy: '0',
     incentiveUsd: '0',
+    merklSupplyIncentives: [],
+    merklBorrowIncentives: [],
     totalInterestUsd: '0',
     isSubscribedToAutomation: false,
     automationResubscribeRequired: false,
@@ -1391,8 +1393,12 @@ const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0
         tokens.push('ETH');
     if (!tokens.includes('WBTC'))
         tokens.push('WBTC');
-    const tokenPrices = yield getTokensPricesForPortfolio(tokens, provider, network);
-    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); }))));
+    const [tokenPrices, merklCampaigns] = yield Promise.all([
+        getTokensPricesForPortfolio(tokens, provider, network),
+        (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, tokenPrices); }))))
+        .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/fluid/merkl.d.ts

@@ -1,3 +1,4 @@
+import memoize from 'memoizee';
 import { FluidMarketData, FluidMerklRewardMap, MerklOpportunity, NetworkNumber } from '../types';
 /**
  * Merkl tags Fluid vault-scoped reward campaigns via the opportunity `type` field:
@@ -22,7 +23,7 @@ export declare const buildFluidMerklRewardMap: (opportunities: MerklOpportunity[
  * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
  * on any failure it returns an empty map, so Merkl being down can't break market data.
  */
-export declare const getFluidMerklCampaigns: (chainId: NetworkNumber) => Promise<FluidMerklRewardMap>;
+export declare const getFluidMerklCampaigns: ((chainId: NetworkNumber) => Promise<FluidMerklRewardMap>) & memoize.Memoized<(chainId: NetworkNumber) => Promise<FluidMerklRewardMap>>;
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every
  * suppliable asset and borrow rewards on every borrowable one. Smart collateral/debt vaults hold

package/cjs/fluid/merkl.js

@@ -8,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
+const memoizee_1 = __importDefault(require("memoizee"));
 const moneymarket_1 = require("../moneymarket");
 const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
@@ -41,6 +45,7 @@ const buildMerklIncentive = (opportunity) => {
         apy: (0, moneymarket_1.aprToApy)(opportunity.apr),
         token,
         incentiveKind: types_1.IncentiveKind.Reward,
+        source: types_1.IncentiveSource.Merkl,
         description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
         eligibilityId: opportunity.identifier,
     };
@@ -68,7 +73,7 @@ exports.buildFluidMerklRewardMap = buildFluidMerklRewardMap;
  * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
  * on any failure it returns an empty map, so Merkl being down can't break market data.
  */
-const getFluidMerklCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getFluidMerklCampaigns = (0, memoizee_1.default)((chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const opportunities = yield (0, merkl_1.fetchAllMerklOpportunities)({
             mainProtocolId: 'fluid',
@@ -81,8 +86,7 @@ const getFluidMerklCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, fu
         console.error('Failed to fetch Fluid Merkl campaigns', e);
         return {};
     }
-});
-exports.getFluidMerklCampaigns = getFluidMerklCampaigns;
+}), { promise: true, maxAge: 60 * 1000 });
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every
  * suppliable asset and borrow rewards on every borrowable one. Smart collateral/debt vaults hold

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

@@ -1,4 +1,6 @@
-import { FluidAggregatedVaultData, FluidAssetData, FluidAssetsData, FluidDexBorrowDataStructOutput, FluidDexSupplyDataStructOutput, FluidUsedAsset, FluidUsedAssets, InnerFluidMarketData } from '../../types';
+import { FluidAggregatedVaultData, FluidAssetData, FluidAssetsData, FluidDexBorrowDataStructOutput, FluidDexSupplyDataStructOutput, FluidUsedAsset, FluidUsedAssets, IncentiveData, InnerFluidMarketData } from '../../types';
+import { IncentiveSide } from '../../types/common';
+export declare const getUniqueFluidMerklIncentives: (assetsData: FluidAssetsData, side: IncentiveSide) => IncentiveData[];
 export declare const getFluidAggregatedData: ({ usedAssets, assetsData, marketData, }: {
     usedAssets: FluidUsedAssets;
     marketData: InnerFluidMarketData;

package/cjs/helpers/fluidHelpers/index.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.mergeUsedAssets = exports.EMPTY_USED_ASSET = exports.mergeAssetData = exports.parseDexBorrowData = exports.parseDexSupplyData = exports.getFluidAggregatedData = void 0;
+exports.mergeUsedAssets = exports.EMPTY_USED_ASSET = exports.mergeAssetData = exports.parseDexBorrowData = exports.parseDexSupplyData = exports.getFluidAggregatedData = exports.getUniqueFluidMerklIncentives = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const types_1 = require("../../types");
@@ -11,13 +11,38 @@ const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
 const common_1 = require("../../types/common");
 const utils_1 = require("../../services/utils");
-const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
+const getUniqueFluidMerklIncentives = (assetsData, side) => {
+    const field = side === common_1.IncentiveSide.Supply ? 'supplyIncentives' : 'borrowIncentives';
+    const incentives = Object.values(assetsData)
+        .flatMap(asset => asset[field])
+        .filter(incentive => incentive.source === types_1.IncentiveSource.Merkl);
+    return [...new Map(incentives.map(incentive => [
+            [incentive.eligibilityId, incentive.token, incentive.apy, incentive.description].join('|'),
+            incentive,
+        ])).values()];
+};
+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 incentiveInterest = isEligible ? (0, staking_1.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : 0;
+    return new decimal_js_1.default(total).add(incentiveInterest).toString();
+}, '0');
+const calculateNetApyDex = ({ marketData, assetsData, usedAssets, suppliedUsd, borrowedUsd, }) => {
     const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
     const totalBorrowRate = new decimal_js_1.default(borrowRate).minus(tradingBorrowRate || '0').toString();
     const totalSupplyRate = new decimal_js_1.default(supplyRate).add(tradingSupplyRate || '0').toString();
     const borrowIncentive = new decimal_js_1.default(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
     const supplyIncentive = new decimal_js_1.default(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
-    const incentiveUsd = new decimal_js_1.default(supplyIncentive).minus(borrowIncentive).toString();
+    const merklSupplyIncentive = getMerklIncentiveInterest((0, exports.getUniqueFluidMerklIncentives)(assetsData, common_1.IncentiveSide.Supply), suppliedUsd, usedAssets);
+    const merklBorrowIncentive = getMerklIncentiveInterest((0, exports.getUniqueFluidMerklIncentives)(assetsData, common_1.IncentiveSide.Borrow), borrowedUsd, usedAssets);
+    const incentiveUsd = new decimal_js_1.default(supplyIncentive)
+        .minus(borrowIncentive)
+        .add(merklSupplyIncentive)
+        .add(merklBorrowIncentive)
+        .toString();
     const borrowInterest = new decimal_js_1.default(totalBorrowRate).mul(borrowedUsd).div(100).toString();
     const supplyInterest = new decimal_js_1.default(totalSupplyRate).mul(suppliedUsd).div(100).toString();
     const totalInterestUsd = new decimal_js_1.default(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
@@ -38,7 +63,15 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
         ? (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd)
         : new decimal_js_1.default(marketData.debtSharePrice).mul(borrowShares).toString();
     const isDex = [types_1.FluidVaultType.T2, types_1.FluidVaultType.T3, types_1.FluidVaultType.T4].includes(marketData.vaultType);
-    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
+    payload.merklSupplyIncentives = (0, exports.getUniqueFluidMerklIncentives)(assetsData, common_1.IncentiveSide.Supply);
+    payload.merklBorrowIncentives = (0, exports.getUniqueFluidMerklIncentives)(assetsData, common_1.IncentiveSide.Borrow);
+    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({
+        marketData,
+        assetsData,
+        usedAssets,
+        suppliedUsd: payload.suppliedUsd,
+        borrowedUsd: payload.borrowedUsd,
+    }) : (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;

package/cjs/portfolio/index.js

@@ -134,7 +134,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                 },
             };
             rewardsData[address.toLowerCase()] = {
-                aaveV3merit: {},
+                merkl: {},
                 aaveV3: {},
                 compV3: {},
                 spark: {},
@@ -355,12 +355,12 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
             }))).flat(),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const aaveMeritData = yield (0, aaveV3_2.getMeritUnclaimedRewards)(address, network);
-                    rewardsData[address.toLowerCase()].aaveV3merit = { error: '', data: aaveMeritData };
+                    const merklData = yield (0, aaveV3_2.getMerklUnclaimedRewards)(address, network);
+                    rewardsData[address.toLowerCase()].merkl = { error: '', data: merklData };
                 }
                 catch (error) {
-                    console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
-                    rewardsData[address.toLowerCase()].aaveV3merit = { error: `Error fetching Aave V3 Merit rewards data for address ${address}`, data: null };
+                    console.error(`Error fetching Merkl rewards data for address ${address}:`, error);
+                    rewardsData[address.toLowerCase()].merkl = { error: `Error fetching Merkl rewards data for address ${address}`, data: null };
                 }
             })),
             ...aaveV3Markets.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {

package/cjs/types/claiming.d.ts

@@ -4,6 +4,8 @@ export declare enum ClaimType {
     AAVE_REWARDS = "AAVE_REWARDS",
     /** Merit rewards from AAVE (various tokens) */
     AAVE_MERIT_REWARDS = "AAVE_MERIT_REWARDS",
+    /** Rewards distributed through Merkl across supported protocols */
+    MERKL_REWARDS = "MERKL_REWARDS",
     /** Rewards from Compound V3 (only in COMP) */
     COMPOUND_V3_COMP = "COMPOUND_V3_COMP",
     /** Rewards from Spark (wstETH only for now) */
@@ -43,6 +45,15 @@ export type AaveMeritRewardsClaimableToken = _ClaimableTokenPartial & {
         unclaimed: string;
     };
 };
+export type MerklRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.MERKL_REWARDS;
+    additionalClaimFields: {
+        accumulated: string;
+        proof: string[];
+        decimals: string;
+        unclaimed: string;
+    };
+};
 export type SparkRewardsClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.SPARK_REWARDS;
     additionalClaimFields: {
@@ -91,5 +102,5 @@ export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
         proof: string[];
     };
 };
-export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
+export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | MerklRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/cjs/types/claiming.js

@@ -7,6 +7,8 @@ var ClaimType;
     ClaimType["AAVE_REWARDS"] = "AAVE_REWARDS";
     /** Merit rewards from AAVE (various tokens) */
     ClaimType["AAVE_MERIT_REWARDS"] = "AAVE_MERIT_REWARDS";
+    /** Rewards distributed through Merkl across supported protocols */
+    ClaimType["MERKL_REWARDS"] = "MERKL_REWARDS";
     /** Rewards from Compound V3 (only in COMP) */
     ClaimType["COMPOUND_V3_COMP"] = "COMPOUND_V3_COMP";
     /** Rewards from Spark (wstETH only for now) */

package/cjs/types/common.d.ts

@@ -6,6 +6,9 @@ export declare enum IncentiveSide {
     Supply = "supply",
     Borrow = "borrow"
 }
+export declare enum IncentiveSource {
+    Merkl = "merkl"
+}
 export declare enum IncentiveEligibilityId {
     AaveV3EthenaLiquidLeverage = "0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
@@ -25,6 +28,7 @@ export interface IncentiveData {
     token: string;
     apy: string;
     incentiveKind?: IncentiveKind;
+    source?: IncentiveSource;
     description?: string;
     eligibilityId?: IncentiveEligibilityId;
 }

package/cjs/types/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkNumber = exports.LeverageType = exports.IncentiveEligibilityId = exports.IncentiveSide = exports.IncentiveKind = void 0;
+exports.NetworkNumber = exports.LeverageType = exports.IncentiveEligibilityId = exports.IncentiveSource = exports.IncentiveSide = exports.IncentiveKind = void 0;
 var IncentiveKind;
 (function (IncentiveKind) {
     IncentiveKind["Staking"] = "staking";
@@ -11,6 +11,10 @@ var IncentiveSide;
     IncentiveSide["Supply"] = "supply";
     IncentiveSide["Borrow"] = "borrow";
 })(IncentiveSide || (exports.IncentiveSide = IncentiveSide = {}));
+var IncentiveSource;
+(function (IncentiveSource) {
+    IncentiveSource["Merkl"] = "merkl";
+})(IncentiveSource || (exports.IncentiveSource = IncentiveSource = {}));
 var IncentiveEligibilityId;
 (function (IncentiveEligibilityId) {
     IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL";

package/cjs/types/fluid.d.ts

@@ -319,6 +319,8 @@ export interface FluidAggregatedVaultData {
     leftToBorrowUsd: string;
     netApy: string;
     incentiveUsd: string;
+    merklSupplyIncentives: IncentiveData[];
+    merklBorrowIncentives: IncentiveData[];
     ratio: string;
     collRatio: string;
     minRatio: string;

package/esm/claiming/aaveV3.d.ts

@@ -1,5 +1,6 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types';
-import { ClaimableToken } from '../types/claiming';
+import { ClaimableToken, MerklRewardsClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
+export declare function getMerklUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<MerklRewardsClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/esm/claiming/aaveV3.js

@@ -88,7 +88,7 @@ export function getUnclaimedRewardsForAllMarkets(provider, network, walletAddres
         return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
     });
 }
-export function getMeritUnclaimedRewards(account, network) {
+export function getMerklUnclaimedRewards(account, network) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
@@ -96,7 +96,7 @@ export function getMeritUnclaimedRewards(account, network) {
             data = yield res.json();
         }
         catch (error) {
-            console.error('External API Failure: Aave Merit', error);
+            console.error('External API Failure: Merkl rewards', error);
             data = [];
         }
         const claimableTokens = [];
@@ -114,12 +114,12 @@ export function getMeritUnclaimedRewards(account, network) {
                     return;
                 const unclaimed = getEthAmountForDecimals(unclaimedAmount, token.decimals);
                 claimableTokens.push({
-                    claimType: ClaimType.AAVE_MERIT_REWARDS,
+                    claimType: ClaimType.MERKL_REWARDS,
                     amount: unclaimed,
                     symbol: token.symbol,
                     tokenAddress: token.address,
                     walletAddress: account,
-                    label: 'AAVE Merit Rewards',
+                    label: 'Merkl Rewards',
                     underlyingSymbol: getAaveUnderlyingSymbol(token.symbol),
                     additionalClaimFields: {
                         accumulated: amount,
@@ -133,3 +133,11 @@ export function getMeritUnclaimedRewards(account, network) {
         return claimableTokens;
     });
 }
+export function getMeritUnclaimedRewards(account, network) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rewards = yield getMerklUnclaimedRewards(account, network);
+        return rewards
+            .filter(reward => reward.symbol.startsWith('a'))
+            .map(reward => (Object.assign(Object.assign({}, reward), { claimType: ClaimType.AAVE_MERIT_REWARDS, label: 'AAVE Merit Rewards' })));
+    });
+}

package/esm/fluid/index.d.ts

@@ -22,6 +22,8 @@ export declare const EMPTY_FLUID_DATA: {
     minRatio: string;
     netApy: string;
     incentiveUsd: string;
+    merklSupplyIncentives: never[];
+    merklBorrowIncentives: never[];
     totalInterestUsd: string;
     isSubscribedToAutomation: boolean;
     automationResubscribeRequired: boolean;
@@ -127,6 +129,8 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         leftToBorrowUsd: string;
         netApy: string;
         incentiveUsd: string;
+        merklSupplyIncentives: import("../types").IncentiveData[];
+        merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
         minRatio: string;
@@ -159,6 +163,8 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         leftToBorrowUsd: string;
         netApy: string;
         incentiveUsd: string;
+        merklSupplyIncentives: import("../types").IncentiveData[];
+        merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
         minRatio: string;
@@ -191,6 +197,8 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         leftToBorrowUsd: string;
         netApy: string;
         incentiveUsd: string;
+        merklSupplyIncentives: import("../types").IncentiveData[];
+        merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
         minRatio: string;

package/esm/fluid/index.js

@@ -912,6 +912,8 @@ export const EMPTY_FLUID_DATA = {
     minRatio: '0',
     netApy: '0',
     incentiveUsd: '0',
+    merklSupplyIncentives: [],
+    merklBorrowIncentives: [],
     totalInterestUsd: '0',
     isSubscribedToAutomation: false,
     automationResubscribeRequired: false,
@@ -1363,8 +1365,12 @@ export const _getUserPositionsPortfolio = (provider, network, user) => __awaiter
         tokens.push('ETH');
     if (!tokens.includes('WBTC'))
         tokens.push('WBTC');
-    const tokenPrices = yield getTokensPricesForPortfolio(tokens, provider, network);
-    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); }))));
+    const [tokenPrices, merklCampaigns] = yield Promise.all([
+        getTokensPricesForPortfolio(tokens, provider, network),
+        getFluidMerklCampaigns(network),
+    ]);
+    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); }))))
+        .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/fluid/merkl.d.ts

@@ -1,3 +1,4 @@
+import memoize from 'memoizee';
 import { FluidMarketData, FluidMerklRewardMap, MerklOpportunity, NetworkNumber } from '../types';
 /**
  * Merkl tags Fluid vault-scoped reward campaigns via the opportunity `type` field:
@@ -22,7 +23,7 @@ export declare const buildFluidMerklRewardMap: (opportunities: MerklOpportunity[
  * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
  * on any failure it returns an empty map, so Merkl being down can't break market data.
  */
-export declare const getFluidMerklCampaigns: (chainId: NetworkNumber) => Promise<FluidMerklRewardMap>;
+export declare const getFluidMerklCampaigns: ((chainId: NetworkNumber) => Promise<FluidMerklRewardMap>) & memoize.Memoized<(chainId: NetworkNumber) => Promise<FluidMerklRewardMap>>;
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every
  * suppliable asset and borrow rewards on every borrowable one. Smart collateral/debt vaults hold

package/esm/fluid/merkl.js

@@ -7,9 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import memoize from 'memoizee';
 import { aprToApy } from '../moneymarket';
 import { fetchAllMerklOpportunities } from '../services/merkl';
-import { IncentiveKind, OpportunityStatus, } from '../types';
+import { IncentiveKind, IncentiveSource, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Fluid vault-scoped reward campaigns via the opportunity `type` field:
  *   - FLUIDVAULT_COLLATERAL → reward for supplying collateral to the vault
@@ -38,6 +39,7 @@ const buildMerklIncentive = (opportunity) => {
         apy: aprToApy(opportunity.apr),
         token,
         incentiveKind: IncentiveKind.Reward,
+        source: IncentiveSource.Merkl,
         description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
         eligibilityId: opportunity.identifier,
     };
@@ -64,7 +66,7 @@ export const buildFluidMerklRewardMap = (opportunities, chainId) => {
  * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
  * on any failure it returns an empty map, so Merkl being down can't break market data.
  */
-export const getFluidMerklCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+export const getFluidMerklCampaigns = memoize((chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const opportunities = yield fetchAllMerklOpportunities({
             mainProtocolId: 'fluid',
@@ -77,7 +79,7 @@ export const getFluidMerklCampaigns = (chainId) => __awaiter(void 0, void 0, voi
         console.error('Failed to fetch Fluid Merkl campaigns', e);
         return {};
     }
-});
+}), { promise: true, maxAge: 60 * 1000 });
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every
  * suppliable asset and borrow rewards on every borrowable one. Smart collateral/debt vaults hold

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

@@ -1,4 +1,6 @@
-import { FluidAggregatedVaultData, FluidAssetData, FluidAssetsData, FluidDexBorrowDataStructOutput, FluidDexSupplyDataStructOutput, FluidUsedAsset, FluidUsedAssets, InnerFluidMarketData } from '../../types';
+import { FluidAggregatedVaultData, FluidAssetData, FluidAssetsData, FluidDexBorrowDataStructOutput, FluidDexSupplyDataStructOutput, FluidUsedAsset, FluidUsedAssets, IncentiveData, InnerFluidMarketData } from '../../types';
+import { IncentiveSide } from '../../types/common';
+export declare const getUniqueFluidMerklIncentives: (assetsData: FluidAssetsData, side: IncentiveSide) => IncentiveData[];
 export declare const getFluidAggregatedData: ({ usedAssets, assetsData, marketData, }: {
     usedAssets: FluidUsedAssets;
     marketData: InnerFluidMarketData;

package/esm/helpers/fluidHelpers/index.js

@@ -1,17 +1,41 @@
 import Dec from 'decimal.js';
 import { assetAmountInEth } from '@defisaver/tokens';
-import { FluidVaultType, } from '../../types';
+import { FluidVaultType, IncentiveSource, } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos, } from '../../moneymarket';
-import { calculateNetApy } from '../../staking';
-import { LeverageType } from '../../types/common';
+import { calculateInterestEarned, calculateNetApy, EligibilityMapping } from '../../staking';
+import { IncentiveSide, LeverageType } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
-const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
+export const getUniqueFluidMerklIncentives = (assetsData, side) => {
+    const field = side === IncentiveSide.Supply ? 'supplyIncentives' : 'borrowIncentives';
+    const incentives = Object.values(assetsData)
+        .flatMap(asset => asset[field])
+        .filter(incentive => incentive.source === IncentiveSource.Merkl);
+    return [...new Map(incentives.map(incentive => [
+            [incentive.eligibilityId, incentive.token, incentive.apy, incentive.description].join('|'),
+            incentive,
+        ])).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 incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : 0;
+    return new Dec(total).add(incentiveInterest).toString();
+}, '0');
+const calculateNetApyDex = ({ marketData, assetsData, usedAssets, suppliedUsd, borrowedUsd, }) => {
     const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
     const totalBorrowRate = new Dec(borrowRate).minus(tradingBorrowRate || '0').toString();
     const totalSupplyRate = new Dec(supplyRate).add(tradingSupplyRate || '0').toString();
     const borrowIncentive = new Dec(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
     const supplyIncentive = new Dec(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
-    const incentiveUsd = new Dec(supplyIncentive).minus(borrowIncentive).toString();
+    const merklSupplyIncentive = getMerklIncentiveInterest(getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Supply), suppliedUsd, usedAssets);
+    const merklBorrowIncentive = getMerklIncentiveInterest(getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Borrow), borrowedUsd, usedAssets);
+    const incentiveUsd = new Dec(supplyIncentive)
+        .minus(borrowIncentive)
+        .add(merklSupplyIncentive)
+        .add(merklBorrowIncentive)
+        .toString();
     const borrowInterest = new Dec(totalBorrowRate).mul(borrowedUsd).div(100).toString();
     const supplyInterest = new Dec(totalSupplyRate).mul(suppliedUsd).div(100).toString();
     const totalInterestUsd = new Dec(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
@@ -32,7 +56,15 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
         ? getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd)
         : new Dec(marketData.debtSharePrice).mul(borrowShares).toString();
     const isDex = [FluidVaultType.T2, FluidVaultType.T3, FluidVaultType.T4].includes(marketData.vaultType);
-    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : calculateNetApy({ usedAssets, assetsData: assetsData });
+    payload.merklSupplyIncentives = getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Supply);
+    payload.merklBorrowIncentives = getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Borrow);
+    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({
+        marketData,
+        assetsData,
+        usedAssets,
+        suppliedUsd: payload.suppliedUsd,
+        borrowedUsd: payload.borrowedUsd,
+    }) : calculateNetApy({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;

package/esm/portfolio/index.js

@@ -26,7 +26,7 @@ import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
 import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
 import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
-import { getMeritUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
+import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { getCompoundV3Rewards } from '../claiming/compV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { getKingRewards } from '../claiming/king';
@@ -114,7 +114,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 },
             };
             rewardsData[address.toLowerCase()] = {
-                aaveV3merit: {},
+                merkl: {},
                 aaveV3: {},
                 compV3: {},
                 spark: {},
@@ -335,12 +335,12 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             }))).flat(),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const aaveMeritData = yield getMeritUnclaimedRewards(address, network);
-                    rewardsData[address.toLowerCase()].aaveV3merit = { error: '', data: aaveMeritData };
+                    const merklData = yield getMerklUnclaimedRewards(address, network);
+                    rewardsData[address.toLowerCase()].merkl = { error: '', data: merklData };
                 }
                 catch (error) {
-                    console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
-                    rewardsData[address.toLowerCase()].aaveV3merit = { error: `Error fetching Aave V3 Merit rewards data for address ${address}`, data: null };
+                    console.error(`Error fetching Merkl rewards data for address ${address}:`, error);
+                    rewardsData[address.toLowerCase()].merkl = { error: `Error fetching Merkl rewards data for address ${address}`, data: null };
                 }
             })),
             ...aaveV3Markets.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {

package/esm/types/claiming.d.ts

@@ -4,6 +4,8 @@ export declare enum ClaimType {
     AAVE_REWARDS = "AAVE_REWARDS",
     /** Merit rewards from AAVE (various tokens) */
     AAVE_MERIT_REWARDS = "AAVE_MERIT_REWARDS",
+    /** Rewards distributed through Merkl across supported protocols */
+    MERKL_REWARDS = "MERKL_REWARDS",
     /** Rewards from Compound V3 (only in COMP) */
     COMPOUND_V3_COMP = "COMPOUND_V3_COMP",
     /** Rewards from Spark (wstETH only for now) */
@@ -43,6 +45,15 @@ export type AaveMeritRewardsClaimableToken = _ClaimableTokenPartial & {
         unclaimed: string;
     };
 };
+export type MerklRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.MERKL_REWARDS;
+    additionalClaimFields: {
+        accumulated: string;
+        proof: string[];
+        decimals: string;
+        unclaimed: string;
+    };
+};
 export type SparkRewardsClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.SPARK_REWARDS;
     additionalClaimFields: {
@@ -91,5 +102,5 @@ export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
         proof: string[];
     };
 };
-export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
+export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | MerklRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/esm/types/claiming.js

@@ -4,6 +4,8 @@ export var ClaimType;
     ClaimType["AAVE_REWARDS"] = "AAVE_REWARDS";
     /** Merit rewards from AAVE (various tokens) */
     ClaimType["AAVE_MERIT_REWARDS"] = "AAVE_MERIT_REWARDS";
+    /** Rewards distributed through Merkl across supported protocols */
+    ClaimType["MERKL_REWARDS"] = "MERKL_REWARDS";
     /** Rewards from Compound V3 (only in COMP) */
     ClaimType["COMPOUND_V3_COMP"] = "COMPOUND_V3_COMP";
     /** Rewards from Spark (wstETH only for now) */

package/esm/types/common.d.ts

@@ -6,6 +6,9 @@ export declare enum IncentiveSide {
     Supply = "supply",
     Borrow = "borrow"
 }
+export declare enum IncentiveSource {
+    Merkl = "merkl"
+}
 export declare enum IncentiveEligibilityId {
     AaveV3EthenaLiquidLeverage = "0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
@@ -25,6 +28,7 @@ export interface IncentiveData {
     token: string;
     apy: string;
     incentiveKind?: IncentiveKind;
+    source?: IncentiveSource;
     description?: string;
     eligibilityId?: IncentiveEligibilityId;
 }

package/esm/types/common.js

@@ -8,6 +8,10 @@ export var IncentiveSide;
     IncentiveSide["Supply"] = "supply";
     IncentiveSide["Borrow"] = "borrow";
 })(IncentiveSide || (IncentiveSide = {}));
+export var IncentiveSource;
+(function (IncentiveSource) {
+    IncentiveSource["Merkl"] = "merkl";
+})(IncentiveSource || (IncentiveSource = {}));
 export var IncentiveEligibilityId;
 (function (IncentiveEligibilityId) {
     IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL";

package/esm/types/fluid.d.ts

@@ -319,6 +319,8 @@ export interface FluidAggregatedVaultData {
     leftToBorrowUsd: string;
     netApy: string;
     incentiveUsd: string;
+    merklSupplyIncentives: IncentiveData[];
+    merklBorrowIncentives: IncentiveData[];
     ratio: string;
     collRatio: string;
     minRatio: string;

package/package.json

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

package/src/claiming/aaveV3.ts

@@ -1,7 +1,7 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
 import { EthAddress, NetworkNumber } from '../types';
-import { ClaimableToken, ClaimType } from '../types/claiming';
+import { ClaimableToken, ClaimType, MerklRewardsClaimableToken } from '../types/claiming';
 import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveRewardsControllerViem,
@@ -103,18 +103,18 @@ export async function getUnclaimedRewardsForAllMarkets(
   return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
 }
 
-export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]> {
+export async function getMerklUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<MerklRewardsClaimableToken[]> {
   let data;
   try {
     const res = await fetch(`https://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`,
       { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
     data = await res.json();
   } catch (error) {
-    console.error('External API Failure: Aave Merit', error);
+    console.error('External API Failure: Merkl rewards', error);
     data = [];
   }
 
-  const claimableTokens: ClaimableToken[] = [];
+  const claimableTokens: MerklRewardsClaimableToken[] = [];
 
   // Merkl (or our proxy, on a non-2xx) can return a non-array error body; `fetch` doesn't throw on
   // HTTP errors, so guard before iterating. Mirrors the app-side getMeritUnclaimedRewards.
@@ -137,12 +137,12 @@ export async function getMeritUnclaimedRewards(account: EthAddress, network: Net
       const unclaimed = getEthAmountForDecimals(unclaimedAmount, token.decimals);
 
       claimableTokens.push({
-        claimType: ClaimType.AAVE_MERIT_REWARDS,
+        claimType: ClaimType.MERKL_REWARDS,
         amount: unclaimed,
         symbol: token.symbol,
         tokenAddress: token.address,
         walletAddress: account,
-        label: 'AAVE Merit Rewards',
+        label: 'Merkl Rewards',
         underlyingSymbol: getAaveUnderlyingSymbol(token.symbol),
         additionalClaimFields: {
           accumulated: amount,
@@ -155,4 +155,16 @@ export async function getMeritUnclaimedRewards(account: EthAddress, network: Net
   });
 
   return claimableTokens;
-}
+}
+
+export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]> {
+  const rewards = await getMerklUnclaimedRewards(account, network);
+
+  return rewards
+    .filter(reward => reward.symbol.startsWith('a'))
+    .map(reward => ({
+      ...reward,
+      claimType: ClaimType.AAVE_MERIT_REWARDS,
+      label: 'AAVE Merit Rewards',
+    }));
+}

package/src/fluid/index.ts

@@ -1154,6 +1154,8 @@ export const EMPTY_FLUID_DATA = {
   minRatio: '0',
   netApy: '0',
   incentiveUsd: '0',
+  merklSupplyIncentives: [],
+  merklBorrowIncentives: [],
   totalInterestUsd: '0',
   isSubscribedToAutomation: false,
   automationResubscribeRequired: false,
@@ -1809,9 +1811,13 @@ export const _getUserPositionsPortfolio = async (provider: PublicClient, network
   if (!tokens.includes('ETH')) tokens.push('ETH');
   if (!tokens.includes('WBTC')) tokens.push('WBTC');
 
-  const tokenPrices = await getTokensPricesForPortfolio(tokens, provider, network);
+  const [tokenPrices, merklCampaigns] = await Promise.all([
+    getTokensPricesForPortfolio(tokens, provider, network),
+    getFluidMerklCampaigns(network),
+  ]);
 
-  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices))));
+  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices))))
+    .map(marketData => (marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData));
 
   const userData = data[0].map((position, i) => (parsedMarketData[i] && { ...parseUserData(position, parsedMarketData[i]) }));
 

package/src/fluid/merkl.ts

@@ -1,3 +1,4 @@
+import memoize from 'memoizee';
 import { aprToApy } from '../moneymarket';
 import { fetchAllMerklOpportunities } from '../services/merkl';
 import {
@@ -6,6 +7,7 @@ import {
   IncentiveData,
   IncentiveEligibilityId,
   IncentiveKind,
+  IncentiveSource,
   MerklOpportunity,
   NetworkNumber,
   OpportunityStatus,
@@ -39,6 +41,7 @@ const buildMerklIncentive = (opportunity: MerklOpportunity): IncentiveData => {
     apy: aprToApy(opportunity.apr),
     token,
     incentiveKind: IncentiveKind.Reward,
+    source: IncentiveSource.Merkl,
     description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
     eligibilityId: opportunity.identifier as IncentiveEligibilityId,
   };
@@ -66,7 +69,7 @@ export const buildFluidMerklRewardMap = (opportunities: MerklOpportunity[], chai
  * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
  * on any failure it returns an empty map, so Merkl being down can't break market data.
  */
-export const getFluidMerklCampaigns = async (chainId: NetworkNumber): Promise<FluidMerklRewardMap> => {
+export const getFluidMerklCampaigns = memoize(async (chainId: NetworkNumber): Promise<FluidMerklRewardMap> => {
   try {
     const opportunities = await fetchAllMerklOpportunities({
       mainProtocolId: 'fluid',
@@ -78,7 +81,7 @@ export const getFluidMerklCampaigns = async (chainId: NetworkNumber): Promise<Fl
     console.error('Failed to fetch Fluid Merkl campaigns', e);
     return {};
   }
-};
+}, { promise: true, maxAge: 60 * 1000 });
 
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every

package/src/helpers/fluidHelpers/index.ts

@@ -5,16 +5,56 @@ import {
   FluidAssetsData, FluidDexBorrowDataStructOutput, FluidDexSupplyDataStructOutput, FluidUsedAsset,
   FluidUsedAssets,
   FluidVaultType,
+  IncentiveData,
+  IncentiveSource,
   InnerFluidMarketData,
 } from '../../types';
 import {
   calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos,
 } from '../../moneymarket';
-import { calculateNetApy } from '../../staking';
-import { LeverageType, MMAssetsData } from '../../types/common';
+import { calculateInterestEarned, calculateNetApy, EligibilityMapping } from '../../staking';
+import { IncentiveSide, LeverageType, MMAssetsData } from '../../types/common';
 import { getEthAmountForDecimals } from '../../services/utils';
 
-const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }: { marketData: InnerFluidMarketData, suppliedUsd: string, borrowedUsd: string }) => {
+export const getUniqueFluidMerklIncentives = (assetsData: FluidAssetsData, side: IncentiveSide): IncentiveData[] => {
+  const field = side === IncentiveSide.Supply ? 'supplyIncentives' : 'borrowIncentives';
+  const incentives = Object.values(assetsData)
+    .flatMap(asset => asset[field])
+    .filter(incentive => incentive.source === IncentiveSource.Merkl);
+
+  return [...new Map(incentives.map(incentive => [
+    [incentive.eligibilityId, incentive.token, incentive.apy, incentive.description].join('|'),
+    incentive,
+  ])).values()];
+};
+
+const getMerklIncentiveInterest = (
+  incentives: IncentiveData[],
+  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 incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : 0;
+
+  return new Dec(total).add(incentiveInterest).toString();
+}, '0');
+
+const calculateNetApyDex = ({
+  marketData,
+  assetsData,
+  usedAssets,
+  suppliedUsd,
+  borrowedUsd,
+}: {
+  marketData: InnerFluidMarketData,
+  assetsData: FluidAssetsData,
+  usedAssets: FluidUsedAssets,
+  suppliedUsd: string,
+  borrowedUsd: string,
+}) => {
   const {
     borrowRate,
     supplyRate,
@@ -29,7 +69,21 @@ const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }: { marketDa
 
   const borrowIncentive = new Dec(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
   const supplyIncentive = new Dec(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
-  const incentiveUsd = new Dec(supplyIncentive).minus(borrowIncentive).toString();
+  const merklSupplyIncentive = getMerklIncentiveInterest(
+    getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Supply),
+    suppliedUsd,
+    usedAssets,
+  );
+  const merklBorrowIncentive = getMerklIncentiveInterest(
+    getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Borrow),
+    borrowedUsd,
+    usedAssets,
+  );
+  const incentiveUsd = new Dec(supplyIncentive)
+    .minus(borrowIncentive)
+    .add(merklSupplyIncentive)
+    .add(merklBorrowIncentive)
+    .toString();
 
   const borrowInterest = new Dec(totalBorrowRate).mul(borrowedUsd).div(100).toString();
   const supplyInterest = new Dec(totalSupplyRate).mul(suppliedUsd).div(100).toString();
@@ -66,7 +120,15 @@ borrowShares?: string,
     : new Dec(marketData.debtSharePrice!).mul(borrowShares!).toString();
 
   const isDex = [FluidVaultType.T2, FluidVaultType.T3, FluidVaultType.T4].includes(marketData.vaultType);
-  const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
+  payload.merklSupplyIncentives = getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Supply);
+  payload.merklBorrowIncentives = getUniqueFluidMerklIncentives(assetsData, IncentiveSide.Borrow);
+  const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({
+    marketData,
+    assetsData,
+    usedAssets,
+    suppliedUsd: payload.suppliedUsd,
+    borrowedUsd: payload.borrowedUsd,
+  }) : calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
   payload.netApy = netApy;
   payload.incentiveUsd = incentiveUsd;
   payload.totalInterestUsd = totalInterestUsd;
@@ -337,4 +399,4 @@ export const mergeUsedAssets = (existing: Partial<FluidUsedAsset> = {}, addition
   ...EMPTY_USED_ASSET,
   ...existing,
   ...additional,
-});
+});

package/src/portfolio/index.ts

@@ -41,7 +41,7 @@ import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
 import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
 import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
-import { getMeritUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
+import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { getCompoundV3Rewards } from '../claiming/compV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { getKingRewards } from '../claiming/king';
@@ -143,7 +143,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     };
 
     rewardsData[address.toLowerCase() as EthAddress] = {
-      aaveV3merit: {},
+      merkl: {},
       aaveV3: {},
       compV3: {},
       spark: {},
@@ -352,11 +352,11 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     })).flat(),
     ...addresses.map(async (address) => {
       try {
-        const aaveMeritData = await getMeritUnclaimedRewards(address, network);
-        rewardsData[address.toLowerCase() as EthAddress].aaveV3merit = { error: '', data: aaveMeritData };
+        const merklData = await getMerklUnclaimedRewards(address, network);
+        rewardsData[address.toLowerCase() as EthAddress].merkl = { error: '', data: merklData };
       } catch (error) {
-        console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
-        rewardsData[address.toLowerCase() as EthAddress].aaveV3merit = { error: `Error fetching Aave V3 Merit rewards data for address ${address}`, data: null };
+        console.error(`Error fetching Merkl rewards data for address ${address}:`, error);
+        rewardsData[address.toLowerCase() as EthAddress].merkl = { error: `Error fetching Merkl rewards data for address ${address}`, data: null };
       }
     }),
     ...aaveV3Markets.map(market => addresses.map(async (address) => {

package/src/types/claiming.ts

@@ -5,6 +5,8 @@ export enum ClaimType {
   AAVE_REWARDS = 'AAVE_REWARDS',
   /** Merit rewards from AAVE (various tokens) */
   AAVE_MERIT_REWARDS = 'AAVE_MERIT_REWARDS',
+  /** Rewards distributed through Merkl across supported protocols */
+  MERKL_REWARDS = 'MERKL_REWARDS',
   /** Rewards from Compound V3 (only in COMP) */
   COMPOUND_V3_COMP = 'COMPOUND_V3_COMP',
   /** Rewards from Spark (wstETH only for now) */
@@ -47,6 +49,16 @@ export type AaveMeritRewardsClaimableToken = _ClaimableTokenPartial & {
   };
 };
 
+export type MerklRewardsClaimableToken = _ClaimableTokenPartial & {
+  claimType: ClaimType.MERKL_REWARDS;
+  additionalClaimFields: {
+    accumulated: string;
+    proof: string[];
+    decimals: string;
+    unclaimed: string;
+  };
+};
+
 export type SparkRewardsClaimableToken = _ClaimableTokenPartial & {
   claimType: ClaimType.SPARK_REWARDS;
   additionalClaimFields: {
@@ -102,6 +114,7 @@ export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
 export type ClaimableToken =
     AaveRewardsClaimableToken
     | AaveMeritRewardsClaimableToken
+    | MerklRewardsClaimableToken
     | CompoundV3CompClaimableToken
     | SparkRewardsClaimableToken
     | KingRewardsClaimableToken

package/src/types/common.ts

@@ -8,6 +8,10 @@ export enum IncentiveSide {
   Borrow = 'borrow',
 }
 
+export enum IncentiveSource {
+  Merkl = 'merkl',
+}
+
 export enum IncentiveEligibilityId {
   AaveV3EthenaLiquidLeverage = '0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL',
   AaveV3ArbitrumEthSupply = '0x5d16261c6715a653248269861bbacf68a9774cde',
@@ -29,6 +33,7 @@ export interface IncentiveData {
   token: string,
   apy: string,
   incentiveKind?: IncentiveKind;
+  source?: IncentiveSource;
   description?: string;
   eligibilityId?: IncentiveEligibilityId;
 }

package/src/types/fluid.ts

@@ -340,6 +340,8 @@ export interface FluidAggregatedVaultData {
   leftToBorrowUsd: string,
   netApy: string,
   incentiveUsd: string,
+  merklSupplyIncentives: IncentiveData[],
+  merklBorrowIncentives: IncentiveData[],
   ratio: string,
   collRatio: string,
   minRatio: string,
@@ -484,4 +486,4 @@ export interface FluidFTokenDataStructOutput {
   supplyRate: bigint;
   rewardsRate: bigint;
   withdrawable: bigint;
-}
+}