@1delta/margin-fetcher 0.0.338 → 0.0.340

package/dist/index.js

@@ -22206,6 +22206,15 @@ function liquityKeyParts(key) {
   return { lender: base, chainId: m[1], collIndex: Number(m[2]) };
 }
 var WAD6 = 1e18;
+var MAX_PLAUSIBLE_UNIT_USD = 1e7;
+function liquityCollateralPrice(raw, collDecimals, priceDecimals) {
+  if (raw == null || raw <= 0n) return 0;
+  if (priceDecimals != null) return Number(raw) / 10 ** priceDecimals;
+  const plain = Number(raw) / WAD6;
+  if (collDecimals >= 18 || plain <= MAX_PLAUSIBLE_UNIT_USD) return plain;
+  const adjusted = Number(raw) / 10 ** (36 - collDecimals);
+  return adjusted <= MAX_PLAUSIBLE_UNIT_USD ? adjusted : 0;
+}
 function toHuman2(raw, decimals) {
   return Number(raw) / 10 ** decimals;
 }
@@ -22237,7 +22246,7 @@ function convertLiquityMarketsToResponse(raw, chainId, prices = {}, _additionalY
     const collSymbol = collToken?.symbol ?? branch.name?.split(" / ").pop() ?? "COLL";
     const marketName = branch.name ?? `${stableSymbol} / ${collSymbol}`;
     const collPriceKey = toOracleKey(collToken?.assetGroup) || toGenericPriceKey(collAddr, chainId);
-    const collPrice = (b.collPrice !== null ? Number(b.collPrice) / WAD6 : 0) || (prices[collPriceKey] ?? 0);
+    const collPrice = liquityCollateralPrice(b.collPrice, collDecimals, branch.priceDecimals) || (prices[collPriceKey] ?? 0);
     const entireDebt = b.entireDebt !== null ? toHuman2(b.entireDebt, stableDecimals) : 0;
     const entireColl = b.entireColl !== null ? toHuman2(b.entireColl, collDecimals) : 0;
     const spDeposits = b.spDeposits !== null ? toHuman2(b.spDeposits, stableDecimals) : 0;
@@ -35199,7 +35208,12 @@ var osethFetcher = {
         operationName: "osTokenApy"
       })
     }).then((r) => r.json());
-    return { [osETH]: apyToAprPercent(res.data?.osTokens?.[0]?.apy) };
+    const apr = apyToAprPercent(res.data?.osTokens?.[0]?.apy);
+    return {
+      [osETH]: apr,
+      // token-lists unifies every osETH deployment (incl. bridged) to the bare `OSETH` group — emit there too.
+      OSETH: apr
+    };
   }
 };
 
@@ -37541,6 +37555,8 @@ var angleFetcher = {
   label: "ANGLE",
   fetch: async () => ({
     [stEur]: 0,
+    // token-lists unifies every stEUR deployment to the bare `STEUR` group — emit there too.
+    STEUR: 0,
     [stUSD]: 0
   })
 };
@@ -38289,10 +38305,13 @@ var rtokensFetcher = {
     const data = res?.rtokens?.["8453"];
     const dataMainnet = res?.rtokens?.["1"];
     const dataMainnetColalterals = res?.collaterals?.["1"];
+    const sfrxethApr = apyToAprPercent((dataMainnetColalterals?.sfrxeth ?? 0) / 100) * 100;
     return {
       [bsdETH]: apyToAprPercent((data?.bsdETH ?? 0) / 100) * 100,
       [hyUSD]: apyToAprPercent((data?.hyUSD ?? 0) / 100) * 100,
-      [sfrxeth]: apyToAprPercent((dataMainnetColalterals?.sfrxeth ?? 0) / 100) * 100,
+      [sfrxeth]: sfrxethApr,
+      // token-lists unifies every sfrxETH deployment to the bare `SFRXETH` group — emit there too.
+      SFRXETH: sfrxethApr,
       [sfrax]: apyToAprPercent((dataMainnetColalterals?.sfrax ?? 0) / 100) * 100,
       [ceth]: apyToAprPercent((dataMainnetColalterals?.ceth ?? 0) / 100) * 100,
       [ethPlus]: apyToAprPercent((dataMainnet?.["ETH+"] ?? 0) / 100) * 100,
@@ -38453,7 +38472,8 @@ async function fetchPendleYields(lists = {}) {
         const ptPrice = prices[market.pt];
         const ytPrice = prices[market.yt];
         const [chainId, address] = market.pt.split("-");
-        const assetKey = lists[chainId]?.list?.[address.toLowerCase()]?.assetGroup ?? market.pt;
+        const assetKey = lists[chainId]?.list?.[address.toLowerCase()]?.assetGroup;
+        if (!assetKey) return;
         const expiry = new Date(market.expiry);
         if (expiry <= now) {
           yields[assetKey] = 0;
@@ -38808,6 +38828,50 @@ var yearnKatanaFetcher = {
   }
 };
 
+// src/yields/intrinsic/fetchers/liquidCollective.ts
+var LSETH_POOL_ID = "465d177e-3d0d-42c0-b5f5-31c857567135";
+var KEYS = ["Liquid Staked ETH::LSETH", "LSETH"];
+var lsethFetcher = {
+  label: "LSETH",
+  fetch: async () => {
+    const apr = apyToAprPercent(await fetchDefiLlamaApy(LSETH_POOL_ID));
+    return Object.fromEntries(KEYS.map((k) => [k, apr]));
+  }
+};
+
+// src/yields/intrinsic/fetchers/treehouse.ts
+var TETH_POOL_ID = "5762f4a8-bb48-45d6-90ed-2d93d1777169";
+var KEYS2 = ["Treehouse ETH::tETH"];
+var tethFetcher = {
+  label: "TETH",
+  fetch: async () => {
+    const apr = apyToAprPercent(await fetchDefiLlamaApy(TETH_POOL_ID));
+    return Object.fromEntries(KEYS2.map((k) => [k, apr]));
+  }
+};
+
+// src/yields/intrinsic/fetchers/strata.ts
+var SRNUSD_POOL_ID = "979711ce-d0c0-4aae-a5fc-d7b76e868649";
+var KEYS3 = ["Strata Senior NUSD::srNUSD"];
+var srnusdFetcher = {
+  label: "SRNUSD",
+  fetch: async () => {
+    const apr = apyToAprPercent(await fetchDefiLlamaApy(SRNUSD_POOL_ID));
+    return Object.fromEntries(KEYS3.map((k) => [k, apr]));
+  }
+};
+
+// src/yields/intrinsic/fetchers/anzen.ts
+var SUSDZ_POOL_ID = "46518e93-8197-4539-9861-2340c2ac965a";
+var KEYS4 = ["Anzen Staked USDz::SUSDZ", "Anzen Staked USDz::sUSDz", "Staked USDz::sUSDz"];
+var susdzFetcher = {
+  label: "SUSDZ",
+  fetch: async () => {
+    const apr = apyToAprPercent(await fetchDefiLlamaApy(SUSDZ_POOL_ID));
+    return Object.fromEntries(KEYS4.map((k) => [k, apr]));
+  }
+};
+
 // src/yields/intrinsic/fetcherRegistry.ts
 var LENDING_ONLY_FETCHERS = [
   stmaticFetcher,
@@ -38833,7 +38897,12 @@ var LENDING_ONLY_FETCHERS = [
   nestFetcher,
   accountableFetcher,
   upshiftFetcher,
-  yearnKatanaFetcher
+  yearnKatanaFetcher,
+  // DefiLlama-mapped intrinsic yields for classifier assets lacking a bespoke source
+  lsethFetcher,
+  tethFetcher,
+  srnusdFetcher,
+  susdzFetcher
 ];
 var collectVaultFetchers = () => {
   const seen = /* @__PURE__ */ new Set();
@@ -39787,7 +39856,6 @@ var termFetcher = {
   parse: parseTermResults,
   getAbi: getTermAbi
 };
-var SANITY_MAX_USD = 1e9;
 function getLiquityCalls(chainId) {
   const results = [];
   for (const lender of LIQUITY_FAMILY_LENDERS) {
@@ -39806,6 +39874,8 @@ function getLiquityCalls(chainId) {
           chainId,
           collIndex: b.collIndex,
           collToken: b.collToken.toLowerCase(),
+          collDecimals: b.collDecimals,
+          priceDecimals: b.priceDecimals,
           debtToken: debtToken?.toLowerCase()
         },
         lender: liquityLenderKey(lender, chainId, b.collIndex)
@@ -39820,8 +39890,12 @@ function parseLiquityResults(data, meta, context) {
   const entries = [];
   const raw = data?.[0];
   const price2 = typeof raw === "bigint" ? raw : raw != null && raw !== "0x" ? BigInt(raw) : 0n;
-  const collUSD = Number(price2) / 1e18;
-  if (collUSD > 0 && collUSD < SANITY_MAX_USD) {
+  const collUSD = liquityCollateralPrice(
+    price2,
+    meta.collDecimals,
+    meta.priceDecimals
+  );
+  if (collUSD > 0) {
     entries.push({
       asset: meta.collToken,
       price: collUSD,