@defisaver/positions-sdk 2.1.103 → 2.1.105

package/cjs/helpers/morphoBlueHelpers/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.getMorphoUnderlyingSymbol = exports.getRewardsForMarket = exports.getReallocation = exports.getLiquidityToAllocate = exports.getReallocatableLiquidity = exports.getApyAfterValuesEstimation = exports.getBorrowRate = exports.getSupplyRate = exports.getMorphoBlueAggregatedPositionData = void 0;
+exports.getRewardsForMarket = exports.getReallocation = exports.getLiquidityToAllocate = exports.getReallocatableLiquidity = exports.getApyAfterValuesEstimation = exports.getBorrowRate = exports.getSupplyRate = exports.getMorphoBlueAggregatedPositionData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../../moneymarket");
@@ -138,12 +138,13 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
     return { borrowRate, supplyRate };
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
-const API_URL = 'https://blue-api.morpho.org/graphql';
+const API_URL = 'https://api.morpho.org/graphql';
+// Morpho Blue ACRM (Adaptive Curve IRM) always targets 90% utilization — protocol constant
+const ACRM_TARGET_UTILIZATION = '900000000000000000';
 const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+  query MarketByUniqueKey($marketId: String!, $chainId: Int!) {
+      marketById(marketId: $marketId, chainId: $chainId) {
         reallocatableLiquidityAssets
-        targetBorrowUtilization
         loanAsset {
           address
           decimals
@@ -160,8 +161,8 @@ const MARKET_QUERY = `
             address
             name
           }
-          allocationMarket {
-            uniqueKey
+          withdrawMarket {
+            marketId
             loanAsset {
               address
             }
@@ -185,14 +186,14 @@ const MARKET_QUERY = `
           address
         }
         irmAddress
-        lltv  
+        lltv
       }
     }
 `;
 const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
+  query MarketByUniqueKey($marketId: String!, $chainId: Int!) {
+      marketById(marketId: $marketId, chainId: $chainId) {
+      marketId
       state {
         rewards {
           amountPerSuppliedToken
@@ -221,17 +222,17 @@ const getReallocatableLiquidity = (marketId_1, ...args_1) => __awaiter(void 0, [
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
                 query: MARKET_QUERY,
-                variables: { uniqueKey: marketId, chainId: network },
+                variables: { marketId, chainId: network },
             }),
             signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
         });
         const data = yield response.json();
-        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;
         if (!marketData)
             throw new Error('Market data not found');
         return {
             reallocatableLiquidity: marketData.reallocatableLiquidityAssets,
-            targetBorrowUtilization: marketData.targetBorrowUtilization,
+            targetBorrowUtilization: ACRM_TARGET_UTILIZATION,
         };
     }
     catch (error) {
@@ -285,12 +286,12 @@ const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...args_1) =>
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
                 query: MARKET_QUERY,
-                variables: { uniqueKey: marketId, chainId: network },
+                variables: { marketId, chainId: network },
             }),
             signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
         });
         const data = yield response.json();
-        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;
         if (!marketData)
             throw new Error('Market data not found');
         const loanAssetInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
@@ -300,9 +301,9 @@ const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...args_1) =>
         const newTotalBorrowAssets = new decimal_js_1.default(totalBorrowWei).add(amountToBorrow).toString();
         const newUtil = new decimal_js_1.default(newTotalBorrowAssets).div(totalSupplyWei).toString();
         const newUtilScaled = new decimal_js_1.default(newUtil).mul(1e18).toString();
-        if (new decimal_js_1.default(newUtilScaled).lt(marketData.targetBorrowUtilization))
+        if (new decimal_js_1.default(newUtilScaled).lt(ACRM_TARGET_UTILIZATION))
             return { vaults: [], withdrawals: [] };
-        const liquidityToAllocate = (0, exports.getLiquidityToAllocate)(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
+        const liquidityToAllocate = (0, exports.getLiquidityToAllocate)(amountToBorrow, totalBorrowWei, totalSupplyWei, ACRM_TARGET_UTILIZATION, marketData.reallocatableLiquidityAssets);
         const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
             const vaultAddress = item.vault.address;
             acc[vaultAddress] = new decimal_js_1.default(acc[vaultAddress] || '0').add(item.assets).toString();
@@ -324,14 +325,14 @@ const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...args_1) =>
                 totalReallocated = new decimal_js_1.default(totalReallocated).add(amountToTake).toString();
                 const withdrawal = [
                     [
-                        item.allocationMarket.loanAsset.address,
-                        (_b = item.allocationMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
-                        (_c = item.allocationMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
-                        item.allocationMarket.irmAddress,
-                        item.allocationMarket.lltv,
+                        item.withdrawMarket.loanAsset.address,
+                        (_b = item.withdrawMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
+                        (_c = item.withdrawMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
+                        item.withdrawMarket.irmAddress,
+                        item.withdrawMarket.lltv,
                     ],
                     amountToTake.toString(),
-                    item.allocationMarket.uniqueKey,
+                    item.withdrawMarket.marketId,
                 ];
                 if (!withdrawalsPerVault[vaultAddress]) {
                     withdrawalsPerVault[vaultAddress] = [];
@@ -359,11 +360,11 @@ const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0, [market
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
             query: REWARDS_QUERY,
-            variables: { uniqueKey: marketId, chainId: network },
+            variables: { marketId, chainId: network },
         }),
     });
     const data = yield response.json();
-    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;
     if (!marketData)
         throw new Error('Market data not found');
     const morphoAssetInfo = (0, tokens_1.getAssetInfo)('MORPHO');
@@ -373,9 +374,3 @@ const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0, [market
     return { supplyApy: (0, moneymarket_1.aprToApy)(supplyAprPercent), borrowApy: (0, moneymarket_1.aprToApy)(borrowAprPercent) };
 });
 exports.getRewardsForMarket = getRewardsForMarket;
-const getMorphoUnderlyingSymbol = (_symbol) => {
-    if (_symbol === 'MORPHO Legacy')
-        return 'MORPHO';
-    return (0, utils_1.wethToEth)(_symbol);
-};
-exports.getMorphoUnderlyingSymbol = getMorphoUnderlyingSymbol;

package/cjs/portfolio/index.js

@@ -37,7 +37,6 @@ const umbrella_1 = require("../umbrella");
 const aaveV3_2 = require("../claiming/aaveV3");
 const compV3_1 = require("../claiming/compV3");
 const spark_2 = require("../claiming/spark");
-const morphoBlue_2 = require("../claiming/morphoBlue");
 const king_1 = require("../claiming/king");
 const ethena_1 = require("../claiming/ethena");
 const aaveV4_1 = require("../aaveV4");
@@ -45,7 +44,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
     return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
         const isMainnet = network === common_1.NetworkNumber.Eth;
         const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
-        const isMorphoRewardsSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Base].includes(network);
         const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
         const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
         const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
@@ -133,7 +131,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                 spark: {},
                 spk: {},
                 king: {},
-                morpho: {},
                 ethena: {},
             };
         }
@@ -343,30 +340,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     rewardsData[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
                 }
             }))).flat(),
-            // Batch Morpho Blue rewards
-            (() => __awaiter(this, void 0, void 0, function* () {
-                if (!isMorphoRewardsSupported)
-                    return;
-                try {
-                    const morphoRewards = yield (0, morphoBlue_2.fetchMorphoBlueRewards)(client, network, addresses);
-                    for (const address of addresses) {
-                        const lowerAddress = address.toLowerCase();
-                        rewardsData[lowerAddress].morpho = {
-                            error: '',
-                            data: morphoRewards[lowerAddress] || [],
-                        };
-                    }
-                }
-                catch (error) {
-                    console.error('Error fetching Morpho Blue rewards data in batch:', error);
-                    for (const address of addresses) {
-                        rewardsData[address.toLowerCase()].morpho = {
-                            error: 'Error fetching Morpho Blue rewards data in batch',
-                            data: null,
-                        };
-                    }
-                }
-            }))(),
             // Batch Spark Airdrop rewards
             (() => __awaiter(this, void 0, void 0, function* () {
                 try {

package/cjs/types/aaveV4.d.ts

@@ -100,6 +100,16 @@ export interface AaveV4ReserveAssetData {
     borrowRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
+    /**
+     * Intrinsic incentives pre-combined with scope-specific Merkl rewards, ready to render per surface:
+     *   - spoke* → spoke supply/borrow (Create page + dashboard market table)
+     *   - hub*   → hub supply/borrow (Lend page)
+     * `supplyIncentives`/`borrowIncentives` above remain intrinsic-only so the net-APY calc is unaffected.
+     */
+    spokeSupplyIncentives?: IncentiveData[];
+    spokeBorrowIncentives?: IncentiveData[];
+    hubSupplyIncentives?: IncentiveData[];
+    hubBorrowIncentives?: IncentiveData[];
     canBeBorrowed: boolean;
     canBeSupplied: boolean;
     canBeWithdrawn: boolean;

package/cjs/types/claiming.d.ts

@@ -8,8 +8,6 @@ export declare enum ClaimType {
     COMPOUND_V3_COMP = "COMPOUND_V3_COMP",
     /** Rewards from Spark (wstETH only for now) */
     SPARK_REWARDS = "SPARK_REWARDS",
-    /** Rewards from Morpho */
-    MORPHO = "MORPHO",
     /** Rewards from King (prev LTR^2 - received for weETH holding) */
     KING_REWARDS = "KING_REWARDS",
     /** Spark Airdrop */
@@ -57,16 +55,6 @@ export type KingRewardsClaimableToken = _ClaimableTokenPartial & {
         merkleProofs: string[];
     };
 };
-export type MorphoClaimableToken = _ClaimableTokenPartial & {
-    claimType: ClaimType.MORPHO;
-    additionalClaimFields: {
-        originalAmount: string;
-        merkleProofs: string[];
-        distributor: EthAddress;
-        isLegacy: boolean;
-        txData: string;
-    };
-};
 export type CompoundV3CompClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.COMPOUND_V3_COMP;
     additionalClaimFields: {
@@ -93,5 +81,5 @@ export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & {
 export type EthenaAirdropClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.ETHENA_AIRDROP;
 };
-export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | MorphoClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
+export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/cjs/types/claiming.js

@@ -11,8 +11,6 @@ var ClaimType;
     ClaimType["COMPOUND_V3_COMP"] = "COMPOUND_V3_COMP";
     /** Rewards from Spark (wstETH only for now) */
     ClaimType["SPARK_REWARDS"] = "SPARK_REWARDS";
-    /** Rewards from Morpho */
-    ClaimType["MORPHO"] = "MORPHO";
     /** Rewards from King (prev LTR^2 - received for weETH holding) */
     ClaimType["KING_REWARDS"] = "KING_REWARDS";
     /** Spark Airdrop */

package/cjs/types/merkl.d.ts

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

package/cjs/types/morphoBlue.d.ts

@@ -189,12 +189,12 @@ export interface MorphoBlueAllocationMarket {
     };
     irmAddress: string;
     lltv: string;
-    uniqueKey: string;
+    marketId: string;
 }
 export interface MorphoBluePublicAllocatorItem {
     vault: MorphoBlueVault;
     assets: string;
-    allocationMarket: MorphoBlueAllocationMarket;
+    withdrawMarket: MorphoBlueAllocationMarket;
 }
 export interface MorphoBlueAllocatorMarketState {
     borrowAssets: string;
@@ -202,7 +202,6 @@ export interface MorphoBlueAllocatorMarketState {
 }
 export interface MorphoBlueRealloactionMarketData {
     reallocatableLiquidityAssets: string;
-    targetBorrowUtilization: string;
     publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[];
     state: MorphoBlueAllocatorMarketState;
 }

package/esm/aaveV4/index.d.ts

@@ -1,6 +1,7 @@
 import { Client } from 'viem';
 import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
 export * as lend from './lend';
+export { getAaveV4MerkleCampaigns } from './merkl';
 export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;

package/esm/aaveV4/index.js

@@ -17,7 +17,9 @@ import { isMaxUint, wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
+import { attachAaveV4MerklIncentives, getAaveV4MerkleCampaigns } from './merkl';
 export * as lend from './lend';
+export { getAaveV4MerkleCampaigns } from './merkl';
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
     return {
@@ -129,15 +131,17 @@ export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
         const hubsData = {};
-        const [spokeData] = yield Promise.all([
+        const [spokeData, merklCampaigns] = yield Promise.all([
             viewContract.read.getSpokeDataFull([market.address]),
+            getAaveV4MerkleCampaigns(network),
             ...market.hubs.map((hubAddress) => __awaiter(this, void 0, void 0, function* () {
                 hubsData[hubAddress] = yield fetchHubData(viewContract, hubAddress);
             })),
         ]);
         const reserveAssetsArray = yield Promise.all(spokeData[1].map((reserveAssetOnChain, index) => __awaiter(this, void 0, void 0, function* () { return formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], index, +spokeData[0].oracleDecimals.toString(), network); })));
+        const enrichedAssets = reserveAssetsArray.map((asset) => attachAaveV4MerklIncentives(asset, market.address, merklCampaigns));
         return {
-            assetsData: reserveAssetsArray.reduce((acc, reserveAsset) => {
+            assetsData: enrichedAssets.reduce((acc, reserveAsset) => {
                 acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
                 return acc;
             }, {}),

package/esm/aaveV4/merkl.d.ts

@@ -0,0 +1,8 @@
+import { AaveV4MerklRewardMap, AaveV4ReserveAssetData } from '../types';
+import { NetworkNumber } from '../types/common';
+export declare const getAaveV4MerkleCampaigns: (chainId: NetworkNumber) => Promise<AaveV4MerklRewardMap>;
+/**
+ * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's
+ * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
+ */
+export declare const attachAaveV4MerklIncentives: (asset: AaveV4ReserveAssetData, spokeAddress: string, campaigns: AaveV4MerklRewardMap) => AaveV4ReserveAssetData;

package/esm/aaveV4/merkl.js

@@ -0,0 +1,85 @@
+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());
+    });
+};
+import { aprToApy } from '../moneymarket';
+import { DEFAULT_TIMEOUT } from '../services/utils';
+import { IncentiveKind, OpportunityAction, OpportunityStatus, } from '../types';
+/**
+ * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
+ *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub (matched per underlying token)
+ *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke (matched per spoke contract + underlying)
+ * Hub campaigns identify the underlying via `tokens[0]`; spoke campaigns identify the spoke via `explorerAddress`.
+ */
+const spokeKey = (spokeAddress, underlying) => `${spokeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
+const buildIncentive = (opportunity) => {
+    var _a, _b, _c, _d, _e;
+    const rewardToken = (_c = (_b = (_a = opportunity.rewardsRecord) === null || _a === void 0 ? void 0 : _a.breakdowns) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.token;
+    const token = (rewardToken === null || rewardToken === void 0 ? void 0 : rewardToken.symbol) || ((_e = (_d = opportunity.tokens) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.symbol) || '';
+    return {
+        apy: aprToApy(opportunity.apr),
+        token,
+        incentiveKind: IncentiveKind.Reward,
+        description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
+    };
+};
+export const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = { hub: {}, spoke: {} };
+    try {
+        const res = yield fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+        });
+        if (!res.ok)
+            throw new Error('Failed to fetch Aave V4 Merkle campaigns');
+        const opportunities = yield res.json();
+        opportunities
+            .filter((o) => o.chainId === chainId)
+            .filter((o) => o.status === OpportunityStatus.LIVE)
+            .filter((o) => typeof o.type === 'string' && o.type.startsWith('AAVE_V4_'))
+            .forEach((o) => {
+            var _a, _b, _c, _d;
+            const underlying = (_c = (_b = (_a = o.tokens) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+            if (!underlying)
+                return;
+            const side = o.action === OpportunityAction.BORROW ? 'borrow' : 'supply';
+            const incentive = buildIncentive(o);
+            if (o.type.includes('HUB')) {
+                if (!result.hub[underlying])
+                    result.hub[underlying] = {};
+                result.hub[underlying][side] = incentive;
+            }
+            else if (o.type.includes('SPOKE')) {
+                const spokeAddress = (_d = o.explorerAddress) === null || _d === void 0 ? void 0 : _d.toLowerCase();
+                if (!spokeAddress)
+                    return;
+                const key = spokeKey(spokeAddress, underlying);
+                if (!result.spoke[key])
+                    result.spoke[key] = {};
+                result.spoke[key][side] = incentive;
+            }
+        });
+        return result;
+    }
+    catch (e) {
+        console.error('Failed to fetch Aave V4 Merkle campaigns', e);
+        return result;
+    }
+});
+/**
+ * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's
+ * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
+ */
+export const attachAaveV4MerklIncentives = (asset, spokeAddress, campaigns) => {
+    var _a;
+    const underlying = (_a = asset.underlying) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+    const baseSupply = asset.supplyIncentives || [];
+    const baseBorrow = asset.borrowIncentives || [];
+    const spokeScoped = (spokeAddress && underlying) ? campaigns.spoke[spokeKey(spokeAddress, underlying)] : undefined;
+    const hubScoped = underlying ? campaigns.hub[underlying] : undefined;
+    return Object.assign(Object.assign({}, asset), { spokeSupplyIncentives: (spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.supply) ? [...baseSupply, spokeScoped.supply] : baseSupply, spokeBorrowIncentives: (spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.borrow) ? [...baseBorrow, spokeScoped.borrow] : baseBorrow, hubSupplyIncentives: (hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.supply) ? [...baseSupply, hubScoped.supply] : baseSupply, hubBorrowIncentives: (hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.borrow) ? [...baseBorrow, hubScoped.borrow] : baseBorrow });
+};

package/esm/claiming/aaveV3.d.ts

@@ -2,4 +2,4 @@ import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
 import { ClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
-export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber, acceptMorpho?: boolean): Promise<ClaimableToken[]>;
+export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/esm/claiming/aaveV3.js

@@ -88,8 +88,8 @@ export function getUnclaimedRewardsForAllMarkets(provider, network, walletAddres
         return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
     });
 }
-export function getMeritUnclaimedRewards(account_1, network_1) {
-    return __awaiter(this, arguments, void 0, function* (account, network, acceptMorpho = true) {
+export function getMeritUnclaimedRewards(account, network) {
+    return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
             const res = yield fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(3000) });
@@ -103,8 +103,7 @@ export function getMeritUnclaimedRewards(account_1, network_1) {
         data.forEach((item) => {
             item.rewards.forEach(reward => {
                 const { token, amount, claimed, proofs, } = reward;
-                const isTokenMorpho = token.symbol === 'MORPHO';
-                if (!token || !token.symbol || amount === '0' || (isTokenMorpho && !acceptMorpho))
+                if (!token || !token.symbol || amount === '0')
                     return;
                 const unclaimedAmount = new Dec(amount).minus(claimed || 0).toString();
                 if (unclaimedAmount === '0')

package/esm/claiming/index.d.ts

@@ -1,6 +1,5 @@
 import * as aaveV3Claim from './aaveV3';
 import * as compV3Claim from './compV3';
 import * as kingV3Claim from './king';
-import * as morphoBlueClaim from './morphoBlue';
 import * as sparkClaim from './spark';
-export { aaveV3Claim, compV3Claim, kingV3Claim, morphoBlueClaim, sparkClaim, };
+export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, };

package/esm/claiming/index.js

@@ -1,6 +1,5 @@
 import * as aaveV3Claim from './aaveV3';
 import * as compV3Claim from './compV3';
 import * as kingV3Claim from './king';
-import * as morphoBlueClaim from './morphoBlue';
 import * as sparkClaim from './spark';
-export { aaveV3Claim, compV3Claim, kingV3Claim, morphoBlueClaim, sparkClaim, };
+export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, };