@defisaver/positions-sdk 2.1.127-dev → 2.1.127-midnight-dev

package/esm/types/portfolio.d.ts

@@ -9,6 +9,7 @@ import { LiquityTroveInfo } from './liquity';
 import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData } from './maker';
 import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
 import { SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
@@ -21,6 +22,9 @@ export interface PortfolioPositionsDataForAddress {
     morphoBlue: {
         [key in MorphoBlueVersions]?: PortfolioProtocolData<MorphoBluePositionData>;
     };
+    morphoMidnight: {
+        [key in MorphoMidnightVersions]?: PortfolioProtocolData<MorphoMidnightPositionData>;
+    };
     compoundV3: {
         [key in CompoundVersions]?: PortfolioProtocolData<CompoundV3PositionData>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.127-dev",
+  "version": "2.1.127-midnight-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/config/contracts.ts

@@ -1113,6 +1113,15 @@ 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"}],
+    "networks": {
+      "8453": {
+        "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
+        "createdBlock": 48932293,
+      }
+    },
+  } as const;
 export const FeedRegistry =  {
     "abi": [{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"address","name":"aggregator","type":"address"}],"name":"confirmFeed","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getAccessController","outputs":[{"internalType":"contract AccessControllerInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint256","name":"roundId","type":"uint256"}],"name":"getAnswer","outputs":[{"internalType":"int256","name":"answer","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getCurrentPhaseId","outputs":[{"internalType":"uint16","name":"currentPhaseId","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"getNextRoundId","outputs":[{"internalType":"uint80","name":"nextRoundId","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint16","name":"phaseId","type":"uint16"}],"name":"getPhase","outputs":[{"components":[{"internalType":"uint16","name":"phaseId","type":"uint16"},{"internalType":"uint80","name":"startingAggregatorRoundId","type":"uint80"},{"internalType":"uint80","name":"endingAggregatorRoundId","type":"uint80"}],"internalType":"struct FeedRegistryInterface.Phase","name":"phase","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint16","name":"phaseId","type":"uint16"}],"name":"getPhaseFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint16","name":"phaseId","type":"uint16"}],"name":"getPhaseRange","outputs":[{"internalType":"uint80","name":"startingRoundId","type":"uint80"},{"internalType":"uint80","name":"endingRoundId","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"getPreviousRoundId","outputs":[{"internalType":"uint80","name":"previousRoundId","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getProposedFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"proposedAggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"getRoundFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint256","name":"roundId","type":"uint256"}],"name":"getTimestamp","outputs":[{"internalType":"uint256","name":"timestamp","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"aggregator","type":"address"}],"name":"isFeedEnabled","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"answer","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestRound","outputs":[{"internalType":"uint256","name":"roundId","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestTimestamp","outputs":[{"internalType":"uint256","name":"timestamp","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"address","name":"aggregator","type":"address"}],"name":"proposeFeed","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"proposedGetRoundData","outputs":[{"internalType":"uint80","name":"id","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"proposedLatestRoundData","outputs":[{"internalType":"uint80","name":"id","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"contract AccessControllerInterface","name":"_accessController","type":"address"}],"name":"setAccessController","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"typeAndVersion","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
     "networks": {

package/src/contracts.ts

@@ -122,6 +122,7 @@ export const getYearnV3VaultContractViem = (client: Client, address: HexString)
 };
 
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
+export const MorphoMidnightViewContractViem = createViemContractFromConfigFunc('MidnightView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');
 export const AaveIncentiveDataProviderV3ContractViem = createViemContractFromConfigFunc('AaveUiIncentiveDataProviderV3');

package/src/helpers/index.ts

@@ -4,6 +4,7 @@ export * as sparkHelpers from './sparkHelpers';
 export * as curveUsdHelpers from './curveUsdHelpers';
 export * as makerHelpers from './makerHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
+export * as morphoMidnightHelpers from './morphoMidnightHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';

package/src/helpers/morphoBlueHelpers/index.ts

@@ -389,7 +389,6 @@ export const getRewardsForMarket = async (marketId: string, network: NetworkNumb
       query: REWARDS_QUERY,
       variables: { marketId, chainId: network },
     }),
-    signal: AbortSignal.timeout(LONGER_TIMEOUT),
   });
 
   const data = await response.json();

package/src/helpers/morphoMidnightHelpers/index.ts

@@ -0,0 +1,86 @@
+import Dec from 'decimal.js';
+import {
+  calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos,
+} from '../../moneymarket';
+import { calculateNetApy } from '../../staking';
+import {
+  LeverageType, MMAssetsData, MMUsedAsset, MMUsedAssets,
+} from '../../types/common';
+import { MorphoMidnightAggregatedPositionData, MorphoMidnightAssetsData, MorphoMidnightMarketInfo } from '../../types';
+
+/**
+ * Aggregate a Morpho Midnight position. Midnight markets are multi-collateral, so the borrow limit is
+ * the sum of each collateral's USD value times its own lltv (Aave-v4 style), rather than a single pair.
+ *
+ * Note on amounts: `borrowedUsd` is derived from the position's `debt`, which is the face value owed at
+ * maturity (principal + fixed interest). Health is therefore measured against the full maturity debt,
+ * matching how MidnightView computes `ratio`. Fixed-rate APY is not derived on-chain in MVP, so
+ * `netApy` reflects the `'0'` rates in `assetsData` (see the module getter).
+ */
+export const getMorphoMidnightAggregatedPositionData = ({
+  usedAssets,
+  assetsData,
+  marketInfo,
+}: {
+  usedAssets: MMUsedAssets,
+  assetsData: MorphoMidnightAssetsData,
+  marketInfo: MorphoMidnightMarketInfo,
+}): MorphoMidnightAggregatedPositionData => {
+  const payload = {} as MorphoMidnightAggregatedPositionData;
+
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+
+  // borrowLimit = Σ collateralUsd_i * lltv_i (per-collateral lltv carried on assetsData)
+  payload.borrowLimitUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral,
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[symbol]?.lltv || 0),
+  );
+  payload.liquidationLimitUsd = payload.borrowLimitUsd;
+
+  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+
+  const loanTokenPrice = assetsData[marketInfo.loanToken]?.price || '0';
+  payload.leftToBorrow = new Dec(loanTokenPrice).eq(0) ? '0' : new Dec(payload.leftToBorrowUsd).div(loanTokenPrice).toString();
+
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+
+  payload.ltv = new Dec(payload.suppliedCollateralUsd).eq(0) ? '0' : new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
+  payload.ratio = new Dec(payload.borrowedUsd).eq(0) ? '0' : new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString();
+  payload.healthRatio = new Dec(payload.borrowedUsd).eq(0) ? 'Infinity' : new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
+
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+  payload.leveragedType = leveragedType;
+  payload.liquidationPrice = '';
+  if (leveragedType !== '') {
+    payload.leveragedAsset = leveragedAsset;
+    let assetPrice = assetsData[leveragedAsset].price;
+    if (leveragedType === LeverageType.VolatilePair) {
+      const borrowedAsset = (Object.values(usedAssets) as MMUsedAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
+      const borrowedAssetPrice = assetsData[borrowedAsset!.symbol].price;
+      const leveragedAssetPrice = assetsData[leveragedAsset].price;
+      const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
+      if (isReverse) {
+        payload.leveragedType = LeverageType.VolatilePairReverse;
+        payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
+        assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
+      } else {
+        assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
+        payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
+      }
+    }
+    payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+  }
+
+  payload.minCollRatio = new Dec(payload.borrowLimitUsd).eq(0) ? '0' : new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+  payload.collLiquidationRatio = new Dec(payload.liquidationLimitUsd).eq(0) ? '0' : new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  payload.exposure = getExposure(payload.borrowedUsd, payload.suppliedUsd);
+
+  return payload;
+};

package/src/index.ts

@@ -17,6 +17,7 @@ import * as markets from './markets';
 import * as helpers from './helpers';
 import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
+import * as morphoMidnight from './morphoMidnight';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
@@ -42,6 +43,7 @@ export {
   markets,
   helpers,
   morphoBlue,
+  morphoMidnight,
   llamaLend,
   eulerV2,
   fluid,

package/src/markets/index.ts

@@ -17,6 +17,7 @@ export {
 export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
+export { MorphoMidnightMarkets, findMorphoMidnightMarket } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';

package/src/markets/morphoMidnight/index.ts

@@ -0,0 +1,161 @@
+import { MorphoMidnightMarketData, MorphoMidnightVersions, NetworkNumber } from '../../types';
+
+// Morpho Midnight core contract on Base (same for every market).
+const MIDNIGHT_BASE = '0xAdedD8ab6dE832766Fedf0FaC4992E5C4D3EA18A';
+const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+
+// Curated Morpho Midnight markets. Each market is fixed-term: it is uniquely identified on-chain by
+// `marketId` (bytes32), derived from the static struct below via MidnightView.toId. Because markets
+// churn as maturities roll, this list is hand-maintained for the pairs/maturities the app supports.
+// Sourced from the official listing at https://markets.morpho.org/fixed/base (see its sitemap.xml) —
+// currently a single USDC/cbBTC pair offered on a monthly maturity ladder; new maturities are added
+// there progressively. Every `marketId` here is verified against MidnightView.toId(marketStruct) in
+// tests/morphoMidnight.ts.
+
+// BASE — USDC/cbBTC, 86% LLTV, monthly maturity ladder
+
+export const MORPHO_MIDNIGHT_CBBTC_USDC_860_20260731 = (networkId = NetworkNumber.Base): MorphoMidnightMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Midnight cbBTC/USDC',
+  shortLabel: 'cbBTC/USDC',
+  url: 'cbbtc-usdc-20260731',
+  value: MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20260731_Base,
+  midnight: MIDNIGHT_BASE,
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+  collaterals: [{
+    token: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf', // cbBTC
+    lltv: 0.86,
+    liquidationCursor: '300000000000000000',
+    oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',
+  }],
+  maturity: 1785510000, // 2026-07-31T15:00:00Z
+  rcfThreshold: '3000000000',
+  enterGate: ZERO_ADDRESS,
+  liquidatorGate: ZERO_ADDRESS,
+  marketId: '0x168e31250e0008b50d2255a5ab85e0265acd6c12e4f9a1336134b36a65a47937',
+  protocolName: 'morpho-midnight',
+});
+
+export const MORPHO_MIDNIGHT_CBBTC_USDC_860_20260828 = (networkId = NetworkNumber.Base): MorphoMidnightMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Midnight cbBTC/USDC',
+  shortLabel: 'cbBTC/USDC',
+  url: 'cbbtc-usdc-20260828',
+  value: MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20260828_Base,
+  midnight: MIDNIGHT_BASE,
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+  collaterals: [{
+    token: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf', // cbBTC
+    lltv: 0.86,
+    liquidationCursor: '300000000000000000',
+    oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',
+  }],
+  maturity: 1787929200, // 2026-08-28T15:00:00Z
+  rcfThreshold: '3000000000',
+  enterGate: ZERO_ADDRESS,
+  liquidatorGate: ZERO_ADDRESS,
+  marketId: '0x05959752fdeff325962b9d263edb421efc6e2186a49360dba6c32e86ebf6c84c',
+  protocolName: 'morpho-midnight',
+});
+
+export const MORPHO_MIDNIGHT_CBBTC_USDC_860_20260925 = (networkId = NetworkNumber.Base): MorphoMidnightMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Midnight cbBTC/USDC',
+  shortLabel: 'cbBTC/USDC',
+  url: 'cbbtc-usdc-20260925',
+  value: MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20260925_Base,
+  midnight: MIDNIGHT_BASE,
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+  collaterals: [{
+    token: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf', // cbBTC
+    lltv: 0.86,
+    liquidationCursor: '300000000000000000',
+    oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',
+  }],
+  maturity: 1790348400, // 2026-09-25T15:00:00Z
+  rcfThreshold: '3000000000',
+  enterGate: ZERO_ADDRESS,
+  liquidatorGate: ZERO_ADDRESS,
+  marketId: '0x549cd072daf99328554f3a6d2d4d6f4a07f1c59369e891e6391946f9cf75f221',
+  protocolName: 'morpho-midnight',
+});
+
+export const MORPHO_MIDNIGHT_CBBTC_USDC_860_20261030 = (networkId = NetworkNumber.Base): MorphoMidnightMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Midnight cbBTC/USDC',
+  shortLabel: 'cbBTC/USDC',
+  url: 'cbbtc-usdc-20261030',
+  value: MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20261030_Base,
+  midnight: MIDNIGHT_BASE,
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+  collaterals: [{
+    token: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf', // cbBTC
+    lltv: 0.86,
+    liquidationCursor: '300000000000000000',
+    oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',
+  }],
+  maturity: 1793372400, // 2026-10-30T15:00:00Z
+  rcfThreshold: '3000000000',
+  enterGate: ZERO_ADDRESS,
+  liquidatorGate: ZERO_ADDRESS,
+  marketId: '0x43d6120738c57b2bc5835901f8250fdf7fc8054efbb006c6ccba61ec898e5ed9',
+  protocolName: 'morpho-midnight',
+});
+
+export const MORPHO_MIDNIGHT_CBBTC_USDC_860_20261127 = (networkId = NetworkNumber.Base): MorphoMidnightMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Midnight cbBTC/USDC',
+  shortLabel: 'cbBTC/USDC',
+  url: 'cbbtc-usdc-20261127',
+  value: MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20261127_Base,
+  midnight: MIDNIGHT_BASE,
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+  collaterals: [{
+    token: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf', // cbBTC
+    lltv: 0.86,
+    liquidationCursor: '300000000000000000',
+    oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',
+  }],
+  maturity: 1795791600, // 2026-11-27T15:00:00Z
+  rcfThreshold: '3000000000',
+  enterGate: ZERO_ADDRESS,
+  liquidatorGate: ZERO_ADDRESS,
+  marketId: '0xe1878eec035b601f301484e63a49a428f8e008e2bf57a2fd88a3fc3a4c1b1acd',
+  protocolName: 'morpho-midnight',
+});
+
+export const MORPHO_MIDNIGHT_CBBTC_USDC_860_20261225 = (networkId = NetworkNumber.Base): MorphoMidnightMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Midnight cbBTC/USDC',
+  shortLabel: 'cbBTC/USDC',
+  url: 'cbbtc-usdc-20261225',
+  value: MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20261225_Base,
+  midnight: MIDNIGHT_BASE,
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+  collaterals: [{
+    token: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf', // cbBTC
+    lltv: 0.86,
+    liquidationCursor: '300000000000000000',
+    oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',
+  }],
+  maturity: 1798210800, // 2026-12-25T15:00:00Z
+  rcfThreshold: '3000000000',
+  enterGate: ZERO_ADDRESS,
+  liquidatorGate: ZERO_ADDRESS,
+  marketId: '0x9593c3a6dba45b6106af8dc8b45ba8c505d90d3d68a3d33f7c278dd921b637da',
+  protocolName: 'morpho-midnight',
+});
+
+export const MorphoMidnightMarkets = (networkId: NetworkNumber) => ({
+  // BASE
+  [MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20260731_Base]: MORPHO_MIDNIGHT_CBBTC_USDC_860_20260731(networkId),
+  [MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20260828_Base]: MORPHO_MIDNIGHT_CBBTC_USDC_860_20260828(networkId),
+  [MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20260925_Base]: MORPHO_MIDNIGHT_CBBTC_USDC_860_20260925(networkId),
+  [MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20261030_Base]: MORPHO_MIDNIGHT_CBBTC_USDC_860_20261030(networkId),
+  [MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20261127_Base]: MORPHO_MIDNIGHT_CBBTC_USDC_860_20261127(networkId),
+  [MorphoMidnightVersions.MorphoMidnightCbBTCUSDC_860_20261225_Base]: MORPHO_MIDNIGHT_CBBTC_USDC_860_20261225(networkId),
+}) as const;
+
+export const findMorphoMidnightMarket = (marketId: string, network: NetworkNumber = NetworkNumber.Base): MorphoMidnightMarketData | undefined => Object.values(MorphoMidnightMarkets(network)).find(
+  (market) => market.marketId.toLowerCase() === marketId.toLowerCase(),
+);

package/src/morphoBlue/index.ts

@@ -8,7 +8,7 @@ import {
   DFSFeedRegistryContractViem, FeedRegistryContractViem, MorphoBlueViewContractViem,
 } from '../contracts';
 import {
-  MorphoBlueAssetsData, MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData,
+  MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
 } from '../types';
 import { USD_QUOTE, WAD } from '../constants';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
@@ -21,39 +21,7 @@ import { getViemProvider, setViemBlockNumber } from '../services/viem';
 
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
 
-const getMorphoRewardIncentives = (apy: string) => [{
-  token: 'MORPHO',
-  apy,
-  incentiveKind: IncentiveKind.Reward,
-  description: 'Eligible for protocol-level MORPHO incentives.',
-}];
-
-export const addMorphoBlueRewardsToMarketInfo = (
-  marketInfo: MorphoBlueMarketInfo,
-  rewards: MorphoBlueMarketRewards,
-): MorphoBlueMarketInfo => ({
-  ...marketInfo,
-  assetsData: {
-    ...marketInfo.assetsData,
-    [marketInfo.loanToken]: {
-      ...marketInfo.assetsData[marketInfo.loanToken],
-      supplyIncentives: [
-        ...marketInfo.assetsData[marketInfo.loanToken].supplyIncentives.filter(({ token }) => token !== 'MORPHO'),
-        ...getMorphoRewardIncentives(rewards.supplyApy),
-      ],
-      borrowIncentives: [
-        ...marketInfo.assetsData[marketInfo.loanToken].borrowIncentives.filter(({ token }) => token !== 'MORPHO'),
-        ...getMorphoRewardIncentives(rewards.borrowApy),
-      ],
-    },
-  },
-});
-
-async function getMorphoBlueMarketDataInternal(
-  provider: Client,
-  network: NetworkNumber,
-  selectedMarket: MorphoBlueMarketData,
-): Promise<MorphoBlueMarketInfo> {
+export async function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
   const {
     loanToken, collateralToken, oracle, irm, lltv, oracleType,
   } = selectedMarket;
@@ -91,6 +59,16 @@ async function getMorphoBlueMarketDataInternal(
     loanTokenPrice = loanTokenPriceRound[1].toString();
   }
 
+  let morphoSupplyApy = '0';
+  let morphoBorrowApy = '0';
+  try {
+    const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
+    morphoSupplyApy = _morphoSupplyApy;
+    morphoBorrowApy = _morphoBorrowApy;
+  } catch (e) {
+    console.error(e);
+  }
+
   const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets.toString(), marketInfo.totalBorrowAssets.toString(), marketInfo.borrowRate.toString(), marketInfo.fee.toString());
   const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate.toString(), marketInfo.totalBorrowShares.toString());
   const utillization = new Dec(marketInfo.totalBorrowAssets.toString()).div(marketInfo.totalSupplyAssets.toString()).mul(100).toString();
@@ -112,8 +90,18 @@ async function getMorphoBlueMarketDataInternal(
     totalBorrow: new Dec(marketInfo.totalBorrowAssets.toString()).div(scale).toString(),
     canBeSupplied: true,
     canBeBorrowed: true,
-    supplyIncentives: [],
-    borrowIncentives: [],
+    supplyIncentives: [{
+      token: 'MORPHO',
+      apy: morphoSupplyApy,
+      incentiveKind: IncentiveKind.Reward,
+      description: 'Eligible for protocol-level MORPHO incentives.',
+    }],
+    borrowIncentives: [{
+      token: 'MORPHO',
+      apy: morphoBorrowApy,
+      incentiveKind: IncentiveKind.Reward,
+      description: 'Eligible for protocol-level MORPHO incentives.',
+    }],
   };
 
   assetsData[wethToEth(collateralTokenInfo.symbol)] = {
@@ -150,70 +138,10 @@ async function getMorphoBlueMarketDataInternal(
   };
 }
 
-export async function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
-  const marketInfo = await getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
-
-  try {
-    const rewards = await getRewardsForMarket(selectedMarket.marketId, network);
-    return addMorphoBlueRewardsToMarketInfo(marketInfo, rewards);
-  } catch (error) {
-    console.error(error);
-    return addMorphoBlueRewardsToMarketInfo(marketInfo, { supplyApy: '0', borrowApy: '0' });
-  }
-}
-
-export function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
-  return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
-}
-
 export async function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
   return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket);
 }
 
-export function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
-  return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket);
-}
-
-export const getMorphoBluePositionDataWithMarketInfo = (
-  data: MorphoBluePositionData,
-  marketInfo: MorphoBlueMarketInfo,
-): MorphoBluePositionData => ({
-  ...data,
-  ...getMorphoBlueAggregatedPositionData({
-    usedAssets: data.usedAssets,
-    assetsData: marketInfo.assetsData,
-    marketInfo,
-  }),
-});
-
-export const getMorphoEarnDataWithMarketInfo = (data: MorphoBlueEarnData, marketInfo: MorphoBlueMarketInfo): MorphoBlueEarnData => {
-  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-  const usedAssets: MMUsedAssets = {
-    [marketInfo.loanToken]: {
-      symbol: loanTokenInfo.symbol,
-      supplied: data.amount,
-      borrowed: '0',
-      isSupplied: new Dec(data.amount).gt(0),
-      isBorrowed: false,
-      collateral: false,
-      suppliedUsd: data.amountUsd,
-      borrowedUsd: '0',
-    },
-  };
-
-  return {
-    ...data,
-    apy: calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData as unknown as MMAssetsData }).netApy,
-  };
-};
-
-export function getMorphoBlueMarketRewards(
-  network: NetworkNumber,
-  selectedMarket: MorphoBlueMarketData,
-): Promise<MorphoBlueMarketRewards> {
-  return getRewardsForMarket(selectedMarket.marketId, network);
-}
-
 export const _getMorphoBlueAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
   let balances: PositionBalances = {
     collateral: {},
@@ -310,7 +238,7 @@ export async function getMorphoBlueAccountData(provider: EthereumProvider, netwo
   return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
 }
 
-export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData> {
+export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{ apy: string, amount: string, amountUsd: string }> {
   const {
     loanToken, collateralToken, oracle, irm, lltv,
   } = selectedMarket;
@@ -326,9 +254,24 @@ export async function getMorphoEarn(provider: Client, network: NetworkNumber, ac
   const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
   const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
   const loanTokenSuppliedUsd = new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString();
-  return getMorphoEarnDataWithMarketInfo({
-    apy: '0',
+  const usedAssets: MMUsedAssets = {
+    [marketInfo.loanToken]: {
+      symbol: loanTokenInfo.symbol,
+      supplied: loanTokenSupplied,
+      borrowed: '0',
+      isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
+      isBorrowed: false,
+      collateral: false,
+      suppliedUsd: loanTokenSuppliedUsd,
+      borrowedUsd: '0',
+    },
+  };
+
+  const { netApy } = calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData as unknown as MMAssetsData });
+
+  return {
+    apy: netApy,
     amount: loanTokenSupplied,
     amountUsd: loanTokenSuppliedUsd,
-  }, marketInfo);
-}
+  };
+}