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

package/cjs/morphoBlue/index.js

@@ -12,12 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = exports.getMorphoEarnDataWithMarketInfo = exports.getMorphoBluePositionDataWithMarketInfo = exports.addMorphoBlueRewardsToMarketInfo = void 0;
+exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = void 0;
 exports._getMorphoBlueMarketData = _getMorphoBlueMarketData;
-exports._getMorphoBluePortfolioMarketData = _getMorphoBluePortfolioMarketData;
 exports.getMorphoBlueMarketData = getMorphoBlueMarketData;
-exports.getMorphoBluePortfolioMarketData = getMorphoBluePortfolioMarketData;
-exports.getMorphoBlueMarketRewards = getMorphoBlueMarketRewards;
 exports._getMorphoBlueAccountData = _getMorphoBlueAccountData;
 exports.getMorphoBlueAccountData = getMorphoBlueAccountData;
 exports.getMorphoEarn = getMorphoEarn;
@@ -32,21 +29,7 @@ const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
 const priceService_1 = require("../services/priceService");
 const viem_1 = require("../services/viem");
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
-const getMorphoRewardIncentives = (apy) => [{
-        token: 'MORPHO',
-        apy,
-        incentiveKind: common_1.IncentiveKind.Reward,
-        description: 'Eligible for protocol-level MORPHO incentives.',
-    }];
-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),
-            ] }) }) }));
-exports.addMorphoBlueRewardsToMarketInfo = addMorphoBlueRewardsToMarketInfo;
-function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
+function _getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
@@ -78,6 +61,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 (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
+            morphoSupplyApy = _morphoSupplyApy;
+            morphoBorrowApy = _morphoBorrowApy;
+        }
+        catch (e) {
+            console.error(e);
+        }
         const supplyRate = (0, morphoBlueHelpers_1.getSupplyRate)(marketInfo.totalSupplyAssets.toString(), marketInfo.totalBorrowAssets.toString(), marketInfo.borrowRate.toString(), marketInfo.fee.toString());
         const compoundedBorrowRate = (0, morphoBlueHelpers_1.getBorrowRate)(marketInfo.borrowRate.toString(), marketInfo.totalBorrowShares.toString());
         const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets.toString()).div(marketInfo.totalSupplyAssets.toString()).mul(100).toString();
@@ -96,8 +89,18 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
             totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets.toString()).div(scale).toString(),
             canBeSupplied: true,
             canBeBorrowed: true,
-            supplyIncentives: [],
-            borrowIncentives: [],
+            supplyIncentives: [{
+                    token: 'MORPHO',
+                    apy: morphoSupplyApy,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description: 'Eligible for protocol-level MORPHO incentives.',
+                }],
+            borrowIncentives: [{
+                    token: 'MORPHO',
+                    apy: morphoBorrowApy,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description: 'Eligible for protocol-level MORPHO incentives.',
+                }],
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
@@ -132,56 +135,11 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
         };
     });
 }
-function _getMorphoBlueMarketData(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const marketInfo = yield getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
-        try {
-            const rewards = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
-            return (0, exports.addMorphoBlueRewardsToMarketInfo)(marketInfo, rewards);
-        }
-        catch (error) {
-            console.error(error);
-            return (0, exports.addMorphoBlueRewardsToMarketInfo)(marketInfo, { supplyApy: '0', borrowApy: '0' });
-        }
-    });
-}
-function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
-    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
-}
 function getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         return _getMorphoBlueMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
     });
 }
-function getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
-    return _getMorphoBluePortfolioMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
-}
-const getMorphoBluePositionDataWithMarketInfo = (data, marketInfo) => (Object.assign(Object.assign({}, data), (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({
-    usedAssets: data.usedAssets,
-    assetsData: marketInfo.assetsData,
-    marketInfo,
-})));
-exports.getMorphoBluePositionDataWithMarketInfo = getMorphoBluePositionDataWithMarketInfo;
-const getMorphoEarnDataWithMarketInfo = (data, marketInfo) => {
-    const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-    const usedAssets = {
-        [marketInfo.loanToken]: {
-            symbol: loanTokenInfo.symbol,
-            supplied: data.amount,
-            borrowed: '0',
-            isSupplied: new decimal_js_1.default(data.amount).gt(0),
-            isBorrowed: false,
-            collateral: false,
-            suppliedUsd: data.amountUsd,
-            borrowedUsd: '0',
-        },
-    };
-    return Object.assign(Object.assign({}, data), { apy: (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData }).netApy });
-};
-exports.getMorphoEarnDataWithMarketInfo = getMorphoEarnDataWithMarketInfo;
-function getMorphoBlueMarketRewards(network, selectedMarket) {
-    return (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
-}
 const _getMorphoBlueAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -271,10 +229,23 @@ function getMorphoEarn(provider, network, account, selectedMarket, marketInfo) {
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
         const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenSuppliedUsd = new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString();
-        return (0, exports.getMorphoEarnDataWithMarketInfo)({
-            apy: '0',
+        const usedAssets = {
+            [marketInfo.loanToken]: {
+                symbol: loanTokenInfo.symbol,
+                supplied: loanTokenSupplied,
+                borrowed: '0',
+                isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
+                isBorrowed: false,
+                collateral: false,
+                suppliedUsd: loanTokenSuppliedUsd,
+                borrowedUsd: '0',
+            },
+        };
+        const { netApy } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData });
+        return {
+            apy: netApy,
             amount: loanTokenSupplied,
             amountUsd: loanTokenSuppliedUsd,
-        }, marketInfo);
+        };
     });
 }

package/cjs/morphoMidnight/index.d.ts

@@ -0,0 +1,14 @@
+import { Client } from 'viem';
+import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
+import { MorphoMidnightMarketData, MorphoMidnightMarketInfo, MorphoMidnightPositionData } from '../types';
+export declare function _getMorphoMidnightMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo>;
+export declare function getMorphoMidnightMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo>;
+export declare function _getMorphoMidnightAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData>;
+export declare function getMorphoMidnightAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData>;
+export declare const _getMorphoMidnightAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData) => Promise<PositionBalances>;
+export declare const getMorphoMidnightAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData) => Promise<PositionBalances>;
+export declare function getMorphoMidnightEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<{
+    apy: string;
+    amount: string;
+    amountUsd: string;
+}>;

package/cjs/morphoMidnight/index.js

@@ -0,0 +1,244 @@
+"use strict";
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMorphoMidnightAccountBalances = exports._getMorphoMidnightAccountBalances = void 0;
+exports._getMorphoMidnightMarketData = _getMorphoMidnightMarketData;
+exports.getMorphoMidnightMarketData = getMorphoMidnightMarketData;
+exports._getMorphoMidnightAccountData = _getMorphoMidnightAccountData;
+exports.getMorphoMidnightAccountData = getMorphoMidnightAccountData;
+exports.getMorphoMidnightEarn = getMorphoMidnightEarn;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const common_1 = require("../types/common");
+const contracts_1 = require("../contracts");
+const constants_1 = require("../constants");
+const staking_1 = require("../staking");
+const utils_1 = require("../services/utils");
+const morphoMidnightHelpers_1 = require("../helpers/morphoMidnightHelpers");
+const priceService_1 = require("../services/priceService");
+const viem_1 = require("../services/viem");
+const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
+const nowInSeconds = () => Math.floor(Date.now() / 1000);
+function _getMorphoMidnightMarketData(provider, network, selectedMarket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { loanToken, collaterals, marketId } = selectedMarket;
+        const loanTokenInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
+        const loanSym = (0, utils_1.wethToEth)(loanTokenInfo.symbol);
+        const loanTokenFeedAddress = (0, priceService_1.getChainlinkAssetAddress)(loanTokenInfo.symbol, network);
+        const viewContract = (0, contracts_1.MorphoMidnightViewContractViem)(provider, network);
+        const isHardcodedUsdStable = ['USDA', 'RLUSD'].includes(loanTokenInfo.symbol);
+        let marketInfo;
+        let loanTokenPrice;
+        if ((0, utils_1.isMainnetNetwork)(network)) {
+            const feedRegistryContract = (0, contracts_1.FeedRegistryContractViem)(provider, common_1.NetworkNumber.Eth);
+            const [_loanTokenPrice, _marketInfo] = yield Promise.all([
+                isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, constants_1.USD_QUOTE]),
+                viewContract.read.getMarketInfo([marketId]),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = _loanTokenPrice;
+        }
+        else {
+            // Currently only Base is supported
+            const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(provider, network);
+            const [loanTokenPriceRound, _marketInfo] = yield Promise.all([
+                isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, constants_1.USD_QUOTE]),
+                viewContract.read.getMarketInfo([marketId]),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = loanTokenPriceRound[1].toString();
+        }
+        const loanTokenUsd = new decimal_js_1.default(loanTokenPrice).div(1e8).toString();
+        const totalUnits = marketInfo.totalUnits.toString();
+        const withdrawable = marketInfo.withdrawable.toString();
+        const totalDebt = decimal_js_1.default.max(new decimal_js_1.default(totalUnits).sub(withdrawable), 0).toString();
+        const assetsData = {};
+        assetsData[loanSym] = {
+            symbol: loanSym,
+            address: loanToken,
+            price: loanTokenUsd,
+            supplyRate: '0', // fixed rate is orderbook-derived, not exposed on-chain (MVP)
+            borrowRate: '0',
+            totalSupply: (0, tokens_1.assetAmountInEth)(totalUnits, loanSym),
+            totalBorrow: (0, tokens_1.assetAmountInEth)(totalDebt, loanSym),
+            canBeSupplied: true,
+            canBeBorrowed: true,
+            supplyIncentives: [],
+            borrowIncentives: [],
+        };
+        const collateralSymbols = [];
+        collaterals.forEach((coll, i) => {
+            const collInfo = (0, tokens_1.getAssetInfoByAddress)(coll.token, network);
+            const collSym = (0, utils_1.wethToEth)(collInfo.symbol);
+            collateralSymbols.push(collSym);
+            // Oracle price is returned in loan-token terms, scaled by 10^(36 + loanDec - collDec)
+            const scale = new decimal_js_1.default(10).pow(new decimal_js_1.default(36).add(loanTokenInfo.decimals).sub(collInfo.decimals).toString()).toString();
+            const rawPrice = marketInfo.prices[i] ? marketInfo.prices[i].toString() : '0';
+            const oracleRate = new decimal_js_1.default(rawPrice).div(scale).toString();
+            assetsData[collSym] = {
+                symbol: collSym,
+                address: coll.token,
+                price: new decimal_js_1.default(loanTokenUsd).mul(oracleRate).toString(),
+                supplyRate: '0',
+                borrowRate: '0',
+                lltv: new decimal_js_1.default(coll.lltv).toString(),
+                canBeSupplied: true,
+                canBeBorrowed: false,
+                supplyIncentives: [],
+                borrowIncentives: [],
+            };
+        });
+        const utillization = new decimal_js_1.default(totalUnits).eq(0) ? '0' : new decimal_js_1.default(totalDebt).div(totalUnits).mul(100).toString();
+        return {
+            id: marketInfo.id,
+            loanToken: loanSym,
+            collaterals: collateralSymbols,
+            maturity: selectedMarket.maturity,
+            isMatured: nowInSeconds() >= selectedMarket.maturity,
+            totalUnits: (0, tokens_1.assetAmountInEth)(totalUnits, loanSym),
+            withdrawable: (0, tokens_1.assetAmountInEth)(withdrawable, loanSym),
+            totalDebt: (0, tokens_1.assetAmountInEth)(totalDebt, loanSym),
+            lossFactor: marketInfo.lossFactor.toString(),
+            tickSpacing: marketInfo.tickSpacing,
+            utillization,
+            assetsData,
+        };
+    });
+}
+function getMorphoMidnightMarketData(provider, network, selectedMarket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return _getMorphoMidnightMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
+    });
+}
+function _getMorphoMidnightAccountData(provider, network, account, selectedMarket, marketInfo) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { marketId, collaterals } = selectedMarket;
+        const viewContract = (0, contracts_1.MorphoMidnightViewContractViem)(provider, network);
+        const positionInfo = yield viewContract.read.getPositionInfo([marketId, account]);
+        const usedAssets = {};
+        const loanTokenData = marketInfo.assetsData[marketInfo.loanToken];
+        const credit = (0, tokens_1.assetAmountInEth)(positionInfo.credit.toString(), marketInfo.loanToken);
+        const debt = (0, tokens_1.assetAmountInEth)(positionInfo.debt.toString(), marketInfo.loanToken);
+        // A user holds either credit (lender) or debt (borrower) in a market, never both.
+        usedAssets[marketInfo.loanToken] = {
+            symbol: marketInfo.loanToken,
+            supplied: credit,
+            borrowed: debt,
+            isSupplied: new decimal_js_1.default(positionInfo.credit.toString()).gt(0),
+            isBorrowed: new decimal_js_1.default(positionInfo.debt.toString()).gt(0),
+            collateral: false,
+            suppliedUsd: new decimal_js_1.default(credit).mul(loanTokenData.price).toString(),
+            borrowedUsd: new decimal_js_1.default(debt).mul(loanTokenData.price).toString(),
+        };
+        // positionInfo.collateral is index-aligned with the market's collateral set (0 where unused).
+        collaterals.forEach((coll, i) => {
+            const collInfo = (0, tokens_1.getAssetInfoByAddress)(coll.token, network);
+            const collSym = (0, utils_1.wethToEth)(collInfo.symbol);
+            const rawAmount = positionInfo.collateral[i] ? positionInfo.collateral[i].toString() : '0';
+            const supplied = (0, tokens_1.assetAmountInEth)(rawAmount, collSym);
+            const collData = marketInfo.assetsData[collSym];
+            usedAssets[collSym] = {
+                symbol: collSym,
+                supplied,
+                borrowed: '0',
+                isSupplied: new decimal_js_1.default(rawAmount).gt(0),
+                isBorrowed: false,
+                collateral: true,
+                suppliedUsd: new decimal_js_1.default(supplied).mul((collData === null || collData === void 0 ? void 0 : collData.price) || 0).toString(),
+                borrowedUsd: '0',
+            };
+        });
+        // Enrich borrower positions with the orderbook-derived rate + principal/interest split (off-chain).
+        // MidnightView only stores `debt` (= face value at maturity), so we default to full-debt-as-principal and
+        // override from the transactions API when available. Never throw here — the position must still render.
+        let borrowRate = '0';
+        let debtBase = debt; // fallback: treat the full on-chain debt as principal until fill history is known
+        let debtInterest = '0';
+        let assetsDataForApy = marketInfo.assetsData;
+        if (new decimal_js_1.default(positionInfo.debt.toString()).gt(0)) {
+            try {
+                const borrowInfo = yield (0, morphoMidnightHelpers_1.getMorphoMidnightUserBorrowInfo)(account, marketId, marketInfo.maturity, marketInfo.loanToken);
+                borrowRate = borrowInfo.borrowRate;
+                debtBase = borrowInfo.debtBase;
+                debtInterest = borrowInfo.debtInterest;
+                usedAssets[marketInfo.loanToken].borrowRate = borrowRate;
+                // Reflect the real borrow cost in netApy without mutating the shared marketInfo.assetsData.
+                assetsDataForApy = Object.assign(Object.assign({}, marketInfo.assetsData), { [marketInfo.loanToken]: Object.assign(Object.assign({}, loanTokenData), { borrowRate }) });
+            }
+            catch (err) {
+                // Orderbook API unavailable — keep the on-chain-only fallback above.
+            }
+        }
+        return Object.assign({ usedAssets,
+            credit,
+            debt,
+            borrowRate,
+            debtBase,
+            debtInterest, maturity: marketInfo.maturity, isMatured: marketInfo.isMatured }, (0, morphoMidnightHelpers_1.getMorphoMidnightAggregatedPositionData)({ usedAssets, assetsData: assetsDataForApy, marketInfo }));
+    });
+}
+function getMorphoMidnightAccountData(provider, network, account, selectedMarket, marketInfo) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return _getMorphoMidnightAccountData((0, viem_1.getViemProvider)(provider, network), network, account, selectedMarket, marketInfo);
+    });
+}
+const _getMorphoMidnightAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+    const balances = { collateral: {}, debt: {} };
+    if (!address)
+        return balances;
+    const { marketId, loanToken, collaterals } = selectedMarket;
+    const viewContract = (0, contracts_1.MorphoMidnightViewContractViem)(provider, network, block);
+    const positionInfo = yield viewContract.read.getPositionInfo([marketId, address], (0, viem_1.setViemBlockNumber)(block));
+    const loanTokenInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
+    balances.debt = {
+        [addressMapping ? loanTokenInfo.address.toLowerCase() : (0, utils_1.wethToEth)(loanTokenInfo.symbol)]: (0, tokens_1.assetAmountInEth)(positionInfo.debt.toString(), (0, utils_1.wethToEth)(loanTokenInfo.symbol)),
+    };
+    const collateral = {};
+    collaterals.forEach((coll, i) => {
+        const collInfo = (0, tokens_1.getAssetInfoByAddress)(coll.token, network);
+        const rawAmount = positionInfo.collateral[i] ? positionInfo.collateral[i].toString() : '0';
+        collateral[addressMapping ? collInfo.address.toLowerCase() : (0, utils_1.wethToEth)(collInfo.symbol)] = (0, tokens_1.assetAmountInEth)(rawAmount, (0, utils_1.wethToEth)(collInfo.symbol));
+    });
+    balances.collateral = collateral;
+    return balances;
+});
+exports._getMorphoMidnightAccountBalances = _getMorphoMidnightAccountBalances;
+const getMorphoMidnightAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getMorphoMidnightAccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address, selectedMarket); });
+exports.getMorphoMidnightAccountBalances = getMorphoMidnightAccountBalances;
+// Lender-side (credit-only) supply position, mirroring getMorphoEarn. `amount` is the credit face value
+// redeemable at maturity; `apy` is '0' in MVP because the fixed yield is orderbook-derived, not on-chain.
+function getMorphoMidnightEarn(provider, network, account, selectedMarket, marketInfo) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { marketId } = selectedMarket;
+        const viewContract = (0, contracts_1.MorphoMidnightViewContractViem)(provider, network);
+        const positionInfo = yield viewContract.read.getPositionInfo([marketId, account]);
+        const loanTokenData = marketInfo.assetsData[marketInfo.loanToken];
+        const credit = (0, tokens_1.assetAmountInEth)(positionInfo.credit.toString(), marketInfo.loanToken);
+        const creditUsd = new decimal_js_1.default(credit).mul(loanTokenData.price).toString();
+        const usedAssets = {
+            [marketInfo.loanToken]: {
+                symbol: marketInfo.loanToken,
+                supplied: credit,
+                borrowed: '0',
+                isSupplied: new decimal_js_1.default(positionInfo.credit.toString()).gt(0),
+                isBorrowed: false,
+                collateral: false,
+                suppliedUsd: creditUsd,
+                borrowedUsd: '0',
+            },
+        };
+        const { netApy } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData });
+        return { apy: netApy, amount: credit, amountUsd: creditUsd };
+    });
+}

package/cjs/portfolio/discovery.js

@@ -24,6 +24,7 @@ const compoundV3_1 = require("../compoundV3");
 const curveUsd_1 = require("../curveUsd");
 const llamaLend_1 = require("../llamaLend");
 const morphoBlue_1 = require("../morphoBlue");
+const morphoMidnight_1 = require("../morphoMidnight");
 const contracts_1 = require("../contracts");
 const hasAnyBalance = (balances) => ([balances.collateral, balances.debt].some((group) => Object.values(group || {}).some((amount) => new decimal_js_1.default(amount || '0').gt(0))));
 /**
@@ -87,6 +88,9 @@ function getUserPositionsExistence(provider_1, network_1, address_1) {
         Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network)).forEach((market) => {
             tasks.push(balanceTask(market.value, () => (0, morphoBlue_1._getMorphoBlueAccountBalances)(client, network, block, false, address, market)));
         });
+        Object.values((0, markets_1.MorphoMidnightMarkets)(network)).filter((market) => market.chainIds.includes(network)).forEach((market) => {
+            tasks.push(balanceTask(market.value, () => (0, morphoMidnight_1._getMorphoMidnightAccountBalances)(client, network, block, false, address, market)));
+        });
         yield Promise.all(tasks);
         return existence;
     });

package/cjs/portfolio/index.js

@@ -31,6 +31,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const common_1 = require("../types/common");
 const markets_1 = require("../markets");
 const morphoBlue_1 = require("../morphoBlue");
+const morphoMidnight_1 = require("../morphoMidnight");
 const types_1 = require("../types");
 const compoundV3_1 = require("../compoundV3");
 const spark_1 = require("../spark");
@@ -59,6 +60,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const isMainnet = network === common_1.NetworkNumber.Eth;
         const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
         const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
+        const morphoMidnightMarkets = Object.values((0, markets_1.MorphoMidnightMarkets)(network)).filter((market) => market.chainIds.includes(network));
         const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
         const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
         const eulerV2Markets = Object.values((0, markets_1.EulerV2Markets)(network)).filter((market) => market.chainIds.includes(network));
@@ -74,6 +76,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const client = (0, viem_1.getViemProvider)(provider, ...args);
         const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
         const morphoMarketsData = {};
+        const morphoMidnightMarketsData = {};
         const compoundV3MarketsData = {};
         const sparkMarketsData = {};
         const eulerV2MarketsData = {};
@@ -87,6 +90,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
+            morphoMidnightMarketsData,
             compoundV3MarketsData,
             sparkMarketsData,
             eulerV2MarketsData,
@@ -107,6 +111,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                 aaveV3: {},
                 aaveV4: {},
                 morphoBlue: {},
+                morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
                 eulerV2: {},
@@ -127,6 +132,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
             stakingPositions[address.toLowerCase()] = {
                 aaveV3: {},
                 morphoBlue: {},
+                morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
                 aaveV2: {},
@@ -151,9 +157,13 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         yield Promise.allSettled([
             // === MARKET DATA (needs to be fetched first) ===
             ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
+                const marketData = yield (0, morphoBlue_1._getMorphoBlueMarketData)(client, network, market);
                 morphoMarketsData[market.value] = marketData;
             })),
+            ...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, morphoMidnight_1._getMorphoMidnightMarketData)(client, network, market);
+                morphoMidnightMarketsData[market.value] = marketData;
+            })),
             ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
                 compoundV3MarketsData[market.value] = marketData;
@@ -464,6 +474,40 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
+            ...morphoMidnightMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
+                        (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, morphoMidnightMarketsData[market.value]),
+                        (0, morphoMidnight_1.getMorphoMidnightEarn)(client, network, address, market, morphoMidnightMarketsData[market.value]),
+                    ]);
+                    if (accDataPromise.status === 'rejected') {
+                        console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, accDataPromise.reason);
+                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
+                    }
+                    if (earnDataPromise.status === 'rejected') {
+                        console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
+                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
+                    }
+                    if (accDataPromise.status !== 'rejected') {
+                        const accData = accDataPromise.value;
+                        if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                            positions[address.toLowerCase()].morphoMidnight[market.value] = { error: '', data: accData };
+                    }
+                    if (earnDataPromise.status !== 'rejected') {
+                        const earnData = earnDataPromise.value;
+                        if (earnData && new decimal_js_1.default(earnData.amount).gt(0)) {
+                            stakingPositions[address.toLowerCase()].morphoMidnight[market.value] = {
+                                error: '',
+                                data: earnData,
+                            };
+                        }
+                    }
+                }
+                catch (error) {
+                    console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
+                    positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
+                }
+            }))).flat(),
             ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });