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

package/esm/morphoMidnight/index.js

@@ -67,8 +67,13 @@ export function _getMorphoMidnightMarketData(provider, network, selectedMarket)
             supplyIncentives: [],
             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 = [];
         collaterals.forEach((coll, i) => {
+            if (coll.hidden)
+                return;
             const collInfo = getAssetInfoByAddress(coll.token, network);
             const collSym = wethToEth(collInfo.symbol);
             collateralSymbols.push(collSym);
@@ -131,8 +136,11 @@ export function _getMorphoMidnightAccountData(provider, network, account, select
             suppliedUsd: new Dec(credit).mul(loanTokenData.price).toString(),
             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';
@@ -212,6 +220,8 @@ export const _getMorphoMidnightAccountBalances = (provider, network, block, addr
     };
     const collateral = {};
     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/esm/types/morphoMidnight.d.ts

@@ -31,7 +31,27 @@ export declare enum MorphoMidnightVersions {
     MorphoMidnightTenorCbETHWETH_20261030_Base = "morphomidnighttenorcbethweth_20261030_base",
     MorphoMidnightTenorCbETHWETH_20261127_Base = "morphomidnighttenorcbethweth_20261127_base",
     MorphoMidnightTenorCbETHWETH_20261225_Base = "morphomidnighttenorcbethweth_20261225_base",
-    MorphoMidnightTenorCbETHWETH_20270129_Base = "morphomidnighttenorcbethweth_20270129_base"
+    MorphoMidnightTenorCbETHWETH_20270129_Base = "morphomidnighttenorcbethweth_20270129_base",
+    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",
+    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';
 export interface MorphoMidnightCollateralParams {
@@ -39,6 +59,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 {
     chainIds: NetworkNumber[];
@@ -48,11 +75,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;
     rcfThreshold: number | string;
     enterGate: EthAddress;

package/esm/types/morphoMidnight.js

@@ -36,6 +36,29 @@ export var MorphoMidnightVersions;
     MorphoMidnightVersions["MorphoMidnightTenorCbETHWETH_20261127_Base"] = "morphomidnighttenorcbethweth_20261127_base";
     MorphoMidnightVersions["MorphoMidnightTenorCbETHWETH_20261225_Base"] = "morphomidnighttenorcbethweth_20261225_base";
     MorphoMidnightVersions["MorphoMidnightTenorCbETHWETH_20270129_Base"] = "morphomidnighttenorcbethweth_20270129_base";
+    // ETHEREUM
+    // Sourced from the official listing at https://markets.morpho.org/fixed?chains=1
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20260925_Eth"] = "morphomidnightwbtcusdc_860_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20261030_Eth"] = "morphomidnightwbtcusdc_860_20261030_eth";
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20261127_Eth"] = "morphomidnightwbtcusdc_860_20261127_eth";
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20261225_Eth"] = "morphomidnightwbtcusdc_860_20261225_eth";
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20270129_Eth"] = "morphomidnightwbtcusdc_860_20270129_eth";
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20270226_Eth"] = "morphomidnightwbtcusdc_860_20270226_eth";
+    MorphoMidnightVersions["MorphoMidnightWBTCUSDC_860_20270326_Eth"] = "morphomidnightwbtcusdc_860_20270326_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20260925_Eth"] = "morphomidnightcbbtcusdc_860_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20261030_Eth"] = "morphomidnightcbbtcusdc_860_20261030_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20261127_Eth"] = "morphomidnightcbbtcusdc_860_20261127_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20261225_Eth"] = "morphomidnightcbbtcusdc_860_20261225_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20270129_Eth"] = "morphomidnightcbbtcusdc_860_20270129_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20270226_Eth"] = "morphomidnightcbbtcusdc_860_20270226_eth";
+    MorphoMidnightVersions["MorphoMidnightCbBTCUSDC_860_20270326_Eth"] = "morphomidnightcbbtcusdc_860_20270326_eth";
+    // Tenor-hosted Midnight markets (same core, different order book)
+    MorphoMidnightVersions["MorphoMidnightTenorWETHUSDC_20260925_Eth"] = "morphomidnighttenorwethusdc_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightTenorStrUSDUSDC_20260925_Eth"] = "morphomidnighttenorstrusdusdc_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightTenorWsrUSDUSDC_20260925_Eth"] = "morphomidnighttenorwsrusdusdc_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightTenorUSD3USDC_20260925_Eth"] = "morphomidnighttenorusd3usdc_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightTenorReUSDUSDC_20260925_Eth"] = "morphomidnighttenorreusdusdc_20260925_eth";
+    MorphoMidnightVersions["MorphoMidnightTenorSiUSDUSDC_20260925_Eth"] = "morphomidnighttenorsiusdusdc_20260925_eth";
 })(MorphoMidnightVersions || (MorphoMidnightVersions = {}));
 /**
  * How much weight `borrowRate` / `debtBase` / `debtInterest` carry on a given position. They fall back to

package/package.json

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

package/src/claiming/compV3.ts

@@ -9,7 +9,6 @@ import { ClaimType } from '../types/claiming';
 // Not decodable by name, since the error lives in CometRewards' ABI and we call through CompV3View.
 const NOT_SUPPORTED_ERROR_SIG = '0x9c58e3b6';
 
-// Only an actual on-chain revert counts - viem reports transport failures as ContractFunctionExecutionError too.
 const isMarketWithoutRewardsConfig = (err: unknown) => {
   if (!(err instanceof BaseError)) return false;
   const revert = err.walk((e) => e instanceof ContractFunctionRevertedError);

package/src/config/contracts.ts

@@ -1128,6 +1128,10 @@ export const MorphoBlueView =  {
 export const MidnightView =  {
     "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
     "networks": {
+      "1": {
+        "address": "0xB64FBf011343961D9AC4A04b714414E35ebE6BE0",
+        "createdBlock": 25938908,
+      },
       "8453": {
         "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
         "createdBlock": 48932293,

package/src/helpers/morphoMidnightHelpers/tenor.ts

@@ -8,7 +8,7 @@ import {
   MorphoMidnightParsedBook,
   NetworkNumber,
 } from '../../types';
-import { isTenorMidnightMarket, MIDNIGHT_BASE } from '../../markets/morphoMidnight';
+import { isTenorMidnightMarket, midnightCoreAddress } from '../../markets/morphoMidnight';
 import type {
   MorphoMidnightBorrowQuote,
   MorphoMidnightPaybackQuote,
@@ -83,11 +83,15 @@ interface TenorOfferFill {
 /**
  * Tenor's offer JSON is flat (market fields live on the offer). Morpho's is nested, and that nested
  * shape is what the app encodes for `Midnight.take`. Map Tenor into that shape so recipes stay on one encoder.
+ *
+ * The core address is the one field Tenor's offer does not carry, so it is derived from the offer's own
+ * `chain_id` rather than the caller's network — an offer names the chain it was made on, and taking it
+ * against another chain's core would address a market that does not exist.
  */
 export const tenorOfferToApiOffer = (offer: TenorOffer) => ({
   market: {
     chain_id: offer.chain_id,
-    midnight: MIDNIGHT_BASE,
+    midnight: midnightCoreAddress(Number(offer.chain_id) as NetworkNumber),
     loan_token: offer.loan_token_address,
     collaterals: offer.collaterals || [],
     maturity: offer.maturity,

package/src/markets/index.ts

@@ -19,6 +19,7 @@ export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export {
   MorphoMidnightMarkets, findMorphoMidnightMarket, isTenorMidnightMarket, morphoMidnightMarketCollateralParams,
+  morphoMidnightVisibleCollaterals,
 } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';