@1delta/margin-fetcher 0.0.197 → 0.0.199

package/dist/index.js

@@ -30526,7 +30526,8 @@ async function fetchMorphoGraphQLPrices(chainId) {
     if (allMarkets.length === 0) 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,19 +30541,45 @@ 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
@@ -31408,11 +31435,12 @@ function selectAssetGroupPrices(structuredPrices, lists = {}, tvlMap = {}, prior
   for (const [chainId, lenders] of Object.entries(structuredPrices)) {
     const tokenList = lists[chainId] ?? {};
     for (const [lender, entries] of Object.entries(lenders)) {
+      if (!Array.isArray(entries)) continue;
       const prio = computePriority(lender, chainId, priorityCfg);
       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,