@1delta/margin-fetcher 0.0.90 → 0.0.91

package/dist/index.js

@@ -10935,6 +10935,7 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
   let debt = 0;
   let collateral = 0;
   let borrowDiscountedCollateral = 0;
+  let borrowDiscountedCollateralAllActive = 0;
   let rewardsPerAsset = {};
   for (let i = 0; i < assetKeys.length; i++) {
     const asset = assetKeys[i];
@@ -10945,7 +10946,8 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
       stakingYield,
       variableBorrowRate,
       stableBorrowRate,
-      rewards
+      rewards,
+      collateralActive
     } = lenderData[asset];
     deposits += depositsUSD;
     debt += debtStableUSD;
@@ -10964,9 +10966,12 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
     );
     stakingDepositAccrual += (stakingYield ?? 0) * depositsUSD;
     stakingBorrowAccrual += (stakingYield ?? 0) * (debtStableUSD + debtUSD);
-    if (collateralEnabled) {
-      collateral += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
-      borrowDiscountedCollateral += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
+    if (collateralActive) {
+      if (collateralEnabled) {
+        collateral += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
+        borrowDiscountedCollateral += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
+      }
+      borrowDiscountedCollateralAllActive += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
     }
     depositInterest += depositRate * depositsUSD;
     borrowInterest += debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
@@ -10975,6 +10980,7 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
   const balanceData2 = {
     "0": {
       borrowDiscountedCollateral,
+      borrowDiscountedCollateralAllActive,
       collateral,
       deposits,
       debt,
@@ -11061,6 +11067,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
     const nav = deposits - debt;
     balanceData2[posId] = {
       borrowDiscountedCollateral,
+      borrowDiscountedCollateralAllActive: borrowDiscountedCollateral,
       collateral,
       deposits,
       debt,
@@ -18055,6 +18062,7 @@ var CHUNK_SIZE = 100;
 var balanceData = {
   "0": {
     borrowDiscountedCollateral: 0,
+    borrowDiscountedCollateralAllActive: 0,
     collateral: 0,
     deposits: 0,
     debt: 0,
@@ -19093,6 +19101,7 @@ var yobtc = "Yield Optimizer BTC::YOBTC";
 var yousd = "Yield Optimizer USD::YOUSD";
 var yoeur = "Yield Optimizer EUR::yoEUR";
 var hwhlp = "Hyperwave HLP::hwHLP";
+var weeths = "Super Symbiotic LRT::weETHs";
 var gmx_eth_usd = "GMX Market ETH/USD::GM [WETH-USDC]";
 var gmx_btc_usd = "GMX Market BTC/USD::GM [WBTC-USDC]";
 var glv_wbtc_usdc = "GMX Liquidity Vault [WBTC-USDC]::GLV [WBTC-USDC]";
@@ -19111,6 +19120,7 @@ var FeedData = {
   EZETH: "https://app.renzoprotocol.com/api/stats?chainId=1",
   RETH: "https://api.rocketpool.net/api/mainnet/payload",
   WEETH: "https://www.ether.fi/api/apr",
+  WEETHS: "https://api.sevenseas.capital/etherfi/ethereum/performance/0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88",
   SAVAX: "https://api.benqi.fi/liquidstaking/apr",
   RSETH: "https://universe.kelpdao.xyz/rseth/totalApy",
   TRUMATIC: "https://api.trufin.io/staker/apy?staker=MATIC",
@@ -19201,6 +19211,10 @@ var fetchGeneralYields = async () => {
     const res = await fetch(FeedData.SAVAX).then((r) => r.json());
     return Number(res.apr) * 100;
   });
+  const weethsPromise = safeFetch("WEETHS", async () => {
+    const res = await fetch(FeedData.WEETHS).then((r) => r.json());
+    return apyToApr(res.Response.apy) * 100;
+  });
   const methPromise = safeFetch("METH", async () => {
     const res = await fetch(FeedData.METH).then((r) => r.json());
     return apyToApr(Number(res.data[0]?.OneDayAPY)) * 100;
@@ -19573,7 +19587,8 @@ var fetchGeneralYields = async () => {
     hlpData,
     yoData,
     hwhlpData,
-    gmxData
+    gmxData,
+    weethsData
   ] = await Promise.all([
     wstethPromise,
     ezethPromise,
@@ -19614,7 +19629,8 @@ var fetchGeneralYields = async () => {
     hlpPromise,
     yoPromise,
     hwhlpPromise,
-    gmxPromise
+    gmxPromise,
+    weethsPromise
   ]);
   const data = {
     intrinsicYields: {
@@ -19653,6 +19669,7 @@ var fetchGeneralYields = async () => {
       [hbhype]: hbhypeData,
       [hlp]: hlpData,
       [hwhlp]: hwhlpData,
+      [weeths]: weethsData,
       ...rtokensData,
       ...hypeData,
       ...angleData,