@1delta/margin-fetcher 0.0.231 → 0.0.232

package/dist/index.js

@@ -7,7 +7,7 @@ import lodash from 'lodash';
 import { getEvmChain, getEvmClient, getEvmClientUniversal, multicallRetryUniversal } from '@1delta/providers';
 import { MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, MorphoBlueAbi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
-import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, InitMarginAddresses } from '@1delta/calldata-sdk';
+import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, getSiloHalfForUnderlying, InitMarginAddresses } from '@1delta/calldata-sdk';
 import { BALANCER_V2_FORKS, BALANCER_V3_FORKS, UNISWAP_V4_FORKS, FLASH_LOAN_IDS } from '@1delta/dex-registry';
 
 // src/abis/aave-v2/ProtocolDataProvider.ts
@@ -13449,7 +13449,7 @@ function getCompoundV2Lens(chainId, lender) {
   return COMPOUND_V2_LENS[lender]?.[chainId];
 }
 function getCompoundV2Tokens(chainId, lender = Lender.VENUS) {
-  return compoundV2TokenArray()?.[lender]?.[chainId];
+  return compoundV2TokenArray()?.[lender]?.[chainId] ?? [];
 }
 
 // src/abis/compound-v2/VenusLensLegacy.ts
@@ -18747,7 +18747,7 @@ var getSiloV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
         { self: market.silo0, other: market.silo1 },
         { self: market.silo1, other: market.silo0 }
       ];
-      const toBigInt6 = (v) => {
+      const toBigInt7 = (v) => {
         if (v === void 0 || v === null || v === "0x") return 0n;
         if (typeof v === "bigint") return v;
         try {
@@ -18759,8 +18759,8 @@ var getSiloV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
       for (let s = 0; s < 2; s++) {
         const { self, other } = sides[s];
         const slot = s * SILO_V2_CALLS_PER_SIDE;
-        const totalAssetsRaw = toBigInt6(data[slot]);
-        const debtAssetsRaw = toBigInt6(data[slot + 1]);
+        const totalAssetsRaw = toBigInt7(data[slot]);
+        const debtAssetsRaw = toBigInt7(data[slot + 1]);
         const decimals = self.decimals;
         const totalDeposits = Number(formatUnits(totalAssetsRaw, decimals));
         const totalDebt = Number(formatUnits(debtAssetsRaw, decimals));
@@ -18899,7 +18899,7 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
         { self: market.silo0, other: market.silo1 },
         { self: market.silo1, other: market.silo0 }
       ];
-      const toBigInt6 = (v) => {
+      const toBigInt7 = (v) => {
         if (v === void 0 || v === null || v === "0x") return 0n;
         if (typeof v === "bigint") return v;
         try {
@@ -18911,8 +18911,8 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
       for (let s = 0; s < 2; s++) {
         const { self, other } = sides[s];
         const slot = s * SILO_V3_CALLS_PER_SIDE;
-        const totalAssetsRaw = toBigInt6(data[slot]);
-        const debtAssetsRaw = toBigInt6(data[slot + 1]);
+        const totalAssetsRaw = toBigInt7(data[slot]);
+        const debtAssetsRaw = toBigInt7(data[slot + 1]);
         const decimals = self.decimals;
         const totalDeposits = Number(formatUnits(totalAssetsRaw, decimals));
         const totalDebt = Number(formatUnits(debtAssetsRaw, decimals));
@@ -20310,6 +20310,55 @@ var buildSiloV2UserCall = (chainId, lender, account) => {
   return calls;
 };
 
+// src/lending/user-data/silo-v3/userCallBuild.ts
+var ASSET_TYPE_PROTECTED2 = 0;
+var ASSET_TYPE_COLLATERAL2 = 1;
+var SILO_V3_USER_CALLS_PER_SIDE = 5;
+var SILO_V3_USER_CALLS_PER_PAIR = SILO_V3_USER_CALLS_PER_SIDE * 2;
+var buildSiloV3UserCall = (chainId, lender, account) => {
+  const market = getSiloV3MarketEntry(chainId, lender);
+  if (!market) return [];
+  const calls = [];
+  for (const half of [market.silo0, market.silo1]) {
+    const oneUnit = BigInt(10) ** BigInt(half.decimals);
+    calls.push(
+      // [0] collateral shares (silo IS the collateral share token)
+      {
+        address: half.silo,
+        name: "balanceOf",
+        params: [account]
+      },
+      // [1] protected shares (separate ERC-20)
+      {
+        address: half.protectedShareToken,
+        name: "balanceOf",
+        params: [account]
+      },
+      // [2] collateral rate: assets per unit of collateral shares
+      {
+        address: half.silo,
+        name: "convertToAssets",
+        params: [oneUnit, ASSET_TYPE_COLLATERAL2],
+        abi: SiloConvertToAssetsTypedAbi
+      },
+      // [3] protected rate: assets per unit of protected shares
+      {
+        address: half.silo,
+        name: "convertToAssets",
+        params: [oneUnit, ASSET_TYPE_PROTECTED2],
+        abi: SiloConvertToAssetsTypedAbi
+      },
+      // [4] debt position (already in assets, includes accrued interest)
+      {
+        address: half.silo,
+        name: "maxRepay",
+        params: [account]
+      }
+    );
+  }
+  return calls;
+};
+
 // src/lending/user-data/fetch-balances/prepare.ts
 async function buildUserCall(chainId, lender, account, params) {
   if (isAaveV4Type(lender)) return buildAaveV4UserCall(chainId, lender, account);
@@ -20324,7 +20373,11 @@ async function buildUserCall(chainId, lender, account, params) {
     return buildEulerUserCall(chainId, lender, account, params?.subAccountIndexes);
   if (isSiloV2Type(lender))
     return buildSiloV2UserCall(chainId, lender, account);
-  return buildCompoundV2UserCall(chainId, lender, account);
+  if (isSiloV3Type(lender))
+    return buildSiloV3UserCall(chainId, lender, account);
+  if (isCompoundV2Type(lender))
+    return buildCompoundV2UserCall(chainId, lender, account);
+  return [];
 }
 function organizeUserQueries(queries) {
   const morphos = queries.filter((q) => isMorphoType(q.lender));
@@ -21864,6 +21917,14 @@ var getSiloV2UserDataConverter = (lender, chainId, account, metaMap) => {
           depositAssetsRaw.toString(),
           metaDecimals
         );
+        const depositsStandardStr = parseRawAmount(
+          collateralAssets.toString(),
+          metaDecimals
+        );
+        const depositsProtectedStr = parseRawAmount(
+          protectedAssets.toString(),
+          metaDecimals
+        );
         const debtStr = parseRawAmount(repayRaw.toString(), metaDecimals);
         const depositsNum = Number(depositsStr);
         const debtNum = Number(debtStr);
@@ -21882,8 +21943,15 @@ var getSiloV2UserDataConverter = (lender, chainId, account, metaMap) => {
           marketUid,
           underlying: self.token.toLowerCase(),
           deposits: depositsStr,
+          depositsStandard: depositsStandardStr,
+          depositsProtected: depositsProtectedStr,
           debt: debtStr,
           debtStable: "0",
+          // Raw share balances (stringified bigints, not decimal-formatted).
+          // Used by the leverage close flow to approve the exact share count
+          // and avoid rounding errors on "withdraw all".
+          depositShares: collateralShares.toString(),
+          protectedDepositShares: protectedShares.toString(),
           depositsUSD,
           debtUSD,
           debtStableUSD: 0,
@@ -21892,6 +21960,7 @@ var getSiloV2UserDataConverter = (lender, chainId, account, metaMap) => {
           debtStableUSDOracle: 0,
           stableBorrowRate: "0",
           collateralEnabled,
+          collateralRate: collateralRate.toString(),
           claimableRewards: 0
         };
       }
@@ -21924,6 +21993,118 @@ function toBigInt5(v) {
   }
 }
 
+// src/lending/user-data/silo-v3/userCallParse.ts
+var getSiloV3UserDataConverter = (lender, chainId, account, metaMap) => {
+  const market = getSiloV3MarketEntry(chainId, lender);
+  if (!market) return [() => void 0, 0];
+  return [
+    (data) => {
+      if (!data || data.length !== SILO_V3_USER_CALLS_PER_PAIR)
+        return void 0;
+      const sides = [
+        { self: market.silo0, other: market.silo1 },
+        { self: market.silo1, other: market.silo0 }
+      ];
+      const lendingPositions = {};
+      let addedDeposits = 0;
+      let addedDebt = 0;
+      let hasAnyPosition = false;
+      for (let s = 0; s < 2; s++) {
+        const { self } = sides[s];
+        const slot = s * SILO_V3_USER_CALLS_PER_SIDE;
+        const collateralShares = toBigInt6(data[slot]);
+        const protectedShares = toBigInt6(data[slot + 1]);
+        const collateralRate = toBigInt6(data[slot + 2]);
+        const protectedRate = toBigInt6(data[slot + 3]);
+        const repayRaw = toBigInt6(data[slot + 4]);
+        const decimals = self.decimals;
+        const oneUnit = BigInt(10) ** BigInt(decimals);
+        const collateralAssets = oneUnit > 0n ? collateralShares * collateralRate / oneUnit : 0n;
+        const protectedAssets = oneUnit > 0n ? protectedShares * protectedRate / oneUnit : 0n;
+        const depositAssetsRaw = collateralAssets + protectedAssets;
+        if (depositAssetsRaw === 0n && repayRaw === 0n) continue;
+        hasAnyPosition = true;
+        const marketUid = createMarketUid(chainId, lender, self.silo);
+        const meta = metaMap?.[marketUid];
+        const metaDecimals = meta?.asset?.decimals ?? decimals;
+        const depositsStr = parseRawAmount(
+          depositAssetsRaw.toString(),
+          metaDecimals
+        );
+        const depositsStandardStr = parseRawAmount(
+          collateralAssets.toString(),
+          metaDecimals
+        );
+        const depositsProtectedStr = parseRawAmount(
+          protectedAssets.toString(),
+          metaDecimals
+        );
+        const debtStr = parseRawAmount(repayRaw.toString(), metaDecimals);
+        const depositsNum = Number(depositsStr);
+        const debtNum = Number(debtStr);
+        const displayPrice = meta ? getDisplayPrice(meta) : 0;
+        const oraclePrice = meta ? getOraclePrice(meta) : 0;
+        const priceHist = meta?.price?.priceUsd24h ?? displayPrice;
+        const depositsUSD = depositsNum * displayPrice;
+        const debtUSD = debtNum * displayPrice;
+        const depositsUSDOracle = depositsNum * oraclePrice;
+        const debtUSDOracle = debtNum * oraclePrice;
+        addedDeposits += depositsNum * priceHist;
+        addedDebt += debtNum * priceHist;
+        const selfLt = Number(self.lt) / 1e18;
+        const collateralEnabled = selfLt > 0 && depositAssetsRaw > 0n;
+        lendingPositions[marketUid] = {
+          marketUid,
+          underlying: self.token.toLowerCase(),
+          deposits: depositsStr,
+          depositsStandard: depositsStandardStr,
+          depositsProtected: depositsProtectedStr,
+          debt: debtStr,
+          debtStable: "0",
+          // Raw share balances (stringified bigints, not decimal-formatted).
+          depositShares: collateralShares.toString(),
+          protectedDepositShares: protectedShares.toString(),
+          depositsUSD,
+          debtUSD,
+          debtStableUSD: 0,
+          depositsUSDOracle,
+          debtUSDOracle,
+          debtStableUSDOracle: 0,
+          stableBorrowRate: "0",
+          collateralEnabled,
+          collateralRate: collateralRate.toString(),
+          claimableRewards: 0
+        };
+      }
+      if (!hasAnyPosition) return void 0;
+      const payload = {
+        chainId,
+        account,
+        lendingPositions,
+        rewards: [],
+        userEMode: 0
+      };
+      return createBaseTypeUserState(
+        payload,
+        metaMap,
+        addedDeposits,
+        addedDebt,
+        lender
+      );
+    },
+    SILO_V3_USER_CALLS_PER_PAIR
+  ];
+};
+function toBigInt6(v) {
+  if (v === void 0 || v === null || v === "0x") return 0n;
+  if (typeof v === "bigint") return v;
+  try {
+    return BigInt(v);
+  } catch {
+    return 0n;
+  }
+}
+
 // src/lending/user-data/fetch-balances/parse.ts
 function getUserDataConverter(lender, chainId, account, params, meta) {
   if (isAaveV4Type(lender))
@@ -21960,6 +22141,8 @@ function getUserDataConverter(lender, chainId, account, params, meta) {
     return getEulerUserDataConverter(lender, chainId, account, meta?.[lender], params?.subAccountIndexes);
   if (isSiloV2Type(lender))
     return getSiloV2UserDataConverter(lender, chainId, account, meta?.[lender]);
+  if (isSiloV3Type(lender))
+    return getSiloV3UserDataConverter(lender, chainId, account, meta?.[lender]);
   return getCompoundV2UserDataConverter(
     lender,
     chainId,
@@ -26639,7 +26822,8 @@ var getAbi2 = (lender) => {
   if (isEulerType(lender)) return accountLensAbi;
   if (isCompoundV2Type(lender))
     return [...ComptrollerAbi, ...CompoundV2CollateralToken];
-  if (isSiloV2Type(lender)) return [...SiloAbi];
+  if (isSiloV2Type(lender) || isSiloV3Type(lender))
+    return [...SiloAbi];
   return [];
 };
 
@@ -27047,7 +27231,21 @@ function toCompoundV2Shares(entry, amount) {
     return amount;
   }
 }
-function resolveDebitDataKey(chainId, lender, tokenAddress, cToken) {
+function toSiloShares(entry, amount, chainId, lender, tokenAddress) {
+  const raw = entry.params?.collateralRate;
+  if (!raw || raw === "0x") return amount;
+  try {
+    const rate = BigInt(raw);
+    if (rate === 0n) return amount;
+    const half = getSiloHalfForUnderlying(chainId, lender, tokenAddress);
+    if (!half) return amount;
+    const oneUnit = BigInt(10) ** BigInt(half.decimals);
+    return amount * oneUnit / rate * 1001n / 1000n;
+  } catch {
+    return amount;
+  }
+}
+function resolveDebitDataKey(chainId, lender, tokenAddress, cToken, isProtected) {
   if (isCompoundV2Type(lender) || isVenusType(lender)) {
     if (cToken) return cToken.toLowerCase();
     const tokenMap = getCompoundV2CollateralTokens(chainId, lender);
@@ -27071,10 +27269,16 @@ function resolveDebitDataKey(chainId, lender, tokenAddress, cToken) {
     const aToken = getAaveCollateralTokenAddress(chainId, lender, tokenAddress);
     if (aToken) return aToken;
   }
+  if (isSiloV2Type(lender) || isSiloV3Type(lender)) {
+    const half = getSiloHalfForUnderlying(chainId, lender, tokenAddress);
+    if (half) {
+      return isProtected ? half.protectedShareToken.toLowerCase() : half.collateralShareToken.toLowerCase();
+    }
+  }
   return tokenAddress.toLowerCase();
 }
 function needsLenderApproval(params) {
-  const { lender, lenderDebitData, tokenAddress, amount, chainId, cToken } = params;
+  const { lender, lenderDebitData, tokenAddress, amount, chainId, cToken, isProtected } = params;
   if (!lenderDebitData) return true;
   if (isAaveV4Type(lender)) {
     const key2 = (params.aaveV4Spoke ?? tokenAddress).toLowerCase();
@@ -27087,13 +27291,17 @@ function needsLenderApproval(params) {
     if (!entry2 || entry2.amount === void 0) return true;
     return entry2.amount === 0n;
   }
-  const key = resolveDebitDataKey(chainId, lender, tokenAddress, cToken);
+  const key = resolveDebitDataKey(chainId, lender, tokenAddress, cToken, isProtected);
   const entry = lenderDebitData[key];
   if (!entry || entry.amount === void 0) return true;
   if (isCompoundV2Type(lender) || isVenusType(lender)) {
     const requiredShares = toCompoundV2Shares(entry, amount);
     return entry.amount < requiredShares;
   }
+  if (isSiloV2Type(lender) || isSiloV3Type(lender)) {
+    const requiredShares = toSiloShares(entry, amount, chainId, lender, tokenAddress);
+    return entry.amount < requiredShares;
+  }
   if (isCompoundV3(lender)) {
     return entry.amount === 0n;
   }
@@ -32158,16 +32366,48 @@ function getSupportedAssets(lenderMeta, targetMode) {
   }
   return { collateral, borrow };
 }
+function isCollateralBlockedInMode(config) {
+  if (!config) return true;
+  if (config.collateralDisabled) return true;
+  if ((config.borrowCollateralFactor ?? 0) === 0) return true;
+  return false;
+}
 function canSwitchToEMode(positions, lenderMeta, targetMode, healthFactor) {
-  if (healthFactor !== null && healthFactor <= 1) return false;
+  if (healthFactor !== null && healthFactor <= 1) {
+    return { canSwitch: false, blockReason: "health_factor", blockingAssets: [] };
+  }
+  const collateralBlocking = [];
+  const debtBlocking = [];
   for (let i = 0; i < positions.length; i++) {
     const pos = positions[i];
-    const totalDebt = pos.debtUSD + pos.debtStableUSD;
-    if (totalDebt <= 0) continue;
     const config = lenderMeta[pos.marketUid]?.configs?.[targetMode];
-    if (!config || config.debtDisabled) return false;
+    if (pos.collateralEnabled && pos.depositsUSD > 0) {
+      if (isCollateralBlockedInMode(config)) {
+        collateralBlocking.push(pos.marketUid);
+      }
+    }
+    const totalDebt = pos.debtUSD + pos.debtStableUSD;
+    if (totalDebt > 0) {
+      if (!config || config.debtDisabled) {
+        debtBlocking.push(pos.marketUid);
+      }
+    }
   }
-  return true;
+  if (collateralBlocking.length > 0) {
+    return {
+      canSwitch: false,
+      blockReason: "collateral_not_supported",
+      blockingAssets: [...collateralBlocking, ...debtBlocking]
+    };
+  }
+  if (debtBlocking.length > 0) {
+    return {
+      canSwitch: false,
+      blockReason: "debt_not_supported",
+      blockingAssets: debtBlocking
+    };
+  }
+  return { canSwitch: true };
 }
 function computeEModeAnalysis(subAccount, lenderMeta, eModes) {
   const { positions, balanceData: balanceData2, userConfig } = subAccount;
@@ -32183,18 +32423,22 @@ function computeEModeAnalysis(subAccount, lenderMeta, eModes) {
       targetMode
     );
     const supportedAssets = getSupportedAssets(lenderMeta, targetMode);
-    const canSwitch = canSwitchToEMode(
+    const { canSwitch, blockReason, blockingAssets } = canSwitchToEMode(
       positions,
       lenderMeta,
       targetMode,
       healthFactor
     );
     return {
+      modeId: eMode.category,
       category: eMode.category,
+      // backward-compat alias
       label: eMode.label,
       healthFactor,
       supportedAssets,
-      canSwitch
+      canSwitch,
+      ...blockReason ? { blockReason } : {},
+      ...blockingAssets ? { blockingAssets } : {}
     };
   });
 }