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

package/esm/contracts.js

@@ -94,6 +94,7 @@ export const getYearnV3VaultContractViem = (client, address) => {
     });
 };
 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/esm/helpers/index.d.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/esm/helpers/index.js

@@ -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/esm/helpers/morphoBlueHelpers/index.js

@@ -348,7 +348,6 @@ export const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0,
             query: REWARDS_QUERY,
             variables: { marketId, chainId: network },
         }),
-        signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     const data = yield response.json();
     const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;

package/esm/helpers/morphoMidnightHelpers/index.d.ts

@@ -0,0 +1,50 @@
+import Dec from 'decimal.js';
+import { 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 declare const getMorphoMidnightAggregatedPositionData: ({ usedAssets, assetsData, marketInfo, }: {
+    usedAssets: MMUsedAssets;
+    assetsData: MorphoMidnightAssetsData;
+    marketInfo: MorphoMidnightMarketInfo;
+}) => MorphoMidnightAggregatedPositionData;
+export interface MorphoMidnightBorrowInfo {
+    borrowRate: string;
+    debtBase: string;
+    debtInterest: string;
+    debtTotal: string;
+}
+export interface MorphoMidnightBorrowQuote {
+    bestPrice: string;
+    worstPrice: string;
+    estBorrowRate: string;
+    maxRate: string;
+    newUnits: string;
+    maxUnits: string;
+    availableAssets: string;
+    availableUnits: string;
+    takeableOffers: any[];
+}
+export declare const midnightTimeToMaturityDays: (maturity: number, atSeconds?: number) => number;
+export declare const midnightApyFromPrice: (price: Dec.Value, ttmDays: Dec.Value) => string;
+/**
+ * Current borrower rate + debt breakdown from the Midnight transactions API. On-chain we can only read the
+ * total debt at maturity (`units`); the base-vs-interest split and the effective borrow rate require the
+ * fill history. Per fill the rate is (units / seller_assets)^(365 / ttmAtFill) − 1, weighted by base amount.
+ * The caller swallows errors — a missing rate must never block position rendering.
+ */
+export declare const getMorphoMidnightUserBorrowInfo: (account: string, marketId: string, maturity: number, loanTokenSymbol: string) => Promise<MorphoMidnightBorrowInfo>;
+/**
+ * Estimate the borrow rate + slippage cap for a prospective borrow by quoting the Midnight order book.
+ * `assetsRaw` (and the returned `newUnits`/`maxUnits`) are raw loan-token base units — callers convert to/from
+ * human amounts. `maxUnits` (from the slippage-adjusted worst price) is the cap sent on-chain to protect the
+ * user if better offers get filled first. Throws if the book can't fill the amount (caller handles).
+ */
+export declare const getMorphoMidnightBorrowQuote: (marketId: string, assetsRaw: string, slippagePercent: Dec.Value, maturity: number) => Promise<MorphoMidnightBorrowQuote>;

package/esm/helpers/morphoMidnightHelpers/index.js

@@ -0,0 +1,159 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import Dec from 'decimal.js';
+import { assetAmountInEth } from '@defisaver/tokens';
+import { calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos, } from '../../moneymarket';
+import { calculateNetApy } from '../../staking';
+import { LeverageType, } from '../../types/common';
+import { SECONDS_PER_DAY, WAD } from '../../constants';
+import { LONGER_TIMEOUT } from '../../services/utils';
+/**
+ * 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, }) => {
+    var _a;
+    const payload = {};
+    payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
+    payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
+    payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    // borrowLimit = Σ collateralUsd_i * lltv_i (per-collateral lltv carried on assetsData)
+    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => { var _a; return new Dec(suppliedUsd).mul(((_a = assetsData[symbol]) === null || _a === void 0 ? void 0 : _a.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 = ((_a = assetsData[marketInfo.loanToken]) === null || _a === void 0 ? void 0 : _a.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 });
+    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).find(({ borrowedUsd }) => +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;
+};
+// ── Off-chain order-book rate helpers ──────────────────────────────────────────────────────────────
+// notion: https://app.notion.com/p/defisaver/Estimate-borrow-rate-and-slippage-before-execution-3a70be682adc80c783c8c11fdb761dd2
+// the borrow rate is not exposed on-chain (MidnightView only stores total debt at maturity in `units`).
+// derive the rate + interest from Morpho's public keyless Midnight API
+// Quote prices are WAD-scaled
+// loan-per-unit ratios (< 1 for a discounted fixed-term borrow); annualizing them yields the borrow APY.
+const MIDNIGHT_API_BASE = 'https://api.morpho.org/v0/midnight';
+const nowInSeconds = () => Math.floor(Date.now() / 1000);
+// Days remaining until maturity, optionally measured at a past timestamp (for historical fills).
+export const midnightTimeToMaturityDays = (maturity, atSeconds = nowInSeconds()) => new Dec(maturity).sub(atSeconds).div(SECONDS_PER_DAY).toNumber();
+// Annualize a fixed-term discount price into an APY percent: (1 / price)^(365 / ttmDays) − 1.
+// `price` is loan-per-unit (assets received / units owed), so 1/price ≥ 1.
+export const midnightApyFromPrice = (price, ttmDays) => {
+    const p = new Dec(price);
+    const ttm = new Dec(ttmDays);
+    if (p.lte(0) || ttm.lte(0))
+        return '0';
+    return new Dec(1).div(p).pow(new Dec(365).div(ttm)).sub(1)
+        .mul(100)
+        .toString();
+};
+/**
+ * Current borrower rate + debt breakdown from the Midnight transactions API. On-chain we can only read the
+ * total debt at maturity (`units`); the base-vs-interest split and the effective borrow rate require the
+ * fill history. Per fill the rate is (units / seller_assets)^(365 / ttmAtFill) − 1, weighted by base amount.
+ * The caller swallows errors — a missing rate must never block position rendering.
+ */
+export const getMorphoMidnightUserBorrowInfo = (account, marketId, maturity, loanTokenSymbol) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`${MIDNIGHT_API_BASE}/users/${account}/transactions`, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
+    const json = yield res.json();
+    const borrows = ((json === null || json === void 0 ? void 0 : json.data) || []).filter((t) => { var _a; return t.event_type === 'borrow' && ((_a = t.market_id) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === marketId.toLowerCase(); });
+    let sumSeller = new Dec(0); // Σ seller_assets (base), raw
+    let sumUnits = new Dec(0); // Σ units (debt at maturity), raw
+    let weightedApy = new Dec(0); // Σ seller_assets × APYᵢ
+    borrows.forEach((t) => {
+        var _a, _b;
+        const sellerAssets = new Dec(((_a = t.data) === null || _a === void 0 ? void 0 : _a.seller_assets) || 0);
+        const units = new Dec(((_b = t.data) === null || _b === void 0 ? void 0 : _b.units) || 0);
+        if (sellerAssets.lte(0) || units.lte(0))
+            return;
+        const ttmDays = midnightTimeToMaturityDays(maturity, t.created_at);
+        const apy = midnightApyFromPrice(sellerAssets.div(units), ttmDays); // price = seller_assets / units
+        sumSeller = sumSeller.add(sellerAssets);
+        sumUnits = sumUnits.add(units);
+        weightedApy = weightedApy.add(sellerAssets.mul(apy));
+    });
+    const borrowRate = sumSeller.lte(0) ? '0' : weightedApy.div(sumSeller).toString();
+    const debtBase = assetAmountInEth(sumSeller.toFixed(0), loanTokenSymbol);
+    const debtTotal = assetAmountInEth(sumUnits.toFixed(0), loanTokenSymbol);
+    const debtInterest = Dec.max(new Dec(debtTotal).sub(debtBase), 0).toString();
+    return {
+        borrowRate, debtBase, debtInterest, debtTotal,
+    };
+});
+/**
+ * Estimate the borrow rate + slippage cap for a prospective borrow by quoting the Midnight order book.
+ * `assetsRaw` (and the returned `newUnits`/`maxUnits`) are raw loan-token base units — callers convert to/from
+ * human amounts. `maxUnits` (from the slippage-adjusted worst price) is the cap sent on-chain to protect the
+ * user if better offers get filled first. Throws if the book can't fill the amount (caller handles).
+ */
+export const getMorphoMidnightBorrowQuote = (marketId, assetsRaw, slippagePercent, maturity) => __awaiter(void 0, void 0, void 0, function* () {
+    const url = `${MIDNIGHT_API_BASE}/books/${marketId}/bids/quote?assets=${assetsRaw}&slippage=${slippagePercent}`;
+    const res = yield fetch(url, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
+    const json = yield res.json();
+    const d = json === null || json === void 0 ? void 0 : json.data;
+    if (!(d === null || d === void 0 ? void 0 : d.average_best_price))
+        throw new Error('Morpho Midnight quote unavailable');
+    const bestPrice = new Dec(d.average_best_price).div(WAD).toString();
+    const worstPrice = new Dec(d.average_worst_price).div(WAD).toString();
+    const ttmDays = midnightTimeToMaturityDays(maturity);
+    const estBorrowRate = midnightApyFromPrice(bestPrice, ttmDays);
+    const maxRate = new Dec(estBorrowRate).add(slippagePercent).toString();
+    const newUnits = new Dec(bestPrice).lte(0) ? '0' : new Dec(assetsRaw).div(bestPrice).toFixed(0);
+    const maxUnits = new Dec(worstPrice).lte(0) ? '0' : new Dec(assetsRaw).div(worstPrice).toFixed(0);
+    return {
+        bestPrice,
+        worstPrice,
+        estBorrowRate,
+        maxRate,
+        newUnits,
+        maxUnits,
+        availableAssets: d.available_assets,
+        availableUnits: d.available_units,
+        takeableOffers: d.takeable_offers || [],
+    };
+});

package/esm/index.d.ts

@@ -16,10 +16,11 @@ 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';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -16,10 +16,11 @@ 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';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/markets/index.d.ts

@@ -3,6 +3,7 @@ export { CompoundMarkets, compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCo
 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/esm/markets/index.js

@@ -3,6 +3,7 @@ export { CompoundMarkets, compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCo
 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/esm/markets/morphoMidnight/index.d.ts

@@ -0,0 +1,16 @@
+import { MorphoMidnightMarketData, NetworkNumber } from '../../types';
+export declare const MORPHO_MIDNIGHT_CBBTC_USDC_860_20260731: (networkId?: NetworkNumber) => MorphoMidnightMarketData;
+export declare const MORPHO_MIDNIGHT_CBBTC_USDC_860_20260828: (networkId?: NetworkNumber) => MorphoMidnightMarketData;
+export declare const MORPHO_MIDNIGHT_CBBTC_USDC_860_20260925: (networkId?: NetworkNumber) => MorphoMidnightMarketData;
+export declare const MORPHO_MIDNIGHT_CBBTC_USDC_860_20261030: (networkId?: NetworkNumber) => MorphoMidnightMarketData;
+export declare const MORPHO_MIDNIGHT_CBBTC_USDC_860_20261127: (networkId?: NetworkNumber) => MorphoMidnightMarketData;
+export declare const MORPHO_MIDNIGHT_CBBTC_USDC_860_20261225: (networkId?: NetworkNumber) => MorphoMidnightMarketData;
+export declare const MorphoMidnightMarkets: (networkId: NetworkNumber) => {
+    readonly morphomidnightcbbtcusdc_860_20260731_base: MorphoMidnightMarketData;
+    readonly morphomidnightcbbtcusdc_860_20260828_base: MorphoMidnightMarketData;
+    readonly morphomidnightcbbtcusdc_860_20260925_base: MorphoMidnightMarketData;
+    readonly morphomidnightcbbtcusdc_860_20261030_base: MorphoMidnightMarketData;
+    readonly morphomidnightcbbtcusdc_860_20261127_base: MorphoMidnightMarketData;
+    readonly morphomidnightcbbtcusdc_860_20261225_base: MorphoMidnightMarketData;
+};
+export declare const findMorphoMidnightMarket: (marketId: string, network?: NetworkNumber) => MorphoMidnightMarketData | undefined;

package/esm/markets/morphoMidnight/index.js

@@ -0,0 +1,148 @@
+import { 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) => ({
+    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) => ({
+    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) => ({
+    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) => ({
+    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) => ({
+    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) => ({
+    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) => ({
+    // 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),
+});
+export const findMorphoMidnightMarket = (marketId, network = NetworkNumber.Base) => Object.values(MorphoMidnightMarkets(network)).find((market) => market.marketId.toLowerCase() === marketId.toLowerCase());

package/esm/morphoBlue/index.d.ts

@@ -1,16 +1,14 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData } from '../types';
-export declare const addMorphoBlueRewardsToMarketInfo: (marketInfo: MorphoBlueMarketInfo, rewards: MorphoBlueMarketRewards) => MorphoBlueMarketInfo;
+import { MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData } from '../types';
 export declare function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
-export declare function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
 export declare function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
-export declare function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
-export declare const getMorphoBluePositionDataWithMarketInfo: (data: MorphoBluePositionData, marketInfo: MorphoBlueMarketInfo) => MorphoBluePositionData;
-export declare const getMorphoEarnDataWithMarketInfo: (data: MorphoBlueEarnData, marketInfo: MorphoBlueMarketInfo) => MorphoBlueEarnData;
-export declare function getMorphoBlueMarketRewards(network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketRewards>;
 export declare const _getMorphoBlueAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare const getMorphoBlueAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
 export declare function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
-export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData>;
+export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{
+    apy: string;
+    amount: string;
+    amountUsd: string;
+}>;

package/esm/morphoBlue/index.js

@@ -18,20 +18,7 @@ import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket
 import { getChainlinkAssetAddress } from '../services/priceService';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
-const getMorphoRewardIncentives = (apy) => [{
-        token: 'MORPHO',
-        apy,
-        incentiveKind: IncentiveKind.Reward,
-        description: 'Eligible for protocol-level MORPHO incentives.',
-    }];
-export const addMorphoBlueRewardsToMarketInfo = (marketInfo, rewards) => (Object.assign(Object.assign({}, marketInfo), { assetsData: Object.assign(Object.assign({}, marketInfo.assetsData), { [marketInfo.loanToken]: Object.assign(Object.assign({}, 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),
-            ] }) }) }));
-function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
+export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
@@ -63,6 +50,16 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
             marketInfo = _marketInfo;
             loanTokenPrice = loanTokenPriceRound[1].toString();
         }
+        let morphoSupplyApy = '0';
+        let morphoBorrowApy = '0';
+        try {
+            const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield 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();
@@ -81,8 +78,18 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
             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)] = {
             symbol: wethToEth(collateralTokenInfo.symbol),
@@ -117,54 +124,11 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
         };
     });
 }
-export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const marketInfo = yield getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
-        try {
-            const rewards = yield getRewardsForMarket(selectedMarket.marketId, network);
-            return addMorphoBlueRewardsToMarketInfo(marketInfo, rewards);
-        }
-        catch (error) {
-            console.error(error);
-            return addMorphoBlueRewardsToMarketInfo(marketInfo, { supplyApy: '0', borrowApy: '0' });
-        }
-    });
-}
-export function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
-    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
-}
 export function getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket);
     });
 }
-export function getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
-    return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket);
-}
-export const getMorphoBluePositionDataWithMarketInfo = (data, marketInfo) => (Object.assign(Object.assign({}, data), getMorphoBlueAggregatedPositionData({
-    usedAssets: data.usedAssets,
-    assetsData: marketInfo.assetsData,
-    marketInfo,
-})));
-export const getMorphoEarnDataWithMarketInfo = (data, marketInfo) => {
-    const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-    const usedAssets = {
-        [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 Object.assign(Object.assign({}, data), { apy: calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData }).netApy });
-};
-export function getMorphoBlueMarketRewards(network, selectedMarket) {
-    return getRewardsForMarket(selectedMarket.marketId, network);
-}
 export const _getMorphoBlueAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -252,10 +216,23 @@ export function getMorphoEarn(provider, network, account, selectedMarket, market
         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 = {
+            [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 });
+        return {
+            apy: netApy,
             amount: loanTokenSupplied,
             amountUsd: loanTokenSuppliedUsd,
-        }, marketInfo);
+        };
     });
 }