@1delta/margin-fetcher 0.0.180 → 0.0.181

package/dist/index.js

@@ -1,7 +1,7 @@
 import { parseAbi, formatEther, BaseError, encodeFunctionData, formatUnits, decodeFunctionResult, decodeAbiParameters, AbiEncodingLengthMismatchError, concatHex, isAddress, InvalidAddressError, pad, stringToHex, boolToHex, integerRegex, numberToHex, bytesRegex, BytesSizeMismatchError, arrayRegex, UnsupportedPackedAbiType } from './chunk-ZVIJSUIM.js';
 import './chunk-BYTNVMX7.js';
 import './chunk-PR4QN5HX.js';
-import { Lender, isAaveType, isCompoundV3, isMultiMarket, isInit, isCompoundV2Type, isVenusType, isMorphoType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isYLDR, isCompoundV3Type, isTectonicType, isBenqiType, isLista } from '@1delta/lender-registry';
+import { Lender, isAaveType, isCompoundV3, isMultiMarket, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isYLDR, isCompoundV3Type, isTectonicType, isBenqiType, isLista } from '@1delta/lender-registry';
 export { isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
 import lodash from 'lodash';
 import { getEvmChain, multicallRetry, getEvmClient, getEvmClientUniversal } from '@1delta/providers';
@@ -10909,7 +10909,7 @@ var apyToApr2 = (apy) => {
 
 // src/lending/user-data/utils/oraclePrice.ts
 function getOraclePrice(meta) {
-  const oracleUSD = meta?.oraclePrice?.oraclePriceUSD;
+  const oracleUSD = meta?.oraclePrice?.oraclePriceUsd;
   if (oracleUSD != null && oracleUSD > 0) return oracleUSD;
   return meta?.price?.priceUsd ?? 1;
 }
@@ -10918,12 +10918,19 @@ function getDisplayPrice(meta) {
 }
 
 // src/lending/user-data/utils/types.ts
+function buildUnderlyingInfo(meta) {
+  return {
+    asset: meta.asset,
+    oraclePrice: meta.oraclePrice,
+    prices: meta.price
+  };
+}
 function getMarketUidsFromMeta(meta) {
   return Object.keys(meta);
 }
 
 // src/lending/user-data/utils/createGeneralUserState.ts
-function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
+function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0, lender) {
   let assetKeys = getMarketUidsFromMeta(lenderData);
   const { chainId, account } = payload;
   const mode = String(payload.userEMode ?? 0);
@@ -11043,7 +11050,8 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
           Math.min(withdrawableUSD / price, Number(pos.deposits))
         );
       }
-      if (withdrawLiquidity != null) {
+      const isCollateralOnlyMorpho = lender && isMorphoType(lender) && !flags?.borrowingEnabled;
+      if (withdrawLiquidity != null && !isCollateralOnlyMorpho) {
         withdrawable = String(Math.min(Number(withdrawable), withdrawLiquidity));
       }
       let borrowable;
@@ -11058,6 +11066,7 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
       }
       pos.withdrawable = withdrawable;
       pos.borrowable = borrowable;
+      pos.underlyingInfo = buildUnderlyingInfo(lenderData[marketUid]);
     } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled) {
       let borrowable = String(Math.max(creditLine / bf, 0) / price);
       if (borrowLiquidity != null) {
@@ -11074,7 +11083,8 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
         collateralEnabled: false,
         claimableRewards: 0,
         withdrawable: "0",
-        borrowable
+        borrowable,
+        underlyingInfo: buildUnderlyingInfo(lenderData[marketUid])
       };
     }
   }
@@ -11814,6 +11824,7 @@ function createSumerUserState(payload, lenderData, totalDeposits24h = 0, totalDe
       }
       pos.withdrawable = withdrawable;
       pos.borrowable = borrowable;
+      pos.underlyingInfo = buildUnderlyingInfo(lenderData[marketUid]);
     } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled) {
       let borrowable = String(Math.max(creditLine / bf, 0) / price);
       if (borrowLiquidity != null) {
@@ -11830,7 +11841,8 @@ function createSumerUserState(payload, lenderData, totalDeposits24h = 0, totalDe
         collateralEnabled: false,
         claimableRewards: 0,
         withdrawable: "0",
-        borrowable
+        borrowable,
+        underlyingInfo: buildUnderlyingInfo(lenderData[marketUid])
       };
     }
   }
@@ -11969,6 +11981,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
         }
         pos.withdrawable = withdrawable;
         pos.borrowable = borrowable;
+        pos.underlyingInfo = buildUnderlyingInfo(lenderData[marketUid]);
       } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled) {
         let borrowable = String(Math.max(creditLine / bf, 0) / price);
         if (borrowLiquidity != null) {
@@ -11983,7 +11996,8 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
           collateralEnabled: false,
           claimableRewards: 0,
           withdrawable: "0",
-          borrowable
+          borrowable,
+          underlyingInfo: buildUnderlyingInfo(lenderData[marketUid])
         };
       }
     }
@@ -12072,7 +12086,8 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
       oracleAddress,
       loanAsset,
       collateralAsset,
-      state
+      state,
+      whitelisted
     } = market;
     if (collateralAsset && loanAsset && oracleAddress && oracleAddress !== zeroAddress) {
       const m = "MORPHO_BLUE_" + uniqueKey.slice(2).toUpperCase();
@@ -12187,7 +12202,8 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
           oracle: oracleAddress,
           irm: irmAddress,
           collateralAddress: collateralAssetAddress,
-          loanAddress: loanAssetAddress
+          loanAddress: loanAssetAddress,
+          isListed: whitelisted
         }
       };
       data[m].chainId = chainId;
@@ -12197,13 +12213,12 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
 }
 
 // src/lending/public-data/morpho/fetchPublic.ts
-var query = (first, skip, chainId) => `
+var query = (first, skip, chainId, includeUnlisted = false) => `
 query GetMarkets {
   markets(first: ${first}, skip: ${skip}, where:  {
-     chainId_in: [${chainId}],
-     whitelisted: true
+     chainId_in: [${chainId}]${includeUnlisted ? "" : ",\n     whitelisted: true"}
   },
-  orderBy: SupplyAssetsUsd,   
+  orderBy: SupplyAssetsUsd,
   orderDirection: Desc
   ) {
     items {
@@ -12211,6 +12226,7 @@ query GetMarkets {
       irmAddress
       oracleAddress
       lltv
+      whitelisted
       loanAsset {
         address
         name
@@ -12248,10 +12264,10 @@ query GetMarkets {
 }
 `;
 var BASE_URL = "https://blue-api.morpho.org/graphql";
-async function fetchMorphoMarkets(chainId) {
+async function fetchMorphoMarkets(chainId, includeUnlisted = false) {
   if (chainId !== Chain.ETHEREUM_MAINNET) {
     const requestBody = {
-      query: query(200, 0, chainId),
+      query: query(200, 0, chainId, includeUnlisted),
       variables: {}
     };
     const response = await fetch(BASE_URL, {
@@ -12270,11 +12286,11 @@ async function fetchMorphoMarkets(chainId) {
     return data.data;
   }
   const requestBody0 = {
-    query: query(200, 0, chainId),
+    query: query(200, 0, chainId, includeUnlisted),
     variables: {}
   };
   const requestBody1 = {
-    query: query(200, 200, chainId),
+    query: query(200, 200, chainId, includeUnlisted),
     variables: {}
   };
   const [data0, data1] = await Promise.all([
@@ -17954,8 +17970,8 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
   }
   return lenderData;
 };
-async function getLenderDataFromApi(lender, chainId, prices, additionalYields) {
-  if (isMorphoType(lender)) return await fetchMorphoMarkets(chainId);
+async function getLenderDataFromApi(lender, chainId, prices, additionalYields, includeUnlisted = false) {
+  if (isMorphoType(lender)) return await fetchMorphoMarkets(chainId, includeUnlisted);
   return {};
 }
 function convertLenderDataFromApi(lender, chainId, data, prices, additionalYields, list = {}) {
@@ -17965,11 +17981,11 @@ function convertLenderDataFromApi(lender, chainId, data, prices, additionalYield
 }
 var getLenderPublicDataViaApi = async (chainId, lenders, prices, additionalYields, tokenList = async () => {
   return {};
-}) => {
+}, includeUnlisted = false) => {
   let promises = [];
   for (const lender of lenders) {
     promises.push(
-      getLenderDataFromApi(lender, chainId)
+      getLenderDataFromApi(lender, chainId, prices, additionalYields, includeUnlisted)
     );
   }
   const [list, ...results] = await Promise.all([tokenList(), ...promises]);
@@ -18017,7 +18033,7 @@ function lenderCanUseApi(lender, chainId) {
   }
   return false;
 }
-var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields, multicallRetry3, tokenList) => {
+var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields, multicallRetry3, tokenList, includeUnlistedMorphoMarkets = false) => {
   const lendersApi = lenders.filter((l) => lenderCanUseApi(l, chainId));
   const lendersOnChain = lenders.filter((l) => !lenderCanUseApi(l, chainId));
   const onChain = getLenderPublicData(
@@ -18033,7 +18049,8 @@ var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields,
     lendersApi,
     prices,
     additionalYields,
-    tokenList
+    tokenList,
+    includeUnlistedMorphoMarkets
   );
   const [onChainRes, apiRes] = await Promise.all([onChain, api]);
   return { ...onChainRes, ...apiRes };
@@ -19099,7 +19116,8 @@ var getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, met
             payload,
             metaMap?.[lenderKey],
             addedDeposits,
-            addedDebt
+            addedDebt,
+            lenderKey
           );
           datas[lenderKey] = userData;
         });
@@ -19162,7 +19180,8 @@ var getListaUserDataConverterWithlens = (lender, chainId, account, markets, meta
             payload,
             metaMap?.[lenderKey],
             addedDeposits,
-            addedDebt
+            addedDebt,
+            lenderKey
           );
           datas[lenderKey] = {
             ...payload,
@@ -19369,6 +19388,7 @@ function createEulerMultiAccountTypeUserState(payload, lenderData, histData) {
       const price = getOraclePrice(lenderData[marketUid]);
       const bcf = config?.borrowCollateralFactor ?? 1;
       const bf = config?.borrowFactor ?? 1;
+      const vaultAddr = lenderData[marketUid]?.params?.metadata?.vault;
       const pos = payload.lendingPositions[subAccountIndex]?.[marketUid];
       if (pos) {
         let withdrawable;
@@ -19390,6 +19410,8 @@ function createEulerMultiAccountTypeUserState(payload, lenderData, histData) {
         let borrowable;
         if (!flags?.borrowingEnabled || flags?.isFrozen || config?.debtDisabled) {
           borrowable = "0";
+        } else if (debt > 0 && vaultAddr !== controller) {
+          borrowable = "0";
         } else {
           const borrowableUSD = Math.max(creditLine / bf, 0);
           borrowable = String(borrowableUSD / price);
@@ -19399,7 +19421,10 @@ function createEulerMultiAccountTypeUserState(payload, lenderData, histData) {
         }
         pos.withdrawable = withdrawable;
         pos.borrowable = borrowable;
-      } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled) {
+        pos.underlyingInfo = buildUnderlyingInfo(
+          lenderData[marketUid]
+        );
+      } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled && (debt === 0 || vaultAddr === controller)) {
         let borrowable = String(Math.max(creditLine / bf, 0) / price);
         if (borrowLiquidity != null) {
           borrowable = String(Math.min(Number(borrowable), borrowLiquidity));
@@ -19419,18 +19444,21 @@ function createEulerMultiAccountTypeUserState(payload, lenderData, histData) {
           collateralEnabled: false,
           isAllowed: false,
           withdrawable: "0",
-          borrowable
+          borrowable,
+          underlyingInfo: buildUnderlyingInfo(lenderData[marketUid])
         };
       }
     }
     data.push({
       accountId: subAccountIndex,
-      health: balanceData2.debt === 0 ? null : balanceData2.adjustedDebt > 0 ? balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt : balanceData2.collateral / balanceData2.debt,
+      health: balanceData2.debt === 0 ? null : balanceData2.adjustedDebt > 0 ? balanceData2.collateral / balanceData2.adjustedDebt : balanceData2.collateral / balanceData2.debt,
       borrowCapacityUSD: creditLine,
       userConfig,
       balanceData: balanceData2,
       aprData: aprData2,
-      positions: Object.values(payload.lendingPositions[subAccountIndex])
+      positions: Object.values(
+        payload.lendingPositions[subAccountIndex]
+      )
     });
   }
   return {
@@ -24652,7 +24680,7 @@ function resolveDebitDataKey(chainId, lender, tokenAddress, cToken) {
 function needsLenderApproval(params) {
   const { lender, lenderDebitData, tokenAddress, amount, chainId, cToken } = params;
   if (!lenderDebitData) return true;
-  if (isInit(lender)) {
+  if (isInit(lender) || isMorphoType(lender)) {
     const entry2 = Object.values(lenderDebitData)[0];
     if (!entry2 || entry2.amount === void 0) return true;
     return entry2.amount === 0n;
@@ -24664,7 +24692,7 @@ function needsLenderApproval(params) {
     const requiredShares = toCompoundV2Shares(entry, amount);
     return entry.amount < requiredShares;
   }
-  if (isCompoundV3(lender) || isMorphoType(lender)) {
+  if (isCompoundV3(lender)) {
     return entry.amount === 0n;
   }
   return entry.amount < amount;