@1delta/margin-fetcher 0.0.229 → 0.0.230

package/dist/index.js

@@ -18772,11 +18772,11 @@ var getSiloV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
         const assetMeta = tokenList[tokenAddrLc];
         const oracleKey = toOracleKey(assetMeta?.assetGroup ?? null) || toGenericPriceKey(tokenAddrLc, chainId);
         const price = prices[oracleKey] ?? 0;
-        const collateralLt = Number(other.lt) / 1e18;
-        const collateralMaxLtv = Number(other.maxLtv) / 1e18;
         const selfLt = Number(self.lt) / 1e18;
-        const borrowingEnabled = collateralLt > 0;
+        const selfMaxLtv = Number(self.maxLtv) / 1e18;
+        const otherLt = Number(other.lt) / 1e18;
         const collateralActive = selfLt > 0;
+        const borrowingEnabled = otherLt > 0;
         const marketUid = createMarketUid(chainId, lender, self.silo);
         out[marketUid] = {
           marketUid,
@@ -18819,11 +18819,11 @@ var getSiloV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
           config: {
             0: {
               category: 0,
-              borrowCollateralFactor: collateralMaxLtv,
-              collateralFactor: collateralLt,
+              borrowCollateralFactor: selfMaxLtv,
+              collateralFactor: selfLt,
               borrowFactor: 1,
-              collateralDisabled: !borrowingEnabled,
-              debtDisabled: !collateralActive
+              collateralDisabled: !collateralActive,
+              debtDisabled: !borrowingEnabled
             }
           },
           collateralActive,
@@ -18924,11 +18924,11 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
         const assetMeta = tokenList[tokenAddrLc];
         const oracleKey = toOracleKey(assetMeta?.assetGroup ?? null) || toGenericPriceKey(tokenAddrLc, chainId);
         const price = prices[oracleKey] ?? 0;
-        const collateralLt = Number(other.lt) / 1e18;
-        const collateralMaxLtv = Number(other.maxLtv) / 1e18;
         const selfLt = Number(self.lt) / 1e18;
-        const borrowingEnabled = collateralLt > 0;
+        const selfMaxLtv = Number(self.maxLtv) / 1e18;
+        const otherLt = Number(other.lt) / 1e18;
         const collateralActive = selfLt > 0;
+        const borrowingEnabled = otherLt > 0;
         const marketUid = createMarketUid(chainId, lender, self.silo);
         out[marketUid] = {
           marketUid,
@@ -18963,11 +18963,11 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
           config: {
             0: {
               category: 0,
-              borrowCollateralFactor: collateralMaxLtv,
-              collateralFactor: collateralLt,
+              borrowCollateralFactor: selfMaxLtv,
+              collateralFactor: selfLt,
               borrowFactor: 1,
-              collateralDisabled: !borrowingEnabled,
-              debtDisabled: !collateralActive
+              collateralDisabled: !collateralActive,
+              debtDisabled: !borrowingEnabled
             }
           },
           collateralActive,
@@ -19424,21 +19424,20 @@ function convertSiloMarketsToPublicResponse(apiItems, chainId, prices, additiona
       const totalDebt = safeNumber(api.borrowed);
       const totalLiquidity = totalDeposits - totalDebt;
       const utilization = totalDeposits > 0 ? totalDebt / totalDeposits : safeNumber(api.utilization);
-      const variableBorrowRatePct = safeNumber(api.borrowRate) * 100;
-      const depositRatePct = safeNumber(api.depositRate) * 100;
+      const variableBorrowRatePct = safeNumber(api.borrowRate);
+      const depositRatePct = safeNumber(api.depositRate);
       const assetMeta = tokenList[tokenAddrLc];
       const oracleKey = toOracleKey(assetMeta?.assetGroup ?? null) || toGenericPriceKey(tokenAddrLc, chainId);
       const fallbackPrice = prices[oracleKey] ?? 0;
       const totalDepositsUSD = api.supplyUsd != null && api.supplyUsd > 0 ? api.supplyUsd : totalDeposits * fallbackPrice;
       const totalDebtUSD = api.borrowedUsd != null && api.borrowedUsd > 0 ? api.borrowedUsd : totalDebt * fallbackPrice;
       const totalLiquidityUSD = Math.max(totalDepositsUSD - totalDebtUSD, 0);
-      const collateralLt = safeLtvOrFee(api, "lt", other.lt);
-      const collateralMaxLtv = safeLtvOrFee(api, "maxLtv", other.maxLtv);
+      const otherApi = sides[0].api === api ? apiSide1 : apiSide0;
       const selfLt = bigintToLtv(api.lt ?? self.lt);
-      const collateralLtFromApi = sides[0].api === api ? bigintToLtv(apiSide1.lt) : bigintToLtv(apiSide0.lt);
-      const collateralMaxLtvFromApi = sides[0].api === api ? bigintToLtv(apiSide1.maxLtv) : bigintToLtv(apiSide0.maxLtv);
-      const borrowingEnabled = (collateralLtFromApi || collateralLt) > 0;
+      const selfMaxLtv = bigintToLtv(api.maxLtv ?? self.maxLtv);
+      const otherLt = bigintToLtv(otherApi.lt ?? other.lt);
       const collateralActive = selfLt > 0;
+      const borrowingEnabled = otherLt > 0;
       const siloAddrLc = self.silo.toLowerCase();
       const marketUid = createMarketUid(chainId, lenderKey, siloAddrLc);
       data[marketUid] = {
@@ -19476,11 +19475,11 @@ function convertSiloMarketsToPublicResponse(apiItems, chainId, prices, additiona
         config: {
           0: {
             category: 0,
-            borrowCollateralFactor: collateralMaxLtvFromApi || collateralMaxLtv,
-            collateralFactor: collateralLtFromApi || collateralLt,
+            borrowCollateralFactor: selfMaxLtv,
+            collateralFactor: selfLt,
             borrowFactor: 1,
-            collateralDisabled: !borrowingEnabled,
-            debtDisabled: !collateralActive
+            collateralDisabled: !collateralActive,
+            debtDisabled: !borrowingEnabled
           }
         },
         collateralActive,
@@ -19529,9 +19528,6 @@ function bigintToLtv(v) {
     return Number.isFinite(n) ? n / 1e18 : 0;
   }
 }
-function safeLtvOrFee(api, field5, fallback) {
-  return bigintToLtv(api[field5] ?? fallback);
-}
 
 // src/lending/public-data/silo-v3/convertPublic.ts
 var ZERO_ADDRESS2 = "0x0000000000000000000000000000000000000000";
@@ -19564,21 +19560,20 @@ function convertSiloV3MarketsToPublicResponse(apiItems, chainId, prices, additio
       const totalDebt = safeNumber2(api.borrowed);
       const totalLiquidity = totalDeposits - totalDebt;
       const utilization = totalDeposits > 0 ? totalDebt / totalDeposits : safeNumber2(api.utilization);
-      const variableBorrowRatePct = safeNumber2(api.borrowRate) * 100;
-      const depositRatePct = safeNumber2(api.depositRate) * 100;
+      const variableBorrowRatePct = safeNumber2(api.borrowRate);
+      const depositRatePct = safeNumber2(api.depositRate);
       const assetMeta = tokenList[tokenAddrLc];
       const oracleKey = toOracleKey(assetMeta?.assetGroup ?? null) || toGenericPriceKey(tokenAddrLc, chainId);
       const fallbackPrice = prices[oracleKey] ?? 0;
       const totalDepositsUSD = api.supplyUsd != null && api.supplyUsd > 0 ? api.supplyUsd : totalDeposits * fallbackPrice;
       const totalDebtUSD = api.borrowedUsd != null && api.borrowedUsd > 0 ? api.borrowedUsd : totalDebt * fallbackPrice;
       const totalLiquidityUSD = Math.max(totalDepositsUSD - totalDebtUSD, 0);
-      const collateralLt = safeLtvOrFee2(api, "lt", other.lt);
-      const collateralMaxLtv = safeLtvOrFee2(api, "maxLtv", other.maxLtv);
+      const otherApi = sides[0].api === api ? apiSide1 : apiSide0;
       const selfLt = bigintToLtv2(api.lt ?? self.lt);
-      const collateralLtFromApi = sides[0].api === api ? bigintToLtv2(apiSide1.lt) : bigintToLtv2(apiSide0.lt);
-      const collateralMaxLtvFromApi = sides[0].api === api ? bigintToLtv2(apiSide1.maxLtv) : bigintToLtv2(apiSide0.maxLtv);
-      const borrowingEnabled = (collateralLtFromApi || collateralLt) > 0;
+      const selfMaxLtv = bigintToLtv2(api.maxLtv ?? self.maxLtv);
+      const otherLt = bigintToLtv2(otherApi.lt ?? other.lt);
       const collateralActive = selfLt > 0;
+      const borrowingEnabled = otherLt > 0;
       const siloAddrLc = self.silo.toLowerCase();
       const marketUid = createMarketUid(chainId, lenderKey, siloAddrLc);
       data[marketUid] = {
@@ -19614,11 +19609,11 @@ function convertSiloV3MarketsToPublicResponse(apiItems, chainId, prices, additio
         config: {
           0: {
             category: 0,
-            borrowCollateralFactor: collateralMaxLtvFromApi || collateralMaxLtv,
-            collateralFactor: collateralLtFromApi || collateralLt,
+            borrowCollateralFactor: selfMaxLtv,
+            collateralFactor: selfLt,
             borrowFactor: 1,
-            collateralDisabled: !borrowingEnabled,
-            debtDisabled: !collateralActive
+            collateralDisabled: !collateralActive,
+            debtDisabled: !borrowingEnabled
           }
         },
         collateralActive,
@@ -19667,9 +19662,6 @@ function bigintToLtv2(v) {
     return Number.isFinite(n) ? n / 1e18 : 0;
   }
 }
-function safeLtvOrFee2(api, field5, fallback) {
-  return bigintToLtv2(api[field5] ?? fallback);
-}
 
 // src/lending/public-data/fetchLenderExt.ts
 async function getLenderDataFromApi(lender, chainId, prices, additionalYields, includeUnlisted = false) {