@1delta/margin-fetcher 0.0.274 → 0.0.275

package/dist/index.js

@@ -35740,6 +35740,32 @@ function parseFTokens(fTokens, chainId, prices, tokenList) {
   }
   return out;
 }
+
+// src/vaults/assetDecimals.ts
+var ERC20_DECIMALS_ABI = parseAbi([
+  "function decimals() view returns (uint8)"
+]);
+async function fetchAssetDecimals(chainId, underlyings, multicallRetry) {
+  const map = /* @__PURE__ */ new Map();
+  if (underlyings.length === 0) return map;
+  const raw = await multicallRetry({
+    chain: chainId,
+    calls: underlyings.map((address) => ({
+      address,
+      name: "decimals",
+      params: []
+    })),
+    abi: underlyings.map(() => ERC20_DECIMALS_ABI),
+    allowFailure: true
+  });
+  underlyings.forEach((address, i) => {
+    const d = Number(raw[i]);
+    if (Number.isFinite(d) && d > 0 && d <= 36) map.set(address, d);
+  });
+  return map;
+}
+
+// src/vaults/fluid/fetchPublic.ts
 var fetchFluidFTokens = async (chainId, multicallRetry, prices = {}, tokenList = {}) => {
   const calls = buildFluidFTokensCall(chainId);
   if (calls.length === 0) return {};
@@ -35750,6 +35776,25 @@ var fetchFluidFTokens = async (chainId, multicallRetry, prices = {}, tokenList =
   });
   const [converter] = getFluidFTokensConverter(chainId, prices, tokenList);
   const fTokens = converter(raw) ?? {};
+  try {
+    const underlyings = Object.values(fTokens).map((f) => f.underlying).filter((a) => !!a && a !== zeroAddress);
+    const assetDec = await fetchAssetDecimals(
+      chainId,
+      [...new Set(underlyings)],
+      multicallRetry
+    );
+    for (const f of Object.values(fTokens)) {
+      const dec = assetDec.get(f.underlying);
+      if (dec == null || dec === f.decimals) continue;
+      const price2 = f.priceUsd ?? 0;
+      f.decimals = dec;
+      f.totalAssetsFormatted = Number(parseRawAmount(f.totalAssets, dec));
+      f.totalAssetsUsd = f.totalAssetsFormatted * price2;
+      f.liquidityFormatted = Number(parseRawAmount(f.liquidity, dec));
+      f.liquidityUsd = f.liquidityFormatted * price2;
+    }
+  } catch {
+  }
   try {
     const exposuresByUnderlying = await fetchFluidExposures(
       chainId,
@@ -36307,7 +36352,12 @@ var fetchMorphoVaultsFromChain = async (chainId, multicallRetry, prices = {}, to
   });
   const core = morphoPools()?.MORPHO_BLUE?.[chainId];
   const allMarketIds = [...new Set(marketIdsByVault.flat())];
-  const [rateMap, positionMap] = await Promise.all([
+  const underlyings = [
+    ...new Set(
+      entries.map(({ entry }) => entry.underlying?.toLowerCase()).filter((a) => !!a)
+    )
+  ];
+  const [rateMap, positionMap, assetDecimals] = await Promise.all([
     fetchMorphoMarketRates(chainId, core, allMarketIds, multicallRetry),
     fetchVaultSupplyShares(
       chainId,
@@ -36315,7 +36365,8 @@ var fetchMorphoVaultsFromChain = async (chainId, multicallRetry, prices = {}, to
       entries.map((e) => e.entry),
       marketIdsByVault,
       multicallRetry
-    )
+    ),
+    fetchAssetDecimals(chainId, underlyings, multicallRetry)
   ]);
   const out = {};
   for (let i = 0; i < entries.length; i++) {
@@ -36330,7 +36381,8 @@ var fetchMorphoVaultsFromChain = async (chainId, multicallRetry, prices = {}, to
       tokenList,
       marketIdsByVault[i],
       rateMap,
-      positionMap
+      positionMap,
+      assetDecimals
     );
     if (parsed) out[parsed.address] = parsed;
   }
@@ -36391,7 +36443,7 @@ async function fetchMorphoMarketRates(chainId, core, marketIds, multicallRetry)
   });
   return map;
 }
-function parseVault3(entry, results, chainId, prices, tokenList, marketIds, rateMap, positionMap) {
+function parseVault3(entry, results, chainId, prices, tokenList, marketIds, rateMap, positionMap, assetDecimals) {
   const address = entry?.vault?.toLowerCase();
   const underlying = entry?.underlying?.toLowerCase();
   if (!address || !underlying) return null;
@@ -36408,7 +36460,7 @@ function parseVault3(entry, results, chainId, prices, tokenList, marketIds, rate
     guardianRaw
   ] = results;
   const assetMeta = tokenList[underlying];
-  const decimals = Number(decimalsRaw ?? assetMeta?.decimals ?? 18);
+  const decimals = assetDecimals.get(underlying) ?? assetMeta?.decimals ?? Number(decimalsRaw ?? 18);
   const totalAssets = toStringSafe(totalAssetsRaw, "0");
   const totalSupply = toStringSafe(totalSupplyRaw, "0");
   const totalAssetsFormatted = Number(parseRawAmount(totalAssets, decimals));
@@ -36679,7 +36731,12 @@ var fetchListaVaultsFromChain = async (chainId, multicallRetry, prices = {}, tok
   });
   const moolah = morphoPools()?.[LISTA_PROTOCOL]?.[chainId];
   const allMarketIds = [...new Set(marketIdsByVault.flat())];
-  const [rateMap, positionMap] = await Promise.all([
+  const underlyings = [
+    ...new Set(
+      entries.map((entry) => entry.underlying?.toLowerCase()).filter((a) => !!a)
+    )
+  ];
+  const [rateMap, positionMap, assetDecimals] = await Promise.all([
     fetchListaMarketRates(chainId, moolah, allMarketIds, multicallRetry),
     fetchVaultSupplyShares(
       chainId,
@@ -36687,7 +36744,8 @@ var fetchListaVaultsFromChain = async (chainId, multicallRetry, prices = {}, tok
       entries,
       marketIdsByVault,
       multicallRetry
-    )
+    ),
+    fetchAssetDecimals(chainId, underlyings, multicallRetry)
   ]);
   const out = {};
   for (let i = 0; i < entries.length; i++) {
@@ -36702,7 +36760,8 @@ var fetchListaVaultsFromChain = async (chainId, multicallRetry, prices = {}, tok
       tokenList,
       marketIdsByVault[i],
       rateMap,
-      positionMap
+      positionMap,
+      assetDecimals
     );
     if (parsed) out[parsed.address] = parsed;
   }
@@ -36765,7 +36824,7 @@ async function fetchListaMarketRates(chainId, moolah, marketIds, multicallRetry)
   });
   return map;
 }
-function parseVault4(entry, results, curatorAddrRaw, chainId, prices, tokenList, marketIds, rateMap, positionMap) {
+function parseVault4(entry, results, curatorAddrRaw, chainId, prices, tokenList, marketIds, rateMap, positionMap, assetDecimals) {
   const address = entry?.vault?.toLowerCase();
   const underlying = entry?.underlying?.toLowerCase();
   if (!address || !underlying) return null;
@@ -36782,7 +36841,7 @@ function parseVault4(entry, results, curatorAddrRaw, chainId, prices, tokenList,
     ,
   ] = results;
   const assetMeta = tokenList[underlying];
-  const decimals = Number(decimalsRaw ?? assetMeta?.decimals ?? 18);
+  const decimals = assetDecimals.get(underlying) ?? assetMeta?.decimals ?? Number(decimalsRaw ?? 18);
   const totalAssets = toStringSafe2(totalAssetsRaw, "0");
   const totalSupply = toStringSafe2(totalSupplyRaw, "0");
   const totalAssetsFormatted = Number(parseRawAmount(totalAssets, decimals));
@@ -38822,6 +38881,16 @@ var Erc4626PreviewRedeemAbi = [
 
 // src/vaults/lst/readers/shared.ts
 var ONE_E187 = 10n ** 18n;
+var MULTICALL3_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
+var Multicall3BalanceAbi = [
+  {
+    name: "getEthBalance",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ name: "addr", type: "address" }],
+    outputs: [{ type: "uint256" }]
+  }
+];
 var toBigInt10 = (v) => {
   if (v === void 0 || v === null) return void 0;
   if (typeof v === "bigint") return v;
@@ -39006,6 +39075,13 @@ var EtherFiLiquidityPoolAbi = [
     stateMutability: "view",
     inputs: [],
     outputs: [{ type: "uint256" }]
+  },
+  {
+    name: "ethAmountLockedForWithdrawal",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ type: "uint256" }]
   }
 ];
 
@@ -39018,8 +39094,17 @@ var readerEtherFiWeEth = (entry) => {
   ];
   const abis = [TotalSupplyAbi, EtherFiWeEthAbi];
   if (lp) {
-    calls.push({ address: lp, name: "getTotalPooledEther", params: [] });
-    abis.push(EtherFiLiquidityPoolAbi);
+    calls.push({
+      address: MULTICALL3_ADDRESS,
+      name: "getEthBalance",
+      params: [lp]
+    });
+    calls.push({
+      address: lp,
+      name: "ethAmountLockedForWithdrawal",
+      params: []
+    });
+    abis.push(Multicall3BalanceAbi, EtherFiLiquidityPoolAbi);
   }
   return {
     calls,
@@ -39030,7 +39115,14 @@ var readerEtherFiWeEth = (entry) => {
       if (totalSupply === void 0 || exchangeRate === void 0) {
         return void 0;
       }
-      const liquidity = lp ? toBigInt10(slice[2]) : void 0;
+      let liquidity;
+      if (lp) {
+        const lpBalance = toBigInt10(slice[2]);
+        const locked = toBigInt10(slice[3]);
+        if (lpBalance !== void 0 && locked !== void 0) {
+          liquidity = lpBalance > locked ? lpBalance - locked : 0n;
+        }
+      }
       return {
         totalAssets: totalSupply * exchangeRate / ONE_E187,
         totalSupply,
@@ -40062,6 +40154,11 @@ var resolveYieldApr = async (entries) => {
 
 // src/vaults/lst/fetchPublic.ts
 var ONE_E188 = 10n ** 18n;
+var ERC20_BALANCE_ABI = parseAbi([
+  "function balanceOf(address) view returns (uint256)"
+]);
+var INSTANT_MODES = /* @__PURE__ */ new Set(["instant-or-queued", "fee-or-queued"]);
+var IDLE_READER_KINDS = /* @__PURE__ */ new Set(["erc4626", "erc4626PreviewRedeem"]);
 var resolveAcceptedInputs = (chainId, shareToken, entry) => {
   const enriched = getLstAcceptedInputs(chainId, shareToken);
   if (enriched) return enriched;
@@ -40079,6 +40176,20 @@ var fetchLstShareTokens = async (chainId, multicallRetry, prices = {}, tokenList
   const readers = entries.map(buildReader);
   const allCalls = readers.flatMap((r) => r.calls);
   const allAbis = readers.flatMap((r) => r.abis);
+  const idleEntries = entries.filter(
+    (e) => INSTANT_MODES.has(e.withdrawalMode) && IDLE_READER_KINDS.has(e.reader)
+  );
+  const idleIsNative = (e) => e.underlying.toLowerCase() === zeroAddress;
+  const idleCalls = idleEntries.map(
+    (e) => idleIsNative(e) ? {
+      address: MULTICALL3_ADDRESS,
+      name: "getEthBalance",
+      params: [e.address]
+    } : { address: e.underlying, name: "balanceOf", params: [e.address] }
+  );
+  const idleAbis = idleEntries.map(
+    (e) => idleIsNative(e) ? Multicall3BalanceAbi : ERC20_BALANCE_ABI
+  );
   const groups = {};
   for (let i = 0; i < allCalls.length; i++) {
     const target = allCalls[i].chainId ?? chainId;
@@ -40088,7 +40199,7 @@ var fetchLstShareTokens = async (chainId, multicallRetry, prices = {}, tokenList
     g.positions.push(i);
   }
   const chainEntries = Object.entries(groups);
-  const [perChainResults, aprByAddress] = await Promise.all([
+  const [perChainResults, aprByAddress, idleResults] = await Promise.all([
     chainEntries.length > 0 ? Promise.all(
       chainEntries.map(async ([chain, { calls, abis }]) => ({
         chain,
@@ -40099,8 +40210,19 @@ var fetchLstShareTokens = async (chainId, multicallRetry, prices = {}, tokenList
         })
       }))
     ) : Promise.resolve([]),
-    resolveYieldApr(entries)
+    resolveYieldApr(entries),
+    idleEntries.length > 0 ? multicallRetry({
+      chain: chainId,
+      calls: idleCalls,
+      abi: idleAbis,
+      allowFailure: true
+    }) : Promise.resolve([])
   ]);
+  const idleByAddress = /* @__PURE__ */ new Map();
+  idleEntries.forEach((e, i) => {
+    const bal = toBigInt10(idleResults[i]);
+    if (bal !== void 0) idleByAddress.set(e.address.toLowerCase(), bal);
+  });
   const rawResults = new Array(allCalls.length);
   for (const { chain, results } of perChainResults) {
     const positions = groups[chain].positions;
@@ -40129,9 +40251,15 @@ var fetchLstShareTokens = async (chainId, multicallRetry, prices = {}, tokenList
     const totalAssetsUsd = priceUsd !== void 0 ? totalAssetsFormatted * priceUsd : 0;
     const convertToAssets = state.exchangeRate;
     const convertToShares = state.exchangeRate > 0n ? ONE_E188 * ONE_E188 / state.exchangeRate : 0n;
-    const liquidity = state.liquidity;
-    const liquidityFormatted = liquidity !== void 0 ? Number(liquidity) / decimalsFactor : void 0;
-    const liquidityUsd = liquidityFormatted !== void 0 && priceUsd !== void 0 ? liquidityFormatted * priceUsd : liquidityFormatted !== void 0 ? 0 : void 0;
+    let liquidityRaw;
+    if (state.liquidity !== void 0) {
+      liquidityRaw = state.liquidity;
+    } else {
+      const idle = idleByAddress.get(addressLc);
+      liquidityRaw = idle !== void 0 ? idle > state.totalAssets ? state.totalAssets : idle : 0n;
+    }
+    const liquidityFormatted = Number(liquidityRaw) / decimalsFactor;
+    const liquidityUsd = priceUsd !== void 0 ? liquidityFormatted * priceUsd : 0;
     const displayName = composeVaultDisplayName(
       entry.brand,
       entry.brand,
@@ -40171,7 +40299,7 @@ var fetchLstShareTokens = async (chainId, multicallRetry, prices = {}, tokenList
       priceUsd,
       totalAssetsFormatted,
       totalAssetsUsd,
-      liquidity: liquidity?.toString(),
+      liquidity: liquidityRaw.toString(),
       liquidityFormatted,
       liquidityUsd
     };
@@ -42585,6 +42713,71 @@ var buildWithdrawalReader = (entry) => {
 // src/vaults/lst/withdrawals/registry.ts
 var LST_WITHDRAWAL_REGISTRY = {
   "1": [
+    // Ankr ankrETH — Ankr unstake queue; reader not yet implemented.
+    {
+      lst: "0xe95a203b1a91a908f9b9ce46459d101078c2c3cb",
+      brand: "Ankr",
+      symbol: "ankrETH",
+      reader: "unverified"
+    },
+    // BTC LSTs — exits via issuer/DEX or a protocol queue; per-protocol
+    // readers not yet implemented. Listed as `unverified` placeholders so the
+    // orchestrator surfaces the asset (returns [] requests) instead of
+    // silently omitting it.
+    {
+      lst: "0x8db2350d78abc13f5673a411d4700bcf87864dde",
+      brand: "Swell",
+      symbol: "swBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0x8236a87084f8b84306f72007f36f2618a5634494",
+      brand: "Lombard",
+      symbol: "LBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0x657e8c867d8b37dcc18fa4caead9c45eb088c642",
+      brand: "ether.fi",
+      symbol: "eBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0x004e9c3ef86bc1ca1f0bb5c7662861ee93350568",
+      brand: "Bedrock",
+      symbol: "uniBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0x2ec37d45fcae65d9787ecf71dc85a444968f6646",
+      brand: "Bedrock",
+      symbol: "brBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0xf469fbd2abcd6b9de8e169d128226c0fc90a012e",
+      brand: "PumpBTC",
+      symbol: "pumpBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0x7a56e1c57c7475ccf742a1832b028f0456652f97",
+      brand: "Solv",
+      symbol: "SolvBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0xd9d920aa40f578ab794426f5c90f6c731d159def",
+      brand: "Solv",
+      symbol: "xSolvBTC",
+      reader: "unverified"
+    },
+    {
+      lst: "0xcea2daf93617b97504e05affc5bcf9b3922d3034",
+      brand: "Solv",
+      symbol: "BTC+",
+      reader: "unverified"
+    },
     {
       lst: "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0",
       brand: "Lido",
@@ -42748,6 +42941,13 @@ var LST_WITHDRAWAL_REGISTRY = {
     }
   ],
   "56": [
+    // Ankr ankrBNB — Ankr unstake queue; reader not yet implemented.
+    {
+      lst: "0x52f24a5e03aee338da5fd9df68d2b6fae1178827",
+      brand: "Ankr",
+      symbol: "ankrBNB",
+      reader: "unverified"
+    },
     {
       // slisBNB — ListaStakeManager withdrawal queue. Per-user
       // requests via getUserWithdrawalRequests; claimability + BNB
@@ -42776,6 +42976,13 @@ var LST_WITHDRAWAL_REGISTRY = {
     }
   ],
   "137": [
+    // Ankr ankrMATIC — bridged, non-mintable on Polygon; exit via DEX only.
+    {
+      lst: "0x0e9b89007eee9c958c0eda24ef70723c2c93dd58",
+      brand: "Ankr",
+      symbol: "ankrMATIC",
+      reader: "noQueue"
+    },
     {
       // Polygon-side MaticX is a bridged ERC-20 — users bridge to
       // Ethereum and claim from the L1 home contract.
@@ -42786,6 +42993,13 @@ var LST_WITHDRAWAL_REGISTRY = {
     }
   ],
   "43114": [
+    // Ankr ankrAVAX — Ankr unstake queue; reader not yet implemented.
+    {
+      lst: "0xc3344870d52688874b06d844e0c36cc39fc727f6",
+      brand: "Ankr",
+      symbol: "ankrAVAX",
+      reader: "unverified"
+    },
     {
       lst: "0x2b2c81e08f1af8835a78bb2a90ae924ace0ea4be",
       brand: "BENQI",
@@ -42969,6 +43183,35 @@ var LST_WITHDRAWAL_REGISTRY = {
       reader: "stellaUnbondQueue",
       withdrawalContract: "0xbc7e02c4178a7df7d3e564323a5c359dc96c4db4"
     }
+  ],
+  "1116": [
+    // Core DAO LSTs — CoreDAO stakers unbond via the Earn / staking
+    // contracts; per-protocol queue readers not yet implemented.
+    {
+      lst: "0xb3a8f0f0da9ffc65318aa39e55079796093029ad",
+      brand: "Core",
+      symbol: "stCORE",
+      reader: "unverified"
+    },
+    {
+      lst: "0xc5555ea27e63cd89f8b227dece2a3916800c0f4f",
+      brand: "b14g",
+      symbol: "dualCORE",
+      reader: "unverified"
+    },
+    {
+      lst: "0xa20b3b97df3a02f9185175760300a06b4e0a2c05",
+      brand: "StakedCore",
+      symbol: "SCORE",
+      reader: "unverified"
+    },
+    // pumpBTC on Core — bridged, non-mintable; exit via DEX only.
+    {
+      lst: "0x5a2aa871954ebdf89b1547e75d032598356caad5",
+      brand: "PumpBTC",
+      symbol: "pumpBTC",
+      reader: "noQueue"
+    }
   ]
 };
 var getLstWithdrawalRegistry = (chainId, extraEntries) => {