@1delta/margin-fetcher 0.0.31 → 0.0.33

package/src/flash-liquidity/utils.ts

@@ -1,22 +1,28 @@
-import { getAssetMeta, toGenericPriceKey } from "../assets";
-import { FlashLiquiditiesOnChain } from "./types";
+import { toGenericPriceKey } from '../assets'
+import { TokenList } from '../types'
+import { FlashLiquiditiesOnChain } from './types'
 
-/** 
+/**
  * Add prices to get dollar flash liquidties
  * Ideal for de-based flash loans
  */
-export function attachPricesToFlashLiquidity(chainId: string, liq: FlashLiquiditiesOnChain, prices: { [k: string]: number }) {
+export function attachPricesToFlashLiquidity(
+  chainId: string,
+  liq: FlashLiquiditiesOnChain,
+  prices: { [k: string]: number },
+  list: TokenList = {},
+) {
+  let liqCopy = { ...liq }
 
-    let liqCopy = { ...liq }
+  Object.entries(liq).forEach(([asset, entry]) => {
+    const priceKey =
+      list[asset]?.assetGroup ?? toGenericPriceKey(asset, chainId)
+    const price = prices[priceKey] ?? 0
+    liqCopy[asset] = entry.map((e) => ({
+      ...e,
+      availableUSD: e.available * price,
+    }))
+  })
 
-    Object.entries(liq).forEach(([asset, entry]) => {
-        const priceKey = getAssetMeta(chainId, asset)?.assetGroup ?? toGenericPriceKey(asset, chainId)
-        const price = prices[priceKey] ?? 0
-        liqCopy[asset] = entry.map(e => ({
-            ...e,
-            availableUSD: e.available * price
-        }))
-    })
-
-    return liqCopy
-}
+  return liqCopy
+}

package/src/lending/aave-v2-type/misc.ts

@@ -1,9 +1,13 @@
-import { Chain, WRAPPED_NATIVE_INFO } from "@1delta/asset-registry";
+import { WRAPPED_NATIVE_INFO } from '@1delta/wnative'
+import { Chain } from '@1delta/chain-registry'
 
-export const AURELIUS_REWARD_ASSETS = [WRAPPED_NATIVE_INFO[Chain.MANTLE], {
+export const AURELIUS_REWARD_ASSETS = [
+  WRAPPED_NATIVE_INFO[Chain.MANTLE],
+  {
     chainId: Chain.MANTLE,
     address: '0x6e20E155819f0ee08d1291b0b9889b0e011b8224',
     decimals: 18,
     symbol: 'oAU',
     name: 'Aurelius Call Option Token',
-}]
+  },
+]

package/src/lending/aave-v2-type/publicCallBuild.ts

@@ -1,20 +1,28 @@
+import { AURELIUS_REWARD_ASSETS } from './misc'
+import {
+  getAaveAssets,
+  getAaveStyleProtocolTokenMap,
+  getAaveTypePoolDataProviderAddress,
+} from '../../assets'
+import { Lender } from '@1delta/lender-registry'
+import { getAaveTypeIncentivesControllerAddress } from '../addresses'
 
-import { AURELIUS_REWARD_ASSETS } from "./misc";
-import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress } from "../../assets";
-import { Lender } from "@1delta/asset-registry";
-import { getAaveTypeIncentivesControllerAddress } from "../addresses";
-
-
-export const buildAaveV2StyleLenderReserveCall = (chainId: string, lender: Lender) => {
+export const buildAaveV2StyleLenderReserveCall = (
+  chainId: string,
+  lender: Lender,
+) => {
   const providerAddress = getAaveTypePoolDataProviderAddress(chainId, lender)
   const underlyingTokensArray = getAaveAssets(chainId, lender)
   switch (lender) {
     case Lender.AURELIUS: {
       const aaveprotocolTokens = getAaveStyleProtocolTokenMap(chainId, lender)
-      const incentivesController = getAaveTypeIncentivesControllerAddress(chainId, lender)
-      const [reward0, reward1] = AURELIUS_REWARD_ASSETS.map(t => t.address)
+      const incentivesController = getAaveTypeIncentivesControllerAddress(
+        chainId,
+        lender,
+      )
+      const [reward0, reward1] = AURELIUS_REWARD_ASSETS.map((t) => t.address)
       return [
-        ...underlyingTokensArray.flatMap(asset => [
+        ...underlyingTokensArray.flatMap((asset) => [
           {
             address: providerAddress,
             name: 'getReserveData',
@@ -49,10 +57,13 @@ export const buildAaveV2StyleLenderReserveCall = (chainId: string, lender: Lende
       ]
     }
     case Lender.LENDLE: {
-      const incentivesController = getAaveTypeIncentivesControllerAddress(chainId, lender)
+      const incentivesController = getAaveTypeIncentivesControllerAddress(
+        chainId,
+        lender,
+      )
       const aaveprotocolTokens = getAaveStyleProtocolTokenMap(chainId, lender)
       return [
-        ...underlyingTokensArray.flatMap(asset => [
+        ...underlyingTokensArray.flatMap((asset) => [
           {
             address: providerAddress,
             name: 'getReserveData',
@@ -72,23 +83,23 @@ export const buildAaveV2StyleLenderReserveCall = (chainId: string, lender: Lende
             address: incentivesController,
             name: 'poolInfo',
             params: [aaveprotocolTokens[asset].vToken],
-          }
+          },
         ]),
         {
           address: incentivesController,
           name: 'rewardsPerSecond',
-          params: []
+          params: [],
         },
         {
           address: incentivesController,
           name: 'totalAllocPoint',
-          params: []
+          params: [],
         },
       ]
     }
     default:
       return [
-        ...underlyingTokensArray.flatMap(tk => [
+        ...underlyingTokensArray.flatMap((tk) => [
           {
             address: providerAddress,
             name: 'getReserveData',
@@ -102,4 +113,4 @@ export const buildAaveV2StyleLenderReserveCall = (chainId: string, lender: Lende
         ]),
       ]
   }
-}
+}

package/src/lending/aave-v2-type/publicCallParse.ts

@@ -1,6 +1,6 @@
 
-import { Lender } from "@1delta/asset-registry";
-import { getAaveAssets, getAssetMeta, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey } from "../../assets";
+import { Lender } from "@1delta/lender-registry";
+import { getAaveAssets, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey } from "../../assets";
 import { BPS, convertRateToApr, formatAaveRawApyToApr, parseRawAmount } from "../../utils/parsing";
 import {
   AaveV2GeneralPublicResponse,
@@ -41,7 +41,7 @@ export const getAaveV2ReservesDataConverter = (
             const [, emission0PerSecondDebt, ,] = data[i * 6 + 4]
             const [, emission1PerSecondDebt, ,] = data[i * 6 + 5]
 
-            const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset }
+            const assetMeta = tokenList[asset] 
             const decimals = assetMeta?.decimals ?? 18
             const totalStableDebt = parseRawAmount(reserveData?.[AaveV2TypeGetReserveDataIndexes.totalStableDebt]?.toString(), decimals)
             const totalVariableDebt = parseRawAmount(reserveData?.[AaveV2TypeGetReserveDataIndexes.totalVariableDebt]?.toString(), decimals)
@@ -144,7 +144,7 @@ export const getAaveV2ReservesDataConverter = (
             const borrowRewards = Number(data?.[borrowRewardIndex]?.[AaveV2TypeIncentivesControllerPoolInfoIndexes.allocPoint].toString()) / totalAllocPoint * rewardsPerSecond
 
 
-            const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset }
+            const assetMeta = tokenList[asset] 
             const decimals = assetMeta?.decimals ?? 18
 
             const totalStableDebt = parseRawAmount(reserveData?.[AaveV2TypeGetReserveDataIndexes.totalStableDebt]?.toString(), decimals)
@@ -231,7 +231,7 @@ export const getAaveV2ReservesDataConverter = (
             const reserveData = data[i * 2]
             const configData = data[i * 2 + 1]
 
-            const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset }
+            const assetMeta = tokenList[asset] 
             const decimals = assetMeta?.decimals ?? 18
 
             const totalStableDebt = parseRawAmount(reserveData?.[AaveV2TypeGetReserveDataIndexes.totalStableDebt]?.toString(), decimals)

package/src/lending/aave-v3-type/publicCallBuild.ts

@@ -1,4 +1,4 @@
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { Call } from '../../utils/multicall'
 import {
   getAaveAssets,

package/src/lending/aave-v3-type/publicCallParse.ts

@@ -8,10 +8,9 @@ import {
 import { AAVE_V3_EMODES } from './publicCallBuild'
 import { AdditionalYields } from '../../types'
 import { BPS, formatAaveRawApyToApr, parseRawAmount } from '../../utils/parsing'
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import {
   getAaveAssets,
-  getAssetMeta,
   LENDER_MODE_NO_MODE,
   toGenericPriceKey,
   toOracleKey,
@@ -85,10 +84,7 @@ export const getAaveV3ReservesDataConverter = (
             const debtCeiling = data[i * 6 + 4]
             const reserveEMode = data[i * 6 + 5]
 
-            const assetMeta = tokenList[asset] ?? {
-              ...getAssetMeta(chainId, asset),
-              address: asset,
-            }
+            const assetMeta = tokenList[asset]
 
             const decimals = assetMeta?.decimals ?? 18
 
@@ -281,10 +277,7 @@ export function parseYLDRCall(
         const reserveData = data[i * 2]
         const configData = data[i * 2 + 1]
 
-        const assetMeta = tokenList[asset] ?? {
-          ...getAssetMeta(chainId, asset),
-          address: asset,
-        }
+        const assetMeta = tokenList[asset]
         const decimals = assetMeta?.decimals ?? 18
 
         const totalVariableDebt = parseRawAmount(
@@ -445,10 +438,7 @@ function parseAave32(
         const reserveCaps = data[i * 5 + 3]
         const debtCeiling = data[i * 5 + 4]
 
-        const assetMeta = tokenList[asset] ?? {
-          ...getAssetMeta(chainId, asset),
-          address: asset,
-        }
+        const assetMeta = tokenList[asset]
 
         const decimals = assetMeta?.decimals ?? 18
         const totalDeposits = parseRawAmount(

package/src/lending/addresses/aave.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 
 export const addressesAaveCore = {

package/src/lending/addresses/aaveV2.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 
 export const addressesAaveV2Core = {

package/src/lending/addresses/aurelius.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 export const addressesAureliusCore = {
   AaveOracle: {

package/src/lending/addresses/compoundV3.ts

@@ -1,16 +1,12 @@
-import {
-  Chain,
-  COMETS_PER_CHAIN_MAP,
-  COMPOUND_BASE_TOKENS,
-  Lender,
-  SWAYLEND_BASE_TOKENS,
-} from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
+import { compoundV3BaseData, compoundV3Pools } from '@1delta/data-sdk'
 
 export function getCompoundV3CometAddress(
   chainId: string,
   lender = Lender.COMPOUND_V3_USDCE,
 ): string | undefined {
-  return COMETS_PER_CHAIN_MAP[chainId]?.[lender]
+  return compoundV3Pools()?.[chainId]?.[lender]
 }
 
 export function getCompoundV3CometRewardsAddress(chainId: string) {
@@ -50,8 +46,5 @@ export function getCompoundV3BaseAsset(
   lender: Lender | string,
   chainId: string,
 ) {
-  return (
-    COMPOUND_BASE_TOKENS[lender]?.[chainId] ??
-    SWAYLEND_BASE_TOKENS[lender]?.[chainId]
-  )
+  return compoundV3BaseData()?.[lender]?.[chainId]
 }

package/src/lending/addresses/contracts.ts

@@ -5,7 +5,7 @@ import { addressesAureliusCore } from "./aurelius";
 import { addressesMeridianCore } from "./meridian";
 import { addressesTakoTakoCore } from "./takotako";
 import { zeroAddress } from "viem";
-import { Lender } from "@1delta/asset-registry";
+import { Lender } from "@1delta/lender-registry";
 
 export function getAaveTypeOracleAddress(chainId: string, lender: Lender) {
   switch (lender) {

package/src/lending/addresses/hana.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 export const addressesHanaCore = {
   AaveOracle: {

package/src/lending/addresses/init.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry"
+import { Chain } from "@1delta/chain-registry"
 
 export function getInitPosManagerAddress(chainId: string) {
   // @ts-ignore

package/src/lending/addresses/lendle.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 export const addressesLendleCore = {
   AaveOracle: {

package/src/lending/addresses/meridian.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 export const addressesMeridianCore = {
   AaveOracle: {

package/src/lending/addresses/takotako.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 
 export const addressesTakoTakoCore = {

package/src/lending/compound-v3/publicCallBuild.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry"
+import { Lender } from '@1delta/lender-registry'
 import { getCompoundV3Assets } from "../../assets"
 import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometLens } from "../addresses/compoundV3"
 import { Call } from "../../utils/multicall"

package/src/lending/compound-v3/publicCallParse.ts

@@ -1,11 +1,10 @@
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { AdditionalYields } from '../../types'
 import {
   CometInterestRateIndexes,
   CompoundV3GeneralPublicResponse,
 } from './types'
 import {
-  getAssetMeta,
   getCompoundV3Assets,
   LENDER_MODE_NO_MODE,
   toGenericPriceKey,
@@ -44,10 +43,7 @@ export const getCompoundV3ReservesDataConverter = (
         const asset = tokensNoBase[i]
         const resultsAssetInfo = data[i * 2]
         const resultsTotals = data[i * 2 + 1]
-        const assetMeta = tokenList[asset] ?? {
-          ...getAssetMeta(chainId, asset),
-          address: asset,
-        }
+        const assetMeta = tokenList[asset]
         const decimals = assetMeta?.decimals ?? 18
         const totals = parseRawAmount(resultsTotals[0], decimals)
         const oracleKey =
@@ -103,10 +99,7 @@ export const getCompoundV3ReservesDataConverter = (
         }
       }
 
-      const baseMeta = tokenList[baseAssetData.baseAsset] ?? {
-        ...getAssetMeta(chainId, baseAssetData.baseAsset),
-        address: baseAssetData.baseAsset,
-      }
+      const baseMeta = tokenList[baseAssetData.baseAsset]
 
       // parse data for rewards calculation
       const decimals = baseMeta?.decimals ?? 18

package/src/lending/fetchLender.ts

@@ -34,7 +34,7 @@ import { getInitReservesDataConverter } from './init/publicCallParse'
 import { getCompoundV3ReservesDataConverter } from './compound-v3/publicCallParse'
 import { AavePoolLegacyAbi } from '../abis/aave-v3/AavePoolLegacy'
 import { AavePoolDataProviderLegacyAbi } from '../abis/aave-v3/AavePoolDataProviderLegacy'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { Call } from 'viem'
 import { YLDRProtocolDataProviderAbi } from '../abis/aave-v2/YLDR'
 import { GenericTokenList } from './types'

package/src/lending/fetchLenderAll.ts

@@ -1,5 +1,5 @@
 import { AdditionalYields, MulticallRetryFunction } from '../types'
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { getLenderPublicData } from './fetchLender'
 import { getLenderPublicDataViaApi } from './fetchLenderExt'
 import { GenericTokenList } from './types'

package/src/lending/fetchLenderExt.ts

@@ -1,6 +1,6 @@
 import { isMorphoType, isMultiMarket } from '../utils'
 import { AdditionalYields } from '../types'
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { GenericTokenList } from './types'
 import { fetchMorphoMarkets } from './morpho/fetchPublic'
 import { convertMarketsToMorphoResponse } from './morpho/convertPublic'

package/src/lending/index.ts

@@ -3,3 +3,4 @@ export * from "./fetchLenderExt"
 export * from "./fetchLenderAll"
 export * from "./user-data"
 export * from "./types"
+export * from "./meta"

package/src/lending/init/publicCallBuild.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry"
+import { Lender } from '@1delta/lender-registry'
 import { Call } from "../../utils/multicall"
 import { getInitLensAddress } from "../addresses/init"
 

package/src/lending/init/publicCallParse.ts

@@ -1,10 +1,10 @@
-import { InitGeneralPublicResponse } from "./types";
-import { AdditionalYields } from "../../types";
-import { INIT_MODES } from "./publicCallBuild";
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../assets";
-import { convertRateToApr, parseRawAmount } from "../../utils/parsing";
-import { Lender } from "@1delta/asset-registry";
-import { GenericTokenList } from "../types";
+import { InitGeneralPublicResponse } from './types'
+import { AdditionalYields } from '../../types'
+import { INIT_MODES } from './publicCallBuild'
+import { toGenericPriceKey, toOracleKey } from '../../assets'
+import { convertRateToApr, parseRawAmount } from '../../utils/parsing'
+import { Lender } from '@1delta/lender-registry'
+import { GenericTokenList } from '../types'
 
 export const INIT_EMODE_LABELS: { [mode: number]: string } = {
   [1]: 'Default',
@@ -20,7 +20,7 @@ export const getInitReservesDataConverter = (
   chainId: string,
   prices: { [asset: string]: number },
   additionalYields: AdditionalYields,
-  tokenList: GenericTokenList = {}
+  tokenList: GenericTokenList = {},
 ): [(data: any[]) => InitGeneralPublicResponse | undefined, number] => {
   const expectedNumberOfCalls = INIT_MODES.length
   return [
@@ -30,42 +30,55 @@ export const getInitReservesDataConverter = (
       }
       const modeOne = 0
       let result = Object.assign(
-        {}, ...data[modeOne]?.map(
-          (dat: any) => {
-            const asset = dat?.underlying.toLowerCase()
-            const meta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset }
-            const totalDeposits = parseRawAmount(dat?.totalSupply.toString(), meta?.decimals)
-            const totalDebt = parseRawAmount(dat?.totalDebt.toString(), meta.decimals)
-            const oracleKey = toOracleKey(meta?.assetGroup!) ?? toGenericPriceKey(asset, chainId)
-            const price = prices[oracleKey]
-            const liquidity = Number(totalDeposits) - Number(totalDebt)
-            return {
-              [asset]: {
-                poolId: asset,
-                underlying: asset,
-                asset: meta,
-                borrowCap: parseRawAmount(dat?.borrowCap.toString(), meta.decimals),
-                canBurn: Boolean(dat?.canBurn),
-                canFlash: Boolean(dat?.canFlash),
-                canMint: Boolean(dat?.canMint),
-                canRepay: Boolean(dat?.canRepay),
-                totalDeposits,
-                totalDebt,
-                totalDepositsUSD: price * Number(totalDeposits),
-                totalDebtUSD: price * Number(totalDebt),
-                totalLiquidity: liquidity,
-                totalLiquidityUSD: liquidity * price,
-                depositRate: convertRateToApr(Number(parseRawAmount(dat?.supplyRate.toString(), 18))),
-                variableBorrowRate: convertRateToApr(Number(parseRawAmount(dat?.borrowRate.toString(), 18))),
-                stableBorrowRate: 0,
-                stakingYield: additionalYields.intrinsicYields[oracleKey] ?? 0,
-                rewards: {},
-                config: {},
-                borrowingEnabled: totalDebt !== "0"
-              }
-            }
+        {},
+        ...data[modeOne]?.map((dat: any) => {
+          const asset = dat?.underlying.toLowerCase()
+          const meta = tokenList[asset]
+          const totalDeposits = parseRawAmount(
+            dat?.totalSupply.toString(),
+            meta?.decimals,
+          )
+          const totalDebt = parseRawAmount(
+            dat?.totalDebt.toString(),
+            meta.decimals,
+          )
+          const oracleKey =
+            toOracleKey(meta?.assetGroup!) ?? toGenericPriceKey(asset, chainId)
+          const price = prices[oracleKey]
+          const liquidity = Number(totalDeposits) - Number(totalDebt)
+          return {
+            [asset]: {
+              poolId: asset,
+              underlying: asset,
+              asset: meta,
+              borrowCap: parseRawAmount(
+                dat?.borrowCap.toString(),
+                meta.decimals,
+              ),
+              canBurn: Boolean(dat?.canBurn),
+              canFlash: Boolean(dat?.canFlash),
+              canMint: Boolean(dat?.canMint),
+              canRepay: Boolean(dat?.canRepay),
+              totalDeposits,
+              totalDebt,
+              totalDepositsUSD: price * Number(totalDeposits),
+              totalDebtUSD: price * Number(totalDebt),
+              totalLiquidity: liquidity,
+              totalLiquidityUSD: liquidity * price,
+              depositRate: convertRateToApr(
+                Number(parseRawAmount(dat?.supplyRate.toString(), 18)),
+              ),
+              variableBorrowRate: convertRateToApr(
+                Number(parseRawAmount(dat?.borrowRate.toString(), 18)),
+              ),
+              stableBorrowRate: 0,
+              stakingYield: additionalYields.intrinsicYields[oracleKey] ?? 0,
+              rewards: {},
+              config: {},
+              borrowingEnabled: totalDebt !== '0',
+            },
           }
-        )
+        }),
       )
 
       let eModes: any = {}
@@ -79,15 +92,18 @@ export const getInitReservesDataConverter = (
             borrowCollateralFactor: cf,
             collateralFactor: cf,
             borrowFactor: parseRawAmount(multicallData.borrowFactor, 18),
-            maxHealthAfterLiq: parseRawAmount(multicallData.maxHealthAfterLiq, 18),
+            maxHealthAfterLiq: parseRawAmount(
+              multicallData.maxHealthAfterLiq,
+              18,
+            ),
           }
           if (!eModes[mode]) eModes[mode] = modeData
           result[asset].config[mode] = modeData
-        });
-      });
+        })
+      })
 
       return { data: result, eModes, chainId }
     },
-    expectedNumberOfCalls
+    expectedNumberOfCalls,
   ]
-}
+}