@1delta/margin-fetcher 0.0.198 → 0.0.200

package/dist/abis/euler/index.d.ts

@@ -1,5 +1,6 @@
 export { genericFactoryAbi } from "./genericFactory.js";
 export { vaultLensAbi } from "./vaultLens.js";
+export { priceLensAbi } from "./priceLens.js";
 export { eVaultAbi } from "./eVault.js";
 export { evcAbi } from "./evc.js";
 export { orchestratorAbi } from "./orchestrator.js";

package/dist/abis/euler/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/abis/euler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/abis/euler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}

package/dist/abis/euler/priceLens.d.ts

@@ -0,0 +1,58 @@
+export declare const priceLensAbi: readonly [{
+    readonly inputs: readonly [{
+        readonly name: "vault";
+        readonly type: "address";
+    }];
+    readonly name: "getVaultPrice";
+    readonly outputs: readonly [{
+        readonly components: readonly [{
+            readonly name: "asset";
+            readonly type: "address";
+        }, {
+            readonly name: "unitOfAccount";
+            readonly type: "address";
+        }, {
+            readonly name: "unitOfAccountDecimals";
+            readonly type: "uint8";
+        }, {
+            readonly name: "amountOutMid";
+            readonly type: "uint256";
+        }, {
+            readonly name: "queryFailure";
+            readonly type: "bool";
+        }];
+        readonly name: "result";
+        readonly type: "tuple";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly name: "vaults";
+        readonly type: "address[]";
+    }];
+    readonly name: "getVaultPrices";
+    readonly outputs: readonly [{
+        readonly components: readonly [{
+            readonly name: "asset";
+            readonly type: "address";
+        }, {
+            readonly name: "unitOfAccount";
+            readonly type: "address";
+        }, {
+            readonly name: "unitOfAccountDecimals";
+            readonly type: "uint8";
+        }, {
+            readonly name: "amountOutMid";
+            readonly type: "uint256";
+        }, {
+            readonly name: "queryFailure";
+            readonly type: "bool";
+        }];
+        readonly name: "results";
+        readonly type: "tuple[]";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}];
+//# sourceMappingURL=priceLens.d.ts.map

package/dist/abis/euler/priceLens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"priceLens.d.ts","sourceRoot":"","sources":["../../../src/abis/euler/priceLens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuCf,CAAA"}

package/dist/index.js

@@ -30520,13 +30520,20 @@ async function fetchMorphoGraphQLPrices(chainId) {
     const allMarkets = [];
     for (const result of results) {
       const items = result?.data?.markets?.items;
-      if (!Array.isArray(items)) return null;
+      if (!Array.isArray(items)) {
+        console.warn(`[morpho-gql] chain ${chainId}: unexpected API shape, items is not an array`);
+        return null;
+      }
       allMarkets.push(...items);
     }
-    if (allMarkets.length === 0) return null;
+    if (allMarkets.length === 0) {
+      console.warn(`[morpho-gql] chain ${chainId}: API returned 0 markets`);
+      return null;
+    }
     const entries = [];
     for (const market of allMarkets) {
-      if (!market.collateralAsset) continue;
+      if (!market.collateralAsset?.address || !market.loanAsset?.address)
+        continue;
       const oracle = market.oracleAddress;
       const loanAsset = market.loanAsset.address.toLowerCase();
       const collateralAsset = market.collateralAsset.address.toLowerCase();
@@ -30540,27 +30547,58 @@ async function fetchMorphoGraphQLPrices(chainId) {
         market.loanAsset.decimals,
         market.collateralAsset.decimals
       ) : 0;
-      if (collateralPriceUSD != null && collateralPriceUSD > 0) {
+      if (loanPriceUSD != null && loanPriceUSD > 0) {
+        const collateralUSD = oracleRatio > 0 ? oracleRatio * loanPriceUSD : collateralPriceUSD ?? 0;
+        if (collateralUSD > 0) {
+          entries.push({
+            asset: collateralAsset,
+            price: oracleRatio,
+            // Raw: collateral price in loan asset terms
+            priceUSD: collateralUSD,
+            marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
+            targetLender: lenderKey
+          });
+        }
+      } else if (collateralPriceUSD != null && collateralPriceUSD > 0) {
         entries.push({
           asset: collateralAsset,
-          price: oracleRatio || collateralPriceUSD,
+          price: oracleRatio,
+          // Raw oracle ratio
           priceUSD: collateralPriceUSD,
           marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
           targetLender: lenderKey
         });
       }
-      if (loanPriceUSD != null && loanPriceUSD > 0) {
+      if (collateralPriceUSD != null && collateralPriceUSD > 0) {
+        const loanUSD = oracleRatio > 0 ? collateralPriceUSD / oracleRatio : loanPriceUSD ?? 0;
+        if (loanUSD > 0) {
+          entries.push({
+            asset: loanAsset,
+            price: oracleRatio > 0 ? 1 / oracleRatio : 0,
+            // Raw: loan price in collateral terms
+            priceUSD: loanUSD,
+            marketUid: createMarketUid(chainId, lenderKey, loanAsset),
+            targetLender: lenderKey
+          });
+        }
+      } else if (loanPriceUSD != null && loanPriceUSD > 0) {
         entries.push({
           asset: loanAsset,
-          price: oracleRatio > 0 ? 1 / oracleRatio : loanPriceUSD,
+          price: oracleRatio > 0 ? 1 / oracleRatio : 0,
+          // Raw oracle ratio
           priceUSD: loanPriceUSD,
           marketUid: createMarketUid(chainId, lenderKey, loanAsset),
           targetLender: lenderKey
         });
       }
     }
-    return entries.length > 0 ? entries : null;
-  } catch {
+    if (entries.length === 0) {
+      console.warn(`[morpho-gql] chain ${chainId}: ${allMarkets.length} markets fetched but 0 price entries produced`);
+      return null;
+    }
+    return entries;
+  } catch (err) {
+    console.warn(`[morpho-gql] chain ${chainId}: API error, falling back to on-chain`, err);
     return null;
   }
 }
@@ -30835,17 +30873,88 @@ var listaFetcher = {
   getAbi: getListaAbi
 };
 
+// src/abis/euler/priceLens.ts
+var priceLensAbi = [
+  {
+    inputs: [{ name: "vault", type: "address" }],
+    name: "getVaultPrice",
+    outputs: [
+      {
+        components: [
+          { name: "asset", type: "address" },
+          { name: "unitOfAccount", type: "address" },
+          { name: "unitOfAccountDecimals", type: "uint8" },
+          { name: "amountOutMid", type: "uint256" },
+          { name: "queryFailure", type: "bool" }
+        ],
+        name: "result",
+        type: "tuple"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ name: "vaults", type: "address[]" }],
+    name: "getVaultPrices",
+    outputs: [
+      {
+        components: [
+          { name: "asset", type: "address" },
+          { name: "unitOfAccount", type: "address" },
+          { name: "unitOfAccountDecimals", type: "uint8" },
+          { name: "amountOutMid", type: "uint256" },
+          { name: "queryFailure", type: "bool" }
+        ],
+        name: "results",
+        type: "tuple[]"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+
 // src/prices/oracle-prices/fetchers/euler.ts
 var MAX_VIRTUAL_ADDRESS = 65535;
 function isUsdUnitOfAccount(addr) {
   const numeric = parseInt(addr, 16);
   return numeric <= MAX_VIRTUAL_ADDRESS;
 }
+var PRICE_LENS_ADDRESS = "0x6392892f3C57c658d2c748fc64c6fe57680E889F";
+var PRICE_LENS_CHAINS = [
+  "1",
+  // Ethereum
+  "56",
+  // BSC
+  "130",
+  // Unichain
+  "143",
+  // Monad
+  "146",
+  // Sonic
+  "999",
+  // HyperEVM
+  "8453",
+  // Base
+  "9745",
+  // Plasma
+  "42161",
+  // Arbitrum
+  "43114",
+  // Avalanche
+  "59144",
+  // Linea
+  "80094"
+  // Berachain
+];
+var eulerCombinedAbi = [...priceLensAbi, ...vaultLensAbi];
 function getEulerV2Calls(chainId) {
   if (!ENABLED_EULER_V2_CHAINS.includes(chainId)) return [];
   const configs = eulerConfigs() ?? {};
   const vaults = eulerVaults() ?? {};
   const results = [];
+  const usePriceLens = PRICE_LENS_CHAINS.includes(chainId);
   for (const [lender, chainVaults] of Object.entries(vaults)) {
     const vaultList = chainVaults[chainId] ?? [];
     const config = configs[lender]?.[chainId];
@@ -30853,14 +30962,23 @@ function getEulerV2Calls(chainId) {
     const calls = [];
     const meta = [];
     for (const entry of vaultList) {
-      calls.push({
-        address: config.vaultLens,
-        name: "getVaultInfoFull",
-        params: [entry.vault]
-      });
+      if (usePriceLens) {
+        calls.push({
+          address: PRICE_LENS_ADDRESS,
+          name: "getVaultPrice",
+          params: [entry.vault]
+        });
+      } else {
+        calls.push({
+          address: config.vaultLens,
+          name: "getVaultInfoFull",
+          params: [entry.vault]
+        });
+      }
       meta.push({
         vault: entry.vault.toLowerCase(),
-        lender
+        lender,
+        usePriceLens
       });
     }
     if (calls.length > 0) {
@@ -30875,14 +30993,27 @@ function parseEulerV2Results(data, meta, context) {
     const queryMeta = meta[index];
     if (!queryMeta || !result) return;
     try {
-      const priceInfo = result.liabilityPriceInfo;
-      if (!priceInfo || priceInfo.queryFailure) return;
-      const amountOutMid = BigInt(priceInfo.amountOutMid);
+      let amountOutMid;
+      let unitOfAccountDecimals;
+      let unitOfAccount;
+      let asset;
+      if (queryMeta.usePriceLens) {
+        if (result.queryFailure) return;
+        amountOutMid = BigInt(result.amountOutMid);
+        unitOfAccountDecimals = BigInt(result.unitOfAccountDecimals);
+        unitOfAccount = result.unitOfAccount.toLowerCase();
+        asset = result.asset.toLowerCase();
+      } else {
+        const priceInfo = result.liabilityPriceInfo;
+        if (!priceInfo || priceInfo.queryFailure) return;
+        amountOutMid = BigInt(priceInfo.amountOutMid);
+        unitOfAccountDecimals = BigInt(result.unitOfAccountDecimals);
+        unitOfAccount = result.unitOfAccount.toLowerCase();
+        asset = result.asset.toLowerCase();
+      }
       if (amountOutMid === 0n) return;
-      const unitOfAccountDecimals = BigInt(result.unitOfAccountDecimals);
       const priceInUoA = Number(amountOutMid) / Number(10n ** unitOfAccountDecimals);
       if (isNaN(priceInUoA) || priceInUoA === 0) return;
-      const unitOfAccount = result.unitOfAccount.toLowerCase();
       let priceUSD;
       if (isUsdUnitOfAccount(unitOfAccount)) {
         priceUSD = priceInUoA;
@@ -30892,12 +31023,15 @@ function parseEulerV2Results(data, meta, context) {
         priceUSD = priceInUoA * uoaUSD;
       }
       if (isNaN(priceUSD) || priceUSD === 0) return;
-      const asset = result.asset.toLowerCase();
       entries.push({
         asset,
         price: priceInUoA,
         priceUSD,
-        marketUid: createMarketUid(context.chainId, queryMeta.lender, queryMeta.vault)
+        marketUid: createMarketUid(
+          context.chainId,
+          queryMeta.lender,
+          queryMeta.vault
+        )
       });
     } catch {
     }
@@ -30905,7 +31039,7 @@ function parseEulerV2Results(data, meta, context) {
   return entries;
 }
 function getEulerV2Abi() {
-  return vaultLensAbi;
+  return eulerCombinedAbi;
 }
 var eulerV2Fetcher = {
   getCalls: getEulerV2Calls,
@@ -31086,7 +31220,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       "eulerV2",
       eulerResults,
       eulerV2Fetcher.parse,
-      vaultLensAbi
+      getEulerV2Abi()
     );
     const morphoGroup = buildGroup(
       "morpho",
@@ -31103,7 +31237,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       morphoGroup
     ];
     const totalCalls = allGroups.reduce((s, g) => s + g.calls.length, 0);
-    if (totalCalls === 0) {
+    if (totalCalls === 0 && !isActive("morpho")) {
       const diag2 = {
         chainId,
         totalCalls: 0,
@@ -31169,6 +31303,9 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       ),
       morphoGqlPromise
     ]);
+    if (morphoGqlEntries == null && isActive("morpho")) {
+      console.warn(`[prices] chain ${chainId}: Morpho GraphQL returned null, falling back to on-chain (${morphoGroup.trackers.length} trackers)`);
+    }
     const morphoData = morphoGqlEntries != null ? { results: [], error: void 0 } : await executeGroup(
       morphoGroup,
       chainId,
@@ -31413,7 +31550,7 @@ function selectAssetGroupPrices(structuredPrices, lists = {}, tvlMap = {}, prior
       if (prio < 0) continue;
       const tvl = tvlMap[lender] ?? 0;
       for (const entry of entries) {
-        if (entry.priceUSD <= 0) continue;
+        if (!entry?.asset || entry.priceUSD <= 0) continue;
         const oracleKey = tokenList[entry.asset]?.assetGroup ?? `${chainId}-${entry.asset.toLowerCase()}`;
         candidates.push({
           oracleKey,