@1delta/margin-fetcher 0.0.31 → 0.0.33

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

@@ -5,7 +5,8 @@ import { Api3OracleAbi } from '../../abis/oracle/Api3Oracle'
 import { RWADynamicOracleAbi } from '../../abis/oracle/RWADynamicOracle'
 
 import { api3OracleAddresses } from './addresses/api3'
-import { AAVE_V2_LENDERS, ASSET_META, Chain } from '@1delta/asset-registry'
+import { AAVE_V2_LENDERS } from '@1delta/lender-registry'
+import { Chain } from '@1delta/chain-registry'
 import { formatEther, formatUnits } from 'viem'
 import { getAaveAssets } from '../../assets'
 import {
@@ -15,12 +16,13 @@ import {
 } from './addresses/chainlink'
 import { fetchDefillamaData } from '../defillama'
 import { fetchPendlePrices } from '../pendle'
-import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles'
-import { AAVES_PER_CHAIN } from '../../utils'
+import { getAavesForChain } from '../../utils'
 import { parseRawAmount } from '../../utils/parsing'
 import { ProxyOracleAbi } from '../../abis/oracle/ProxyOracle'
-import { MrophoOracleInfo, MrophoOracles } from './addresses/morpho'
 import { multicallRetry } from '@1delta/providers'
+import { TokenList } from '../../types'
+import { UniswapV3Abi } from '../../abis/oracle/UniV3'
+import { aaveOracles, morphoOracles } from '@1delta/data-sdk'
 
 export const formatAavePrice = (price: string, isV2 = false): number => {
   try {
@@ -71,9 +73,11 @@ type QueryAave = { oracle: string; assets: string[]; fork: string }
 export const fetchMainPrices = async (
   chainIds: string[],
   rpcOverrides?: { [chainId: string]: string },
+  lists: { [chainId: string]: { list: TokenList } } = {},
 ): Promise<OracleData> => {
+  const aaves = getAavesForChain()
   const multicallPromises = chainIds.map(async (chainId) => {
-    const aaveForks = AAVES_PER_CHAIN[chainId]
+    const aaveForks = aaves?.[chainId]
     const reservesToQuery =
       aaveForks?.map((a) => ({
         fork: a,
@@ -89,14 +93,15 @@ export const fetchMainPrices = async (
         queries.push({
           assets: newAssets,
           // @ts-ignore
-          oracle: AAVE_STYLE_ORACLES[e.fork][chainId],
+          oracle: aaveOracles()?.[e.fork]?.[chainId],
           fork: e.fork,
         })
         newAssets.forEach((a) => handled.add(a))
       }
     }
 
-    const morphoQueries = (MrophoOracles[chainId] ?? []).filter(
+    const morphoOraclesObtained = morphoOracles()
+    const morphoQueries = (morphoOraclesObtained[chainId] ?? []).filter(
       (a) => !handled.has(a.collateralAsset) || !handled.has(a.loanAsset),
     )
 
@@ -104,6 +109,7 @@ export const fetchMainPrices = async (
     const aaveCalls = getAaveCalls(queries)
     const [chainlinkCalls, chainlinkNames] = getChainLinkCalls(chainId)
     const uniswapCalls = getUniswapV2Calls(chainId)
+    const uniswapV3Calls = getUniswapV3Calls(chainId)
     const [api3Calls, api3Names] = getApi3Calls(chainId)
     const [rwaCalls, rwaNames] = getRWADynamicOracleCalls(chainId)
 
@@ -111,6 +117,7 @@ export const fetchMainPrices = async (
       ...chainlinkCalls,
       ...aaveCalls,
       ...uniswapCalls,
+      ...uniswapV3Calls,
       ...api3Calls,
       ...rwaCalls,
       ...morphoCalls,
@@ -119,6 +126,7 @@ export const fetchMainPrices = async (
     const abis = [
       ...ChainLinkAggregatorAbi,
       ...UniswapV2PairAbi,
+      ...UniswapV3Abi,
       ...AaveOracleAbi,
       ...Api3OracleAbi,
       ...RWADynamicOracleAbi,
@@ -146,6 +154,7 @@ export const fetchMainPrices = async (
         rwa: { calls: rwaCalls, names: rwaNames },
         morpho: { queries: morphoQueries },
         uniswapCalls,
+        uniswapV3Calls,
         aaveCalls,
       },
     }
@@ -163,7 +172,15 @@ export const fetchMainPrices = async (
   for (const {
     chainId,
     result,
-    meta: { queries, chainlink, api3, rwa, uniswapCalls, aaveCalls },
+    meta: {
+      queries,
+      chainlink,
+      api3,
+      rwa,
+      uniswapCalls,
+      uniswapV3Calls,
+      aaveCalls,
+    },
   } of chainResults) {
     let offset = 0
 
@@ -176,13 +193,22 @@ export const fetchMainPrices = async (
     offset += chainlink.calls.length
 
     const aaveSlice = result.slice(offset, offset + aaveCalls.length)
-    const aaveData = parseAaveResults(chainId, aaveSlice, queries)
+    const aaveData = parseAaveResults(
+      chainId,
+      aaveSlice,
+      queries,
+      lists[chainId]?.list,
+    )
     offset += aaveCalls.length
 
     const uniswapSlice = result.slice(offset, offset + uniswapCalls.length)
     const uniswapData = parseUniswapV2results(uniswapSlice, chainId)
     offset += uniswapCalls.length
 
+    const uniswapV3Slice = result.slice(offset, offset + uniswapV3Calls.length)
+    const uniswapV3Data = parseUniswapV3results(uniswapV3Slice, chainId)
+    offset += uniswapV3Calls.length
+
     const api3Slice = result.slice(offset, offset + api3.calls.length)
     const api3Data = parseApi3Results(chainId, api3Slice, api3.names)
     offset += api3.calls.length
@@ -196,6 +222,7 @@ export const fetchMainPrices = async (
       ...chainlinkData,
       ...aaveData,
       ...uniswapData,
+      ...uniswapV3Data,
       ...api3Data,
       ...rwaData,
     }
@@ -205,20 +232,31 @@ export const fetchMainPrices = async (
   for (const {
     chainId,
     result,
-    meta: { morpho, chainlink, aaveCalls, uniswapCalls, api3, rwa },
+    meta: {
+      morpho,
+      chainlink,
+      aaveCalls,
+      uniswapCalls,
+      uniswapV3Calls,
+      api3,
+      rwa,
+    },
   } of chainResults) {
     const morphoOffset =
       chainlink.calls.length +
       aaveCalls.length +
       uniswapCalls.length +
+      uniswapV3Calls.length +
       api3.calls.length +
       rwa.calls.length
     const morphoResult = result.slice(morphoOffset)
+
     const morphoData = parseMorphoResults(
       chainId,
       morphoResult,
       morpho.queries,
       allPrices,
+      lists[chainId]?.list,
     )
 
     allPrices = {
@@ -265,6 +303,68 @@ const getUniswapV2Calls = (chainId: string) => {
   }
 }
 
+/**
+ * Gets the calls foir the uniswap pools
+ * @param chainId network id
+ * @returns array of calls
+ */
+const getUniswapV3Calls = (chainId: string) => {
+  switch (chainId) {
+    case Chain.HEMI_NETWORK:
+      return [
+        {
+          // HMEU/USDC pool
+          address: '0xe2f1012fa5e8709ed38888c15615207fac278b57',
+          name: 'slot0',
+          params: [],
+        },
+      ]
+    default:
+      return []
+  }
+}
+
+const BASE_MULTI = 10n ** 18n
+
+export function getV3PriceFromSqrt(
+  sqrtPrice: bigint,
+  t0d: number,
+  t1d: number,
+) {
+  const scalarNumerator = 10n ** BigInt(t0d)
+  const scalarDenominator = 10n ** BigInt(t1d)
+  const sqrtP = BigInt(sqrtPrice)
+  const inputNumerator = sqrtP * sqrtP
+  const inputDenominator = 2n ** 192n
+  const adjustedForDecimalsNumerator = scalarDenominator * inputDenominator
+  const adjustedForDecimalsDenominator = scalarNumerator * inputNumerator
+  const price0to1 = Number(
+    formatUnits(
+      (adjustedForDecimalsDenominator * BASE_MULTI) /
+        adjustedForDecimalsNumerator,
+      18, // normalize amount to 18
+    ),
+  ) // in token1 / token0
+  return price0to1
+}
+
+const parseUniswapV3results = (data: any[], chainId: string) => {
+  switch (chainId) {
+    case Chain.HEMI_NETWORK: {
+      let uniswapData: any = {}
+      if (data.length > 0) {
+        const state = data[0]
+        const [sqrtPriceX96, , , , , ,] = state
+        const price = getV3PriceFromSqrt(sqrtPriceX96, 18, 6)
+        uniswapData['Hemi::HEMI'] = price
+      }
+      return uniswapData
+    }
+    default:
+      return {}
+  }
+}
+
 /**
  * Create calldata for aave oracles
  * @param chainId network
@@ -288,7 +388,7 @@ const getAaveCalls = (query: QueryAave[]) => {
  * @param addressesAaveUnderlyings address array
  * @returns call data
  */
-const getMorphoCalls = (query: MrophoOracleInfo[] = []) => {
+const getMorphoCalls = (query: any[] = []) => {
   if (query.length === 0) return []
   return query.map(({ oracle }) => ({
     address: oracle,
@@ -384,6 +484,7 @@ function lowDecimalOracle(chainId: string, fork: string) {
   if (chainId === Chain.AVALANCHE_C_CHAIN || chainId === Chain.MODE) {
     return false
   }
+  if (chainId === Chain.XDC_NETWORK) return true
   // otherwise, it depends on whether it is aave V3
   return AAVE_V2_LENDERS.includes(fork as any)
 }
@@ -399,6 +500,7 @@ const parseAaveResults = (
   chainId: string,
   data: any[],
   queries: QueryAave[],
+  list: TokenList = {},
 ) => {
   let prices: any = {}
 
@@ -406,10 +508,7 @@ const parseAaveResults = (
     if (d !== '0x') {
       const details = queries[i]
       details.assets.forEach((a, j) => {
-        const oracleId =
-          ASSET_META[chainId][a]?.assetGroup ??
-          ASSET_META[chainId]?.[a]?.symbol ??
-          chainId + '-' + a
+        const oracleId = list[a]?.assetGroup ?? chainId + '-' + a
         prices[oracleId] = formatAavePrice(
           d[j].toString(),
           lowDecimalOracle(chainId, details.fork as any),
@@ -424,8 +523,9 @@ const parseAaveResults = (
 const parseMorphoResults = (
   chainId: string,
   data: any[],
-  queries: MrophoOracleInfo[],
+  queries: any[],
   donePrices: any = {},
+  list: TokenList = {},
 ) => {
   let prices: any = {}
   data.forEach((d, i) => {
@@ -437,13 +537,11 @@ const parseMorphoResults = (
       collateralAssetDecimals,
     } = details
 
-    const oracleId =
-      ASSET_META[chainId][loanAsset]?.assetGroup ?? chainId + '-' + loanAsset
+    const oracleId = list[loanAsset]?.assetGroup ?? chainId + '-' + loanAsset
     // get price from map or just computed ones
     const debtPrice = donePrices[oracleId] ?? prices[oracleId]
     const oracleIdCollateral =
-      ASSET_META[chainId][collateralAsset]?.assetGroup ??
-      chainId + '-' + collateralAsset
+      list[collateralAsset]?.assetGroup ?? chainId + '-' + collateralAsset
     // get price from map or just computed ones
     const collateralPrice =
       donePrices[oracleIdCollateral] ?? prices[oracleIdCollateral]

package/src/types/index.ts

@@ -1,4 +1,4 @@
-export * from "./apiReturnType"
+export * from './apiReturnType'
 
 export interface ParsedResponse {
   price: number
@@ -13,7 +13,7 @@ export enum ChainlinkAggregatorIndexes {
   answer,
   startedAt,
   updatedAt,
-  answeredInRound
+  answeredInRound,
 }
 
 interface LenderRewardsEntry {
@@ -23,7 +23,9 @@ interface LenderRewardsEntry {
 
 export type LenderRewardsMap = { [key: string]: LenderRewardsEntry }
 export type NumberMap = { [key: string]: number }
-export type FullLenderRewardsMap = { [chainId: string]: { [lender: string]: LenderRewardsMap } }
+export type FullLenderRewardsMap = {
+  [chainId: string]: { [lender: string]: LenderRewardsMap }
+}
 export type AdditionalYields = {
   intrinsicYields: NumberMap
   lenderRewards: FullLenderRewardsMap
@@ -35,4 +37,8 @@ export declare interface GeneralCall {
   params?: any[] // Function params
 }
 
-export * from "./providers"
+export type TokenList = {
+  [address: string]: { decimals: number; assetGroup?: string }
+}
+
+export * from './providers'

package/src/utils/constants.ts

@@ -1,4 +1,4 @@
-import { Chain } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
 
 // Uniswap interface Multicalls
 const CELO_MULTICALL_ADDRESS = '0x633987602DE5C4F337e3DbF265303A1080324204'

package/src/utils/index.ts

@@ -1,34 +1,40 @@
 import {
-  AAVE_FORK_POOL_DATA,
-  AAVE_STYLE_RESERVE_ASSETS,
   AAVE_V2_LENDERS,
   AAVE_V3_LENDERS,
-  COMPOUND_BASE_TOKENS,
-  COMPOUND_STYLE_RESERVE_ASSETS,
-  INIT_STYLE_RESERVE_ASSETS,
   Lender,
-  SWAYLEND_RESERVE_ASSETS,
-  INIT_CONFIG_DATA,
-  MORPHO_BLUE_POOL_DATA,
   AAVE_V32_LENDERS,
-} from "@1delta/asset-registry"
-import { uniq } from "lodash"
-import { COMPOSERS } from "./constants"
-import { zeroAddress } from "viem"
-
-const COMPOUND_V3_KEY = "COMPOUND_V3"
-
-export function isCompoundV3(lender: string) { return lender?.startsWith(COMPOUND_V3_KEY) }
+} from '@1delta/lender-registry'
+import { uniq } from 'lodash'
+import { COMPOSERS } from './constants'
+import { zeroAddress } from 'viem'
+import {
+  aavePools,
+  aaveReserves,
+  compoundV3Pools,
+  compoundV3Reserves,
+  initConfig,
+  morphoPools,
+} from '@1delta/data-sdk'
+
+const COMPOUND_V3_KEY = 'COMPOUND_V3'
+
+export function isCompoundV3(lender: string) {
+  return lender?.startsWith(COMPOUND_V3_KEY)
+}
 
-export function isCompoundV3Type(lender: string) { return lender?.startsWith(COMPOUND_V3_KEY) }
+export function isCompoundV3Type(lender: string) {
+  return lender?.startsWith(COMPOUND_V3_KEY)
+}
 
-export function isInit(lender: string) { return lender === Lender.INIT }
+export function isInit(lender: string) {
+  return lender === Lender.INIT
+}
 
 export function isMorphoType(lender: string) {
-  return lender?.startsWith("MORPHO_BLUE")
+  return lender?.startsWith('MORPHO_BLUE')
 }
 
-const SWAYLEND_KEY = "SWAYLEND"
+const SWAYLEND_KEY = 'SWAYLEND'
 
 export function isAaveV3Type(lender: string) {
   return AAVE_V3_LENDERS.includes(lender as any)
@@ -57,35 +63,37 @@ export function isSwaylend(lender: string) {
 export const getLendersForChain = (c: string) => {
   let lenders: string[] = []
   // aaves
-  Object.entries(AAVE_FORK_POOL_DATA).forEach(([l, data]) => {
+  Object.entries(aavePools() ?? {}).forEach(([l, data]) => {
     const chains = Object.keys(data)
     if (chains.includes(c)) lenders.push(l)
   })
 
   // compound V3s
-  Object.entries(COMPOUND_BASE_TOKENS).forEach(([l, data]) => {
+  Object.entries(compoundV3Pools() ?? {}).forEach(([l, data]) => {
     const chains = Object.keys(data)
     if (chains.includes(c)) lenders.push(l)
   })
 
   // init
-  Object.entries(INIT_CONFIG_DATA).forEach(([l, data]) => {
+  Object.entries(initConfig() ?? {}).forEach(([l, data]) => {
     const chains = Object.keys(data)
     if (chains.includes(c)) lenders.push(l)
   })
 
   // morpho
-  Object.entries(MORPHO_BLUE_POOL_DATA).forEach(([l, data]) => {
+  Object.entries(morphoPools() ?? {}).forEach(([l, data]) => {
     const chains = Object.keys(data)
     if (chains.includes(c)) lenders.push(l)
   })
 
-
   return lenders
 }
 
 /** Filter lenders by protocol list */
-export const filterLendersByProtocol = (allLenders: string[], protocolList?: string[]): string[] => {
+export const filterLendersByProtocol = (
+  allLenders: string[],
+  protocolList?: string[],
+): string[] => {
   // return all lenders if no filter is provided
   if (!protocolList || protocolList.length === 0) {
     return allLenders
@@ -93,12 +101,17 @@ export const filterLendersByProtocol = (allLenders: string[], protocolList?: str
 
   const hasMorpho = protocolList.includes(Lender.MORPHO_BLUE)
   // Filter lenders based on protocol list
-  return allLenders.filter((lender) => protocolList.includes(lender) || (hasMorpho && lender?.startsWith("MORPHO_BLUE")))
+  return allLenders.filter(
+    (lender) =>
+      protocolList.includes(lender) ||
+      (hasMorpho && lender?.startsWith('MORPHO_BLUE')),
+  )
 }
 
-const getAavesForChain = () => {
+/** All aave protocols per chain */
+export const getAavesForChain = () => {
   let lenders: { [c: string]: string[] } = {}
-  Object.entries(AAVE_FORK_POOL_DATA).forEach(([l, data]) => {
+  Object.entries(aavePools() ?? {}).forEach(([l, data]) => {
     Object.entries(data).forEach(([chain, data]) => {
       if (!lenders[chain]) lenders[chain] = []
       lenders[chain] = uniq([...lenders[chain], l])
@@ -107,26 +120,22 @@ const getAavesForChain = () => {
   return lenders
 }
 
-/** All aave protocols per chain */
-export const AAVES_PER_CHAIN = getAavesForChain()
-
 export const getComposerAddress = (chainId: string): string => {
   return COMPOSERS[chainId as keyof typeof COMPOSERS] ?? zeroAddress
 }
 
 export const getLenderAssets = (
   chainId: string | number | undefined,
-  lendingProtocol = Lender.AAVE_V3
+  lendingProtocol = Lender.AAVE_V3,
 ): string[] => {
   if (!chainId) return []
-  if (isAaveType(lendingProtocol)) return AAVE_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? []
-  if (isCompoundV3(lendingProtocol)) return COMPOUND_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? []
-  if (isInit(lendingProtocol)) return INIT_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? []
-  if (isSwaylend(lendingProtocol)) return SWAYLEND_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? 0] ?? []
+  if (isAaveType(lendingProtocol))
+    return aaveReserves()?.[lendingProtocol]?.[chainId] ?? []
+  if (isCompoundV3(lendingProtocol))
+    return compoundV3Reserves()?.[lendingProtocol]?.[chainId] ?? []
   return []
 }
 
-
 export function isMultiMarket(lender: string) {
-  return lender?.startsWith("MORPHO_BLUE")
+  return lender?.startsWith('MORPHO_BLUE')
 }

package/src/utils/parsing.ts

@@ -1,17 +1,18 @@
-import { Chain, Lender } from "@1delta/asset-registry";
-import { formatEther, formatUnits } from "viem";
-import { isCompoundV3 } from ".";
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-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";
+  if (!answer || answer === '0x') return '0'
   try {
-    return formatUnits(BigInt(answer ?? "0"), decimals ?? 18);
+    return formatUnits(BigInt(answer ?? '0'), decimals ?? 18)
   } catch (e) {
-    return "0";
+    return '0'
   }
-};
+}
 
 export enum TimeScale {
   BLOCK,
@@ -22,59 +23,60 @@ const BLOCK_TIMES: { [chainId: string]: number } = {
   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 apyToAprPercent = (apy: number) => {
-  return 100 * ((apy / 100 + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
-};
-
+  return (
+    100 * ((apy / 100 + 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
+  lender = Lender.COMPOUND_V3_USDCE,
 ): number => {
-  let scale = TimeScale.MS;
+  let scale = TimeScale.MS
   if (isCompoundV3(lender) || Lender.COMPOUND_V2) {
-    scale = TimeScale.BLOCK;
+    scale = TimeScale.BLOCK
   } else if (chainId === Chain.BNB_SMART_CHAIN_MAINNET) {
-    scale = TimeScale.BLOCK;
+    scale = TimeScale.BLOCK
   }
-  const rate = Number(formatEther(BigInt(n)));
+  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;
-};
+  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/src/yields/index.ts

@@ -153,8 +153,9 @@ export const fetchGeneralYields = async () => {
   })
 
   const stmaticPromise = safeFetch('STMATIC', async () => {
-    const res = await fetch(FeedData.STMATIC).then((r) => r.json())
-    return Number(res.apr) * 0.9
+    // const res = await fetch(FeedData.STMATIC).then((r) => r.json())
+    // return Number(res.apr) * 0.9
+    return 0
   })
 
   const savaxPromise = safeFetch('SAVAX', async () => {
@@ -230,7 +231,10 @@ export const fetchGeneralYields = async () => {
       const key = addressToAssetYearn[addr.toLowerCase()]
       if (key) {
         const apr =
-          ((data.apr.netAPR ?? 0) + (data.apr.extra.extrinsicYield ?? 0)) * 100
+          ((data.apr.netAPR ?? 0) +
+            (data.apr.extra.extrinsicYield ?? 0) +
+            (data.apr.extra.katanaNativeYield ?? 0)) *
+          100
         map[key] = apr
       }
     })

package/test/flashLiquidity.test.ts

@@ -1,26 +1,26 @@
 import { describe, it } from 'vitest'
 import { attachPricesToFlashLiquidity, fetchFlashLiquidityForChain, fetchMainPrices } from "../src"
 import { getEvmClient, multicallRetry } from "@1delta/providers"
-import { Chain } from "@1delta/asset-registry"
+import { Chain } from "@1delta/chain-registry"
 
 
 
 describe('find flash liquidity', () => {
   it('flash liquidity for chain', async () => {
 
-    const chain = Chain.HYPEREVM
+    const chain = Chain.XDC_NETWORK
 
     const liquidity = await fetchFlashLiquidityForChain(chain, multicallRetry)
 
     console.log("liquidity", liquidity)
 
-    const prices = await fetchMainPrices([chain], getEvmClient)
+    // const prices = await fetchMainPrices([chain])
 
-    console.log("prices", prices)
+    // console.log("prices", prices)
 
-    const dataWithPrices = attachPricesToFlashLiquidity(chain, liquidity, prices)
+    // const dataWithPrices = attachPricesToFlashLiquidity(chain, liquidity, prices)
 
-    console.log(dataWithPrices)
+    // console.log(dataWithPrices)
 
   })
 }, { timeout: 10000 })

package/test/index.test.ts

@@ -8,7 +8,7 @@ import {
   getLenderPublicData,
 } from '../src'
 import { getEvmClient, multicallRetry } from '@1delta/providers'
-import { Chain } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
 import { getLendersForChain } from '../src/utils'
 
 describe(