@defisaver/positions-sdk 2.1.142-dev → 2.1.143

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

@@ -8,7 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
+import { fetchAllMerklOpportunities } from '../services/merkl';
+import { wethToEth } from '../services/utils';
 import { OpportunityAction, OpportunityStatus, } from '../types';
 export const getAaveUnderlyingSymbol = (_symbol = '') => {
     let symbol = _symbol
@@ -35,14 +36,10 @@ export const formatAaveAsset = (_symbol) => {
 };
 export 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(LONGER_TIMEOUT),
+        const opportunities = yield fetchAllMerklOpportunities({
+            mainProtocolId: 'aave',
+            status: 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 === OpportunityStatus.LIVE);

package/esm/aaveV4/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT } from '../services/utils';
+import { fetchAllMerklOpportunities } from '../services/merkl';
 import { IncentiveKind, IncentiveSide, OpportunityAction, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
@@ -63,12 +63,11 @@ export const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
 };
 export 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(LONGER_TIMEOUT),
+        const opportunities = yield fetchAllMerklOpportunities({
+            mainProtocolId: 'aave',
+            type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW',
+            status: OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Aave V4 Merkle campaigns');
-        const opportunities = yield res.json();
         return buildAaveV4MerklRewardMap(opportunities, chainId);
     }
     catch (e) {

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

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { aprToApy } from '../moneymarket';
-import { compareAddresses, LONGER_TIMEOUT, wethToEth } from '../services/utils';
+import { fetchAllMerklOpportunities } from '../services/merkl';
+import { compareAddresses, wethToEth } from '../services/utils';
 import { IncentiveKind, OpportunityAction, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Compound V3 reward campaigns with COMPOUND_V3_* opportunity types (e.g.
@@ -21,13 +22,10 @@ import { IncentiveKind, OpportunityAction, OpportunityStatus, } from '../types';
  */
 export 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(LONGER_TIMEOUT),
+        return yield fetchAllMerklOpportunities({
+            mainProtocolId: 'compound-v3',
+            status: 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/esm/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/esm/fluid/index.js

@@ -20,7 +20,7 @@ import { getChainlinkAssetAddress, getSyrupUSDTChainLinkPriceCalls, getSyrupUSDT
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getViemProvider } from '../services/viem';
 import { attachFluidMerklIncentives, getFluidMerklCampaigns } from './merkl';
-export { FLUID_MERKL_OPPORTUNITY_TYPES, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
+export { FluidMerklOpportunityType, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
 export const EMPTY_USED_ASSET = {
     isSupplied: false,
     isBorrowed: false,
@@ -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:
@@ -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/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 { LONGER_TIMEOUT } from '../services/utils';
-import { IncentiveKind, OpportunityStatus, } from '../types';
+import { fetchAllMerklOpportunities } from '../services/merkl';
+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
@@ -24,7 +25,11 @@ import { IncentiveKind, OpportunityStatus, } from '../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.
  */
-export const FLUID_MERKL_OPPORTUNITY_TYPES = ['FLUIDVAULT_COLLATERAL', 'FLUIDVAULT_BORROW'];
+export var FluidMerklOpportunityType;
+(function (FluidMerklOpportunityType) {
+    FluidMerklOpportunityType["Collateral"] = "FLUIDVAULT_COLLATERAL";
+    FluidMerklOpportunityType["Borrow"] = "FLUIDVAULT_BORROW";
+})(FluidMerklOpportunityType || (FluidMerklOpportunityType = {}));
 // '0x' + 20-byte vault address; conditional campaigns append a marker after it
 const VAULT_ADDRESS_LENGTH = 42;
 const buildMerklIncentive = (opportunity) => {
@@ -34,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,
     };
@@ -43,7 +49,7 @@ export const buildFluidMerklRewardMap = (opportunities, chainId) => {
     opportunities
         .filter((o) => o.chainId === chainId)
         .filter((o) => o.status === OpportunityStatus.LIVE)
-        .filter((o) => 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;
@@ -52,30 +58,28 @@ export 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;
 };
 /**
  * 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 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 res = yield fetch(`https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=fluid&type=${FLUID_MERKL_OPPORTUNITY_TYPES.join(',')}&status=LIVE&items=100`, {
-            signal: AbortSignal.timeout(LONGER_TIMEOUT),
+        const opportunities = yield fetchAllMerklOpportunities({
+            mainProtocolId: 'fluid',
+            type: Object.values(FluidMerklOpportunityType).join(','),
+            status: OpportunityStatus.LIVE,
         });
-        if (!res.ok)
-            throw new Error('Failed to fetch Fluid Merkl campaigns');
-        const opportunities = yield res.json();
-        return buildFluidMerklRewardMap(Array.isArray(opportunities) ? opportunities : [], chainId);
+        return buildFluidMerklRewardMap(opportunities, chainId);
     }
     catch (e) {
         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/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/esm/morphoBlue/index.js

@@ -18,7 +18,7 @@ import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket
 import { getChainlinkAssetAddress } from '../services/priceService';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities } from './merkl';
-export { MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES, addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities, addMorphoBlueMerklRewardsToMarketInfo, } from './merkl';
+export { MorphoBlueMerklOpportunityType, addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities, addMorphoBlueMerklRewardsToMarketInfo, } from './merkl';
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
 const getMorphoRewardIncentives = (apy) => [{
         token: 'MORPHO',

package/esm/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/esm/morphoBlue/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT } from '../services/utils';
+import { fetchAllMerklOpportunities } from '../services/merkl';
 import { IncentiveKind, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Morpho Blue market-level reward campaigns via the opportunity `type` field:
@@ -23,7 +23,12 @@ import { IncentiveKind, OpportunityStatus, } from '../types';
  * identifier (e.g. `0x54cf…c46WHITELIST_CAMPAIGN`); their rewards only accrue to whitelisted
  * addresses, so they are skipped rather than advertised to every user.
  */
-export const MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES = ['MORPHOSUPPLY', 'MORPHOCOLLATERAL', 'MORPHOBORROW'];
+export var MorphoBlueMerklOpportunityType;
+(function (MorphoBlueMerklOpportunityType) {
+    MorphoBlueMerklOpportunityType["Supply"] = "MORPHOSUPPLY";
+    MorphoBlueMerklOpportunityType["Collateral"] = "MORPHOCOLLATERAL";
+    MorphoBlueMerklOpportunityType["Borrow"] = "MORPHOBORROW";
+})(MorphoBlueMerklOpportunityType || (MorphoBlueMerklOpportunityType = {}));
 const MERKL_DESCRIPTION_MARKER = 'through Merkl';
 // '0x' + first 20 bytes of the market id
 const MARKET_ID_PREFIX_LENGTH = 42;
@@ -54,7 +59,7 @@ export const addMorphoBlueMerklOpportunitiesToMarketInfo = (marketInfo, selected
         var _a;
         return o.chainId === chainId
             && o.status === OpportunityStatus.LIVE
-            && 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;
@@ -62,26 +67,22 @@ export const addMorphoBlueMerklOpportunitiesToMarketInfo = (marketInfo, selected
     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] }) }) });
 };
 /**
  * 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 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=${MORPHO_BLUE_MERKL_OPPORTUNITY_TYPES.join(',')}&status=LIVE&items=100`, {
-            signal: AbortSignal.timeout(LONGER_TIMEOUT),
+        return yield fetchAllMerklOpportunities({
+            mainProtocolId: 'morpho',
+            type: Object.values(MorphoBlueMerklOpportunityType).join(','),
+            status: 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);