@1delta/margin-fetcher 0.0.70 → 0.0.72

package/dist/index.js

@@ -8763,22 +8763,39 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
       INIT_MODES.forEach((mode, index) => {
         data[index]?.forEach((multicallData) => {
           const asset = multicallData?.underlying.toLowerCase();
-          const cf = parseRawAmount(multicallData.collateralFactor, 18);
+          const cf = Number(parseRawAmount(multicallData.collateralFactor, 18));
           const modeData = {
             category: mode,
             label: INIT_EMODE_LABELS[mode],
             borrowCollateralFactor: cf,
             collateralFactor: cf,
-            borrowFactor: parseRawAmount(multicallData.borrowFactor, 18),
-            maxHealthAfterLiq: parseRawAmount(
-              multicallData.maxHealthAfterLiq,
-              18
+            borrowFactor: Number(
+              parseRawAmount(multicallData.borrowFactor, 18)
+            ),
+            maxHealthAfterLiq: Number(
+              parseRawAmount(multicallData.maxHealthAfterLiq, 18)
             )
           };
           if (!eModes[mode]) eModes[mode] = modeData;
           result[asset].config[mode] = modeData;
         });
       });
+      Object.entries(eModes).forEach(([modeId, data2]) => {
+        Object.entries(result)?.forEach(([key, _2]) => {
+          if (!result[key].config[modeId]) {
+            let mode = {
+              ...data2,
+              debtDisabled: true,
+              collateralDisabled: true,
+              collateralFactor: 0,
+              borrowCollateralFactor: 0,
+              borrowFactor: 3402823669209385e5
+              // disabled flag
+            };
+            result[key].config[modeId] = mode;
+          }
+        });
+      });
       return { data: result, eModes, chainId };
     },
     expectedNumberOfCalls
@@ -16714,12 +16731,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(
         {},
@@ -16729,20 +16744,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]: {
@@ -16753,10 +16781,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";