@defisaver/positions-sdk 2.1.151-midnight-2-dev → 2.1.151

package/src/morphoMidnight/index.ts

@@ -71,12 +71,8 @@ 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);
@@ -142,10 +138,8 @@ 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 full on-chain collateral set (0 where
-  // unused), so hidden entries are skipped in place rather than filtered out first.
+  // positionInfo.collateral is index-aligned with the market's collateral set (0 where unused).
   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';
@@ -234,7 +228,6 @@ 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/types/aaveV4.ts

@@ -20,6 +20,7 @@ export enum AaveV4SpokesType {
   AaveV4LidoSpoke = 'aave_v4_lido_spoke',
   AaveV4LombardBtcSpoke = 'aave_v4_lombard_btc_spoke',
   AaveV4MainSpoke = 'aave_v4_main_spoke',
+  AaveV4PaxgGoldSpoke = 'aave_v4_paxg_gold_spoke',
   AaveV4USDGPendleSpoke = 'aave_v4_usdg_pendle_spoke',
   AaveV4USDGMapleSpoke = 'aave_v4_usdg_maple_spoke',
 }

package/src/types/morphoMidnight.ts

@@ -39,51 +39,6 @@ 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)
-  MorphoMidnightTenorReUSDUSDC_20260925_Eth = 'morphomidnighttenorreusdusdc_20260925_eth',
-  MorphoMidnightTenorReUSDUSDC_20261030_Eth = 'morphomidnighttenorreusdusdc_20261030_eth',
-  MorphoMidnightTenorReUSDUSDC_20261127_Eth = 'morphomidnighttenorreusdusdc_20261127_eth',
-  MorphoMidnightTenorReUSDUSDC_20261225_Eth = 'morphomidnighttenorreusdusdc_20261225_eth',
-  MorphoMidnightTenorSiUSDUSDC_20260925_Eth = 'morphomidnighttenorsiusdusdc_20260925_eth',
-  MorphoMidnightTenorSiUSDUSDC_20261030_Eth = 'morphomidnighttenorsiusdusdc_20261030_eth',
-  MorphoMidnightTenorSiUSDUSDC_20261127_Eth = 'morphomidnighttenorsiusdusdc_20261127_eth',
-  MorphoMidnightTenorSiUSDUSDC_20261225_Eth = 'morphomidnighttenorsiusdusdc_20261225_eth',
-  MorphoMidnightTenorStrUSDUSDC_20260925_Eth = 'morphomidnighttenorstrusdusdc_20260925_eth',
-  MorphoMidnightTenorStrUSDUSDC_20261030_Eth = 'morphomidnighttenorstrusdusdc_20261030_eth',
-  MorphoMidnightTenorStrUSDUSDC_20261127_Eth = 'morphomidnighttenorstrusdusdc_20261127_eth',
-  MorphoMidnightTenorStrUSDUSDC_20261225_Eth = 'morphomidnighttenorstrusdusdc_20261225_eth',
-  MorphoMidnightTenorUSD3USDC_20260925_Eth = 'morphomidnighttenorusd3usdc_20260925_eth',
-  MorphoMidnightTenorUSD3USDC_20261030_Eth = 'morphomidnighttenorusd3usdc_20261030_eth',
-  MorphoMidnightTenorUSD3USDC_20261127_Eth = 'morphomidnighttenorusd3usdc_20261127_eth',
-  MorphoMidnightTenorUSD3USDC_20261225_Eth = 'morphomidnighttenorusd3usdc_20261225_eth',
-  MorphoMidnightTenorWETHUSDC_20260925_Eth = 'morphomidnighttenorwethusdc_20260925_eth',
-  MorphoMidnightTenorWETHUSDC_20261030_Eth = 'morphomidnighttenorwethusdc_20261030_eth',
-  MorphoMidnightTenorWETHUSDC_20261127_Eth = 'morphomidnighttenorwethusdc_20261127_eth',
-  MorphoMidnightTenorWETHUSDC_20261225_Eth = 'morphomidnighttenorwethusdc_20261225_eth',
-  MorphoMidnightTenorWsrUSDUSDC_20260925_Eth = 'morphomidnighttenorwsrusdusdc_20260925_eth',
-  MorphoMidnightTenorWsrUSDUSDC_20261030_Eth = 'morphomidnighttenorwsrusdusdc_20261030_eth',
-  MorphoMidnightTenorWsrUSDUSDC_20261127_Eth = 'morphomidnighttenorwsrusdusdc_20261127_eth',
-  MorphoMidnightTenorWsrUSDUSDC_20261225_Eth = 'morphomidnighttenorwsrusdusdc_20261225_eth',
-  MorphoMidnightTenorWstETHWETH_20260925_Eth = 'morphomidnighttenorwstethweth_20260925_eth',
-  MorphoMidnightTenorWstETHWETH_20261030_Eth = 'morphomidnighttenorwstethweth_20261030_eth',
-  MorphoMidnightTenorWstETHWETH_20261127_Eth = 'morphomidnighttenorwstethweth_20261127_eth',
-  MorphoMidnightTenorWstETHWETH_20261225_Eth = 'morphomidnighttenorwstethweth_20261225_eth',
 }
 
 export type MorphoMidnightCurator = 'Morpho' | 'Tenor';
@@ -93,13 +48,6 @@ 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 {
@@ -110,15 +58,11 @@ export interface MorphoMidnightMarketData {
   value: MorphoMidnightVersions,
   midnight: EthAddress,
   loanToken: EthAddress,
+  collaterals: MorphoMidnightCollateralParams[],
   /**
-   * 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.
+   * Tenor's curated markets list the curator's own vault share token next to the real collateral.
    */
-  collaterals: MorphoMidnightCollateralParams[],
+  hiddenCollaterals?: MorphoMidnightCollateralParams[],
   maturity: number, // unix timestamp (seconds)
   rcfThreshold: number | string,
   enterGate: EthAddress,