@1delta/margin-fetcher 0.0.238 → 0.0.240

package/dist/index.js

@@ -18867,7 +18867,7 @@ var getSiloV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
         { self: market.silo0, other: market.silo1 },
         { self: market.silo1, other: market.silo0 }
       ];
-      const toBigInt7 = (v) => {
+      const toBigInt8 = (v) => {
         if (v === void 0 || v === null || v === "0x") return 0n;
         if (typeof v === "bigint") return v;
         try {
@@ -18879,8 +18879,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 = toBigInt7(data[slot]);
-        const debtAssetsRaw = toBigInt7(data[slot + 1]);
+        const totalAssetsRaw = toBigInt8(data[slot]);
+        const debtAssetsRaw = toBigInt8(data[slot + 1]);
         const irmConfigRaw = data[slot + 2];
         const decimals = self.decimals;
         const totalDeposits = Number(formatUnits(totalAssetsRaw, decimals));
@@ -19035,7 +19035,7 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
         { self: market.silo0, other: market.silo1 },
         { self: market.silo1, other: market.silo0 }
       ];
-      const toBigInt7 = (v) => {
+      const toBigInt8 = (v) => {
         if (v === void 0 || v === null || v === "0x") return 0n;
         if (typeof v === "bigint") return v;
         try {
@@ -19047,8 +19047,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 = toBigInt7(data[slot]);
-        const debtAssetsRaw = toBigInt7(data[slot + 1]);
+        const totalAssetsRaw = toBigInt8(data[slot]);
+        const debtAssetsRaw = toBigInt8(data[slot + 1]);
         const irmConfigRaw = data[slot + 2];
         const decimals = self.decimals;
         const totalDeposits = Number(formatUnits(totalAssetsRaw, decimals));
@@ -19215,7 +19215,7 @@ function parseVault(vault, chainId, prices, additionalYields, tokenList) {
   const collateralAddress = normalizeUnderlying(rawCollateral);
   const loanAddress = normalizeUnderlying(rawLoan);
   const vaultId = Number(constants.vaultId ?? 0);
-  const lender = `FLUID_${vaultId}`;
+  const lender = `FLUID_${chainId}_${vaultId}`;
   const collateralMeta = tokenList[collateralAddress];
   const loanMeta = tokenList[loanAddress];
   const colDecimals = Number(
@@ -20721,6 +20721,20 @@ var buildSiloV3UserCall = (chainId, lender, account) => {
   return calls;
 };
 
+// src/lending/user-data/fluid/userCallBuild.ts
+var FLUID_USER_CALL_COUNT = 1;
+var buildFluidUserCall = (chainId, _lender, account) => {
+  const resolvers = fluidResolvers()?.[chainId];
+  if (!resolvers) return [];
+  return [
+    {
+      address: resolvers.vaultResolver,
+      name: "positionsByUser",
+      params: [account]
+    }
+  ];
+};
+
 // src/lending/user-data/fetch-balances/prepare.ts
 async function buildUserCall(chainId, lender, account, params) {
   if (isAaveV4Type(lender)) return buildAaveV4UserCall(chainId, lender, account);
@@ -20739,6 +20753,8 @@ async function buildUserCall(chainId, lender, account, params) {
     return buildSiloV3UserCall(chainId, lender, account);
   if (isCompoundV2Type(lender))
     return buildCompoundV2UserCall(chainId, lender, account);
+  if (isFluid(lender))
+    return buildFluidUserCall(chainId, lender, account);
   return [];
 }
 function organizeUserQueries(queries) {
@@ -22466,6 +22482,141 @@ function toBigInt6(v) {
     return 0n;
   }
 }
+var FLUID_EEE_LOWER2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying2 = (addr) => addr === FLUID_EEE_LOWER2 ? zeroAddress : addr;
+function toBigInt7(v) {
+  if (v === void 0 || v === null || v === "0x") return 0n;
+  if (typeof v === "bigint") return v;
+  try {
+    return BigInt(v);
+  } catch {
+    return 0n;
+  }
+}
+var getFluidUserDataConverter = (lender, chainId, account, meta) => {
+  return [
+    (data) => {
+      if (!data || data.length !== FLUID_USER_CALL_COUNT) return void 0;
+      const result = data[0];
+      if (!result) return void 0;
+      const positions = result[0];
+      const vaults = result[1];
+      if (!Array.isArray(positions) || !Array.isArray(vaults) || positions.length === 0)
+        return void 0;
+      const perVault = /* @__PURE__ */ new Map();
+      for (let i = 0; i < positions.length; i++) {
+        const pos = positions[i];
+        const vault = vaults[i];
+        if (!vault?.constantVariables) continue;
+        if (vault.isSmartCol || vault.isSmartDebt) continue;
+        if (pos.isLiquidated) continue;
+        const vaultId = Number(vault.constantVariables.vaultId ?? 0);
+        if (!perVault.has(vaultId)) perVault.set(vaultId, []);
+        perVault.get(vaultId).push({ pos, vault });
+      }
+      if (perVault.size === 0) return void 0;
+      const out = {};
+      for (const [vaultId, nfts] of perVault) {
+        const lenderKey = `${Lender.FLUID}_${chainId}_${vaultId}`;
+        const metaMap = meta?.[lenderKey];
+        if (!metaMap) continue;
+        const constants = nfts[0].vault.constantVariables;
+        const rawCol = (constants.supplyToken?.token0 ?? constants.supplyToken ?? "").toString().toLowerCase();
+        const rawLoan = (constants.borrowToken?.token0 ?? constants.borrowToken ?? "").toString().toLowerCase();
+        if (!rawCol || !rawLoan) continue;
+        const collateral = normalizeUnderlying2(rawCol);
+        const loan = normalizeUnderlying2(rawLoan);
+        const colMarketUid = createMarketUid(chainId, lenderKey, collateral);
+        const loanMarketUid = createMarketUid(chainId, lenderKey, loan);
+        const colMeta = metaMap[colMarketUid];
+        const loanMeta = metaMap[loanMarketUid];
+        const colDec = colMeta?.asset?.decimals ?? 18;
+        const loanDec = loanMeta?.asset?.decimals ?? 18;
+        const colDisplayPrice = colMeta ? getDisplayPrice(colMeta) : 0;
+        const colOraclePrice = colMeta ? getOraclePrice(colMeta) : 0;
+        const loanDisplayPrice = loanMeta ? getDisplayPrice(loanMeta) : 0;
+        const loanOraclePrice = loanMeta ? getOraclePrice(loanMeta) : 0;
+        const colPriceHist = colMeta?.price?.priceUsd24h ?? colDisplayPrice;
+        const loanPriceHist = loanMeta?.price?.priceUsd24h ?? loanDisplayPrice;
+        const lendingPositions = {};
+        const modes = {};
+        const histData = {};
+        for (const { pos } of nfts) {
+          const nftId = pos.nftId.toString();
+          const supplyRaw = toBigInt7(pos.supply);
+          const borrowRaw = toBigInt7(pos.borrow) + toBigInt7(pos.dustBorrow);
+          if (supplyRaw === 0n && borrowRaw === 0n) continue;
+          const depositsStr = parseRawAmount(
+            supplyRaw.toString(),
+            colDec
+          );
+          const debtStr = parseRawAmount(borrowRaw.toString(), loanDec);
+          const depositsNum = Number(depositsStr);
+          const debtNum = Number(debtStr);
+          const depositsUSD = depositsNum * colDisplayPrice;
+          const debtUSD = debtNum * loanDisplayPrice;
+          const depositsUSDOracle = depositsNum * colOraclePrice;
+          const debtUSDOracle = debtNum * loanOraclePrice;
+          histData[nftId] = {
+            totalDeposits24h: depositsNum * colPriceHist,
+            totalDebt24h: debtNum * loanPriceHist
+          };
+          modes[nftId] = 0;
+          const posData = {};
+          posData[colMarketUid] = {
+            marketUid: colMarketUid,
+            underlying: collateral,
+            deposits: depositsStr,
+            debt: "0",
+            debtStable: "0",
+            depositsUSD,
+            debtUSD: 0,
+            debtStableUSD: 0,
+            depositsUSDOracle,
+            debtUSDOracle: 0,
+            debtStableUSDOracle: 0,
+            stableBorrowRate: "0",
+            collateralEnabled: supplyRaw > 0n,
+            claimableRewards: 0
+          };
+          posData[loanMarketUid] = {
+            marketUid: loanMarketUid,
+            underlying: loan,
+            deposits: "0",
+            debt: debtStr,
+            debtStable: "0",
+            depositsUSD: 0,
+            debtUSD,
+            debtStableUSD: 0,
+            depositsUSDOracle: 0,
+            debtUSDOracle,
+            debtStableUSDOracle: 0,
+            stableBorrowRate: "0",
+            collateralEnabled: false,
+            claimableRewards: 0
+          };
+          lendingPositions[nftId] = posData;
+        }
+        if (Object.keys(lendingPositions).length === 0) continue;
+        const userData = createMultiAccountTypeUserState(
+          {
+            chainId,
+            account,
+            lendingPositions,
+            modes
+          },
+          metaMap,
+          histData
+        );
+        if (userData && userData.data.length > 0) {
+          out[lenderKey] = userData;
+        }
+      }
+      return Object.keys(out).length > 0 ? out : void 0;
+    },
+    FLUID_USER_CALL_COUNT
+  ];
+};
 
 // src/lending/user-data/fetch-balances/parse.ts
 function getUserDataConverter(lender, chainId, account, params, meta) {
@@ -22505,6 +22656,8 @@ function getUserDataConverter(lender, chainId, account, params, meta) {
     return getSiloV2UserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isSiloV3Type(lender))
     return getSiloV3UserDataConverter(lender, chainId, account, meta?.[lender]);
+  if (isFluid(lender))
+    return getFluidUserDataConverter(lender, chainId, account, meta);
   return getCompoundV2UserDataConverter(
     lender,
     chainId,
@@ -27186,6 +27339,7 @@ var getAbi2 = (lender) => {
     return [...ComptrollerAbi, ...CompoundV2CollateralToken];
   if (isSiloV2Type(lender) || isSiloV3Type(lender))
     return [...SiloAbi];
+  if (isFluid(lender)) return [...FluidVaultResolverAbi];
   return [];
 };
 
@@ -28856,6 +29010,7 @@ async function getListsMulti(chainIds) {
 
 // src/yields/intrinsic/fetchers/lido.ts
 var WSTETH_URL = "https://eth-api.lido.fi/v1/protocol/steth/apr/sma";
+var DEFILLAMA_LIDO_URL = "https://yields.llama.fi/chart/747c1d2a-c668-4682-b9f9-296708a3dd90";
 var tETH = "Treehouse ETH::TETH";
 var robustFetchJson = async (url, { timeoutMs = 5e3, attempts = 3 } = {}) => {
   let lastErr;
@@ -28879,11 +29034,20 @@ var robustFetchJson = async (url, { timeoutMs = 5e3, attempts = 3 } = {}) => {
   }
   throw lastErr;
 };
+async function fetchLidoApr() {
+  try {
+    const res = await robustFetchJson(WSTETH_URL);
+    return Number(res.data.aprs.at(-1).apr) * 0.9;
+  } catch {
+    const res = await robustFetchJson(DEFILLAMA_LIDO_URL);
+    const latest = res.data.at(-1);
+    return Number(latest.apyBase) * 0.9;
+  }
+}
 var wstethFetcher = {
   label: "WSTETH",
   fetch: async () => {
-    const res = await robustFetchJson(WSTETH_URL);
-    const apr = Number(res.data.aprs.at(-1).apr) * 0.9;
+    const apr = await fetchLidoApr();
     return {
       WSTETH: apr,
       [tETH]: apr
@@ -31481,8 +31645,8 @@ var siloV3Fetcher = {
   parse: parseSiloV3Results,
   getAbi: getSiloV3Abi
 };
-var FLUID_EEE_LOWER2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-var normalizeUnderlying2 = (addr) => addr === FLUID_EEE_LOWER2 ? zeroAddress : addr;
+var FLUID_EEE_LOWER3 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying3 = (addr) => addr === FLUID_EEE_LOWER3 ? zeroAddress : addr;
 function priceColInDebt(raw, colDec, debtDec) {
   return formatMorphoPrice(raw, debtDec, colDec + 9);
 }
@@ -31519,8 +31683,8 @@ function parseFluidResults(data, _meta, context) {
       const rawCol = (constants.supplyToken?.token0 ?? constants.supplyToken ?? "").toString().toLowerCase();
       const rawLoan = (constants.borrowToken?.token0 ?? constants.borrowToken ?? "").toString().toLowerCase();
       if (!rawCol || !rawLoan) continue;
-      const collateral = normalizeUnderlying2(rawCol);
-      const loan = normalizeUnderlying2(rawLoan);
+      const collateral = normalizeUnderlying3(rawCol);
+      const loan = normalizeUnderlying3(rawLoan);
       const colDec = tokenList?.[collateral]?.decimals ?? 18;
       const loanDec = tokenList?.[loan]?.decimals ?? 18;
       const rawPrice = configs.oraclePriceOperate?.toString() ?? "0";
@@ -31528,7 +31692,7 @@ function parseFluidResults(data, _meta, context) {
       const priceDebtPerCol = priceColInDebt(rawPrice, colDec, loanDec);
       if (!Number.isFinite(priceDebtPerCol) || priceDebtPerCol === 0) continue;
       const vaultId = Number(constants.vaultId ?? 0);
-      const lenderKey = `${Lender.FLUID}_${vaultId}`;
+      const lenderKey = `${Lender.FLUID}_${chainId}_${vaultId}`;
       const loanOracleKey = tokenList?.[loan]?.assetGroup ?? `${chainId}-${loan}`;
       const loanUSD = usdPrices[loanOracleKey] ?? usdPrices[loan];
       if (!loanUSD) continue;
@@ -32879,8 +33043,8 @@ var buildFluidFTokensCall = (chainId) => {
 };
 
 // src/vaults/fluid/publicCallParse.ts
-var FLUID_EEE_LOWER3 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-var normalizeUnderlying3 = (addr) => addr === FLUID_EEE_LOWER3 ? zeroAddress : addr;
+var FLUID_EEE_LOWER4 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying4 = (addr) => addr === FLUID_EEE_LOWER4 ? zeroAddress : addr;
 var FLUID_RATE_SCALE2 = 100;
 var scaleFluidRate2 = (raw) => {
   if (raw === void 0 || raw === null) return 0;
@@ -32902,7 +33066,7 @@ function parseFTokens(fTokens, chainId, prices, tokenList) {
   for (const ft of fTokens) {
     const rawAsset = (ft.asset ?? "").toString().toLowerCase();
     if (!rawAsset) continue;
-    const underlying = normalizeUnderlying3(rawAsset);
+    const underlying = normalizeUnderlying4(rawAsset);
     const assetMeta = tokenList[underlying];
     const decimals = Number(ft.decimals ?? assetMeta?.decimals ?? 18);
     const totalAssetsFormatted = Number(