@1delta/margin-fetcher 0.0.31 → 0.0.33

package/dist/utils/parsing.js

@@ -1,15 +1,16 @@
-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 parseRawAmount = (answer, decimals = 18) => {
-    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 var TimeScale;
@@ -31,7 +32,7 @@ export const apyToApr = (apy) => {
     return ((apy + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
 };
 export const apyToAprPercent = (apy) => {
-    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) => {
     if (!n)

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

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

package/dist/yields/index.js

@@ -120,8 +120,9 @@ export const fetchGeneralYields = async () => {
         return aYield + (wstethRes ?? 0);
     });
     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 () => {
         const res = await fetch(FeedData.SAVAX).then((r) => r.json());
@@ -183,7 +184,10 @@ export const fetchGeneralYields = async () => {
         Object.entries(res).forEach(([addr, data]) => {
             const key = addressToAssetYearn[addr.toLowerCase()];
             if (key) {
-                const apr = ((data.apr.netAPR ?? 0) + (data.apr.extra.extrinsicYield ?? 0)) * 100;
+                const apr = ((data.apr.netAPR ?? 0) +
+                    (data.apr.extra.extrinsicYield ?? 0) +
+                    (data.apr.extra.katanaNativeYield ?? 0)) *
+                    100;
                 map[key] = apr;
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
     "@types/async-retry": "^1.4.9",
     "async-retry": "^1.3.3",
     "typescript": "^5.9.2",
-    "@1delta/providers": "0.0.10"
+    "@1delta/providers": "0.0.12"
   },
   "scripts": {
     "build": "tsc",

package/src/abis/oracle/UniV3.ts

@@ -0,0 +1,63 @@
+export const UniswapV3Abi = [
+  {
+    inputs: [],
+    name: 'protocolFees',
+    outputs: [
+      {
+        internalType: 'uint128',
+        name: 'token0',
+        type: 'uint128',
+      },
+      {
+        internalType: 'uint128',
+        name: 'token1',
+        type: 'uint128',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'slot0',
+    outputs: [
+      {
+        internalType: 'uint160',
+        name: 'sqrtPriceX96',
+        type: 'uint160',
+      },
+      {
+        internalType: 'int24',
+        name: 'tick',
+        type: 'int24',
+      },
+      {
+        internalType: 'uint16',
+        name: 'observationIndex',
+        type: 'uint16',
+      },
+      {
+        internalType: 'uint16',
+        name: 'observationCardinality',
+        type: 'uint16',
+      },
+      {
+        internalType: 'uint16',
+        name: 'observationCardinalityNext',
+        type: 'uint16',
+      },
+      {
+        internalType: 'uint8',
+        name: 'feeProtocol',
+        type: 'uint8',
+      },
+      {
+        internalType: 'bool',
+        name: 'unlocked',
+        type: 'bool',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const

package/src/assets/index.ts

@@ -1,90 +1,50 @@
+import { isAaveType, isCompoundV3 } from '../utils'
 import {
-  AAVE_FORK_POOL_DATA,
-  AAVE_STYLE_RESERVE_ASSETS,
-  AAVE_STYLE_TOKENS,
-  ASSET_META,
-  COMPOUND_STYLE_RESERVE_ASSETS,
-  COMPOUND_V2_STYLE_RESERVE_ASSETS,
-  INIT_STYLE_RESERVE_ASSETS,
-  Lender,
-  SWAYLEND_RESERVE_ASSETS,
-} from "@1delta/asset-registry";
-import { isAaveType, isCompoundV3, isInit, isSwaylend } from "../utils";
+  aaveTokens,
+  aavePools,
+  aaveReserves,
+  compoundV3Reserves,
+} from '@1delta/data-sdk'
 
 /** No specific configuration */
-export const LENDER_MODE_NO_MODE = 0;
+export const LENDER_MODE_NO_MODE = 0
 
 export function getAaveStyleProtocolTokenMap(chainId: string, lender: string) {
-  return AAVE_STYLE_TOKENS[lender]?.[chainId] as any;
+  return aaveTokens()?.[lender]?.[chainId] as any
 }
 
 export const getAaveAssets = (
   chainId: string | undefined,
-  lendingProtocol: string = Lender.AAVE_V3
+  lendingProtocol: string | undefined,
 ): string[] => {
-  if (isAaveType(lendingProtocol))
-    return AAVE_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? "0"] ?? [];
-  return [];
-};
-
-export const getInitAssets = (
-  chainId: string | undefined,
-  lendingProtocol = Lender.INIT
-): string[] => {
-  if (isInit(lendingProtocol))
-    return INIT_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? "0"] ?? [];
-  return [];
-};
+  if (isAaveType(lendingProtocol ?? ''))
+    return aaveReserves()?.[lendingProtocol ?? '']?.[chainId ?? ''] ?? []
+  return []
+}
 
 export const getCompoundV3Assets = (
   chainId: string | undefined,
-  lendingProtocol = Lender.COMPOUND_V3_USDCE
+  lendingProtocol: string | undefined,
 ): string[] => {
-  if (isCompoundV3(lendingProtocol))
-    return (
-      COMPOUND_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? "0"] ?? []
-    );
-  return [];
-};
-
-export const getCompoundV2Assets = (
-  chainId: string | undefined,
-  lendingProtocol = Lender.VENUS
-): string[] => {
-  if (isCompoundV3(lendingProtocol))
-    return (
-      COMPOUND_V2_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? "0"] ?? []
-    );
-  return [];
-};
-
-export const getSwaylendAssets = (
-  chainId: string | undefined,
-  lendingProtocol = Lender.SWAYLEND_USDC
-): string[] => {
-  if (isSwaylend(lendingProtocol))
-    return SWAYLEND_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? "0"] ?? [];
-  return [];
-};
+  if (isCompoundV3(lendingProtocol ?? ''))
+    return compoundV3Reserves()?.[lendingProtocol ?? '']?.[chainId ?? '']
+  return []
+}
 
 export function getAaveTypePoolDataProviderAddress(
   chainId: string,
-  lender: string
+  lender: string,
 ) {
   // @ts-ignore
-  return AAVE_FORK_POOL_DATA[lender]?.[chainId]?.protocolDataProvider;
+  return aavePools()?.[lender]?.[chainId]?.protocolDataProvider
 }
 
 export function getAaveTypePoolAddress(
   chainId: string,
-  lender: string
+  lender: string,
 ): string {
   // @ts-ignore
-  return AAVE_FORK_POOL_DATA[lender]?.[chainId]?.pool;
-}
-
-export function getAssetMeta(chainId: string, asset: string | undefined) {
-  return ASSET_META[chainId ?? "0"]?.[asset?.toLowerCase() ?? ""] as any;
+  return aavePools()?.[lender]?.[chainId]?.pool
 }
 
 /**
@@ -93,9 +53,9 @@ export function getAssetMeta(chainId: string, asset: string | undefined) {
  * @returns SupportedAsset
  */
 export const toOracleKey = (a: string) => {
-  return a;
-};
+  return a
+}
 
 export const toGenericPriceKey = (assetAddress: string, chainId: string) => {
-  return chainId + "-" + assetAddress;
-};
+  return chainId + '-' + assetAddress
+}

package/src/assets/liquidityThresholds.ts

@@ -1,30 +1,32 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from '@1delta/chain-registry'
 
 export interface LiquidityThresholds {
   /** Minimum total deposits in USD */
-  minDepositsUSD: number;
+  minDepositsUSD: number
   /** Minimum total debt/borrows in USD */
-  minDebtUSD: number;
+  minDebtUSD: number
   /** Minimum total liquidity in USD */
-  minLiquidityUSD: number;
+  minLiquidityUSD: number
 }
 
 export const DEFAULT_LIQUIDITY_THRESHOLDS: LiquidityThresholds = {
-  minDepositsUSD: 25_000,  
-  minDebtUSD: 10_000,      
-  minLiquidityUSD: 15_000, 
-};
+  minDepositsUSD: 25_000,
+  minDebtUSD: 10_000,
+  minLiquidityUSD: 15_000,
+}
 
-export const ASSET_GROUP_LIQUIDITY_THRESHOLDS: { [assetGroup: string]: LiquidityThresholds } = {
-  'USDC': {
+export const ASSET_GROUP_LIQUIDITY_THRESHOLDS: {
+  [assetGroup: string]: LiquidityThresholds
+} = {
+  USDC: {
     minDepositsUSD: 25_000,
     minDebtUSD: 5_000,
     minLiquidityUSD: 15_000,
   },
-};
+}
 
 export const CHAIN_THRESHOLD_MULTIPLIERS: { [chainId: string]: number } = {
-  [Chain.POLYGON_MAINNET]: 1.0,  
+  [Chain.POLYGON_MAINNET]: 1.0,
   [Chain.ARBITRUM_ONE]: 1.0,
   [Chain.OP_MAINNET]: 1.0,
   [Chain.BASE]: 1.0,
@@ -34,69 +36,79 @@ export const CHAIN_THRESHOLD_MULTIPLIERS: { [chainId: string]: number } = {
   [Chain.SCROLL]: 0.8,
   [Chain.TAIKO_ALETHIA]: 0.6,
   [Chain.HEMI_NETWORK]: 0.6,
-};
+}
 
 /**
  * Asset based overrides (per chain)
  * assetKey format: "chainId-assetAddress" (lowercase)
  */
-export const ASSET_SPECIFIC_THRESHOLDS: { [assetKey: string]: LiquidityThresholds } = {
-
-};
-
-
-
+export const ASSET_SPECIFIC_THRESHOLDS: {
+  [assetKey: string]: LiquidityThresholds
+} = {}
 
 export function getLiquidityThresholds(
-  chainId: string, 
-  assetAddress: string, 
-  assetGroup?:string,
+  chainId: string,
+  assetAddress: string,
+  assetGroup?: string,
 ): LiquidityThresholds {
   // Check for asset overrides
-  const assetKey = `${chainId}-${assetAddress.toLowerCase()}`;
+  const assetKey = `${chainId}-${assetAddress.toLowerCase()}`
   if (ASSET_SPECIFIC_THRESHOLDS[assetKey]) {
-    return ASSET_SPECIFIC_THRESHOLDS[assetKey];
+    return ASSET_SPECIFIC_THRESHOLDS[assetKey]
   }
 
-  let baseThresholds = assetGroup && ASSET_GROUP_LIQUIDITY_THRESHOLDS[assetGroup] 
-    ? ASSET_GROUP_LIQUIDITY_THRESHOLDS[assetGroup]
-    : DEFAULT_LIQUIDITY_THRESHOLDS;
-  
-  const chainMultiplier = CHAIN_THRESHOLD_MULTIPLIERS[chainId] ?? 1.0;
-  
+  let baseThresholds =
+    assetGroup && ASSET_GROUP_LIQUIDITY_THRESHOLDS[assetGroup]
+      ? ASSET_GROUP_LIQUIDITY_THRESHOLDS[assetGroup]
+      : DEFAULT_LIQUIDITY_THRESHOLDS
+
+  const chainMultiplier = CHAIN_THRESHOLD_MULTIPLIERS[chainId] ?? 1.0
+
   return {
     minDepositsUSD: Math.floor(baseThresholds.minDepositsUSD * chainMultiplier),
     minDebtUSD: Math.floor(baseThresholds.minDebtUSD * chainMultiplier),
-    minLiquidityUSD: Math.floor(baseThresholds.minLiquidityUSD * chainMultiplier),
-  };
+    minLiquidityUSD: Math.floor(
+      baseThresholds.minLiquidityUSD * chainMultiplier,
+    ),
+  }
 }
 
 export function meetsLiquidityThresholds(
-  pool: { totalDepositsUSD: number; totalDebtUSD: number; totalLiquidityUSD: number },
-  thresholds: LiquidityThresholds
+  pool: {
+    totalDepositsUSD: number
+    totalDebtUSD: number
+    totalLiquidityUSD: number
+  },
+  thresholds: LiquidityThresholds,
 ): boolean {
   return (
     pool.totalDepositsUSD >= thresholds.minDepositsUSD &&
     pool.totalDebtUSD >= thresholds.minDebtUSD &&
     pool.totalLiquidityUSD >= thresholds.minLiquidityUSD
-  );
+  )
 }
 
 export function meetsLiquidityThresholdsLong(
-  pool: { totalDepositsUSD: number; totalDebtUSD: number; totalLiquidityUSD: number },
-  thresholds: LiquidityThresholds
+  pool: {
+    totalDepositsUSD: number
+    totalDebtUSD: number
+    totalLiquidityUSD: number
+  },
+  thresholds: LiquidityThresholds,
 ): boolean {
-  return (
-    pool.totalDepositsUSD >= thresholds.minDepositsUSD
-  );
+  return pool.totalDepositsUSD >= thresholds.minDepositsUSD
 }
 
 export function meetsLiquidityThresholdsShort(
-  pool: { totalDepositsUSD: number; totalDebtUSD: number; totalLiquidityUSD: number },
-  thresholds: LiquidityThresholds
+  pool: {
+    totalDepositsUSD: number
+    totalDebtUSD: number
+    totalLiquidityUSD: number
+  },
+  thresholds: LiquidityThresholds,
 ): boolean {
   return (
     pool.totalDebtUSD >= thresholds.minDebtUSD &&
     pool.totalLiquidityUSD >= thresholds.minLiquidityUSD
-  );
+  )
 }

package/src/flash-liquidity/assets.ts

@@ -1,61 +1,85 @@
-import { AAVE_STYLE_RESERVE_ASSETS, COMPOUND_STYLE_RESERVE_ASSETS, COMPOUND_V2_STYLE_RESERVE_ASSETS, MORPHO_BLUE_POOL_DATA } from "@1delta/asset-registry"
-import { BALANCER_V2_FORKS, BALANCER_V3_FORKS, UNISWAP_V4_FORKS } from "@1delta/dex-registry"
-import { uniq } from "lodash"
+import {
+  aaveReserves,
+  compoundV2Reserves,
+  compoundV3Reserves,
+  morphoPools,
+} from '@1delta/data-sdk'
+import {
+  BALANCER_V2_FORKS,
+  BALANCER_V3_FORKS,
+  UNISWAP_V4_FORKS,
+} from '@1delta/dex-registry'
+import { uniq } from 'lodash'
 
 function createAssetArrayPerChain() {
-    let assetsPerChain: { [chainId: string]: string[] } = {}
-    Object.entries(COMPOUND_STYLE_RESERVE_ASSETS).forEach(([lender, data]) => {
-
-        Object.entries(data).forEach(([chainId, assetArray]) => {
-            if (!assetsPerChain[chainId]) assetsPerChain[chainId] = []
-            assetsPerChain[chainId] = uniq([...assetsPerChain[chainId], ...assetArray])
-        })
+  let assetsPerChain: { [chainId: string]: string[] } = {}
+  Object.entries(compoundV3Reserves() ?? {}).forEach(([lender, data]) => {
+    Object.entries(data).forEach(([chainId, assetArray]) => {
+      if (!assetsPerChain[chainId]) assetsPerChain[chainId] = []
+      assetsPerChain[chainId] = uniq([
+        ...assetsPerChain[chainId],
+        ...assetArray,
+      ])
     })
-
-    Object.entries(AAVE_STYLE_RESERVE_ASSETS).forEach(([lender, data]) => {
-        Object.entries(data).forEach(([chainId, assetArray]) => {
-            if (!assetsPerChain[chainId]) assetsPerChain[chainId] = []
-            assetsPerChain[chainId] = uniq([...assetsPerChain[chainId], ...assetArray])
-        })
+  })
+
+  Object.entries(aaveReserves() ?? {}).forEach(([lender, data]) => {
+    Object.entries(data).forEach(([chainId, assetArray]) => {
+      if (!assetsPerChain[chainId]) assetsPerChain[chainId] = []
+      assetsPerChain[chainId] = uniq([
+        ...assetsPerChain[chainId],
+        ...assetArray,
+      ])
     })
-
-    Object.entries(COMPOUND_V2_STYLE_RESERVE_ASSETS).forEach(([lender, data]) => {
-        Object.entries(data).forEach(([chainId, assetArray]) => {
-            if (!assetsPerChain[chainId]) assetsPerChain[chainId] = []
-            assetsPerChain[chainId] = uniq([...assetsPerChain[chainId], ...assetArray])
-        })
+  })
+
+  Object.entries(compoundV2Reserves() ?? {}).forEach(([lender, data]) => {
+    Object.entries(data).forEach(([chainId, assetArray]) => {
+      if (!assetsPerChain[chainId]) assetsPerChain[chainId] = []
+      assetsPerChain[chainId] = uniq([
+        ...assetsPerChain[chainId],
+        ...assetArray,
+      ])
     })
-    return assetsPerChain
+  })
+  return assetsPerChain
 }
 
 export const RELEVANT_LENDING_ASSETS = createAssetArrayPerChain()
 
-
 interface PoolData {
-    pool: string
-    address: string
+  pool: string
+  address: string
 }
 
-function createSimpleArrayPerChain(fork: any, field: undefined | string = undefined) {
-    let pools: { [chainId: string]: PoolData[] } = {}
-    Object.entries(fork).forEach(([b2, data]: [string, any]) => {
-        // @ts-ignore
-        Object.entries(field ? data[field] : data).forEach(([chainId, address]: [string, any]) => {
-            if (!pools[chainId]) pools[chainId] = []
-            pools[chainId] = uniq([...pools[chainId], { address, pool: b2 }])
-        })
-    })
-    return pools
+function createSimpleArrayPerChain(
+  fork: any,
+  field: undefined | string = undefined,
+) {
+  let pools: { [chainId: string]: PoolData[] } = {}
+  Object.entries(fork ?? {}).forEach(([b2, data]: [string, any]) => {
+    // @ts-ignore
+    Object.entries(field ? data[field] : data).forEach(
+      ([chainId, address]: [string, any]) => {
+        if (!pools[chainId]) pools[chainId] = []
+        pools[chainId] = uniq([...pools[chainId], { address, pool: b2 }])
+      },
+    )
+  })
+  return pools
 }
 
+export const RELEVANT_BALANCER_V2_FORKS =
+  createSimpleArrayPerChain(BALANCER_V2_FORKS)
 
-export const RELEVANT_BALANCER_V2_FORKS = createSimpleArrayPerChain(BALANCER_V2_FORKS)
-
-
-export const RELEVANT_MORPHOB_FORKS = createSimpleArrayPerChain(MORPHO_BLUE_POOL_DATA)
-
-
-export const RELEVANT_BALANCER_V3_FORKS = createSimpleArrayPerChain(BALANCER_V3_FORKS, "vault")
+export const RELEVANT_MORPHOB_FORKS = createSimpleArrayPerChain(morphoPools())
 
+export const RELEVANT_BALANCER_V3_FORKS = createSimpleArrayPerChain(
+  BALANCER_V3_FORKS,
+  'vault',
+)
 
-export const RELEVANT_UNISWAP_V4_FORKS = createSimpleArrayPerChain(UNISWAP_V4_FORKS, "pm")
+export const RELEVANT_UNISWAP_V4_FORKS = createSimpleArrayPerChain(
+  UNISWAP_V4_FORKS,
+  'pm',
+)

package/src/flash-liquidity/fetchLiquidity.ts

@@ -1,9 +1,5 @@
-import {
-  getAaveStyleProtocolTokenMap,
-  getAaveTypePoolAddress,
-  getAssetMeta,
-} from '../assets'
-import { AAVES_PER_CHAIN } from '../utils'
+import { getAaveStyleProtocolTokenMap, getAaveTypePoolAddress } from '../assets'
+import { getAavesForChain } from '../utils'
 import {
   RELEVANT_BALANCER_V2_FORKS,
   RELEVANT_BALANCER_V3_FORKS,
@@ -12,12 +8,12 @@ import {
   RELEVANT_UNISWAP_V4_FORKS,
 } from './assets'
 import { Call } from '../utils/multicall'
-import { MulticallRetryFunction } from '../types'
+import { MulticallRetryFunction, TokenList } from '../types'
 import { FlashAbi } from '../abis/flashloan-united/flashAbi'
 import { FlashLiquiditiesOnChain, FlashLoanIds } from './types'
 import { FLASH_LOAN_IDS } from '@1delta/dex-registry'
 import { formatUnits, zeroAddress } from 'viem'
-import { AAVE_V2_LENDERS, AAVE_V3_LENDERS } from '@1delta/asset-registry'
+import { AAVE_V2_LENDERS, AAVE_V3_LENDERS } from '@1delta/lender-registry'
 import _ from 'lodash'
 import { MULTICALL_ADDRESS } from '../utils/constants'
 
@@ -39,13 +35,16 @@ function getFlashLoanEnabled(data: bigint): boolean {
 export async function fetchFlashLiquidityForChain(
   chain: string,
   multicallRetry: MulticallRetryFunction,
+  list: TokenList = {},
 ) {
   let callLengths: { [l: string]: number } = {}
   let aaveAssets: { [l: string]: string[] } = {}
 
   let aaveCalls: Call[] = []
 
-  const aaveProtocols = AAVES_PER_CHAIN[chain] ?? []
+  const aaves = getAavesForChain()
+
+  const aaveProtocols = aaves[chain] ?? []
 
   // we only ned to check aave flash liquidity for aave assets
   aaveProtocols.forEach((aaveFork) => {
@@ -205,7 +204,7 @@ export async function fetchFlashLiquidityForChain(
     currentOffset += callLen
 
     aaveAssets[aave].forEach((asset, i) => {
-      const decimals = getAssetMeta(chain, asset)?.decimals
+      const decimals = list[asset]?.decimals
       const rawAmount = data[2 * i]
 
       const config = data[2 * i + 1]
@@ -237,7 +236,7 @@ export async function fetchFlashLiquidityForChain(
     currentOffset += callLen
 
     otherAssets.forEach((asset, i) => {
-      const decimals = getAssetMeta(chain, asset)?.decimals
+      const decimals = list[asset]?.decimals
       const rawAmount = data[i]
       if (rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = []
@@ -266,7 +265,7 @@ export async function fetchFlashLiquidityForChain(
       const rawAmount = data[i]
       if (rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = []
-        const decimals = getAssetMeta(chain, asset)?.decimals
+        const decimals = list[asset]?.decimals
         liquidity[asset].push({
           id: FLASH_LOAN_IDS[morpho.pool],
           name: morpho.pool,
@@ -289,7 +288,7 @@ export async function fetchFlashLiquidityForChain(
     currentOffset += callLen
 
     otherAssets.forEach((asset, i) => {
-      const decimals = getAssetMeta(chain, asset)?.decimals
+      const decimals = list[asset]?.decimals
       const rawAmount = data[i]
       if (rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = []
@@ -315,7 +314,7 @@ export async function fetchFlashLiquidityForChain(
     currentOffset += callLen
 
     otherAssets.forEach((asset, i) => {
-      const decimals = getAssetMeta(chain, asset)?.decimals
+      const decimals = list[asset]?.decimals
       const rawAmount = data[i]
       if (rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = []