@1delta/margin-fetcher 0.0.37 → 0.0.39

package/dist/prices/main-prices/fetchOracleData.js

@@ -73,7 +73,7 @@ export const fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
             ...RWADynamicOracleAbi,
             ...ProxyOracleAbi,
         ];
-        const result = await multicallRetry(chainId, allCalls, abis, undefined, 3, 0, true, rpcOverrides);
+        const result = await multicallRetry(chainId, allCalls, abis, undefined, 3, 0, false, rpcOverrides);
         return {
             chainId,
             result,
@@ -317,15 +317,17 @@ const parseUniswapV2results = (data, chainId) => {
             return {};
     }
 };
-function lowDecimalOracle(chainId, fork) {
+function getExponentForOracle(chainId, fork) {
     // some chains only have high decimal oracles
     if (chainId === Chain.AVALANCHE_C_CHAIN || chainId === Chain.MODE) {
-        return false;
+        return 10n;
     }
     if (chainId === Chain.XDC_NETWORK)
-        return true;
+        return 0n;
+    if (chainId === Chain.TELOS_EVM_MAINNET)
+        return 10n;
     // otherwise, it depends on whether it is aave V3
-    return AAVE_V2_LENDERS.includes(fork);
+    return AAVE_V2_LENDERS.includes(fork) ? 0n : 10n;
 }
 /**
  * Parser for aave results in ulticall slice
@@ -341,7 +343,7 @@ const parseAaveResults = (chainId, data, queries, list = {}) => {
             const details = queries[i];
             details.assets.forEach((a, j) => {
                 const oracleId = list[a]?.assetGroup ?? chainId + '-' + a;
-                prices[oracleId] = formatAavePrice(d[j].toString(), lowDecimalOracle(chainId, details.fork));
+                prices[oracleId] = formatAavePrice(d[j].toString(), getExponentForOracle(chainId, details.fork));
             });
         }
     });

package/dist/utils/parsing.d.ts

@@ -12,6 +12,6 @@ export declare const formatAaveYieldToNumber: (n?: string | bigint) => number;
 export declare const calculateRateForCompound: (n: string, chainId: string, lender?: Lender) => number;
 export declare const formatAaveRawApyToApr: (raw: bigint | string | undefined) => number;
 export declare const convertRateToApr: (ratePerSecond: number | string) => number;
-export declare const formatAavePrice: (price: string, isV2?: boolean) => number;
+export declare const formatAavePrice: (price: string, exponent?: bigint) => number;
 export declare const formatMorphoPrice: (price: string, collateralDec: number, debtDec: number) => number;
 //# sourceMappingURL=parsing.d.ts.map

package/dist/utils/parsing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD,eAAO,MAAM,GAAG,QAAQ,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAA;AAED,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAI1C,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAA;AAGD,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAY7D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA"}
+{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD,eAAO,MAAM,GAAG,QAAQ,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAA;AAED,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAI1C,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAA;AAGD,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,iBAAc,KAAG,MAY/D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA"}

package/dist/utils/parsing.js

@@ -65,11 +65,11 @@ export const convertRateToApr = (ratePerSecond) => {
         return 0;
     return rps * 3600 * 24 * 365 * 100;
 };
-export const formatAavePrice = (price, isV2 = false) => {
+export const formatAavePrice = (price, exponent = 10n) => {
     try {
         return Number(formatEther(BigInt(price ?? '0') *
             // 10^(18 - decimals)
-            10n ** (isV2 ? 0n : 10n)));
+            10n ** (exponent)));
     }
     catch {
         return NaN;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAqGA,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+c9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAwGA,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,uCAmf9B,CAAA"}

package/dist/yields/index.js

@@ -31,6 +31,7 @@ const usdThree = 'Web 3 Dollar::USD3';
 const jitoSol = 'Jito Staked SOL::JitoSOL';
 const thBill = 'Theo Short Duration US Treasury Fund::THBILL';
 const ssuperusd = 'SuperReturn sSuperUSD::SSUPERUSD';
+const hbhype = 'hyperbeat x ether.fi HYPE::beHYPE';
 const FeedData = {
     WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
     STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -65,6 +66,7 @@ const FeedData = {
     THBILL: 'https://thbill-api.theo.xyz/snapshots',
     YEARN_KATANA: 'https://katana-apr-service.vercel.app/api/vaults',
     SSUPERUSD: 'https://www.superreturn.ai/api/trpc/cmc.getUSDCPrice,rewardBackend.getYield,rewardBackend.getTvlChange?batch=1&input=%7B%220%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%221%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%222%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%7D',
+    HBHYPE: 'https://api.hyperbeat.org/api/v1/staking?address=0xCeaD893b162D38e714D82d06a7fe0b0dc3c38E0b',
 };
 const LenderAPIs = {
     MERIDIAN: 'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields',
@@ -147,6 +149,29 @@ export const fetchGeneralYields = async () => {
             return 0;
         }
     });
+    const hbhypePromise = safeFetch('HBHYPE', async () => {
+        try {
+            const response = await fetch(FeedData.HBHYPE);
+            if (!response.ok) {
+                throw new Error(`HTTP error! Status: ${response.status}`);
+            }
+            const result = await response.json();
+            // Ensure data exists and delegations is an array
+            if (!result.success ||
+                !result.data ||
+                !Array.isArray(result.data.delegations)) {
+                throw new Error('Invalid response structure');
+            }
+            const delegations = result.data.delegations;
+            // Compute average APR
+            const totalApr = delegations.reduce((sum, validator) => sum + Number(validator.apr ?? 0), 0);
+            const averageApr = totalApr / delegations.length;
+            return averageApr;
+        }
+        catch (e) {
+            return 0;
+        }
+    });
     const ssuperusdPromise = safeFetch('SSUPERUSD', async () => {
         try {
             const res = await fetch(FeedData.SSUPERUSD, {
@@ -394,7 +419,7 @@ export const fetchGeneralYields = async () => {
             },
         })));
     });
-    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, jitoSolData, thBillData, yearnKatanaData, ssuperusdData,] = 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, jitoSolData, thBillData, yearnKatanaData, ssuperusdData, hbhypeData,] = await Promise.all([
         wstethPromise,
         ezethPromise,
         rethPromise,
@@ -429,6 +454,7 @@ export const fetchGeneralYields = async () => {
         thbillPromise,
         yearnKatanaPromise,
         ssuperusdPromise,
+        hbhypePromise,
     ]);
     const data = {
         intrinsicYields: {
@@ -464,6 +490,7 @@ export const fetchGeneralYields = async () => {
             [jitoSol]: jitoSolData,
             [thBill]: thBillData,
             [ssuperusd]: ssuperusdData,
+            [hbhype]: hbhypeData,
             ...rtokensData,
             ...hypeData,
             ...angleData,

package/package.json

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