@1delta/margin-fetcher 0.0.25 → 0.0.26

package/dist/yields/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AA4CA,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QACb,CAAC,OAAO,EAAE,MAAM,GAAG;YACjB,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SACzD,CAAA;KACF,CAAA;CACF;AAcD,eAAO,MAAM,kBAAkB,uCA+K9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAmFA,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QACb,CAAC,OAAO,EAAE,MAAM,GAAG;YACjB,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SACzD,CAAA;KACF,CAAA;CACF;AAcD,eAAO,MAAM,kBAAkB,uCA2X9B,CAAA"}

package/dist/yields/index.js

@@ -3,6 +3,30 @@ const hyUSD = 'High Yield USD Base::HYUSD';
 const bsdETH = 'Based ETH::BSDETH';
 const wstHype = 'Staked HYPE Shares::WSTHYPE';
 const kHYPE = 'Kinetiq Staked HYPE::kHYPE';
+const tETH = 'Treehouse ETH::TETH';
+const osETH = 'StakeWise Staked ETH::OSETH';
+// const ethPlus = 'ETHPlus::ETH+'
+const ethX = 'Stader ETHx::ETHx';
+const pufEth = 'PUFETH';
+const stUSD = 'Angle Staked USDA::STUSD';
+const stEur = 'Angle Staked EURA::STEUR';
+const sUsds = 'sUSDS::SUSDS';
+const srUsd = 'Reservoir srUSD::SRUSD';
+const yusd = 'YieldFi yUSD::yUSD';
+const rlp = 'Resolv RLP::RLP';
+const wstusr = 'Resolv wstUSR::WSTUSR';
+const ethPlus = 'ETHPlus::ETH+';
+const woEth = 'Wrapped OETH::WOETH';
+const csusdl = 'Coinshift USDL Morpho Vault::CSUSDL';
+const sfrxeth = 'Staked Frax Ether::sfrxETH';
+const ceth = 'cETH::CETH';
+const sfrax = 'Staked FRAX::SFRAX';
+const sdeusd = 'Elixir Staked deUSD::SDEUSD';
+const rsweth = 'Restaked Swell ETH::RSWETH';
+const ynethx = 'ynETH MAX::YNETHX';
+const usdZeroPlus = 'Staked USD0::USD0++';
+const ethZero = 'ETH0::ETH0';
+const usdThree = "Web 3 Dollar::USD3";
 const FeedData = {
     WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
     STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -18,6 +42,21 @@ const FeedData = {
     TRUMATIC: 'https://api.trufin.io/staker/apy?staker=MATIC',
     RTOKENS: 'https://yields.reserve.org/pools',
     HYPE: 'https://api.hyperlend.finance/data/nativeApy',
+    ETHX: 'https://universe.staderlabs.com/eth/apy',
+    OSETH: 'https://graphs.stakewise.io/mainnet-a/subgraphs/name/stakewise/prod?opName=osTokenApy',
+    PUFETH: 'https://api-v2.puffer.fi/backend-for-frontend/tvl/all',
+    ANGLE: 'https://exporter.angle.money/v2/savingsApr',
+    SUSDS: 'https://info-sky.blockanalitica.com/api/v1/overall/?format=json',
+    SRUSD: 'https://app.reservoir.xyz/api/website',
+    YUSD: 'https://ctrl.yield.fi/t/yusd/apy',
+    RLP: 'https://api.resolv.xyz/apr/rlp/7d',
+    WSTUSR: 'https://api.resolv.xyz/apr/staking/7d',
+    MORPHO_VAULTS: 'https://blue-api.morpho.org/graphql',
+    SDEUSD: 'https://api-deusd-prod-public.elixir.xyz/public/deusd_apy',
+    RSWETH: 'https://v3-lst.svc.swellnetwork.io/api/tokens/sweth/apr',
+    YNETHX: 'https://gateway.yieldnest.finance/api/v1/graphql',
+    USDZEROPLUS: 'https://app.usual.money/api/rewards/rates/USD0++',
+    ETHZERO: 'https://app.usual.money/api/rewards/rates/ETH0',
 };
 const LenderAPIs = {
     MERIDIAN: 'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields',
@@ -57,8 +96,7 @@ export const fetchGeneralYields = async () => {
         return Number(res.rethAPR);
     });
     const weethPromise = safeFetch('WEETH', async () => {
-        const wstethRes = await fetch(FeedData.WSTETH).then((r) => r.json());
-        const wstethApr = Number(wstethRes.data.aprs.at(-1).apr) * 0.9;
+        const wstethRes = await wstethPromise;
         let aYield = 0;
         try {
             const weethRes = await fetch(FeedData.WEETH).then((r) => r.json());
@@ -67,7 +105,7 @@ export const fetchGeneralYields = async () => {
         catch (e) {
             aYield = 0.5;
         }
-        return aYield + wstethApr;
+        return aYield + (wstethRes ?? 0);
     });
     const stmaticPromise = safeFetch('STMATIC', async () => {
         const res = await fetch(FeedData.STMATIC).then((r) => r.json());
@@ -102,12 +140,140 @@ export const fetchGeneralYields = async () => {
         const res = await fetch(FeedData.TRUMATIC).then((r) => r.json());
         return apyToAprPercent(res.apy);
     });
+    const ethxPromise = safeFetch('ETHX', async () => {
+        const res = await fetch(FeedData.ETHX).then((r) => r.json());
+        return apyToAprPercent(res.value);
+    });
+    const osEthPromise = safeFetch('OSETH', async () => {
+        const res = await fetch(FeedData.OSETH, {
+            method: 'POST',
+            headers: { Accept: 'application/json' },
+            body: JSON.stringify({
+                query: 'query osTokenApy { osTokens { apy feePercent }}',
+                operationName: 'osTokenApy',
+            }),
+        }).then((r) => r.json());
+        return apyToAprPercent(res.data?.osTokens?.[0]?.apy);
+    });
+    const ynethxPromise = safeFetch('YNETHX', async () => {
+        const res = await fetch(FeedData.YNETHX, {
+            method: 'POST',
+            headers: {
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                operationName: 'GetTokenMetrics',
+                variables: {
+                    networkType: 'mainnet',
+                },
+                query: 'query GetTokenMetrics($networkType: NetworkType!) {\n  getLRTsData(networkType: $networkType) {\n    summary {\n      total_tvl {\n        value\n        value_raw\n        value_usd\n        __typename\n      }\n      __typename\n    }\n    tokens {\n      token\n      total_tvl {\n        value\n        value_raw\n        value_usd\n        __typename\n      }\n      price\n      blockchains {\n        chainId\n        tvl {\n          value\n          value_raw\n          value_usd\n          __typename\n        }\n        apr {\n          apr7d\n          apr31d\n          restaking7dApr\n          __typename\n        }\n        strategyAssets {\n          tokenAddress\n          symbol\n          apr7d\n          tvl\n          isBuffer\n          protocols\n          manager\n          maturityDate\n          __typename\n        }\n        contract_details {\n          tokenAddress\n          ynViewer\n          referralDepositAdapter\n          rateProvider\n          __typename\n        }\n        historicalData {\n          apy\n          exchangeRate\n          usdPrice\n          baseAsset\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}',
+            }),
+        }).then((r) => r.json());
+        const dat = res?.data?.getLRTsData?.tokens
+            .find((x) => x.token === 'ynETHx')
+            ?.blockchains?.find((b) => b.chainId === 1)?.apr?.apr31d;
+        return Number(dat ?? 0);
+    });
+    const pufEthPromise = safeFetch('PUFETH', async () => {
+        const res = await fetch(FeedData.PUFETH, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return apyToAprPercent(res.apy);
+    });
+    const usdZeroPlusPromise = safeFetch('USDZEROPLUS', async () => {
+        const res = await fetch(FeedData.USDZEROPLUS, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return Number(res?.rewards[0]?.apr ?? 0) * 100;
+    });
+    const ethZeroPromise = safeFetch('ETHZERO', async () => {
+        const res = await fetch(FeedData.ETHZERO, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return Number(res?.rewards[0]?.apr ?? 0) * 100;
+    });
+    const susdsPromise = safeFetch('SUSDS', async () => {
+        const res = await fetch(FeedData.SUSDS, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return apyToAprPercent(Number(res?.[0]?.sky_savings_rate_apy ?? 0) * 100);
+    });
+    const srusdPromise = safeFetch('SRUSD', async () => {
+        const res = await fetch(FeedData.SRUSD, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return apyToAprPercent(Number(res?.srusdApy ?? 0));
+    });
+    const yusdPromise = safeFetch('YUSD', async () => {
+        const res = await fetch(FeedData.YUSD, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return apyToAprPercent(Number(res?.apy ?? 0));
+    });
+    const rlpPromise = safeFetch('RLP', async () => {
+        const res = await fetch(FeedData.RLP, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return Number(res?.value ?? 0) * 100;
+    });
+    const wstusrPromise = safeFetch('WSTUSR', async () => {
+        const res = await fetch(FeedData.WSTUSR, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return Number(res?.value ?? 0) * 100;
+    });
+    const sdeusdPromise = safeFetch('SDEUSD', async () => {
+        const res = await fetch(FeedData.SDEUSD, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.json());
+        return apyToAprPercent((res?.deusd_apy ?? 0) / 100) * 100;
+    });
+    const rswethPromise = safeFetch('RSWETH', async () => {
+        const res = await fetch(FeedData.RSWETH, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        }).then((r) => r.text());
+        return Number(res) ?? 0;
+    });
+    const csusdlPromise = safeFetch('CSUSDL', async () => {
+        const res = await fetch(FeedData.MORPHO_VAULTS, {
+            method: 'POST',
+            headers: { Accept: 'application/json' },
+            body: JSON.stringify({
+                query: 'query GetAllCurrentAPYFromVault($address: String!) {\n  vaultByAddress(address: $address) {\n    state {\n      apy\n      netApy\n    }\n    asset {\n      yield {\n        apr\n      }\n    }\n  }\n}',
+                variables: {
+                    address: '0xbEeFc011e94f43b8B7b455eBaB290C7Ab4E216f1',
+                },
+            }),
+        }).then((r) => r.json());
+        const vba = res?.data?.vaultByAddress;
+        return (apyToAprPercent(vba.state.apy ?? 0) * 100 +
+            (vba?.asset?.yield.apr ?? 0) * 100);
+    });
     const rtokensPromise = safeFetch('RTOKENS', async () => {
         const res = await fetch(FeedData.RTOKENS).then((r) => r.json());
         const data = res.rtokens['8453'];
+        const dataMainnet = res.rtokens['1'];
+        const dataMainnetColalterals = res.collaterals['1'];
         return {
             [bsdETH]: apyToAprPercent(data.bsdETH / 100) * 100,
             [hyUSD]: apyToAprPercent(data.hyUSD / 100) * 100,
+            [sfrxeth]: apyToAprPercent(dataMainnetColalterals.sfrxeth / 100) * 100,
+            [sfrax]: apyToAprPercent(dataMainnetColalterals.sfrax / 100) * 100,
+            [ceth]: apyToAprPercent(dataMainnetColalterals.ceth / 100) * 100,
+            [ethPlus]: apyToAprPercent(dataMainnet['ETH+'] / 100) * 100,
+            [usdThree]: apyToAprPercent(dataMainnet['USD3'] / 100) * 100,
+            [woEth]: apyToAprPercent(dataMainnetColalterals.woeth / 100) * 100,
         };
     });
     const hypePromise = safeFetch('HYPE', async () => {
@@ -117,6 +283,15 @@ export const fetchGeneralYields = async () => {
             [kHYPE]: res.kHYPE.latestApr,
         };
     });
+    const anglePromise = safeFetch('ANGLE', async () => {
+        const now = Math.floor(Date.now() / 1000);
+        const nowMinusWeek = now - 7 * 24 * 3600;
+        const res = await fetch(FeedData.ANGLE + `?from=${nowMinusWeek}&to=${now}`).then((r) => r.json());
+        return {
+            [stEur]: apyToAprPercent(res.EURA) * 100,
+            [stUSD]: apyToAprPercent(res.USDA) * 100,
+        };
+    });
     const cbethPromise = safeFetch('CBETH', async () => {
         try {
             const res = await fetch(FeedData.CBETH, {
@@ -142,7 +317,7 @@ export const fetchGeneralYields = async () => {
             },
         })));
     });
-    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData, rtokensData, hypeData,] = await Promise.all([
+    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData, rtokensData, hypeData, osEthData, ethXData, pufEthData, angleData, susdsData, srUsdData, yusdData, rlpData, wstusrData, csusdlData, sdeusdData, rswethData, ynethxData, ethZeroData, usdZeroPlusData,] = await Promise.all([
         wstethPromise,
         ezethPromise,
         rethPromise,
@@ -158,6 +333,21 @@ export const fetchGeneralYields = async () => {
         trumaticPromise,
         rtokensPromise,
         hypePromise,
+        osEthPromise,
+        ethxPromise,
+        pufEthPromise,
+        anglePromise,
+        susdsPromise,
+        srusdPromise,
+        yusdPromise,
+        rlpPromise,
+        wstusrPromise,
+        csusdlPromise,
+        sdeusdPromise,
+        rswethPromise,
+        ynethxPromise,
+        ethZeroPromise,
+        usdZeroPlusPromise,
     ]);
     const data = {
         intrinsicYields: {
@@ -170,14 +360,29 @@ export const fetchGeneralYields = async () => {
             WEETH: weethData,
             STMATIC: stmaticData,
             USDY: 4.35,
-            USDE: 0,
             SUSDE: susdeData,
             SAVAX: savaxData,
             CBETH: cbethData,
             RSETH: rsethData,
             TRUMATIC: trumaticData,
+            [sUsds]: susdsData,
+            [ethZero]: ethZeroData,
+            [usdZeroPlus]: usdZeroPlusData,
+            [csusdl]: csusdlData,
+            [srUsd]: srUsdData,
+            [sdeusd]: sdeusdData,
+            [wstusr]: wstusrData,
+            [yusd]: yusdData,
+            [rlp]: rlpData,
+            [rsweth]: rswethData,
+            [osETH]: osEthData,
+            [ethX]: ethXData,
+            [ynethx]: ynethxData,
+            [tETH]: wstethData,
+            [pufEth]: pufEthData,
             ...rtokensData,
             ...hypeData,
+            ...angleData,
         },
         lenderRewards: {
             '167000': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/yields/index.ts

@@ -5,7 +5,30 @@ const bsdETH = 'Based ETH::BSDETH'
 
 const wstHype = 'Staked HYPE Shares::WSTHYPE'
 const kHYPE = 'Kinetiq Staked HYPE::kHYPE'
-
+const tETH = 'Treehouse ETH::TETH'
+const osETH = 'StakeWise Staked ETH::OSETH'
+// const ethPlus = 'ETHPlus::ETH+'
+const ethX = 'Stader ETHx::ETHx'
+const pufEth = 'PUFETH'
+const stUSD = 'Angle Staked USDA::STUSD'
+const stEur = 'Angle Staked EURA::STEUR'
+const sUsds = 'sUSDS::SUSDS'
+const srUsd = 'Reservoir srUSD::SRUSD'
+const yusd = 'YieldFi yUSD::yUSD'
+const rlp = 'Resolv RLP::RLP'
+const wstusr = 'Resolv wstUSR::WSTUSR'
+const ethPlus = 'ETHPlus::ETH+'
+const woEth = 'Wrapped OETH::WOETH'
+const csusdl = 'Coinshift USDL Morpho Vault::CSUSDL'
+const sfrxeth = 'Staked Frax Ether::sfrxETH'
+const ceth = 'cETH::CETH'
+const sfrax = 'Staked FRAX::SFRAX'
+const sdeusd = 'Elixir Staked deUSD::SDEUSD'
+const rsweth = 'Restaked Swell ETH::RSWETH'
+const ynethx = 'ynETH MAX::YNETHX'
+const usdZeroPlus = 'Staked USD0::USD0++'
+const ethZero = 'ETH0::ETH0'
+const usdThree = "Web 3 Dollar::USD3"
 const FeedData = {
   WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
   STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -22,6 +45,22 @@ const FeedData = {
   TRUMATIC: 'https://api.trufin.io/staker/apy?staker=MATIC',
   RTOKENS: 'https://yields.reserve.org/pools',
   HYPE: 'https://api.hyperlend.finance/data/nativeApy',
+  ETHX: 'https://universe.staderlabs.com/eth/apy',
+  OSETH:
+    'https://graphs.stakewise.io/mainnet-a/subgraphs/name/stakewise/prod?opName=osTokenApy',
+  PUFETH: 'https://api-v2.puffer.fi/backend-for-frontend/tvl/all',
+  ANGLE: 'https://exporter.angle.money/v2/savingsApr',
+  SUSDS: 'https://info-sky.blockanalitica.com/api/v1/overall/?format=json',
+  SRUSD: 'https://app.reservoir.xyz/api/website',
+  YUSD: 'https://ctrl.yield.fi/t/yusd/apy',
+  RLP: 'https://api.resolv.xyz/apr/rlp/7d',
+  WSTUSR: 'https://api.resolv.xyz/apr/staking/7d',
+  MORPHO_VAULTS: 'https://blue-api.morpho.org/graphql',
+  SDEUSD: 'https://api-deusd-prod-public.elixir.xyz/public/deusd_apy',
+  RSWETH: 'https://v3-lst.svc.swellnetwork.io/api/tokens/sweth/apr',
+  YNETHX: 'https://gateway.yieldnest.finance/api/v1/graphql',
+  USDZEROPLUS: 'https://app.usual.money/api/rewards/rates/USD0++',
+  ETHZERO: 'https://app.usual.money/api/rewards/rates/ETH0',
 }
 
 const LenderAPIs = {
@@ -87,8 +126,7 @@ export const fetchGeneralYields = async () => {
   })
 
   const weethPromise = safeFetch('WEETH', async () => {
-    const wstethRes = await fetch(FeedData.WSTETH).then((r) => r.json())
-    const wstethApr = Number(wstethRes.data.aprs.at(-1).apr) * 0.9
+    const wstethRes = await wstethPromise
     let aYield = 0
     try {
       const weethRes = await fetch(FeedData.WEETH).then((r) => r.json())
@@ -96,7 +134,7 @@ export const fetchGeneralYields = async () => {
     } catch (e) {
       aYield = 0.5
     }
-    return aYield + wstethApr
+    return aYield + (wstethRes ?? 0)
   })
 
   const stmaticPromise = safeFetch('STMATIC', async () => {
@@ -138,12 +176,160 @@ export const fetchGeneralYields = async () => {
     return apyToAprPercent(res.apy)
   })
 
+  const ethxPromise = safeFetch('ETHX', async () => {
+    const res = await fetch(FeedData.ETHX).then((r) => r.json())
+    return apyToAprPercent(res.value)
+  })
+
+  const osEthPromise = safeFetch('OSETH', async () => {
+    const res = await fetch(FeedData.OSETH, {
+      method: 'POST',
+      headers: { Accept: 'application/json' },
+      body: JSON.stringify({
+        query: 'query osTokenApy { osTokens { apy feePercent }}',
+        operationName: 'osTokenApy',
+      }),
+    }).then((r) => r.json())
+    return apyToAprPercent(res.data?.osTokens?.[0]?.apy)
+  })
+
+  const ynethxPromise = safeFetch('YNETHX', async () => {
+    const res = await fetch(FeedData.YNETHX, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        operationName: 'GetTokenMetrics',
+        variables: {
+          networkType: 'mainnet',
+        },
+        query:
+          'query GetTokenMetrics($networkType: NetworkType!) {\n  getLRTsData(networkType: $networkType) {\n    summary {\n      total_tvl {\n        value\n        value_raw\n        value_usd\n        __typename\n      }\n      __typename\n    }\n    tokens {\n      token\n      total_tvl {\n        value\n        value_raw\n        value_usd\n        __typename\n      }\n      price\n      blockchains {\n        chainId\n        tvl {\n          value\n          value_raw\n          value_usd\n          __typename\n        }\n        apr {\n          apr7d\n          apr31d\n          restaking7dApr\n          __typename\n        }\n        strategyAssets {\n          tokenAddress\n          symbol\n          apr7d\n          tvl\n          isBuffer\n          protocols\n          manager\n          maturityDate\n          __typename\n        }\n        contract_details {\n          tokenAddress\n          ynViewer\n          referralDepositAdapter\n          rateProvider\n          __typename\n        }\n        historicalData {\n          apy\n          exchangeRate\n          usdPrice\n          baseAsset\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}',
+      }),
+    }).then((r) => r.json())
+
+    const dat = res?.data?.getLRTsData?.tokens
+      .find((x: any) => x.token === 'ynETHx')
+      ?.blockchains?.find((b: any) => b.chainId === 1)?.apr?.apr31d
+
+    return Number(dat ?? 0)
+  })
+
+  const pufEthPromise = safeFetch('PUFETH', async () => {
+    const res = await fetch(FeedData.PUFETH, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return apyToAprPercent(res.apy)
+  })
+
+  const usdZeroPlusPromise = safeFetch('USDZEROPLUS', async () => {
+    const res = await fetch(FeedData.USDZEROPLUS, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return Number(res?.rewards[0]?.apr ?? 0) * 100
+  })
+
+  const ethZeroPromise = safeFetch('ETHZERO', async () => {
+    const res = await fetch(FeedData.ETHZERO, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return Number(res?.rewards[0]?.apr ?? 0) * 100
+  })
+
+  const susdsPromise = safeFetch('SUSDS', async () => {
+    const res = await fetch(FeedData.SUSDS, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return apyToAprPercent(Number(res?.[0]?.sky_savings_rate_apy ?? 0) * 100)
+  })
+
+  const srusdPromise = safeFetch('SRUSD', async () => {
+    const res = await fetch(FeedData.SRUSD, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return apyToAprPercent(Number(res?.srusdApy ?? 0))
+  })
+
+  const yusdPromise = safeFetch('YUSD', async () => {
+    const res = await fetch(FeedData.YUSD, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return apyToAprPercent(Number(res?.apy ?? 0))
+  })
+
+  const rlpPromise = safeFetch('RLP', async () => {
+    const res = await fetch(FeedData.RLP, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return Number(res?.value ?? 0) * 100
+  })
+
+  const wstusrPromise = safeFetch('WSTUSR', async () => {
+    const res = await fetch(FeedData.WSTUSR, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return Number(res?.value ?? 0) * 100
+  })
+
+  const sdeusdPromise = safeFetch('SDEUSD', async () => {
+    const res = await fetch(FeedData.SDEUSD, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    return apyToAprPercent((res?.deusd_apy ?? 0) / 100) * 100
+  })
+
+  const rswethPromise = safeFetch('RSWETH', async () => {
+    const res = await fetch(FeedData.RSWETH, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.text())
+    return Number(res) ?? 0
+  })
+
+  const csusdlPromise = safeFetch('CSUSDL', async () => {
+    const res = await fetch(FeedData.MORPHO_VAULTS, {
+      method: 'POST',
+      headers: { Accept: 'application/json' },
+      body: JSON.stringify({
+        query:
+          'query GetAllCurrentAPYFromVault($address: String!) {\n  vaultByAddress(address: $address) {\n    state {\n      apy\n      netApy\n    }\n    asset {\n      yield {\n        apr\n      }\n    }\n  }\n}',
+        variables: {
+          address: '0xbEeFc011e94f43b8B7b455eBaB290C7Ab4E216f1',
+        },
+      }),
+    }).then((r) => r.json())
+    const vba = res?.data?.vaultByAddress
+    return (
+      apyToAprPercent(vba.state.apy ?? 0) * 100 +
+      (vba?.asset?.yield.apr ?? 0) * 100
+    )
+  })
+
   const rtokensPromise = safeFetch('RTOKENS', async () => {
     const res = await fetch(FeedData.RTOKENS).then((r) => r.json())
     const data = res.rtokens['8453']
+    const dataMainnet = res.rtokens['1']
+    const dataMainnetColalterals = res.collaterals['1']
     return {
       [bsdETH]: apyToAprPercent(data.bsdETH / 100) * 100,
       [hyUSD]: apyToAprPercent(data.hyUSD / 100) * 100,
+      [sfrxeth]: apyToAprPercent(dataMainnetColalterals.sfrxeth / 100) * 100,
+      [sfrax]: apyToAprPercent(dataMainnetColalterals.sfrax / 100) * 100,
+      [ceth]: apyToAprPercent(dataMainnetColalterals.ceth / 100) * 100,
+      [ethPlus]: apyToAprPercent(dataMainnet['ETH+'] / 100) * 100,
+      [usdThree]: apyToAprPercent(dataMainnet['USD3'] / 100) * 100,
+      [woEth]: apyToAprPercent(dataMainnetColalterals.woeth / 100) * 100,
     }
   })
 
@@ -155,6 +341,18 @@ export const fetchGeneralYields = async () => {
     }
   })
 
+  const anglePromise = safeFetch('ANGLE', async () => {
+    const now = Math.floor(Date.now() / 1000)
+    const nowMinusWeek = now - 7 * 24 * 3600
+    const res = await fetch(
+      FeedData.ANGLE + `?from=${nowMinusWeek}&to=${now}`,
+    ).then((r) => r.json())
+    return {
+      [stEur]: apyToAprPercent(res.EURA) * 100,
+      [stUSD]: apyToAprPercent(res.USDA) * 100,
+    }
+  })
+
   const cbethPromise = safeFetch('CBETH', async () => {
     try {
       const res = await fetch(FeedData.CBETH, {
@@ -200,6 +398,21 @@ export const fetchGeneralYields = async () => {
     trumaticData,
     rtokensData,
     hypeData,
+    osEthData,
+    ethXData,
+    pufEthData,
+    angleData,
+    susdsData,
+    srUsdData,
+    yusdData,
+    rlpData,
+    wstusrData,
+    csusdlData,
+    sdeusdData,
+    rswethData,
+    ynethxData,
+    ethZeroData,
+    usdZeroPlusData,
   ] = await Promise.all([
     wstethPromise,
     ezethPromise,
@@ -216,6 +429,21 @@ export const fetchGeneralYields = async () => {
     trumaticPromise,
     rtokensPromise,
     hypePromise,
+    osEthPromise,
+    ethxPromise,
+    pufEthPromise,
+    anglePromise,
+    susdsPromise,
+    srusdPromise,
+    yusdPromise,
+    rlpPromise,
+    wstusrPromise,
+    csusdlPromise,
+    sdeusdPromise,
+    rswethPromise,
+    ynethxPromise,
+    ethZeroPromise,
+    usdZeroPlusPromise,
   ])
 
   const data: YieldDataWithTimestamp = {
@@ -229,14 +457,29 @@ export const fetchGeneralYields = async () => {
       WEETH: weethData,
       STMATIC: stmaticData,
       USDY: 4.35,
-      USDE: 0,
       SUSDE: susdeData,
       SAVAX: savaxData,
       CBETH: cbethData,
       RSETH: rsethData,
       TRUMATIC: trumaticData,
+      [sUsds]: susdsData,
+      [ethZero]: ethZeroData,
+      [usdZeroPlus]: usdZeroPlusData,
+      [csusdl]: csusdlData,
+      [srUsd]: srUsdData,
+      [sdeusd]: sdeusdData,
+      [wstusr]: wstusrData,
+      [yusd]: yusdData,
+      [rlp]: rlpData,
+      [rsweth]: rswethData,
+      [osETH]: osEthData,
+      [ethX]: ethXData,
+      [ynethx]: ynethxData,
+      [tETH]: wstethData,
+      [pufEth]: pufEthData,
       ...rtokensData,
       ...hypeData,
+      ...angleData,
     },
     lenderRewards: {
       '167000': {

package/test/mainPrices.test.ts

@@ -16,8 +16,8 @@ describe(
           // Chain.POLYGON_MAINNET,
           // Chain.HEMI_NETWORK,
           // Chain.ARBITRUM_ONE,
-          // Chain.HYPEREVM,
-          Chain.ETHEREUM_MAINNET,
+          Chain.HYPEREVM,
+          // Chain.ETHEREUM_MAINNET,
         ],
         getEvmClient,
       )

package/test/yields.test.ts

@@ -10,7 +10,7 @@ describe(
       prettyPrint(yields)
     })
   },
-  { timeout: 10000 },
+  { timeout: 30000 },
 )
 
 function prettyPrint(obj: any) {