@1delta/margin-fetcher 0.0.7 → 0.0.9

package/src/prices/main-prices/fetchOracleData.ts

@@ -15,7 +15,7 @@ import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles'
 import { AAVES_PER_CHAIN } from '../../utils'
 import { GetEvmClientFunction } from '../../types'
 
-export const formatAavePrice = (price: string, chainId: string, isV2 = false): number => {
+export const formatAavePrice = (price: string, isV2 = false): number => {
   return Number(formatEther(BigInt(price ?? '0') * (
     // 10^(18 - decimals)
     10n ** (isV2 ? 0n : 10n)
@@ -242,6 +242,18 @@ const parseUniswapV2results = (data: any[], chainId: string) => {
   }
 }
 
+function lowDecimalOracle(chainId: string, fork: string) {
+  // some chains only have high decimal oracles
+  if (
+    chainId === Chain.AVALANCHE_C_CHAIN ||
+    chainId === Chain.MODE) {
+    return false
+  }
+  // otherwise, it depends on whether it is aave V3
+  return AAVE_V2_LENDERS.includes(fork as any)
+
+}
+
 /**
  * Parser for aave results in ulticall slice
  * @param chainId network
@@ -257,7 +269,7 @@ const parseAaveResults = (chainId: string, data: any[], queries: QueryAave[]) =>
     const details = queries[i]
     details.assets.forEach((a, j) => {
       const oracleId = ASSET_META[chainId][a]?.assetGroup ?? ASSET_META[chainId]?.[a]?.symbol ?? chainId + "-" + a
-      prices[oracleId] = formatAavePrice(d[j].toString(), chainId, AAVE_V2_LENDERS.includes(details.fork as any))
+      prices[oracleId] = formatAavePrice(d[j].toString(), lowDecimalOracle(chainId, details.fork as any))
     })
   })
 

package/src/utils/parsing.ts

@@ -1,75 +1,75 @@
-import { Chain, Lender } from "@1delta/asset-registry"
-import { formatEther, formatUnits } from "viem"
-import { isCompoundV3 } from "."
+import { Chain, Lender } from "@1delta/asset-registry";
+import { formatEther, formatUnits } from "viem";
+import { isCompoundV3 } from ".";
 
-export const BPS = 10000
+export const BPS = 10000;
 
 export const parseRawAmount = (answer?: string, decimals = 18): string => {
-    if (!answer || answer === "0x") return "0"
-    try {
-        return (formatUnits(BigInt(answer ?? '0'), decimals ?? 18))
-    } catch (e) {
-        return "0"
-    }
-}
+  if (!answer || answer === "0x") return "0";
+  try {
+    return formatUnits(BigInt(answer ?? "0"), decimals ?? 18);
+  } catch (e) {
+    return "0";
+  }
+};
 
 export enum TimeScale {
-    BLOCK,
-    MS,
+  BLOCK,
+  MS,
 }
 
 const BLOCK_TIMES: { [chainId: string]: number } = {
-    5: 12,
-    1: 12,
-    56: 3,
-}
+  5: 12,
+  1: 12,
+  56: 3,
+};
 
 // Converters from apy to apr and reversed
 
-const SECONDS_PER_YEAR = 31536000
+const SECONDS_PER_YEAR = 31536000;
 
 export const aprToApy = (apr: number) => {
-    return (1 + apr / SECONDS_PER_YEAR) ** SECONDS_PER_YEAR - 1
-}
+  return (1 + apr / SECONDS_PER_YEAR) ** SECONDS_PER_YEAR - 1;
+};
 
 export const apyToApr = (apy: number) => {
-    return ((apy + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR
-}
-
+  return ((apy + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
+};
 
 export const formatAaveYieldToNumber = (n?: string | bigint): number => {
-    if (!n) return 0
-    return Number(formatEther(BigInt(n) / BigInt(1e7)))
-}
-
+  if (!n) return 0;
+  return Number(formatEther(BigInt(n) / BigInt(1e7)));
+};
 
 export const calculateRateForCompound = (
-    n: string,
-    chainId: string,
-    lender = Lender.COMPOUND_V3_USDCE,
+  n: string,
+  chainId: string,
+  lender = Lender.COMPOUND_V3_USDCE
 ): number => {
-    let scale = TimeScale.MS
-    if (isCompoundV3(lender) || Lender.COMPOUND_V2) {
-        scale = TimeScale.BLOCK
-    } else if (chainId === Chain.BNB_SMART_CHAIN_MAINNET) {
-        scale = TimeScale.BLOCK
-    }
-    const rate = Number(formatEther(BigInt(n)))
-    if (scale === TimeScale.BLOCK)
-        return (Math.pow((rate * 60 * 60 * 24) / (BLOCK_TIMES[chainId] ?? 1) + 1, 365) - 1) * 100
-
-    return (Math.pow(rate * 60 * 60 * 24 + 1, 365) - 1) * 100
-}
+  let scale = TimeScale.MS;
+  if (isCompoundV3(lender) || Lender.COMPOUND_V2) {
+    scale = TimeScale.BLOCK;
+  } else if (chainId === Chain.BNB_SMART_CHAIN_MAINNET) {
+    scale = TimeScale.BLOCK;
+  }
+  const rate = Number(formatEther(BigInt(n)));
+  if (scale === TimeScale.BLOCK)
+    return (
+      (Math.pow((rate * 60 * 60 * 24) / (BLOCK_TIMES[chainId] ?? 1) + 1, 365) -
+        1) *
+      100
+    );
+
+  return (Math.pow(rate * 60 * 60 * 24 + 1, 365) - 1) * 100;
+};
 export const formatAaveRawApyToApr = (raw: bigint | string | undefined) => {
-    const apy = formatAaveYieldToNumber(raw)
-    return apyToApr(apy / 100) * 100
-}
-
-
+  const apy = formatAaveYieldToNumber(raw);
+  return apyToApr(apy / 100) * 100;
+};
 
 // converts rate per second to rate per year
 export const convertRateToApr = (ratePerSecond: number | string) => {
-    const rps = Number(ratePerSecond)
-    if(isNaN(rps)) return 0
-    return rps * 3600 * 24 * 365 * 100
-}
+  const rps = Number(ratePerSecond);
+  if (isNaN(rps)) return 0;
+  return rps * 3600 * 24 * 365 * 100;
+};

package/test/userdata.test.ts

@@ -104,19 +104,19 @@ describe(
 
 
     it(
-      "should fetch user data for YLDR on Polygon",
+      "should fetch user data for AAVE V3 on Polygon",
       async () => {
         try {
-          const { userData } = await getUserData(Chain.POLYGON_MAINNET, [Lender.YLDR]);
+          const { userData } = await getUserData(Chain.ARBITRUM_ONE, [Lender.AAVE_V3]);
 
-          console.log("YLDR Polygon user data:", userData[Lender.YLDR]);
-          console.log("YLDR Polygon user aprData:", userData[Lender.YLDR]);
+          console.log("AAVE_V3 Polygon user data:", userData[Lender.AAVE_V3][TEST_ADDRESS.toLowerCase()].lendingPositions);
+          console.log("AAVE_V3 Polygon user aprData:", userData[Lender.AAVE_V3]);
 
           // Basic validation
           expect(userData).toBeDefined();
           expect(typeof userData).toBe("object");
         } catch (error) {
-          console.log("Error fetching YLDR Polygon data:", error);
+          console.log("Error fetching AAVE_V3 Polygon data:", error);
         }
       },
       { timeout: 30000 }