@1delta/margin-fetcher 0.0.88 → 0.0.91

package/dist/index.js

@@ -7802,6 +7802,9 @@ var AAVE_V3_EMODES = (chain, lender) => {
   if (chain === Chain.BASE) {
     if (lender === Lender.AAVE_V3) return range(12);
   }
+  if (chain === Chain.PLASMA_MAINNET) {
+    if (lender === Lender.AAVE_V3) return range(12);
+  }
   return [0, 1, 2, 3, 4, 5, 6];
 };
 function yldrBaseline(assetsToQuery, providerAddress) {
@@ -10932,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];
@@ -10942,7 +10946,8 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
       stakingYield,
       variableBorrowRate,
       stableBorrowRate,
-      rewards
+      rewards,
+      collateralActive
     } = lenderData[asset];
     deposits += depositsUSD;
     debt += debtStableUSD;
@@ -10961,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;
@@ -10972,6 +10980,7 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
   const balanceData2 = {
     "0": {
       borrowDiscountedCollateral,
+      borrowDiscountedCollateralAllActive,
       collateral,
       deposits,
       debt,
@@ -11058,6 +11067,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
     const nav = deposits - debt;
     balanceData2[posId] = {
       borrowDiscountedCollateral,
+      borrowDiscountedCollateralAllActive: borrowDiscountedCollateral,
       collateral,
       deposits,
       debt,
@@ -18052,6 +18062,7 @@ var CHUNK_SIZE = 100;
 var balanceData = {
   "0": {
     borrowDiscountedCollateral: 0,
+    borrowDiscountedCollateralAllActive: 0,
     collateral: 0,
     deposits: 0,
     debt: 0,
@@ -19090,6 +19101,15 @@ 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]";
+var glv_weth_usdc = "GMX Liquidity Vault [WETH-USDC]::GLV [WETH-USDC]";
+var gmx_eth_usd_address = "0x70d95587d40a2caf56bd97485ab3eec10bee6336";
+var gmx_btc_usd_address = "0x47c031236e19d024b42f8ae6780e44a573170703";
+var glv_wbtc_usdc_address = "0xdf03eed325b82bc1d4db8b49c30ecc9e05104b96";
+var glv_weth_usdc_address = "0x528a5bac7e746c9a509a1f4f6df58a03d44279f9";
 var FeedData = {
   WSTETH: "https://eth-api.lido.fi/v1/protocol/steth/apr/sma",
   STMATIC: "https://polygon.lido.fi/api/stats",
@@ -19100,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",
@@ -19127,7 +19148,8 @@ var FeedData = {
   HBHYPE: "https://api.hyperbeat.org/api/v1/staking?address=0xCeaD893b162D38e714D82d06a7fe0b0dc3c38E0b",
   HLP: "https://api-ui.hyperliquid.xyz/info",
   HWHLP: "https://api.hyperwavefi.xyz/stats/latest?asset=hwhlp_999",
-  YO: "https://api.yo.xyz/api/v1/vault/stats"
+  YO: "https://api.yo.xyz/api/v1/vault/stats",
+  GMX: "https://arbitrum-api.gmxinfra.io/apy?period=1d"
 };
 function averageDataLastN(arr, n = 7) {
   const last = arr.slice(-n);
@@ -19189,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;
@@ -19347,6 +19373,28 @@ var fetchGeneralYields = async () => {
       [yoeur]: apyToAprPercent(yoEUR)
     };
   });
+  const gmxPromise = safeFetch("GMX", async () => {
+    const res = await fetch(FeedData.GMX, {
+      method: "GET",
+      headers: { Accept: "application/json" }
+    }).then((r) => r.json());
+    let rData = {};
+    const markets = res.markets;
+    Object.entries(markets).forEach(([m, d]) => {
+      if (m.toLowerCase() === gmx_eth_usd_address)
+        rData[gmx_eth_usd] = apyToApr(d.apy) * 100;
+      if (m.toLowerCase() === gmx_btc_usd_address)
+        rData[gmx_btc_usd] = apyToApr(d.apy) * 100;
+    });
+    const glvs = res.glvs;
+    Object.entries(glvs).forEach(([m, d]) => {
+      if (m.toLowerCase() === glv_wbtc_usdc_address)
+        rData[glv_wbtc_usdc] = apyToApr(d.apy) * 100;
+      if (m.toLowerCase() === glv_weth_usdc_address)
+        rData[glv_weth_usdc] = apyToApr(d.apy) * 100;
+    });
+    return rData;
+  });
   const susdsPromise = safeFetch("SUSDS", async () => {
     const res = await fetch(FeedData.SUSDS, {
       method: "GET",
@@ -19538,7 +19586,9 @@ var fetchGeneralYields = async () => {
     pendleData,
     hlpData,
     yoData,
-    hwhlpData
+    hwhlpData,
+    gmxData,
+    weethsData
   ] = await Promise.all([
     wstethPromise,
     ezethPromise,
@@ -19578,7 +19628,9 @@ var fetchGeneralYields = async () => {
     pendlePromise,
     hlpPromise,
     yoPromise,
-    hwhlpPromise
+    hwhlpPromise,
+    gmxPromise,
+    weethsPromise
   ]);
   const data = {
     intrinsicYields: {
@@ -19617,12 +19669,14 @@ var fetchGeneralYields = async () => {
       [hbhype]: hbhypeData,
       [hlp]: hlpData,
       [hwhlp]: hwhlpData,
+      [weeths]: weethsData,
       ...rtokensData,
       ...hypeData,
       ...angleData,
       ...yearnKatanaData,
       ...pendleData,
-      ...yoData
+      ...yoData,
+      ...gmxData
     },
     lenderRewards: {
       // '167000': {
@@ -21553,7 +21607,7 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
     Promise.all(multicallPromises),
     ...otherDataPromises
   ]);
-  let allPrices = {};
+  let allPrices = { ...otherResults[0], ...otherResults[1] };
   for (const {
     chainId,
     result,
@@ -21607,7 +21661,8 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
     const compoundV2Data = parseCompoundV2Results(
       chainId,
       compoundV2Slice,
-      compoundV2.names
+      compoundV2.names,
+      allPrices
     );
     offset += comet.calls.length;
     allPrices = {
@@ -21622,7 +21677,6 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
       ...compoundV2Data
     };
   }
-  allPrices = { ...otherResults[0], ...allPrices, ...otherResults[1] };
   for (const {
     chainId,
     result,
@@ -21749,9 +21803,9 @@ var getCompoundV2Calls = (chainId) => {
   switch (chainId) {
     case Chain.ARBITRUM_ONE: {
       const names = [
-        "GMX Market ETH/USD::GM [WETH-USDC]",
+        ["GMX Market ETH/USD::GM [WETH-USDC]", 18],
         //
-        "GMX Market BTC/USD::GM [WBTC-USDC]"
+        ["GMX Market BTC/USD::GM [WBTC-USDC]", 18]
       ];
       return [
         [
@@ -21776,18 +21830,87 @@ var getCompoundV2Calls = (chainId) => {
         names
       ];
     }
+    case Chain.ETHEREUM_MAINNET: {
+      const names = [
+        ["SFRXETH", 18],
+        //
+        ["Super Symbiotic LRT::weETHs", 18],
+        ["USDC-1 yVault::yvUSDC-1", 30],
+        ["USDS-1 yVault::yvUSDS-1", 18],
+        ["USDT-1 yVault::yvUSDT-1", 30],
+        ["WETH-1 yVault::yvWETH-1", 18]
+      ];
+      return [
+        [
+          {
+            address: "0x277950603178BDD223eB53B9b7cF5D0053aa3473",
+            // lens
+            name: "vTokenUnderlyingPrice",
+            params: [
+              "0x17142a05fe678e9584FA1d88EfAC1bF181bF7ABe"
+              //
+            ]
+          },
+          {
+            address: "0x277950603178BDD223eB53B9b7cF5D0053aa3473",
+            // lens
+            name: "vTokenUnderlyingPrice",
+            params: [
+              "0xc42E4bfb996ED35235bda505430cBE404Eb49F77"
+              //
+            ]
+          },
+          {
+            address: "0x277950603178BDD223eB53B9b7cF5D0053aa3473",
+            name: "vTokenUnderlyingPrice",
+            params: [
+              "0xf87c0a64dc3a8622D6c63265FA29137788163879"
+              //
+            ]
+          },
+          {
+            address: "0x277950603178BDD223eB53B9b7cF5D0053aa3473",
+            name: "vTokenUnderlyingPrice",
+            params: [
+              "0x520d67226Bc904aC122dcE66ed2f8f61AA1ED764"
+              //
+            ]
+          },
+          {
+            address: "0x277950603178BDD223eB53B9b7cF5D0053aa3473",
+            name: "vTokenUnderlyingPrice",
+            params: [
+              "0x475d0C68a8CD275c15D1F01F4f291804E445F677"
+              //
+            ]
+          },
+          {
+            address: "0x277950603178BDD223eB53B9b7cF5D0053aa3473",
+            name: "vTokenUnderlyingPrice",
+            params: [
+              "0xba3916302cBA4aBcB51a01e706fC6051AaF272A0"
+              //
+            ]
+          }
+        ],
+        names
+      ];
+    }
     default:
       return [[], []];
   }
 };
-var parseCompoundV2Results = (chainId, data, names) => {
+var parseCompoundV2Results = (chainId, data, names, other = {}) => {
   return Object.assign(
     {},
     ...data.map((entry, index) => {
+      let price = Number(parseRawAmount(entry?.underlyingPrice ?? "0", names[index][1]));
+      const name = names[index][0];
+      if (name === "SFRXETH") {
+        price = other["ETH"] * price;
+      }
       return {
-        [names[index]]: Number(
-          parseRawAmount(entry?.underlyingPrice ?? "0", 18)
-        )
+        [name]: price
       };
     })
   );