@1delta/margin-fetcher 5.0.8 → 5.0.10

package/dist/index.js

@@ -7,7 +7,7 @@ import { fetchTokenLists, fetchTokenList, aavePools, compoundV3Pools, initConfig
 import lodash from 'lodash';
 import { Chain } from '@1delta/chain-registry';
 import { multicallRetryUniversal, getEvmClient, getEvmChain, getEvmClientUniversal } from '@1delta/providers';
-import { LiquityTroveManagerAbi, LiquityActivePoolAbi, LiquityStabilityPoolAbi, LiquityPriceFeedAbi, LiquitySortedTrovesAbi, RiverTroveManagerAbi, RiverStabilityPoolAbi, TellerMarketRegistryAbi, TellerV2Abi, InverseMarketAbi, InverseOracleAbi, InverseDbrAbi, Erc20Abi, LlamaLendControllerAbi, LlamaLendControllerV1Abi, LlamaLendControllerV2Abi, LlamaLendVaultAbi, LlamaLendAmmAbi, MetaMorphoAbi, ExactlyPreviewerAbi, ExactlyAuditorAbi, LenderCommitmentGroupAbi, ResupplyRegistryAbi, ResupplyPairAbi, UsddVatAbi, UsddJugAbi, UsddSpotAbi, FrankencoinPositionAbi, FluidLendingResolverAbi, FluidVaultResolverAbi, FluidLiquidityResolverAbi, MoolahVaultAbi, ResupplyUtilitiesAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, MorphoBlueAbi, MidnightAbi, TermRepoTokenAbi, TermRepoServicerAbi, TermRepoCollateralManagerAbi, LiquityTroveNFTAbi, LiquityCollSurplusPoolAbi, TellerCollateralManagerAbi, TermMaxViewerAbi, InverseEscrowAbi, CurvanceMarketManagerAbi, CurvanceCTokenAbi, GearboxCreditAccountCompressorV310Abi, UsddCdpManagerAbi, UsddProxyRegistryAbi, CurvanceProtocolReaderAbi, CurvanceCentralRegistryAbi, TermPriceConsumerAbi, CurvanceOracleManagerAbi, TermMaxOracleAggregatorV2Abi } from '@1delta/abis';
+import { LiquityTroveManagerAbi, LiquityActivePoolAbi, LiquityStabilityPoolAbi, LiquityPriceFeedAbi, LiquitySortedTrovesAbi, RiverTroveManagerAbi, RiverStabilityPoolAbi, TellerMarketRegistryAbi, TellerV2Abi, InverseMarketAbi, InverseOracleAbi, InverseDbrAbi, Erc20Abi, LlamaLendControllerAbi, LlamaLendControllerV1Abi, LlamaLendControllerV2Abi, LlamaLendVaultAbi, LlamaLendAmmAbi, MetaMorphoAbi, ExactlyPreviewerAbi, ExactlyAuditorAbi, LenderCommitmentGroupAbi, ResupplyRegistryAbi, ResupplyPairAbi, ResupplyUtilitiesAbi, ResupplyRewardHandlerAbi, ResupplyPairEmissionsAbi, ConvexPoolUtilAbi, UsddVatAbi, UsddJugAbi, UsddSpotAbi, FrankencoinPositionAbi, FluidLendingResolverAbi, FluidVaultResolverAbi, FluidLiquidityResolverAbi, MoolahVaultAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, MorphoBlueAbi, MidnightAbi, TermRepoTokenAbi, TermRepoServicerAbi, TermRepoCollateralManagerAbi, LiquityTroveNFTAbi, LiquityCollSurplusPoolAbi, TellerCollateralManagerAbi, TermMaxViewerAbi, InverseEscrowAbi, CurvanceMarketManagerAbi, CurvanceCTokenAbi, GearboxCreditAccountCompressorV310Abi, UsddCdpManagerAbi, UsddProxyRegistryAbi, CurvanceProtocolReaderAbi, CurvanceCentralRegistryAbi, TermPriceConsumerAbi, CurvanceOracleManagerAbi, TermMaxOracleAggregatorV2Abi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
 import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, getSiloHalfForUnderlying, InitMarginAddresses, getLstAcceptedInputs } from '@1delta/calldata-sdk';
 import { proxyNativeFetch } from '@1delta/proxy-fetch';
@@ -21401,6 +21401,19 @@ function convertLiquityMarketsToResponse(raw, chainId, prices = {}, _additionalY
       borrowLiquidity = Math.min(borrowLiquidity, Math.max(0, cap - entireDebt));
     }
     if (shutdown) borrowLiquidity = 0;
+    const rateParameter = {
+      kind: "interest-rate",
+      dimension: "rate",
+      domain: {
+        min: Number(cfg.minAnnualInterestRate ?? 0) / 1e18,
+        max: Number(cfg.maxAnnualInterestRate ?? 0) / 1e18
+      },
+      // No protocol default — the borrower must choose. The low end is the
+      // cheapest but the first to be redeemed against.
+      default: Number(cfg.minAnnualInterestRate ?? 0) / 1e18,
+      immutableAfterOpen: false,
+      adjustCooldownSeconds: cfg.interestRateAdjCooldownSeconds ? Number(cfg.interestRateAdjCooldownSeconds) : void 0
+    };
     const entry = { data: {} };
     const collUid = createMarketUid(chainId, lenderKey, collAddr);
     entry.data[collUid] = {
@@ -21435,7 +21448,18 @@ function convertLiquityMarketsToResponse(raw, chainId, prices = {}, _additionalY
           liquidationPenalty: liqPenalty,
           closeFactor: 1,
           collateralDisabled: false,
-          debtDisabled: true
+          debtDisabled: true,
+          /**
+           * Liquity's borrower picks their own interest rate at open, and it
+           * sets redemption priority as well as cost — so it is a real
+           * parameter, not a quoted rate.
+           *
+           * The MUTABLE case: adjustable in place, but rate-limited by
+           * `interestRateAdjCooldownSeconds` and fee-charged if adjusted
+           * early. The per-trove value lives in `modes[troveId]`, because one
+           * address can hold several troves at different rates at once.
+           */
+          openParameter: rateParameter
         }
       },
       closeFactor: 1,
@@ -23028,7 +23052,11 @@ async function fetchChainExtras(chainId, markets) {
       abi: LLAMALEND_READ_ABI,
       allowFailure: true
     });
-  } catch {
+  } catch (e) {
+    console.error(
+      `[llamalend] chain-extras multicall failed on chain ${chainId} for ${markets.length} market(s) \u2014 LTV/price/band state unavailable this cycle:`,
+      e?.message ?? e
+    );
     return {};
   }
   const out = {};
@@ -23201,7 +23229,7 @@ var VAULT_PRICE_ABI = [
   }
 ];
 var IDENTITY_READS = 3;
-var STATE_READS = 12;
+var STATE_READS = 14;
 var ONE = 10n ** 18n;
 var identityCache = /* @__PURE__ */ new Map();
 var identityKey = (chainId, pair) => `${chainId}:${pair.toLowerCase()}`;
@@ -23308,6 +23336,11 @@ async function fetchResupplyMarkets(lender, chainId) {
   }
   const identities = discovered.map((p) => identityCache.get(identityKey(chainId, p))).filter((x) => !!x);
   if (identities.length === 0) return { lender, config, pairs: [] };
+  const { rsup, pairEmissions, convexPoolUtil } = await readRewardContext(
+    chainId,
+    config.registry,
+    config.utilities
+  );
   const utilities = config.utilities;
   const calls = [];
   const abis = [];
@@ -23324,7 +23357,16 @@ async function fetchResupplyMarkets(lender, chainId) {
       // The collateral vault's own share price — the exact input Resupply's
       // `BasicVaultOracle` uses. Read LIVE rather than inverting the pair's
       // cached `exchangeRate`, which only moves when someone writes.
-      { address: id.collateral, name: "convertToAssets", params: [ONE] }
+      { address: id.collateral, name: "convertToAssets", params: [ONE] },
+      // Rewards. `convexPid == 0` means the collateral is not staked, so there
+      // is nothing to report; the weight is this pair's slice of the RSUP
+      // stream. Both are governance-mutable, so neither is cached.
+      { address: id.pair, name: "convexPid", params: [] },
+      {
+        address: pairEmissions ?? id.pair,
+        name: pairEmissions ? "balanceOf" : "convexPid",
+        params: pairEmissions ? [id.pair] : []
+      }
     );
     abis.push(
       ResupplyPairAbi,
@@ -23335,7 +23377,9 @@ async function fetchResupplyMarkets(lender, chainId) {
       ResupplyPairAbi,
       ResupplyPairAbi,
       ResupplyPairAbi,
-      VAULT_PRICE_ABI
+      VAULT_PRICE_ABI,
+      ResupplyPairAbi,
+      pairEmissions ? ResupplyPairEmissionsAbi : ResupplyPairAbi
     );
     if (utilities) {
       calls.push(
@@ -23393,11 +23437,118 @@ async function fetchResupplyMarkets(lender, chainId) {
       ratePerSec: tuple(rateInfo, 1),
       exchangeRate: tuple(exchangeInfo, 2),
       collateralPrice: big(results[base + 8]),
-      liveRatePerSec: utilities ? big(results[base + 9]) : null,
-      underlyingSupplyRatePerSec: utilities ? big(results[base + 10]) : null
+      // Indices follow the PUSH ORDER above exactly: the two reward reads sit
+      // at +9/+10, BEFORE the lens block, so the lens reads are +11/+12.
+      // (Getting this wrong is silent — it produced a 3-billion-percent APR
+      // before the numbers were checked against a hand computation.)
+      convexPid: big(results[base + 9]),
+      rsupWeight: pairEmissions ? big(results[base + 10]) : null,
+      liveRatePerSec: utilities ? big(results[base + 11]) : null,
+      underlyingSupplyRatePerSec: utilities ? big(results[base + 12]) : null,
+      collateralRewards: []
     };
   });
-  return { lender, config, pairs };
+  await attachCollateralRewards(chainId, convexPoolUtil, pairs);
+  return { lender, config, pairs, rsup };
+}
+async function readRewardContext(chainId, registry, utilities) {
+  const addr2 = (v) => typeof v === "string" && v.startsWith("0x") && !/^0x0+$/.test(v) ? v : void 0;
+  try {
+    const first = await multicallRetryUniversal({
+      chain: chainId,
+      calls: [
+        { address: registry, name: "rewardHandler", params: [] },
+        { address: registry, name: "govToken", params: [] },
+        ...utilities ? [{ address: utilities, name: "convexPoolUtil", params: [] }] : []
+      ],
+      abi: [
+        ResupplyRegistryAbi,
+        ResupplyRegistryAbi,
+        ...utilities ? [ResupplyUtilitiesAbi] : []
+      ],
+      allowFailure: true
+    });
+    const rewardHandler = addr2(first[0]);
+    const govToken = addr2(first[1]);
+    const convexPoolUtil = utilities ? addr2(first[2]) : void 0;
+    if (!rewardHandler || !govToken) return { convexPoolUtil };
+    const [emissions] = await multicallRetryUniversal({
+      chain: chainId,
+      calls: [{ address: rewardHandler, name: "pairEmissions", params: [] }],
+      abi: ResupplyRewardHandlerAbi,
+      allowFailure: true
+    });
+    const pairEmissions = addr2(emissions);
+    if (!pairEmissions) return { convexPoolUtil };
+    const stream = await multicallRetryUniversal({
+      chain: chainId,
+      calls: [
+        { address: pairEmissions, name: "periodFinish", params: [] },
+        { address: pairEmissions, name: "rewardRate", params: [] },
+        { address: pairEmissions, name: "totalSupply", params: [] }
+      ],
+      abi: [
+        ResupplyPairEmissionsAbi,
+        ResupplyPairEmissionsAbi,
+        ResupplyPairEmissionsAbi
+      ],
+      allowFailure: true
+    });
+    const periodFinish = big(stream[0]);
+    const rewardRate = big(stream[1]);
+    const totalWeight = big(stream[2]);
+    if (periodFinish === null || rewardRate === null || totalWeight === null || totalWeight === 0n) {
+      return { pairEmissions, convexPoolUtil };
+    }
+    if (periodFinish <= BigInt(Math.floor(Date.now() / 1e3))) {
+      return { pairEmissions, convexPoolUtil };
+    }
+    return {
+      rsup: { govToken, rewardRate, totalWeight, periodFinish },
+      pairEmissions,
+      convexPoolUtil
+    };
+  } catch {
+    return {};
+  }
+}
+async function attachCollateralRewards(chainId, convexPoolUtil, pairs) {
+  if (!convexPoolUtil) return;
+  const staked = pairs.filter((p) => (p.convexPid ?? 0n) > 0n);
+  if (staked.length === 0) return;
+  let res = [];
+  try {
+    res = await multicallRetryUniversal({
+      chain: chainId,
+      calls: staked.map((p) => ({
+        address: convexPoolUtil,
+        name: "rewardRates",
+        params: [p.convexPid]
+      })),
+      abi: staked.map(() => ConvexPoolUtilAbi),
+      allowFailure: true
+    });
+  } catch {
+    return;
+  }
+  staked.forEach((p, i) => {
+    const entry = res[i];
+    if (!Array.isArray(entry)) return;
+    const [tokens, rates] = entry;
+    if (!Array.isArray(tokens) || !Array.isArray(rates)) return;
+    const byToken = /* @__PURE__ */ new Map();
+    tokens.forEach((t, j) => {
+      const rate = rates[j];
+      if (typeof t !== "string" || typeof rate !== "bigint" || rate === 0n) {
+        return;
+      }
+      const key2 = t.toLowerCase();
+      byToken.set(key2, (byToken.get(key2) ?? 0n) + rate);
+    });
+    p.collateralRewards = [...byToken.entries()].map(
+      ([token, ratePerSecPerShare]) => ({ token, ratePerSecPerShare })
+    );
+  });
 }
 
 // src/prices/oracle-prices/fetchers/curvanceRoster.ts
@@ -23987,6 +24138,8 @@ function currencyFor9(address, decimals, symbol, tokens) {
   const lower3 = address.toLowerCase();
   return tokens[lower3] ?? { address: lower3, symbol, name: symbol, decimals };
 }
+var LLAMALEND_MIN_BANDS = 4;
+var LLAMALEND_MAX_BANDS = 50;
 function convertLlamaLendMarketsToResponse(raw, chainId, prices = {}, additionalYields = {
   intrinsicYields: {},
   lenderRewards: {},
@@ -24019,10 +24172,17 @@ function convertLlamaLendMarketsToResponse(raw, chainId, prices = {}, additional
     const utilization = reserves > 0 ? totalDebt / reserves : 0;
     const borrowRatePct = (m.borrowApr ?? 0) * 100;
     const depositRatePct = (m.lendApr ?? 0) * 100;
-    const ltv = m.collateralFactor ?? 0;
+    const ltv = m.collateralFactor ?? null;
     const liqPenalty = Number(market.liquidationDiscount) / 1e18 || 0;
     const closeFactor = 1;
     const depositsEnabled = (m.maxDeposit ?? 0) > 0;
+    const bandParameter = {
+      kind: "llamalend-bands",
+      dimension: "collateralFactor",
+      domain: { min: LLAMALEND_MIN_BANDS, max: LLAMALEND_MAX_BANDS },
+      default: market.defaultBands ?? 10,
+      immutableAfterOpen: true
+    };
     const entry = { data: {} };
     const collUid = createMarketUid(chainId, lenderKey, collAddr);
     entry.data[collUid] = {
@@ -24060,7 +24220,8 @@ function convertLlamaLendMarketsToResponse(raw, chainId, prices = {}, additional
           liquidationPenalty: liqPenalty,
           closeFactor,
           collateralDisabled: false,
-          debtDisabled: true
+          debtDisabled: true,
+          openParameter: bandParameter
         }
       },
       closeFactor,
@@ -24128,7 +24289,10 @@ function convertLlamaLendMarketsToResponse(raw, chainId, prices = {}, additional
         collateralDecimals: collDecimals,
         // The Controller doubles as the market id.
         id: market.controller.toLowerCase(),
-        lltv: String(ltv),
+        // Mirrors the Morpho shape. Empty string, not "0": a consumer parsing
+        // this as a number gets NaN and can branch, where "0" would silently
+        // become a zero LTV. The real curve is in `llamalend.bandLtv`.
+        lltv: ltv !== null ? String(ltv) : "",
         oracle: market.priceOracle ?? market.amm,
         irm: market.monetaryPolicy ?? zeroAddress,
         collateralAddress: collAddr,
@@ -24256,6 +24420,52 @@ function ratePerSecToApr(rate) {
   if (rate === null) return 0;
   return Number(rate) / 1e18 * SECONDS_PER_YEAR9 * 100;
 }
+function buildRewardEntries(p, rsup, chainId, prices, tokens, collateralUsd, debtUsd) {
+  const priceOf = (address) => {
+    const lower3 = address.toLowerCase();
+    const token = tokens[lower3];
+    const key2 = toOracleKey(token?.assetGroup) || toGenericPriceKey(lower3, chainId);
+    return prices[key2] ?? 0;
+  };
+  const collateral = [];
+  if (collateralUsd > 0) {
+    for (const r of p.collateralRewards ?? []) {
+      const price2 = priceOf(r.token);
+      if (price2 <= 0) continue;
+      const decimals = tokens[r.token.toLowerCase()]?.decimals ?? 18;
+      const perSecond = Number(r.ratePerSecPerShare) * Number(p.totalCollateral ?? 0n) / 1e18;
+      const usdPerYear = perSecond / 10 ** decimals * SECONDS_PER_YEAR9 * price2;
+      const apr = usdPerYear / collateralUsd * 100;
+      if (!Number.isFinite(apr) || apr <= 0) continue;
+      collateral.push({
+        asset: r.token,
+        depositRate: apr,
+        variableBorrowRate: 0,
+        stableBorrowRate: 0
+      });
+    }
+  }
+  const borrow = [];
+  if (rsup && debtUsd > 0 && (p.rsupWeight ?? 0n) > 0n) {
+    const price2 = priceOf(rsup.govToken);
+    if (price2 > 0) {
+      const decimals = tokens[rsup.govToken.toLowerCase()]?.decimals ?? 18;
+      const perSecond = Number(rsup.rewardRate) * Number(p.rsupWeight) / Number(rsup.totalWeight);
+      const usdPerYear = perSecond / 10 ** decimals * SECONDS_PER_YEAR9 * price2;
+      const apr = usdPerYear / debtUsd * 100;
+      if (Number.isFinite(apr) && apr > 0) {
+        borrow.push({
+          asset: rsup.govToken,
+          depositRate: 0,
+          // A REBATE on the borrow cost, not a charge.
+          variableBorrowRate: apr,
+          stableBorrowRate: 0
+        });
+      }
+    }
+  }
+  return { collateral, borrow };
+}
 function convertResupplyMarketsToResponse(raw, chainId, prices = {}, _additionalYields = {
   intrinsicYields: {},
   lenderRewards: {},
@@ -24291,6 +24501,15 @@ function convertResupplyMarketsToResponse(raw, chainId, prices = {}, _additional
     const borrowLiquidity = Math.max(borrowLimit - totalDebt, 0);
     const halted = (p.borrowLimit ?? 0n) === 0n;
     const wrappedMarket = resolveWrappedMarket(chainId, id.collateral, id.name);
+    const rewardEntries = buildRewardEntries(
+      p,
+      raw.rsup,
+      chainId,
+      prices,
+      tokens,
+      totalColl * collPrice,
+      totalDebt * debtPrice
+    );
     const maxLtv = p.maxLTV !== null ? Number(p.maxLTV) / LTV_PRECISION : 0;
     const liquidationPenalty = p.liquidationFee !== null ? Number(p.liquidationFee) / LTV_PRECISION : 0;
     const mintFeePct = p.mintFee !== null ? Number(p.mintFee) / LTV_PRECISION * 100 : 0;
@@ -24321,7 +24540,9 @@ function convertResupplyMarketsToResponse(raw, chainId, prices = {}, _additional
       // The wrapped Curve Lend / Fraxlend supply rate — this collateral is a
       // lending position and earns while it sits here.
       intrinsicYield: collateralIntrinsicApr,
-      rewards: void 0,
+      // CRV/CVX from the Convex position the pair stakes the collateral into.
+      // Empty (not undefined) when the pair does not stake — `convexPid == 0`.
+      rewards: rewardEntries.collateral,
       decimals: collDecimals,
       config: {
         0: {
@@ -24378,7 +24599,9 @@ function convertResupplyMarketsToResponse(raw, chainId, prices = {}, _additional
       // but it is governance-settable.
       originationFee: mintFeePct,
       intrinsicYield: 0,
-      rewards: void 0,
+      // RSUP emissions to BORROWERS — a rebate on `variableBorrowRate`, not a
+      // deposit yield. Empty when the emission stream has expired.
+      rewards: rewardEntries.borrow,
       decimals: debtDecimals,
       config: {
         0: {
@@ -31134,7 +31357,7 @@ var getLiquityUserDataConverter = (lender, chainId, account, meta) => {
               troveInfo
             }
           };
-          modes[t.troveId] = 0;
+          modes[t.troveId] = Number(troveInfo.annualInterestRate) / 1e18;
           hist[t.troveId] = {
             totalDeposits24h: collNum * collHist,
             totalDebt24h: debtNum * loanHist
@@ -31594,7 +31817,7 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
             }
           }
         };
-        const modes = { "0": 0 };
+        const modes = { "0": bandCount };
         const hist = {
           "0": {
             totalDeposits24h: collNum * collHist + bandBorrowedNum * loanHist,
@@ -45942,6 +46165,12 @@ function emptyReward() {
     additionalBorrowData: []
   };
 }
+function ensureReserveTokenReward(result, chainId, reserveToken) {
+  if (!result[chainId]) result[chainId] = {};
+  const key2 = reserveToken.toLowerCase();
+  if (!result[chainId][key2]) result[chainId][key2] = emptyReward();
+  return result[chainId][key2];
+}
 function ensureReward(result, chainId, lender, asset) {
   if (!result[chainId]) result[chainId] = {};
   if (!result[chainId][lender]) result[chainId][lender] = {};
@@ -45989,6 +46218,7 @@ function createMerklRewardFetcher(config) {
     label: `MERKL_${config.merklProtocolId.toUpperCase()}`,
     fetch: async () => {
       const result = {};
+      const byReserveToken = {};
       const chainResults = config.chainIds ? await Promise.all(
         config.chainIds.map(async (chainId) => {
           try {
@@ -46012,8 +46242,17 @@ function createMerklRewardFetcher(config) {
           for (const resolved2 of resolutions) {
             const bucket = resolved2.bucket ?? (opp.action === "LEND" ? "deposit" : opp.action === "BORROW" ? "borrow" : void 0);
             if (!bucket) continue;
-            const lender = resolved2.lender ?? config.lenderKey;
-            const reward = ensureReward(result, chainId, lender, resolved2.asset);
+            const keyBy = resolved2.keyBy ?? (config.keyByReserveToken ? "reserveToken" : "lender");
+            const reward = keyBy === "reserveToken" ? ensureReserveTokenReward(
+              byReserveToken,
+              chainId,
+              resolved2.asset
+            ) : ensureReward(
+              result,
+              chainId,
+              resolved2.lender ?? config.lenderKey,
+              resolved2.asset
+            );
             const breakdowns = extractRewardBreakdowns(opp);
             reward.link = getMerkleUrl(opp);
             if (bucket === "deposit") {
@@ -46026,13 +46265,41 @@ function createMerklRewardFetcher(config) {
           }
         }
       }
-      return result;
+      return { byLender: result, byReserveToken };
     }
   };
 }
 var aaveMerklRewardFetcher = createMerklRewardFetcher({
   merklProtocolId: "aave",
-  lenderKey: "AAVE_V3"
+  lenderKey: "AAVE_V3",
+  // Aave campaigns are keyed by the reserve token they pay on, NOT by lender:
+  // Merkl's `aave` protocol id covers V3 mainnet, Horizon, Prime, Ether.fi and
+  // every V4 hub/spoke, and nothing in the payload identifies the deployment
+  // reliably — "Borrow USDC on Aave" advertises `marketName=proto_mainnet` in
+  // its depositUrl while paying on `variableDebtHorRwaUSDC`, i.e. Horizon.
+  // Filing them all under AAVE_V3 summed unrelated deployments into one number
+  // (V3 USDC borrow read 5.75% = 1.75 + 2 + 2; V3 USDG read 12% = two V4 hubs)
+  // and left the deployments actually running the campaigns at 0%.
+  keyByReserveToken: true,
+  resolveAsset: (opp) => {
+    const explorer = opp.explorerAddress?.toLowerCase();
+    if (opp.type?.startsWith("AAVE_V4")) {
+      const underlying2 = resolveUnderlyingFromOpportunity(opp);
+      if (!explorer || !underlying2) return void 0;
+      return {
+        asset: underlying2,
+        lender: `AAVE_V4_${explorer.slice(2).toUpperCase()}`,
+        keyBy: "lender"
+      };
+    }
+    if (explorer) return { asset: explorer };
+    const underlying = resolveUnderlyingFromOpportunity(opp);
+    const candidates = (opp.tokens ?? []).filter(
+      (t) => t.address.toLowerCase() !== underlying
+    );
+    if (candidates.length !== 1) return void 0;
+    return { asset: candidates[0].address.toLowerCase() };
+  }
 });
 function parseEulerVaultFromUrl(depositUrl) {
   if (!depositUrl) return void 0;
@@ -46349,6 +46616,8 @@ async function fetchForPool(chainId, lender, pool, nowSeconds) {
 }
 var dtrinityRebateRewardFetcher = {
   label: "DTRINITY_REBATE",
+  // On-chain source: the pool (and therefore the lender key) is known up front,
+  // so this stays lender-keyed — no deployment ambiguity to resolve.
   fetch: async () => {
     const nowSeconds = Math.floor(Date.now() / 1e3);
     const results = await Promise.all(
@@ -46371,7 +46640,7 @@ var dtrinityRebateRewardFetcher = {
         }
       }
     }
-    return merged;
+    return { byLender: merged };
   }
 };
 
@@ -46391,30 +46660,51 @@ var rewardFetchers = [
   morphoCollateralMerklRewardFetcher,
   dtrinityRebateRewardFetcher
 ];
+function mergeReserveTokenRewards(target, source) {
+  for (const [chainId, byToken] of Object.entries(source)) {
+    if (!target[chainId]) target[chainId] = {};
+    Object.assign(target[chainId], byToken);
+  }
+}
 async function fetchLenderRewards() {
   const results = await Promise.all(
     rewardFetchers.map((f) => safeFetch(f.label, f.fetch))
   );
-  const lenderRewards = {};
+  const byLender = {};
+  const byReserveToken = {};
   for (const rr of results) {
-    if (rr) mergeRewardResults(lenderRewards, rr);
+    if (!rr) continue;
+    if (rr.byLender) mergeRewardResults(byLender, rr.byLender);
+    if (rr.byReserveToken)
+      mergeReserveTokenRewards(byReserveToken, rr.byReserveToken);
   }
-  return lenderRewards;
+  return { byLender, byReserveToken };
 }
 
 // src/yields/fetchGeneralYields.ts
 var fetchGeneralYields = async () => {
-  const [intrinsicYields, lenderRewards] = await Promise.all([
+  const [intrinsicYields, rewards] = await Promise.all([
     fetchIntrinsicYields(),
     fetchLenderRewards()
   ]);
-  return { intrinsicYields, lenderRewards };
+  return {
+    intrinsicYields,
+    lenderRewards: rewards.byLender,
+    rewardsByReserveToken: rewards.byReserveToken
+  };
 };
 var fetchGeneralYieldsByMarketUid = async () => {
-  const { intrinsicYields, lenderRewards } = await fetchGeneralYields();
+  const { intrinsicYields, lenderRewards, rewardsByReserveToken } = await fetchGeneralYields();
   return {
     intrinsicYields,
-    lenderRewards: flattenLenderRewards(lenderRewards)
+    lenderRewards: flattenLenderRewards(lenderRewards),
+    // Same rewards, un-flattened: the flatten above assumes a uid ends in the
+    // underlying address, which Aave V4 (reserve-id uids) breaks. Consumers
+    // with market nodes join (lender, underlying) off this instead.
+    rewardsByLenderAsset: lenderRewards,
+    // Left un-flattened for the same reason: turning a reserve token into a
+    // marketUid needs the market's own metadata, which only the consumer has.
+    rewardsByReserveToken
   };
 };
 var flattenLenderRewards = (input) => {