@1delta/margin-fetcher 0.0.149 → 0.0.150

package/dist/index.js

@@ -8014,6 +8014,8 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
             const price = prices[oracleKey] ?? 0;
             const totalDepositsUSD = Number(totalAToken) * price;
             const totalDebtUSD = Number(totalVariableDebt) * price;
+            const collateralActive = configData?.[5 /* usageAsCollateralEnabled */];
+            const borrowingEnabled = configData?.[6 /* borrowingEnabled */];
             resultReserves[asset] = {
               poolId: asset,
               underlying: asset,
@@ -8060,15 +8062,17 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
                   collateralFactor: Number(
                     configData?.[2 /* liquidationThreshold */].toString()
                   ) / BPS,
-                  borrowFactor: 1
+                  borrowFactor: 1,
+                  collateralDisabled: !collateralActive,
+                  debtDisabled: !borrowingEnabled
                 }
               },
               liquidationBonus: Number(
                 configData?.[3 /* liquidationBonus */].toString()
               ) / BPS,
               // flags
-              collateralActive: configData?.[5 /* usageAsCollateralEnabled */],
-              borrowingEnabled: configData?.[6 /* borrowingEnabled */],
+              collateralActive,
+              borrowingEnabled,
               hasStable: configData?.[7 /* stableBorrowRateEnabled */],
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */]
@@ -8154,6 +8158,8 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
             );
             const liquidity = Number(totalDeposits) - Number(totalDebt) - Number(totalDebtStable);
             const price = prices[toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)] ?? 0;
+            const usageAsCollateralEnabled = configData?.[5 /* usageAsCollateralEnabled */];
+            const borrowingEnabled = configData?.[6 /* borrowingEnabled */];
             resultReserves[asset] = {
               poolId: asset,
               underlying: asset,
@@ -8195,11 +8201,13 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
                 ) / BPS,
                 eModeCategory,
                 eModeConfigs,
-                allModes
+                allModes,
+                usageAsCollateralEnabled,
+                borrowingEnabled
               ),
               // flags
-              collateralActive: configData?.[5 /* usageAsCollateralEnabled */],
-              borrowingEnabled: configData?.[6 /* borrowingEnabled */],
+              collateralActive: usageAsCollateralEnabled,
+              borrowingEnabled,
               hasStable: configData?.[7 /* stableBorrowRateEnabled */],
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */],
@@ -8224,7 +8232,7 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
     }
   }
 };
-var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, eModeConfigs, allModes) => {
+var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, eModeConfigs, allModes, usageAsCollateralEnabled, borrowingEnabled) => {
   let data = {};
   allModes.forEach((e) => {
     if (e === 0)
@@ -8233,7 +8241,9 @@ var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, e
         category: e,
         borrowCollateralFactor,
         collateralFactor,
-        borrowFactor: 1
+        borrowFactor: 1,
+        collateralDisabled: !usageAsCollateralEnabled,
+        debtDisabled: !borrowingEnabled
       };
     if (e > 0 && eModeConfigs[e]?.label && eModeConfigs[e]?.label !== "") {
       data[e] = {};
@@ -8243,6 +8253,8 @@ var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, e
       data[e].borrowFactor = 1;
       data[e].collateralFactor = collateralFactor;
       data[e].borrowCollateralFactor = borrowCollateralFactor;
+      data[e].collateralDisabled = !usageAsCollateralEnabled;
+      data[e].debtDisabled = !borrowingEnabled;
       if (e > 0 && e === eModeCategory && eModeConfigs[e]) {
         data[e] = {
           ...data[e],
@@ -8257,7 +8269,7 @@ var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, e
   });
   return data;
 };
-var populateEModes32 = (borrowCollateralFactor, collateralFactor, collateralBitmap, debtBitmap, assetIndex, eModeConfigs, allModes) => {
+var populateEModes32 = (borrowCollateralFactor, collateralFactor, collateralBitmap, debtBitmap, assetIndex, eModeConfigs, allModes, usageAsCollateralEnabled, borrowingEnabled) => {
   let data = {};
   allModes.forEach((e) => {
     if (e === 0)
@@ -8266,7 +8278,9 @@ var populateEModes32 = (borrowCollateralFactor, collateralFactor, collateralBitm
         category: e,
         borrowCollateralFactor,
         collateralFactor,
-        borrowFactor: 1
+        borrowFactor: 1,
+        collateralDisabled: !usageAsCollateralEnabled,
+        debtDisabled: !borrowingEnabled
       };
     if (e > 0) {
       if (eModeConfigs[e]?.label && eModeConfigs[e]?.label !== "") {
@@ -8332,6 +8346,8 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
         const price = prices[oracleKey] ?? 0;
         const totalDepositsUSD = Number(totalAToken) * price;
         const totalDebtUSD = Number(totalVariableDebt) * price;
+        const usageAsCollateralEnabled = configData?.[5 /* usageAsCollateralEnabled */];
+        const borrowingEnabled = configData?.[6 /* borrowingEnabled */];
         resultReserves[asset] = {
           poolId: asset,
           underlying: asset,
@@ -8370,15 +8386,17 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
               collateralFactor: Number(
                 configData?.[2 /* liquidationThreshold */]?.toString()
               ) / BPS,
-              borrowFactor: 1
+              borrowFactor: 1,
+              collateralDisabled: !usageAsCollateralEnabled,
+              debtDisabled: !borrowingEnabled
             }
           },
           liquidationBonus: Number(
             configData?.[3 /* liquidationBonus */]?.toString()
           ) / BPS,
           // flags
-          collateralActive: configData?.[5 /* usageAsCollateralEnabled */],
-          borrowingEnabled: configData?.[6 /* borrowingEnabled */],
+          collateralActive: usageAsCollateralEnabled,
+          borrowingEnabled,
           hasStable: false,
           isActive: configData?.[7 /* isActive */],
           isFrozen: configData?.[8 /* isFrozen */]
@@ -8480,10 +8498,8 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
           rewards: {}
         };
         const assetIndex = lowerReservesList.indexOf(asset);
-        const activeEmodes = allModes.map(
-          (mode) => isReserveEnabledOnBitmap(debtBitmap[mode], assetIndex) || isReserveEnabledOnBitmap(collateralBitmap[mode], assetIndex) ? mode : -1
-        ).filter((m) => m !== void 0 && m > 0);
-        activeEmodes.length === 0 ? 0 : activeEmodes[0];
+        const usageAsCollateralEnabled = configData?.[5 /* usageAsCollateralEnabled */];
+        const borrowingEnabled = configData?.[6 /* borrowingEnabled */];
         resultReserves[asset] = {
           ...resultReserves[asset],
           decimals: Number(
@@ -8498,11 +8514,13 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
             debtBitmap,
             assetIndex,
             eModeConfigs,
-            allModes
+            allModes,
+            usageAsCollateralEnabled,
+            borrowingEnabled
           ),
           // flags
-          collateralActive: configData?.[5 /* usageAsCollateralEnabled */],
-          borrowingEnabled: configData?.[6 /* borrowingEnabled */],
+          collateralActive: usageAsCollateralEnabled,
+          borrowingEnabled,
           hasStable: configData?.[7 /* stableBorrowRateEnabled */],
           isActive: configData?.[8 /* isActive */],
           isFrozen: configData?.[9 /* isFrozen */],
@@ -8609,7 +8627,9 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
             ),
             maxHealthAfterLiq: Number(
               parseRawAmount(multicallData.maxHealthAfterLiq, 18)
-            )
+            ),
+            debtDisabled: false,
+            collateralDisabled: false
           };
           if (!eModes[mode]) eModes[mode] = modeData;
           result[asset].config[mode] = modeData;
@@ -8680,7 +8700,9 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
                 resultsAssetInfo.liquidateCollateralFactor.toString(),
                 COMET_RISK_DECIMALS
               ),
-              borrowFactor: 1
+              borrowFactor: 1,
+              collateralDisabled: false,
+              debtDisabled: true
             }
           },
           supplyCap: parseRawAmount(
@@ -8744,7 +8766,10 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
               // collateral factors
               borrowCollateralFactor: 0,
               collateralFactor: 0,
-              borrowFactor: 1
+              borrowFactor: 1,
+              // base asset: borrowable, no collateral
+              collateralDisabled: true,
+              debtDisabled: false
             }
           },
           // interest rates
@@ -10948,7 +10973,9 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
             category: 0,
             borrowCollateralFactor: 0,
             collateralFactor: 0,
-            borrowFactor: 1
+            borrowFactor: 1,
+            collateralDisabled: true,
+            debtDisabled: false
           }
         },
         collateralActive: false,
@@ -10989,7 +11016,9 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
             category: 0,
             borrowCollateralFactor: ltv,
             collateralFactor: ltv,
-            borrowFactor: 1
+            borrowFactor: 1,
+            collateralDisabled: false,
+            debtDisabled: true
           }
         },
         collateralActive: true,
@@ -11647,7 +11676,9 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
                 category: 0,
                 borrowCollateralFactor: 0,
                 collateralFactor: 0,
-                borrowFactor: 1
+                borrowFactor: 1,
+                collateralDisabled: true,
+                debtDisabled: false
               }
             },
             collateralActive: false,
@@ -11683,7 +11714,9 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
                 category: 0,
                 borrowCollateralFactor: ltv,
                 collateralFactor: ltv,
-                borrowFactor: 1
+                borrowFactor: 1,
+                collateralDisabled: false,
+                debtDisabled: true
               }
             },
             collateralActive: true,
@@ -11808,7 +11841,9 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
                 category: 0,
                 borrowCollateralFactor: 0,
                 collateralFactor: 0,
-                borrowFactor: 1
+                borrowFactor: 1,
+                collateralDisabled: true,
+                debtDisabled: false
               }
             },
             collateralActive: false,
@@ -11843,7 +11878,9 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
                 category: 0,
                 borrowCollateralFactor: ltv,
                 collateralFactor: ltv,
-                borrowFactor: 1
+                borrowFactor: 1,
+                collateralDisabled: false,
+                debtDisabled: true
               }
             },
             collateralActive: true,
@@ -12418,6 +12455,8 @@ function convertSingleReserveEntry(opts) {
   const pausedActions = currentEntry.pausedActions;
   const allPaused = pausedActions[0 /* MINT */] && pausedActions[2 /* BORROW */] && pausedActions[1 /* REDEEM */] && pausedActions[3 /* REPAY */];
   const poolId = asset.address;
+  const collateralActive = Boolean(currentEntry?.isListed);
+  const borrowingEnabled = Boolean(currentEntry?.isBorrowAllowed) && !pausedActions[2 /* BORROW */];
   return {
     poolId,
     asset,
@@ -12440,7 +12479,9 @@ function convertSingleReserveEntry(opts) {
         // collateral factors
         borrowCollateralFactor: Number(borrowCollateralFactor),
         collateralFactor: Number(borrowCollateralFactor),
-        borrowFactor: 1
+        borrowFactor: 1,
+        collateralDisabled: !collateralActive,
+        debtDisabled: !borrowingEnabled
       }
     },
     hasStable: false,
@@ -12449,14 +12490,14 @@ function convertSingleReserveEntry(opts) {
     // compSupplySpeed: parseRawAmount(currentEntry?.venusSupplySpeed?.toString(), 5),
     // compBorrowSpeed: parseRawAmount(currentEntry?.venusBorrowSpeed?.toString(), 5),
     isActive: Boolean(currentEntry?.isListed) && !allPaused,
-    collateralActive: Boolean(currentEntry?.isListed),
     isFrozen: pausedActions[0 /* MINT */] && pausedActions[2 /* BORROW */],
     rewards: {},
     state: {
       exchangeRateCurrent: exchangeRateRaw.toString(),
       cTokenDecimals: Number(currentEntry?.cTokenDecimals?.toString())
     },
-    borrowingEnabled: Boolean(currentEntry?.isBorrowAllowed) && !pausedActions[2 /* BORROW */]
+    collateralActive,
+    borrowingEnabled
     // borrowCap example left commented as in original:
     // borrowCap: parseRawAmount(currentEntry?.borrowCap?.toString(), decs),
   };