@1delta/margin-fetcher 0.0.68 → 0.0.71

package/dist/index.js

@@ -8287,9 +8287,9 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
           const resultReserves = {};
           const decimalsCeiling = data[expectedNumberOfCalls - 1];
           let eModeConfigs = {};
-          allModes.map((mode, index) => {
+          allModes.forEach((mode, index) => {
             const rawCfg = emodeDataResult[index];
-            if (mode === 0 || rawCfg?.label !== "")
+            if ((mode === 0 || rawCfg?.label !== "") && Number(rawCfg.ltv) !== 0) {
               eModeConfigs[mode] = {
                 category: mode,
                 label: rawCfg.label,
@@ -8297,6 +8297,7 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
                 collateralFactor: rawCfg.liquidationThreshold / BPS,
                 borrowFactor: 1
               };
+            }
           });
           for (let i = 0; i < assetsToQuery.length; i++) {
             const asset = assetsToQuery[i];
@@ -8370,8 +8371,6 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
               hasStable: configData?.[7 /* stableBorrowRateEnabled */],
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */],
-              // eMode
-              eMode: eModeConfigs[eModeCategory],
               // caps
               borrowCap: Number(reserveCaps[0]?.toString()),
               supplyCap: Number(reserveCaps[1]?.toString()),
@@ -8395,23 +8394,32 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
 var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, eModeConfigs, allModes) => {
   let data = {};
   allModes.forEach((e) => {
-    data[e] = {
-      category: e,
-      borrowCollateralFactor,
-      collateralFactor,
-      borrowFactor: 1
-    };
-    if (e > 0) data[e].debtDisabled = true;
-    if (e > 0 && e === eModeCategory && eModeConfigs[e]) {
+    if (e === 0)
       data[e] = {
-        ...data[e],
+        label: "Disabled",
         category: e,
-        label: eModeConfigs[e]?.label ?? "Default",
-        borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
-        collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
-        borrowFactor: 1,
-        debtDisabled: false
+        borrowCollateralFactor,
+        collateralFactor,
+        borrowFactor: 1
       };
+    if (e > 0 && eModeConfigs[e]?.label && eModeConfigs[e]?.label !== "") {
+      data[e] = {};
+      data[e].label = eModeConfigs[e]?.label;
+      data[e].debtDisabled = true;
+      data[e].category = e;
+      data[e].borrowFactor = 1;
+      data[e].collateralFactor = collateralFactor;
+      data[e].borrowCollateralFactor = borrowCollateralFactor;
+      if (e > 0 && e === eModeCategory && eModeConfigs[e]) {
+        data[e] = {
+          ...data[e],
+          category: e,
+          borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
+          collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
+          borrowFactor: 1,
+          debtDisabled: false
+        };
+      }
     }
   });
   return data;
@@ -8419,27 +8427,39 @@ var populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, e
 var populateEModes32 = (borrowCollateralFactor, collateralFactor, collateralBitmap, debtBitmap, assetIndex, eModeConfigs, allModes) => {
   let data = {};
   allModes.forEach((e) => {
-    data[e] = {
-      category: e,
-      borrowCollateralFactor,
-      collateralFactor,
-      borrowFactor: 1
-    };
-    if (e > 0) data[e].debtDisabled = !!eModeConfigs[e];
-    if (e > 0 && eModeConfigs[e]) {
+    if (e === 0)
       data[e] = {
-        ...data[e],
+        label: "Disabled",
         category: e,
-        label: eModeConfigs[e]?.label ?? "Default",
-        borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
-        collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
-        borrowFactor: 1,
-        collateralDisabled: !isReserveEnabledOnBitmap(
-          collateralBitmap[e],
-          assetIndex
-        ),
-        debtDisabled: !isReserveEnabledOnBitmap(debtBitmap[e], assetIndex)
+        borrowCollateralFactor,
+        collateralFactor,
+        borrowFactor: 1
       };
+    if (e > 0) {
+      if (eModeConfigs[e]?.label && eModeConfigs[e]?.label !== "") {
+        data[e] = {};
+        data[e].label = eModeConfigs[e]?.label ?? "Default";
+        data[e].debtDisabled = true;
+        data[e].category = e;
+        data[e].borrowFactor = 1;
+        data[e].collateralFactor = collateralFactor;
+        data[e].borrowCollateralFactor = borrowCollateralFactor;
+        data[e].debtDisabled = !!eModeConfigs[e];
+        if (eModeConfigs[e]) {
+          data[e] = {
+            ...data[e],
+            category: e,
+            borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
+            collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
+            borrowFactor: 1,
+            collateralDisabled: !isReserveEnabledOnBitmap(
+              collateralBitmap[e],
+              assetIndex
+            ),
+            debtDisabled: !isReserveEnabledOnBitmap(debtBitmap[e], assetIndex)
+          };
+        }
+      }
     }
   });
   return data;
@@ -8559,9 +8579,9 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
       let eModeConfigs = {};
       let collateralBitmap = {};
       let debtBitmap = {};
-      allModes.map((mode, index) => {
+      allModes.forEach((mode, index) => {
         const rawCfg = emodeDataResult[3 * index];
-        if (rawCfg && (mode === 0 || rawCfg?.label !== ""))
+        if (rawCfg && (mode === 0 || rawCfg?.label !== "")) {
           eModeConfigs[mode] = {
             category: mode,
             label: rawCfg.label,
@@ -8569,8 +8589,9 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
             collateralFactor: rawCfg.liquidationThreshold / BPS,
             borrowFactor: 1
           };
-        debtBitmap[mode] = emodeDataResult[3 * index + 1];
-        collateralBitmap[mode] = emodeDataResult[3 * index + 2];
+          debtBitmap[mode] = emodeDataResult[3 * index + 1];
+          collateralBitmap[mode] = emodeDataResult[3 * index + 2];
+        }
       });
       const lowerReservesList = reservesList?.map(
         (a) => a.toLowerCase()
@@ -8629,7 +8650,7 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
         const activeEmodes = allModes.map(
           (mode) => isReserveEnabledOnBitmap(debtBitmap[mode], assetIndex) || isReserveEnabledOnBitmap(collateralBitmap[mode], assetIndex) ? mode : -1
         ).filter((m) => m !== void 0 && m > 0);
-        const eModeCategory = activeEmodes.length === 0 ? 0 : activeEmodes[0];
+        activeEmodes.length === 0 ? 0 : activeEmodes[0];
         resultReserves[asset] = {
           ...resultReserves[asset],
           decimals: Number(
@@ -8652,8 +8673,6 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
           hasStable: configData?.[7 /* stableBorrowRateEnabled */],
           isActive: configData?.[8 /* isActive */],
           isFrozen: configData?.[9 /* isFrozen */],
-          // eMode
-          eMode: eModeConfigs[eModeCategory],
           // caps
           borrowCap: Number(reserveCaps[0]?.toString()),
           supplyCap: Number(reserveCaps[1]?.toString()),
@@ -16695,12 +16714,10 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
         return void 0;
       }
       const [data] = _data;
-      const indexes = data[0 /* posMeta */].map(
-        (e, i) => {
-          return { e, i };
-        }
-      ).filter((a) => a.e.owner.toLowerCase() === validOwner).map((a) => a.i);
-      const assets = getLenderAssets(chainId, lender);
+      const indexes = data[0 /* posMeta */].map((e, i) => {
+        return { e, i };
+      }).filter((a) => a.e.owner.toLowerCase() === validOwner).map((a) => a.i);
+      const assets = Object.keys(lenderData);
       let histData = {};
       const result = Object.assign(
         {},
@@ -16710,20 +16727,33 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
           const id = entry.posId.toString();
           const collatData = Object.assign(
             {},
-            ...data[1 /* collaterals */][index].map((c) => {
-              const asset = c.underlying.toLowerCase();
-              const decimals = lenderData[asset].asset?.decimals ?? 18;
-              const depositsRaw = c.amount.toString();
-              return { [asset]: { deposits: parseRawAmount(depositsRaw, decimals), depositsRaw } };
-            })
+            ...data[1 /* collaterals */][index].map(
+              (c) => {
+                const asset = c.underlying.toLowerCase();
+                const decimals = lenderData[asset].asset?.decimals ?? 18;
+                const depositsRaw = c.amount.toString();
+                return {
+                  [asset]: {
+                    deposits: parseRawAmount(depositsRaw, decimals),
+                    depositsRaw
+                  }
+                };
+              }
+            )
           );
           const debtData = Object.assign(
             {},
-            ...data[2 /* debts */][index].map((c) => {
-              const asset = c.underlying.toLowerCase();
-              const decimals = lenderData[asset]?.asset?.decimals ?? 18;
-              return { [asset]: { debt: parseRawAmount(c.amount.toString(), decimals) } };
-            })
+            ...data[2 /* debts */][index].map(
+              (c) => {
+                const asset = c.underlying.toLowerCase();
+                const decimals = lenderData[asset]?.asset?.decimals ?? 18;
+                return {
+                  [asset]: {
+                    debt: parseRawAmount(c.amount.toString(), decimals)
+                  }
+                };
+              }
+            )
           );
           return {
             [id]: {
@@ -16734,10 +16764,11 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
                   const ams = toOracleKey(lenderData[a]?.asset?.assetGroup);
                   const price = prices[ams] ?? 1;
                   const priceHist = pricesHist?.[ams] ?? price;
-                  if (!histData[id]) histData[id] = {
-                    totalDebt24h: 0,
-                    totalDeposits24h: 0
-                  };
+                  if (!histData[id])
+                    histData[id] = {
+                      totalDebt24h: 0,
+                      totalDeposits24h: 0
+                    };
                   const debt = debtData[a]?.debt ?? 0;
                   const deposits = collatData[a]?.deposits ?? 0;
                   const depositsRaw = collatData[a]?.depositsRaw ?? "0";
@@ -18418,6 +18449,7 @@ var RUSD = "0x09d4214c03d01f49544c0448dbe3a27f768f2b34";
 var USDF = "0xfa2b947eec368f42195f24f36d2af29f7c24cec2";
 var USUAL = "0xc4441c2be5d8fa8126822b9929ca0b81ea0de38e";
 var WOETH = "0xdcee70654261af21c44c093c300ed3bb97b78192";
+var DEUSD = "0x15700B564Ca08D9439C58cA5053166E8317aa138";
 var datasEthereum = [
   RETH,
   WBTC,
@@ -18462,7 +18494,8 @@ var datasEthereum = [
   RUSD,
   USDF,
   USUAL,
-  WOETH
+  WOETH,
+  DEUSD
 ].map((d) => prefixEthereum + d).join(",");
 var prefixAvalanche = "avax:";
 var WAVAX = "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7";
@@ -18639,7 +18672,8 @@ var SYMBOL_MAP = {
   wbera: "WBERA",
   wtlos: "WTLOS",
   xpl: "WXPL",
-  wglmr: "WGLMR"
+  wglmr: "WGLMR",
+  deusd: "Elixir deUSD::DEUSD"
 };
 async function fetchDefillamaData() {
   try {
@@ -20226,6 +20260,7 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
     const uniswapV3Calls = getUniswapV3Calls(chainId);
     const [api3Calls, api3Names] = getApi3Calls(chainId);
     const [rwaCalls, rwaNames] = getRWADynamicOracleCalls(chainId);
+    const [cometCalls, cometNames] = getCometCalls(chainId);
     const allCalls = [
       ...chainlinkCalls,
       ...aaveCalls,
@@ -20233,6 +20268,7 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
       ...uniswapV3Calls,
       ...api3Calls,
       ...rwaCalls,
+      ...cometCalls,
       ...morphoCalls
     ];
     const abis = [
@@ -20242,7 +20278,8 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
       ...AaveOracleAbi,
       ...Api3OracleAbi,
       ...RWADynamicOracleAbi,
-      ...ProxyOracleAbi
+      ...ProxyOracleAbi,
+      ...CometAbi
     ];
     const result = await multicallRetry(
       chainId,
@@ -20262,6 +20299,7 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
         chainlink: { calls: chainlinkCalls, names: chainlinkNames },
         api3: { calls: api3Calls, names: api3Names },
         rwa: { calls: rwaCalls, names: rwaNames },
+        comet: { calls: cometCalls, names: cometNames },
         morpho: { queries: morphoQueries },
         uniswapCalls,
         uniswapV3Calls,
@@ -20285,6 +20323,7 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
       rwa,
       uniswapCalls,
       uniswapV3Calls,
+      comet,
       aaveCalls
     }
   } of chainResults) {
@@ -20316,6 +20355,13 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
     const rwaSlice = result.slice(offset, offset + rwa.calls.length);
     const rwaData = parseRWADynamicOracleResults(chainId, rwaSlice, rwa.names);
     offset += rwa.calls.length;
+    const cometSlice = result.slice(offset, offset + comet.calls.length);
+    const cometData = parseCometResults(
+      chainId,
+      cometSlice,
+      comet.names
+    );
+    offset += comet.calls.length;
     allPrices = {
       ...allPrices,
       ...chainlinkData,
@@ -20323,7 +20369,8 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
       ...uniswapData,
       ...uniswapV3Data,
       ...api3Data,
-      ...rwaData
+      ...rwaData,
+      ...cometData
     };
   }
   allPrices = { ...otherResults[0], ...allPrices, ...otherResults[1] };
@@ -20383,6 +20430,68 @@ var getUniswapV2Calls = (chainId) => {
       return [];
   }
 };
+var getCometCalls = (chainId) => {
+  switch (chainId) {
+    case Chain.ETHEREUM_MAINNET: {
+      const names = [
+        "Staked FRAX::SFRAX",
+        //
+        "Elixir deUSD::DEUSD",
+        "Elixir Staked deUSD::SDEUSD"
+      ];
+      return [
+        [
+          {
+            address: "0x3Afdc9BCA9213A35503b077a6072F3D0d5AB0840",
+            // usdt comet
+            name: "getPrice",
+            params: [
+              "0x8C74B2811D2F1aD65517ADB5C65773c1E520ed2f"
+              // sfrax
+            ]
+          },
+          {
+            address: "0x3Afdc9BCA9213A35503b077a6072F3D0d5AB0840",
+            name: "getPrice",
+            params: [
+              "0x471a6299C027Bd81ed4D66069dc510Bd0569f4F8"
+              // deusd
+            ]
+          },
+          {
+            address: "0x3Afdc9BCA9213A35503b077a6072F3D0d5AB0840",
+            name: "getPrice",
+            params: [
+              "0xE4829421ae79f2F44716cCbbb40751cd6Be3d483"
+              // sdeusd
+            ]
+          }
+        ],
+        names
+      ];
+    }
+    default:
+      return [[], []];
+  }
+};
+var parseCometResults = (chainId, data, names) => {
+  switch (chainId) {
+    case Chain.ETHEREUM_MAINNET: {
+      const targetDecimals = [8, 8, 8];
+      return Object.assign(
+        {},
+        ...data.map((entry, index) => {
+          return {
+            [names[index]]: Number(parseRawAmount(entry ?? "0", targetDecimals[index]))
+          };
+        })
+      );
+    }
+    default: {
+      return {};
+    }
+  }
+};
 var getUniswapV3Calls = (chainId) => {
   switch (chainId) {
     case Chain.HEMI_NETWORK:
@@ -20530,12 +20639,10 @@ var parseMorphoResults = (chainId, data, queries, donePrices = {}, list = {}) =>
   let prices = {};
   data.forEach((d, i) => {
     const details = queries[i];
-    const {
-      loanAsset,
-      collateralAsset,
-      loanAssetDecimals,
-      collateralAssetDecimals
-    } = details;
+    const loanAsset = details?.loanAsset;
+    const collateralAsset = details?.collateralAsset;
+    const loanAssetDecimals = details?.loanAssetDecimals;
+    const collateralAssetDecimals = details?.collateralAssetDecimals;
     const oracleId = list[loanAsset]?.assetGroup ?? chainId + "-" + loanAsset;
     const debtPrice = donePrices[oracleId] ?? prices[oracleId];
     const oracleIdCollateral = list[collateralAsset]?.assetGroup ?? chainId + "-" + collateralAsset;
@@ -20546,12 +20653,12 @@ var parseMorphoResults = (chainId, data, queries, donePrices = {}, list = {}) =>
       collateralAssetDecimals
     );
     if (debtPrice) {
-      if (!prices[oracleIdCollateral]) {
+      if (!prices[oracleIdCollateral] && !donePrices[oracleIdCollateral]) {
         prices[oracleIdCollateral] = priceDebtToCollateral * debtPrice;
       }
     } else {
       if (collateralPrice) {
-        if (!prices[oracleId]) {
+        if (!prices[oracleId] && !donePrices[oracleId]) {
           prices[oracleId] = collateralPrice / priceDebtToCollateral;
         }
       }