@defisaver/positions-sdk 2.1.142-dev → 2.1.143

package/cjs/aaveV3/merkl.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMerkleCampaigns = exports.formatAaveAsset = exports.getAaveUnderlyingSymbol = void 0;
 const moneymarket_1 = require("../moneymarket");
+const merkl_1 = require("../services/merkl");
 const utils_1 = require("../services/utils");
 const types_1 = require("../types");
 const getAaveUnderlyingSymbol = (_symbol = '') => {
@@ -40,14 +41,10 @@ const formatAaveAsset = (_symbol) => {
 exports.formatAaveAsset = formatAaveAsset;
 const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        // status/items narrow the query because Merkl paginates at 20 items by default — an
-        // unfiltered query silently drops live campaigns once the protocol has enough opportunities
-        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave&status=LIVE&items=100', {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        const opportunities = yield (0, merkl_1.fetchAllMerklOpportunities)({
+            mainProtocolId: 'aave',
+            status: types_1.OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Merkle campaigns');
-        const opportunities = yield res.json();
         const relevantOpportunities = opportunities
             .filter((o) => o.chainId === chainId)
             .filter((o) => o.status === types_1.OpportunityStatus.LIVE);

package/cjs/aaveV4/merkl.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachAaveV4MerklIncentives = exports.getAaveV4MerkleCampaigns = exports.buildAaveV4MerklRewardMap = void 0;
 const moneymarket_1 = require("../moneymarket");
-const utils_1 = require("../services/utils");
+const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
@@ -67,12 +67,11 @@ const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
 exports.buildAaveV4MerklRewardMap = buildAaveV4MerklRewardMap;
 const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave&type=AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW&status=LIVE&items=100', {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        const opportunities = yield (0, merkl_1.fetchAllMerklOpportunities)({
+            mainProtocolId: 'aave',
+            type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW',
+            status: types_1.OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Aave V4 Merkle campaigns');
-        const opportunities = yield res.json();
         return (0, exports.buildAaveV4MerklRewardMap)(opportunities, chainId);
     }
     catch (e) {

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/compoundV3/merkl.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachCompoundV3MerklIncentives = exports.getCompoundV3MerklOpportunities = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../moneymarket");
+const merkl_1 = require("../services/merkl");
 const utils_1 = require("../services/utils");
 const types_1 = require("../types");
 /**
@@ -24,13 +25,10 @@ const types_1 = require("../types");
  */
 const getCompoundV3MerklOpportunities = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=compound-v3&status=LIVE&items=100', {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        return yield (0, merkl_1.fetchAllMerklOpportunities)({
+            mainProtocolId: 'compound-v3',
+            status: types_1.OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Compound V3 Merkl campaigns');
-        const data = yield res.json();
-        return Array.isArray(data) ? data : [];
     }
     catch (e) {
         console.error('Failed to fetch Compound V3 Merkl campaigns', e);

package/cjs/fluid/index.d.ts

@@ -1,7 +1,7 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
 import { FluidAssetsData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
-export { FLUID_MERKL_OPPORTUNITY_TYPES, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
+export { FluidMerklOpportunityType, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
     isBorrowed: boolean;
@@ -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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._getUserPositionsPortfolio = exports.getUserPositions = exports._getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports._getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports._getFluidDepositData = exports.getFluidTokenData = exports._getFluidTokenData = exports.getAllFluidMarketDataChunked = exports._getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports._getFluidPositionWithMarket = exports.getFluidPosition = exports._getFluidPosition = exports.getFluidVaultIdsForUser = exports._getFluidVaultIdsForUser = exports.getFluidMarketData = exports._getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FLUID_MERKL_OPPORTUNITY_TYPES = void 0;
+exports._getUserPositionsPortfolio = exports.getUserPositions = exports._getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports._getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports._getFluidDepositData = exports.getFluidTokenData = exports._getFluidTokenData = exports.getAllFluidMarketDataChunked = exports._getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports._getFluidPositionWithMarket = exports.getFluidPosition = exports._getFluidPosition = exports.getFluidVaultIdsForUser = exports._getFluidVaultIdsForUser = exports.getFluidMarketData = exports._getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -27,7 +27,7 @@ const staking_1 = require("../staking");
 const viem_1 = require("../services/viem");
 const merkl_1 = require("./merkl");
 var merkl_2 = require("./merkl");
-Object.defineProperty(exports, "FLUID_MERKL_OPPORTUNITY_TYPES", { enumerable: true, get: function () { return merkl_2.FLUID_MERKL_OPPORTUNITY_TYPES; } });
+Object.defineProperty(exports, "FluidMerklOpportunityType", { enumerable: true, get: function () { return merkl_2.FluidMerklOpportunityType; } });
 Object.defineProperty(exports, "buildFluidMerklRewardMap", { enumerable: true, get: function () { return merkl_2.buildFluidMerklRewardMap; } });
 Object.defineProperty(exports, "getFluidMerklCampaigns", { enumerable: true, get: function () { return merkl_2.getFluidMerklCampaigns; } });
 Object.defineProperty(exports, "attachFluidMerklIncentives", { enumerable: true, get: function () { return merkl_2.attachFluidMerklIncentives; } });
@@ -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:
@@ -13,14 +14,16 @@ import { FluidMarketData, FluidMerklRewardMap, MerklOpportunity, NetworkNumber }
  * ids apply unconditionally, mirroring Aave V3. Whitelist-gated campaigns only accrue to
  * whitelisted addresses, so they are skipped rather than advertised to every user.
  */
-export declare const FLUID_MERKL_OPPORTUNITY_TYPES: readonly ["FLUIDVAULT_COLLATERAL", "FLUIDVAULT_BORROW"];
+export declare enum FluidMerklOpportunityType {
+    Collateral = "FLUIDVAULT_COLLATERAL",
+    Borrow = "FLUIDVAULT_BORROW"
+}
 export declare const buildFluidMerklRewardMap: (opportunities: MerklOpportunity[], chainId: NetworkNumber) => FluidMerklRewardMap;
 /**
  * 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. The query
- * is narrowed by `type=` and capped at `items=100` because Merkl paginates at 20 items by default.
+ * 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,10 +8,14 @@ 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.FLUID_MERKL_OPPORTUNITY_TYPES = void 0;
+exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
+const memoizee_1 = __importDefault(require("memoizee"));
 const moneymarket_1 = require("../moneymarket");
-const utils_1 = require("../services/utils");
+const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
 /**
  * Merkl tags Fluid vault-scoped reward campaigns via the opportunity `type` field:
@@ -27,7 +31,11 @@ const types_1 = require("../types");
  * ids apply unconditionally, mirroring Aave V3. Whitelist-gated campaigns only accrue to
  * whitelisted addresses, so they are skipped rather than advertised to every user.
  */
-exports.FLUID_MERKL_OPPORTUNITY_TYPES = ['FLUIDVAULT_COLLATERAL', 'FLUIDVAULT_BORROW'];
+var FluidMerklOpportunityType;
+(function (FluidMerklOpportunityType) {
+    FluidMerklOpportunityType["Collateral"] = "FLUIDVAULT_COLLATERAL";
+    FluidMerklOpportunityType["Borrow"] = "FLUIDVAULT_BORROW";
+})(FluidMerklOpportunityType || (exports.FluidMerklOpportunityType = FluidMerklOpportunityType = {}));
 // '0x' + 20-byte vault address; conditional campaigns append a marker after it
 const VAULT_ADDRESS_LENGTH = 42;
 const buildMerklIncentive = (opportunity) => {
@@ -37,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,
     };
@@ -46,7 +55,7 @@ const buildFluidMerklRewardMap = (opportunities, chainId) => {
     opportunities
         .filter((o) => o.chainId === chainId)
         .filter((o) => o.status === types_1.OpportunityStatus.LIVE)
-        .filter((o) => exports.FLUID_MERKL_OPPORTUNITY_TYPES.includes(o.type))
+        .filter((o) => Object.values(FluidMerklOpportunityType).includes(o.type))
         .filter((o) => { var _a; return !((_a = o.identifier) === null || _a === void 0 ? void 0 : _a.includes('WHITELIST')); })
         .forEach((o) => {
         var _a;
@@ -55,32 +64,29 @@ const buildFluidMerklRewardMap = (opportunities, chainId) => {
             return;
         if (!result[vaultAddress])
             result[vaultAddress] = { supply: [], borrow: [] };
-        result[vaultAddress][o.type === 'FLUIDVAULT_BORROW' ? 'borrow' : 'supply'].push(buildMerklIncentive(o));
+        result[vaultAddress][o.type === FluidMerklOpportunityType.Borrow ? 'borrow' : 'supply'].push(buildMerklIncentive(o));
     });
     return result;
 };
 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. The query
- * is narrowed by `type=` and capped at `items=100` because Merkl paginates at 20 items by default.
+ * 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 res = yield fetch(`https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=fluid&type=${exports.FLUID_MERKL_OPPORTUNITY_TYPES.join(',')}&status=LIVE&items=100`, {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        const opportunities = yield (0, merkl_1.fetchAllMerklOpportunities)({
+            mainProtocolId: 'fluid',
+            type: Object.values(FluidMerklOpportunityType).join(','),
+            status: types_1.OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Fluid Merkl campaigns');
-        const opportunities = yield res.json();
-        return (0, exports.buildFluidMerklRewardMap)(Array.isArray(opportunities) ? opportunities : [], chainId);
+        return (0, exports.buildFluidMerklRewardMap)(opportunities, chainId);
     }
     catch (e) {
         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/morphoBlue/index.d.ts

@@ -1,7 +1,7 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 import { MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData } from '../types';
-export { MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES, addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities, addMorphoBlueMerklRewardsToMarketInfo, } from './merkl';
+export { MorphoBlueMerklOpportunityType, addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities, addMorphoBlueMerklRewardsToMarketInfo, } from './merkl';
 export declare const addMorphoBlueRewardsToMarketInfo: (marketInfo: MorphoBlueMarketInfo, rewards: MorphoBlueMarketRewards) => MorphoBlueMarketInfo;
 export declare function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
 export declare function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;

package/cjs/morphoBlue/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = exports.getMorphoEarnDataWithMarketInfo = exports.getMorphoBluePositionDataWithMarketInfo = exports.addMorphoBlueRewardsToMarketInfo = exports.addMorphoBlueMerklRewardsToMarketInfo = exports.getMorphoBlueMerklOpportunities = exports.addMorphoBlueMerklOpportunitiesToMarketInfo = exports.MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES = void 0;
+exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = exports.getMorphoEarnDataWithMarketInfo = exports.getMorphoBluePositionDataWithMarketInfo = exports.addMorphoBlueRewardsToMarketInfo = exports.addMorphoBlueMerklRewardsToMarketInfo = exports.getMorphoBlueMerklOpportunities = exports.addMorphoBlueMerklOpportunitiesToMarketInfo = exports.MorphoBlueMerklOpportunityType = void 0;
 exports._getMorphoBlueMarketData = _getMorphoBlueMarketData;
 exports._getMorphoBluePortfolioMarketData = _getMorphoBluePortfolioMarketData;
 exports.getMorphoBlueMarketData = getMorphoBlueMarketData;
@@ -33,7 +33,7 @@ const priceService_1 = require("../services/priceService");
 const viem_1 = require("../services/viem");
 const merkl_1 = require("./merkl");
 var merkl_2 = require("./merkl");
-Object.defineProperty(exports, "MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES", { enumerable: true, get: function () { return merkl_2.MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES; } });
+Object.defineProperty(exports, "MorphoBlueMerklOpportunityType", { enumerable: true, get: function () { return merkl_2.MorphoBlueMerklOpportunityType; } });
 Object.defineProperty(exports, "addMorphoBlueMerklOpportunitiesToMarketInfo", { enumerable: true, get: function () { return merkl_2.addMorphoBlueMerklOpportunitiesToMarketInfo; } });
 Object.defineProperty(exports, "getMorphoBlueMerklOpportunities", { enumerable: true, get: function () { return merkl_2.getMorphoBlueMerklOpportunities; } });
 Object.defineProperty(exports, "addMorphoBlueMerklRewardsToMarketInfo", { enumerable: true, get: function () { return merkl_2.addMorphoBlueMerklRewardsToMarketInfo; } });

package/cjs/morphoBlue/merkl.d.ts

@@ -12,7 +12,11 @@ import { MerklOpportunity, MorphoBlueMarketData, MorphoBlueMarketInfo, NetworkNu
  * identifier (e.g. `0x54cf…c46WHITELIST_CAMPAIGN`); their rewards only accrue to whitelisted
  * addresses, so they are skipped rather than advertised to every user.
  */
-export declare const MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES: readonly ["MORPHOSUPPLY", "MORPHOCOLLATERAL", "MORPHOBORROW"];
+export declare enum MorphoBlueMerklOpportunityType {
+    Supply = "MORPHOSUPPLY",
+    Collateral = "MORPHOCOLLATERAL",
+    Borrow = "MORPHOBORROW"
+}
 /**
  * Appends the given live Merkl campaigns for the market to its `assetsData` incentive arrays
  * (collateral supply / loan supply / loan borrow). Existing Merkl incentives are replaced rather
@@ -21,9 +25,7 @@ export declare const MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES: readonly ["MORPHOSUPPL
 export declare const addMorphoBlueMerklOpportunitiesToMarketInfo: (marketInfo: MorphoBlueMarketInfo, selectedMarket: MorphoBlueMarketData, chainId: NetworkNumber, opportunities: MerklOpportunity[]) => MorphoBlueMarketInfo;
 /**
  * Fetches live market-scoped Morpho Blue campaigns for all chains. Never throws — on any failure
- * it returns an empty list, so Merkl being down can't break market data. The query is narrowed by
- * `type=` and capped at `items=100` because Merkl paginates at 20 items by default — an
- * unfiltered protocol query would silently drop campaigns once Morpho has enough opportunities.
+ * it returns an empty list, so Merkl being down can't break market data.
  */
 export declare const getMorphoBlueMerklOpportunities: () => Promise<MerklOpportunity[]>;
 /**

package/cjs/morphoBlue/merkl.js

@@ -9,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMorphoBlueMerklRewardsToMarketInfo = exports.getMorphoBlueMerklOpportunities = exports.addMorphoBlueMerklOpportunitiesToMarketInfo = exports.MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES = void 0;
+exports.addMorphoBlueMerklRewardsToMarketInfo = exports.getMorphoBlueMerklOpportunities = exports.addMorphoBlueMerklOpportunitiesToMarketInfo = exports.MorphoBlueMerklOpportunityType = void 0;
 const moneymarket_1 = require("../moneymarket");
-const utils_1 = require("../services/utils");
+const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
 /**
  * Merkl tags Morpho Blue market-level reward campaigns via the opportunity `type` field:
@@ -26,7 +26,12 @@ const types_1 = require("../types");
  * identifier (e.g. `0x54cf…c46WHITELIST_CAMPAIGN`); their rewards only accrue to whitelisted
  * addresses, so they are skipped rather than advertised to every user.
  */
-exports.MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES = ['MORPHOSUPPLY', 'MORPHOCOLLATERAL', 'MORPHOBORROW'];
+var MorphoBlueMerklOpportunityType;
+(function (MorphoBlueMerklOpportunityType) {
+    MorphoBlueMerklOpportunityType["Supply"] = "MORPHOSUPPLY";
+    MorphoBlueMerklOpportunityType["Collateral"] = "MORPHOCOLLATERAL";
+    MorphoBlueMerklOpportunityType["Borrow"] = "MORPHOBORROW";
+})(MorphoBlueMerklOpportunityType || (exports.MorphoBlueMerklOpportunityType = MorphoBlueMerklOpportunityType = {}));
 const MERKL_DESCRIPTION_MARKER = 'through Merkl';
 // '0x' + first 20 bytes of the market id
 const MARKET_ID_PREFIX_LENGTH = 42;
@@ -57,7 +62,7 @@ const addMorphoBlueMerklOpportunitiesToMarketInfo = (marketInfo, selectedMarket,
         var _a;
         return o.chainId === chainId
             && o.status === types_1.OpportunityStatus.LIVE
-            && exports.MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES.includes(o.type)
+            && Object.values(MorphoBlueMerklOpportunityType).includes(o.type)
             // a suffixed identifier marks a whitelist-gated campaign — skip those
             && ((_a = o.identifier) === null || _a === void 0 ? void 0 : _a.length) === MARKET_ID_PREFIX_LENGTH
             && o.identifier.toLowerCase() === marketIdPrefix;
@@ -65,27 +70,23 @@ const addMorphoBlueMerklOpportunitiesToMarketInfo = (marketInfo, selectedMarket,
     if (!relevant.length)
         return marketInfo;
     const incentivesByType = (type) => relevant.filter((o) => o.type === type).map(buildMerklIncentive);
-    const collateralSupply = incentivesByType('MORPHOCOLLATERAL');
-    const loanSupply = incentivesByType('MORPHOSUPPLY');
-    const loanBorrow = incentivesByType('MORPHOBORROW');
+    const collateralSupply = incentivesByType(MorphoBlueMerklOpportunityType.Collateral);
+    const loanSupply = incentivesByType(MorphoBlueMerklOpportunityType.Supply);
+    const loanBorrow = incentivesByType(MorphoBlueMerklOpportunityType.Borrow);
     return Object.assign(Object.assign({}, marketInfo), { assetsData: Object.assign(Object.assign({}, marketInfo.assetsData), { [marketInfo.collateralToken]: Object.assign(Object.assign({}, collateralAsset), { supplyIncentives: [...withoutMerklIncentives(collateralAsset.supplyIncentives), ...collateralSupply] }), [marketInfo.loanToken]: Object.assign(Object.assign({}, loanAsset), { supplyIncentives: [...withoutMerklIncentives(loanAsset.supplyIncentives), ...loanSupply], borrowIncentives: [...withoutMerklIncentives(loanAsset.borrowIncentives), ...loanBorrow] }) }) });
 };
 exports.addMorphoBlueMerklOpportunitiesToMarketInfo = addMorphoBlueMerklOpportunitiesToMarketInfo;
 /**
  * Fetches live market-scoped Morpho Blue campaigns for all chains. Never throws — on any failure
- * it returns an empty list, so Merkl being down can't break market data. The query is narrowed by
- * `type=` and capped at `items=100` because Merkl paginates at 20 items by default — an
- * unfiltered protocol query would silently drop campaigns once Morpho has enough opportunities.
+ * it returns an empty list, so Merkl being down can't break market data.
  */
 const getMorphoBlueMerklOpportunities = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch(`https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=morpho&type=${exports.MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES.join(',')}&status=LIVE&items=100`, {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        return yield (0, merkl_1.fetchAllMerklOpportunities)({
+            mainProtocolId: 'morpho',
+            type: Object.values(MorphoBlueMerklOpportunityType).join(','),
+            status: types_1.OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Morpho Blue Merkl campaigns');
-        const data = yield res.json();
-        return Array.isArray(data) ? data : [];
     }
     catch (e) {
         console.error('Failed to fetch Morpho Blue Merkl campaigns', e);

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/services/merkl.d.ts

@@ -0,0 +1,6 @@
+import { MerklOpportunity } from '../types';
+/**
+ * Fetches every page matching the query. Merkl returns 20 opportunities by default, so omitting
+ * `items` and advancing `page` avoids imposing a client-side maximum on the result set.
+ */
+export declare const fetchAllMerklOpportunities: (query: Record<string, string>) => Promise<MerklOpportunity[]>;

package/cjs/services/merkl.js

@@ -0,0 +1,39 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchAllMerklOpportunities = void 0;
+const utils_1 = require("./utils");
+const MERKL_OPPORTUNITIES_URL = 'https://fe.defisaver.com/api/merkl/opportunities';
+/**
+ * Fetches every page matching the query. Merkl returns 20 opportunities by default, so omitting
+ * `items` and advancing `page` avoids imposing a client-side maximum on the result set.
+ */
+const fetchAllMerklOpportunities = (query) => __awaiter(void 0, void 0, void 0, function* () {
+    const opportunities = [];
+    let page = 0;
+    let pageOpportunities;
+    do {
+        const searchParams = new URLSearchParams(Object.assign(Object.assign({}, query), { page: page.toString() }));
+        const res = yield fetch(`${MERKL_OPPORTUNITIES_URL}?${searchParams}`, {
+            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        });
+        if (!res.ok)
+            throw new Error(`Failed to fetch Merkl opportunities page ${page}`);
+        const data = yield res.json(); // eslint-disable-line no-await-in-loop
+        if (!Array.isArray(data))
+            throw new Error(`Invalid Merkl opportunities response on page ${page}`);
+        pageOpportunities = data;
+        opportunities.push(...pageOpportunities);
+        page += 1;
+    } while (pageOpportunities.length > 0);
+    return opportunities;
+});
+exports.fetchAllMerklOpportunities = fetchAllMerklOpportunities;