@defisaver/positions-sdk 2.1.150-cirbtc-dev → 2.1.151-midnight-dev

package/src/morphoMidnight/index.ts

@@ -71,8 +71,12 @@ export async function _getMorphoMidnightMarketData(provider: Client, network: Ne
     borrowIncentives: [],
   };
 
+  // `collaterals` is the full on-chain set, so `i` is the index `prices` is keyed by. Hidden entries
+  // (curator vaults, the loan token itself) are skipped rather than filtered out beforehand, which would
+  // shift every later collateral onto the wrong price.
   const collateralSymbols: string[] = [];
   collaterals.forEach((coll, i) => {
+    if (coll.hidden) return;
     const collInfo = getAssetInfoByAddress(coll.token, network);
     const collSym = wethToEth(collInfo.symbol);
     collateralSymbols.push(collSym);
@@ -138,8 +142,10 @@ export async function _getMorphoMidnightAccountData(provider: Client, network: N
     borrowedUsd: new Dec(debt).mul(loanTokenData.price).toString(),
   };
 
-  // positionInfo.collateral is index-aligned with the market's collateral set (0 where unused).
+  // positionInfo.collateral is index-aligned with the market's full on-chain collateral set (0 where
+  // unused), so hidden entries are skipped in place rather than filtered out first.
   collaterals.forEach((coll, i) => {
+    if (coll.hidden) return;
     const collInfo = getAssetInfoByAddress(coll.token, network);
     const collSym = wethToEth(collInfo.symbol);
     const rawAmount = positionInfo.collateral[i] ? positionInfo.collateral[i].toString() : '0';
@@ -228,6 +234,7 @@ export const _getMorphoMidnightAccountBalances = async (provider: Client, networ
 
   const collateral: Record<string, string> = {};
   collaterals.forEach((coll, i) => {
+    if (coll.hidden) return;
     const collInfo = getAssetInfoByAddress(coll.token, network);
     const rawAmount = positionInfo.collateral[i] ? positionInfo.collateral[i].toString() : '0';
     collateral[addressMapping ? collInfo.address.toLowerCase() : wethToEth(collInfo.symbol)] = assetAmountInEth(rawAmount, wethToEth(collInfo.symbol));

package/src/portfolio/index.ts

@@ -12,7 +12,7 @@ import {
   SparkMarkets,
 } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
-import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
+import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData } from '../morphoMidnight';
 import {
   AaveV2MarketData,
   AaveV3MarketData,
@@ -137,7 +137,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     stakingPositions[address.toLowerCase() as EthAddress] = {
       aaveV3: {},
       morphoBlue: {},
-      morphoMidnight: {},
       compoundV3: {},
       spark: {},
       aaveV2: {},
@@ -487,31 +486,8 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     })).flat(),
     ...morphoMidnightMarkets.map((market) => addresses.map(async (address) => {
       try {
-        const [accDataPromise, earnDataPromise] = await Promise.allSettled([
-          _getMorphoMidnightAccountData(client, network, address, market, morphoMidnightMarketsData[market.value]),
-          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() as EthAddress].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() as EthAddress].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 Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: '', data: accData };
-        }
-        if (earnDataPromise.status !== 'rejected') {
-          const earnData = earnDataPromise.value;
-          if (earnData && new Dec(earnData.amount).gt(0)) {
-            stakingPositions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = {
-              error: '',
-              data: earnData,
-            };
-          }
-        }
+        const accData = await _getMorphoMidnightAccountData(client, network, address, market, morphoMidnightMarketsData[market.value]);
+        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: '', data: accData };
       } catch (error) {
         console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
         positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };

package/src/types/morphoMidnight.ts

@@ -39,6 +39,29 @@ export enum MorphoMidnightVersions {
   MorphoMidnightTenorCbETHWETH_20261127_Base = 'morphomidnighttenorcbethweth_20261127_base',
   MorphoMidnightTenorCbETHWETH_20261225_Base = 'morphomidnighttenorcbethweth_20261225_base',
   MorphoMidnightTenorCbETHWETH_20270129_Base = 'morphomidnighttenorcbethweth_20270129_base',
+  // ETHEREUM
+  // Sourced from the official listing at https://markets.morpho.org/fixed?chains=1
+  MorphoMidnightWBTCUSDC_860_20260925_Eth = 'morphomidnightwbtcusdc_860_20260925_eth',
+  MorphoMidnightWBTCUSDC_860_20261030_Eth = 'morphomidnightwbtcusdc_860_20261030_eth',
+  MorphoMidnightWBTCUSDC_860_20261127_Eth = 'morphomidnightwbtcusdc_860_20261127_eth',
+  MorphoMidnightWBTCUSDC_860_20261225_Eth = 'morphomidnightwbtcusdc_860_20261225_eth',
+  MorphoMidnightWBTCUSDC_860_20270129_Eth = 'morphomidnightwbtcusdc_860_20270129_eth',
+  MorphoMidnightWBTCUSDC_860_20270226_Eth = 'morphomidnightwbtcusdc_860_20270226_eth',
+  MorphoMidnightWBTCUSDC_860_20270326_Eth = 'morphomidnightwbtcusdc_860_20270326_eth',
+  MorphoMidnightCbBTCUSDC_860_20260925_Eth = 'morphomidnightcbbtcusdc_860_20260925_eth',
+  MorphoMidnightCbBTCUSDC_860_20261030_Eth = 'morphomidnightcbbtcusdc_860_20261030_eth',
+  MorphoMidnightCbBTCUSDC_860_20261127_Eth = 'morphomidnightcbbtcusdc_860_20261127_eth',
+  MorphoMidnightCbBTCUSDC_860_20261225_Eth = 'morphomidnightcbbtcusdc_860_20261225_eth',
+  MorphoMidnightCbBTCUSDC_860_20270129_Eth = 'morphomidnightcbbtcusdc_860_20270129_eth',
+  MorphoMidnightCbBTCUSDC_860_20270226_Eth = 'morphomidnightcbbtcusdc_860_20270226_eth',
+  MorphoMidnightCbBTCUSDC_860_20270326_Eth = 'morphomidnightcbbtcusdc_860_20270326_eth',
+  // Tenor-hosted Midnight markets (same core, different order book)
+  MorphoMidnightTenorWETHUSDC_20260925_Eth = 'morphomidnighttenorwethusdc_20260925_eth',
+  MorphoMidnightTenorStrUSDUSDC_20260925_Eth = 'morphomidnighttenorstrusdusdc_20260925_eth',
+  MorphoMidnightTenorWsrUSDUSDC_20260925_Eth = 'morphomidnighttenorwsrusdusdc_20260925_eth',
+  MorphoMidnightTenorUSD3USDC_20260925_Eth = 'morphomidnighttenorusd3usdc_20260925_eth',
+  MorphoMidnightTenorReUSDUSDC_20260925_Eth = 'morphomidnighttenorreusdusdc_20260925_eth',
+  MorphoMidnightTenorSiUSDUSDC_20260925_Eth = 'morphomidnighttenorsiusdusdc_20260925_eth',
 }
 
 export type MorphoMidnightCurator = 'Morpho' | 'Tenor';
@@ -48,6 +71,13 @@ export interface MorphoMidnightCollateralParams {
   lltv: number | string,
   liquidationCursor: number | string,
   oracle: EthAddress,
+  /**
+   * A collateral the market carries on-chain but the app never surfaces: a curator's own vault share
+   * token (Tenor's collateral vaults) or the loan token itself (Morpho's mainnet ladders list USDC at
+   * 98% next to the real collateral). It is not an asset the app deals in — nothing renders, prices or
+   * supplies it — but it stays in `collaterals` because the market id is the hash of the full set.
+   */
+  hidden?: boolean,
 }
 
 export interface MorphoMidnightMarketData {
@@ -58,11 +88,15 @@ export interface MorphoMidnightMarketData {
   value: MorphoMidnightVersions,
   midnight: EthAddress,
   loanToken: EthAddress,
-  collaterals: MorphoMidnightCollateralParams[],
   /**
-   * Tenor's curated markets list the curator's own vault share token next to the real collateral.
+   * Every collateral the market carries on-chain, in the chain's own order — which is what the id is
+   * hashed from, so neither the set nor the order may be rearranged. Entries the app does not deal in
+   * are flagged `hidden` rather than kept in a second list: their on-chain position varies per market
+   * (Morpho's mainnet cbBTC ladder lists USDC first, its WBTC ladder second), so a separate list can
+   * only be re-joined by guessing, and every positional read — `MarketInfo.prices[i]`,
+   * `PositionInfo.collateral[i]`, the collateral index a supply call takes — indexes into *this* array.
    */
-  hiddenCollaterals?: MorphoMidnightCollateralParams[],
+  collaterals: MorphoMidnightCollateralParams[],
   maturity: number, // unix timestamp (seconds)
   rcfThreshold: number | string,
   enterGate: EthAddress,