@defisaver/positions-sdk 2.1.157 → 2.1.158-morpho-batch-dev

package/src/aaveV4/merkl.ts

@@ -8,6 +8,7 @@ import {
   IncentiveData,
   IncentiveKind,
   IncentiveSide,
+  IncentiveSource,
   MerklCampaign,
   MerklOpportunity,
   OpportunityAction,
@@ -17,8 +18,12 @@ import {
 
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
- *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW / AAVE_V4_HUB_NET_LENDING → hub asset
+ *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub asset
  *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke reserve
+ *   - AAVE_V4_HUB_NET_LENDING / AAVE_V4_SPOKE_NET_BORROWING → reward on the NET position
+ *     (supply minus same-token borrows, or vice versa); params list scopes as `hubs[]`/`spokes[]`
+ *     arrays instead of a flat address+id pair, and only the campaign's own side maps to a reward
+ *     (the opposite-side ids describe what reduces the accrual)
  * Embedded campaign params provide the exact on-chain identifiers. Token addresses cannot safely
  * identify Aave V4 rewards because one spoke can expose the same underlying from multiple hubs.
  * Each stored reward is also tagged with campaign identity (`campaignIds`/`parentCampaignIds`) so
@@ -35,13 +40,24 @@ const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
     apy: aprToApy(opportunity.apr),
     token,
     incentiveKind: IncentiveKind.Reward,
-    description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
+    source: IncentiveSource.Merkl,
+    name: opportunity.name,
+    description: opportunity.description || `Eligible for ${token} rewards through Merkl.`,
   };
 };
 
 export const buildAaveV4MerklRewardMap = (opportunities: MerklOpportunity[], chainId: NetworkNumber): AaveV4MerklRewardMap => {
   const result: AaveV4MerklRewardMap = { hub: {}, spoke: {} };
 
+  const endByCampaignId: Record<string, number> = {};
+  opportunities.forEach((o) => o.campaigns?.forEach((c) => {
+    if (c.id && c.endTimestamp) endByCampaignId[c.id] = +c.endTimestamp;
+  }));
+  const effectiveEndTimestamp = (campaign: MerklCampaign): number => Math.max(
+    campaign.endTimestamp ? +campaign.endTimestamp : 0,
+    ...(campaign.childCampaignIds || []).map((id) => endByCampaignId[id] || 0),
+  );
+
   opportunities
     .filter((o) => o.chainId === chainId)
     .filter((o) => o.status === OpportunityStatus.LIVE)
@@ -64,15 +80,25 @@ export const buildAaveV4MerklRewardMap = (opportunities: MerklOpportunity[], cha
       };
       // one opportunity can span several campaigns (e.g. renewed periods), so campaign identity is
       // collected per scope key before the reward entries are written
-      const idsByKey: Record<string, { campaignIds: Set<string>, parentCampaignIds: Set<string> }> = {};
+      const idsByKey: Record<string, { campaignIds: Set<string>, parentCampaignIds: Set<string>, endTimestamp?: number }> = {};
       const collect = (key: string, campaign: MerklCampaign) => {
         if (!idsByKey[key]) idsByKey[key] = { campaignIds: new Set(), parentCampaignIds: new Set() };
         if (campaign.id) idsByKey[key].campaignIds.add(campaign.id);
         if (campaign.parentCampaignId) idsByKey[key].parentCampaignIds.add(campaign.parentCampaignId);
+        const endTimestamp = effectiveEndTimestamp(campaign);
+        if (endTimestamp) idsByKey[key].endTimestamp = Math.max(idsByKey[key].endTimestamp || 0, endTimestamp);
       };
 
       if (o.type.includes('HUB')) {
         o.campaigns?.forEach((c) => {
+          if (c.params?.hubs?.length) {
+            c.params.hubs.forEach((hub) => {
+              if (!hub.hubAddress) return;
+              const rewardedIds = (side === IncentiveSide.Borrow ? hub.borrowAssetIds : hub.lendingAssetIds) || [];
+              rewardedIds.forEach((assetId) => collect(scopeKey(hub.hubAddress, assetId), c));
+            });
+            return;
+          }
           const hubAddress = c.params?.hubAddress ?? c.params?.distributionMethodParameters?.distributionSettings?.hubAddress;
           const assetId = c.params?.assetId ?? c.params?.distributionMethodParameters?.distributionSettings?.assetId;
           if (!hubAddress || assetId === undefined || assetId === null) return;
@@ -80,16 +106,29 @@ export const buildAaveV4MerklRewardMap = (opportunities: MerklOpportunity[], cha
         });
         Object.entries(idsByKey).forEach(([key, ids]) => {
           if (!result.hub[key]) result.hub[key] = {};
-          result.hub[key][side] = [...(result.hub[key][side] || []), { ...incentive, campaignIds: [...ids.campaignIds] }];
+          result.hub[key][side] = [...(result.hub[key][side] || []), { ...incentive, endTimestamp: ids.endTimestamp, campaignIds: [...ids.campaignIds] }];
         });
       } else if (o.type.includes('SPOKE')) {
         o.campaigns?.forEach((c) => {
+          if (c.params?.spokes?.length) {
+            c.params.spokes.forEach((spoke) => {
+              if (!spoke.spokeAddress) return;
+              const rewardedTokens = (side === IncentiveSide.Borrow ? spoke.borrowTokens : spoke.supplyTokens) || [];
+              rewardedTokens.forEach((tokenScope) => {
+                if (tokenScope.reserveId === undefined || tokenScope.reserveId === null) return;
+                collect(scopeKey(spoke.spokeAddress, tokenScope.reserveId), c);
+              });
+            });
+            return;
+          }
           if (!c.params?.spokeAddress || c.params.reserveId === undefined || c.params.reserveId === null) return;
           collect(scopeKey(c.params.spokeAddress, c.params.reserveId), c);
         });
         Object.entries(idsByKey).forEach(([key, ids]) => {
           if (!result.spoke[key]) result.spoke[key] = {};
-          result.spoke[key][side] = [...(result.spoke[key][side] || []), { ...incentive, campaignIds: [...ids.campaignIds], parentCampaignIds: [...ids.parentCampaignIds] }];
+          result.spoke[key][side] = [...(result.spoke[key][side] || []), {
+            ...incentive, endTimestamp: ids.endTimestamp, campaignIds: [...ids.campaignIds], parentCampaignIds: [...ids.parentCampaignIds],
+          }];
         });
       }
     });
@@ -101,7 +140,7 @@ export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<
   try {
     const opportunities = await fetchAllMerklOpportunities({
       mainProtocolId: 'aave',
-      type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_HUB_NET_LENDING,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW',
+      type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW,AAVE_V4_HUB_NET_LENDING,AAVE_V4_HUB_NET_BORROWING,AAVE_V4_SPOKE_NET_LENDING,AAVE_V4_SPOKE_NET_BORROWING',
       status: OpportunityStatus.LIVE,
       campaigns: 'true',
     });

package/src/config/contracts.ts

@@ -1126,15 +1126,27 @@ export const MorphoBlueView =  {
     },
   } as const;
 export const MidnightView =  {
-    "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
+    "abi": [{"inputs":[],"name":"InvalidCollateralIndex","type":"error"},{"inputs":[],"name":"InvalidOfferMarketId","type":"error"},{"inputs":[],"name":"InvalidOfferType","type":"error"},{"inputs":[],"name":"NoOrdersProvided","type":"error"},{"inputs":[],"name":"ZeroAmountRequested","type":"error"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
     "networks": {
       "1": {
-        "address": "0xB64FBf011343961D9AC4A04b714414E35ebE6BE0",
-        "createdBlock": 25938908,
+        "address": "0xb8e1dAAd42e18203cfCED7193FE0e2E19d713A56",
+        "createdBlock": 25983494,
+        "oldVersions": {
+          "25938908": {
+            "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
+            "address": "0xB64FBf011343961D9AC4A04b714414E35ebE6BE0",
+          }
+        },
       },
       "8453": {
-        "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
-        "createdBlock": 48932293,
+        "address": "0xdEab43eb1519bD4314bc99c4019866734103D3Ae",
+        "createdBlock": 51346932,
+        "oldVersions": {
+          "48932293": {
+            "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
+            "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
+          }
+        },
       }
     },
   } as const;

package/src/savings/index.ts

@@ -43,15 +43,15 @@ export const getSavingsData = async (
 
   await Promise.all([
     ...(network === NetworkNumber.Eth ? [
-      ...morphoVaultsList.map(async (vaultKey) => {
+      (async () => {
         try {
-          const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
-          const data = await morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
-          savingsData[vaultKey] = data;
+          const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
+          const data = await morphoVaults.getMorphoVaultsData(provider, network, vaults, accounts);
+          Object.assign(savingsData, data);
         } catch (err) {
-          console.error(`[getSavingsData] Error fetching morpho vault ${vaultKey}:`, err);
+          console.error('[getSavingsData] Error fetching morpho vaults:', err);
         }
-      }),
+      })(),
       ...yearnVaultsList.map(async (vaultKey) => {
         try {
           const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);

package/src/savings/morphoVaults/index.ts

@@ -3,52 +3,100 @@ import Dec from 'decimal.js';
 import { request as graphqlRequest } from 'graphql-request';
 import { assetAmountInEth } from '@defisaver/tokens';
 import * as morphoVaultsOptions from './options';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import {
+  EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, SavingsVaultData,
+} from '../../types';
 import { getViemProvider } from '../../services/viem';
 import { getMorphoVaultContractViem } from '../../contracts';
-import { MorphoVault, SavingsVaultData } from '../../types';
 
 export {
   morphoVaultsOptions,
 };
 
-const vaultDataQuery = `
-  query VaultByAddress($address: String!, $chainId: Int!) {
-    vaultByAddress(address: $address, chainId: $chainId) {
-      address
-      state {
-        totalAssets
-        totalAssetsUsd
-        totalSupply
-      }
-      liquidity {
-        underlying
-        usd
+const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
+
+// Morpho API caps list page size at 100 items
+const MORPHO_API_PAGE_SIZE = 100;
+
+const vaultsLiquidityQuery = `
+  query VaultsLiquidity($addresses: [String!], $chainIds: [Int!]) {
+    vaults(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
+      items {
+        address
+        liquidity {
+          underlying
+        }
       }
     }
 }`;
 
-const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
+/**
+ * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
+ * returned as a map keyed by lowercased vault address. A vault missing from the API response is
+ * absent from the map.
+ */
+export const fetchMorphoVaultsLiquidity = async (network: NetworkNumber, vaults: MorphoVault[]): Promise<Record<string, string>> => {
+  const chunks: MorphoVault[][] = [];
+  for (let i = 0; i < vaults.length; i += MORPHO_API_PAGE_SIZE) chunks.push(vaults.slice(i, i + MORPHO_API_PAGE_SIZE));
+
+  const liquidityByAddress: Record<string, string> = {};
+  await Promise.all(chunks.map(async (chunk) => {
+    const data = await graphqlRequest(MORPHO_BLUE_API, vaultsLiquidityQuery, {
+      addresses: chunk.map((vault) => vault.address),
+      chainIds: [network],
+    // the BigInt scalar serializes as a JSON number when it fits in Number.MAX_SAFE_INTEGER, a string otherwise
+    }) as { vaults: { items: { address: string, liquidity: { underlying: string | number | null } | null }[] | null } };
 
-export const _getMorphoVaultData = async (provider: Client, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
+    (data.vaults.items || []).forEach((item) => {
+      if (item?.liquidity?.underlying !== undefined && item.liquidity?.underlying !== null) {
+        liquidityByAddress[item.address.toLowerCase()] = String(item.liquidity.underlying);
+      }
+    });
+  }));
+  return liquidityByAddress;
+};
+
+const getBatchedViemProvider = (provider: EthereumProvider, network: NetworkNumber) => getViemProvider(provider, network, {
+  batch: {
+    multicall: {
+      batchSize: 2500000,
+    },
+  },
+});
+
+const getMorphoVaultChainData = async (provider: Client, morphoVault: MorphoVault, accounts: EthAddress[]) => {
   const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
 
   const shares: Record<EthAddress, bigint> = {};
 
-  const [totalAssets, totalSupply, decimals, decimalsOffset, vaultData] = await Promise.all([
+  const [totalAssets, totalSupply, decimals, decimalsOffset] = await Promise.all([
     morphoVaultContract.read.totalAssets(),
     morphoVaultContract.read.totalSupply(),
     morphoVaultContract.read.decimals(),
     morphoVaultContract.read.DECIMALS_OFFSET(),
-    graphqlRequest(MORPHO_BLUE_API, vaultDataQuery, { address: morphoVault.address, chainId: network }),
     ...accounts.map(async (account) => {
       const share = await morphoVaultContract.read.balanceOf([account]);
       shares[account] = share;
     }),
   ]);
 
+  return {
+    totalAssets, totalSupply, decimals, decimalsOffset, shares,
+  };
+};
+
+const formatMorphoVaultData = (
+  morphoVault: MorphoVault,
+  chainData: Awaited<ReturnType<typeof getMorphoVaultChainData>>,
+  liquidityUnderlying: string,
+  accounts: EthAddress[],
+): SavingsVaultData => {
+  const {
+    totalAssets, totalSupply, decimals, decimalsOffset, shares,
+  } = chainData;
+
   const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
-  const liquidity = assetAmountInEth((vaultData as any).vaultByAddress.liquidity.underlying, morphoVault.asset);
+  const liquidity = assetAmountInEth(liquidityUnderlying, morphoVault.asset);
 
   const supplied: Record<EthAddress, string> = {};
   accounts.forEach((account) => {
@@ -67,12 +115,45 @@ export const _getMorphoVaultData = async (provider: Client, network: NetworkNumb
   };
 };
 
+/**
+ * Fetches data for all given vaults with a single Morpho API request for their liquidity,
+ * instead of one request per vault. The on-chain reads run in parallel with the API request.
+ * A vault whose on-chain reads fail or that is missing from the API response is left out of
+ * the result; a failed API request rejects, leaving all vaults out.
+ */
+export const _getMorphoVaultsData = async (provider: Client, network: NetworkNumber, vaults: MorphoVault[], accounts: EthAddress[]): Promise<Partial<Record<MorphoVaultType, SavingsVaultData>>> => {
+  const [liquidityByAddress, chainData] = await Promise.all([
+    fetchMorphoVaultsLiquidity(network, vaults),
+    Promise.all(vaults.map((vault) => getMorphoVaultChainData(provider, vault, accounts).catch((err) => {
+      console.error(`[getMorphoVaultsData] Error fetching on-chain data for morpho vault ${vault.type}:`, err);
+      return null;
+    }))),
+  ]);
+
+  const savingsData: Partial<Record<MorphoVaultType, SavingsVaultData>> = {};
+  vaults.forEach((vault, i) => {
+    const vaultChainData = chainData[i];
+    if (!vaultChainData) return;
+    const liquidityUnderlying = liquidityByAddress[vault.address.toLowerCase()];
+    if (liquidityUnderlying === undefined) {
+      console.error(`[getMorphoVaultsData] Vault ${vault.type} (${vault.address}) missing from Morpho API response`);
+      return;
+    }
+    savingsData[vault.type] = formatMorphoVaultData(vault, vaultChainData, liquidityUnderlying, accounts);
+  });
+  return savingsData;
+};
+
+export async function getMorphoVaultsData(provider: EthereumProvider, network: NetworkNumber, vaults: MorphoVault[], accounts: EthAddress[]): Promise<Partial<Record<MorphoVaultType, SavingsVaultData>>> {
+  return _getMorphoVaultsData(getBatchedViemProvider(provider, network), network, vaults, accounts);
+}
+
 export async function getMorphoVaultData(provider: EthereumProvider, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
-  return _getMorphoVaultData(getViemProvider(provider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  }), network, morphoVault, accounts);
-}
+  const [liquidityByAddress, chainData] = await Promise.all([
+    fetchMorphoVaultsLiquidity(network, [morphoVault]),
+    getMorphoVaultChainData(getBatchedViemProvider(provider, network), morphoVault, accounts),
+  ]);
+  const liquidityUnderlying = liquidityByAddress[morphoVault.address.toLowerCase()];
+  if (liquidityUnderlying === undefined) throw new Error(`Vault ${morphoVault.address} missing from Morpho API response`);
+  return formatMorphoVaultData(morphoVault, chainData, liquidityUnderlying, accounts);
+}

package/src/types/common.ts

@@ -34,7 +34,9 @@ export interface IncentiveData {
   apy: string,
   incentiveKind?: IncentiveKind;
   source?: IncentiveSource;
+  name?: string;
   description?: string;
+  endTimestamp?: number;
   eligibilityId?: IncentiveEligibilityId;
 }
 

package/src/types/merkl.ts

@@ -14,8 +14,6 @@ export enum OpportunityStatus {
 export type MerklCampaign = {
   id: string;
   campaignId: string;
-  startTimestamp?: number;
-  endTimestamp?: number;
   /**
    * Merkl-internal `id` of the parent campaign — set on child campaigns, which re-publish a hub
    * (parent) campaign's reward scoped to a single spoke reserve. Absent on standalone campaigns,
@@ -23,12 +21,32 @@ export type MerklCampaign = {
    */
   parentCampaignId?: string;
   childCampaignIds?: string[];
+  startTimestamp?: number;
+  endTimestamp?: number;
   params?: {
     reserveId?: string | number;
     spokeAddress?: EthAddress;
     hubAddress?: EthAddress;
     hubAssetId?: string | number;
     assetId?: string | number;
+    /**
+     * AAVE_V4_HUB_NET_* campaigns scope per hub: the reward applies to the ids on the campaign's
+     * own side (`lendingAssetIds` for LEND, `borrowAssetIds` for BORROW) — the opposite-side ids
+     * only describe positions that reduce the net accrual, so they never map to a reward.
+     */
+    hubs?: {
+      hubAddress: EthAddress;
+      assets?: { symbol: string; assetId: string | number; decimals?: number; underlyingToken?: EthAddress }[];
+      lendingAssetIds?: (string | number)[];
+      borrowAssetIds?: (string | number)[];
+    }[];
+    /** AAVE_V4_SPOKE_NET_* campaigns scope per spoke, with the same own-side rule as `hubs`. */
+    spokes?: {
+      spokeAddress: EthAddress;
+      spokeName?: string;
+      supplyTokens?: { symbol: string; reserveId: string | number; hubAddress?: EthAddress; hubAssetId?: string | number; underlyingToken?: EthAddress }[];
+      borrowTokens?: { symbol: string; reserveId: string | number; hubAddress?: EthAddress; hubAssetId?: string | number; underlyingToken?: EthAddress }[];
+    }[];
     distributionMethodParameters?: {
       distributionMethod?: string;
       distributionSettings?: {