@1delta/margin-fetcher 0.0.31 → 0.0.33

package/src/lending/user-data/aave-v3-type/userCallParseYldr.ts

@@ -1,9 +1,10 @@
-import { Lender } from "@1delta/asset-registry"
-import { getAaveAssets, getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { AaveV3UserReserveResponse } from "../types"
-import { createBaseTypeUserState } from "../utils"
-import { YldrTypeGetUserReserveIndexes } from "../../aave-v3-type/types"
-import { parseRawAmount } from "../../../utils/parsing"
+import { Lender } from '@1delta/lender-registry'
+import { toGenericPriceKey, toOracleKey } from '../../../assets'
+import { AaveV3UserReserveResponse } from '../types'
+import { createBaseTypeUserState } from '../utils'
+import { YldrTypeGetUserReserveIndexes } from '../../aave-v3-type/types'
+import { parseRawAmount } from '../../../utils/parsing'
+import { GenericCurrency } from '../../types'
 
 /** Like Aave V3, not stable debt data and no emode */
 export const getYldrUserDataConverter = (
@@ -12,10 +13,9 @@ export const getYldrUserDataConverter = (
   account: string,
   prices: { [asset: string]: number },
   pricesHist: { [asset: string]: number },
-  lenderData: any
+  lenderData: any,
 ): [(data: any[]) => AaveV3UserReserveResponse | undefined, number] => {
-
-  const assetsToQuery = getAaveAssets(chainId, lender)
+  const assetsToQuery = Object.keys(lenderData)
   const expectedNumberOfCalls = assetsToQuery.length
   return [
     (data: any[]) => {
@@ -29,19 +29,15 @@ export const getYldrUserDataConverter = (
 
       for (let i = 0; i < assetsToQuery.length; i++) {
         const asset = assetsToQuery[i]
-        const {
-          dataForAsset,
-          addedDebt,
-          addedDeposits
-        } = createAaveV3Entry(
+        const { dataForAsset, addedDebt, addedDeposits } = createAaveV3Entry(
           i,
           data,
           chainId,
-          asset,
+          lenderData[asset].asset``,
           prices,
           pricesHist,
         )
-        if (!dataForAsset) continue;
+        if (!dataForAsset) continue
         totalDebt24h += addedDebt
         totalDeposits24h += addedDeposits
         lendingPositions[asset] = dataForAsset
@@ -50,15 +46,20 @@ export const getYldrUserDataConverter = (
       const payload = {
         chainId,
         account,
-        lendingPositions: { "0": lendingPositions },
+        lendingPositions: { '0': lendingPositions },
         rewards: {},
         userEMode: 0,
       }
 
-      const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+      const userData = createBaseTypeUserState(
+        payload,
+        lenderData,
+        totalDeposits24h,
+        totalDebt24h,
+      )
       return {
         ...payload,
-        ...userData
+        ...userData,
       }
     },
     expectedNumberOfCalls,
@@ -69,34 +70,34 @@ function createAaveV3Entry(
   i: number,
   data: any[],
   chainId: string,
-  asset: string,
+  asset: GenericCurrency,
   prices: any,
   pricesHist: any,
 ) {
   const reserveData = data[i]
 
-  const currentATokenBalanceRaw = reserveData[YldrTypeGetUserReserveIndexes.currentYTokenBalance]?.toString()
-  const currentVariableDebtRaw = reserveData[YldrTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
-
+  const currentATokenBalanceRaw =
+    reserveData[YldrTypeGetUserReserveIndexes.currentYTokenBalance]?.toString()
+  const currentVariableDebtRaw =
+    reserveData[YldrTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
 
-  if (
-    currentATokenBalanceRaw === "0" &&
-    currentVariableDebtRaw === "0") {
+  if (currentATokenBalanceRaw === '0' && currentVariableDebtRaw === '0') {
     return {
       dataForAsset: undefined,
       addedDeposits: 0,
-      addedDebt: 0
+      addedDebt: 0,
     }
   }
 
-  const assetMeta = getAssetMeta(chainId, asset)
+  const assetMeta = asset
   const decimals = assetMeta?.decimals ?? 18
 
   const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals)
   const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals)
 
-
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
+  const key =
+    toOracleKey(assetMeta?.assetGroup) ??
+    toGenericPriceKey(asset.address, chainId)
   // prices
   const price = prices[key] ?? 1
   const priceHist = pricesHist?.[key] ?? price
@@ -106,19 +107,21 @@ function createAaveV3Entry(
     underlying: asset,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
-    debtStable: "0",
+    debtStable: '0',
     debt: currentVariableDebt,
     depositsUSD: Number(currentATokenBalance) * price,
     debtStableUSD: 0,
     debtUSD: Number(currentVariableDebt) * price,
     stableBorrowRate: 0,
-    collateralActive: Boolean(reserveData[YldrTypeGetUserReserveIndexes.usageAsCollateralEnabled]),
+    collateralActive: Boolean(
+      reserveData[YldrTypeGetUserReserveIndexes.usageAsCollateralEnabled],
+    ),
     claimableRewards: 0,
   }
 
   return {
     dataForAsset,
     addedDeposits: Number(currentATokenBalance) * priceHist,
-    addedDebt: Number(currentVariableDebt) * priceHist
+    addedDebt: Number(currentVariableDebt) * priceHist,
   }
-}
+}

package/src/lending/user-data/abis.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry"
+import { Lender } from '@1delta/lender-registry'
 import { isAaveV2Type, isAaveV3Type, isCompoundV3, isInit, isAaveV32Type, isYLDR, isMorphoType } from "../../utils"
 import { IncentivesControllerAbi } from "../../abis/lendle/IncentivesController"
 import { RewarderAbi } from "../../abis/aurelius/Rewarder"

package/src/lending/user-data/compound-v3/userCallBuild.ts

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

package/src/lending/user-data/compound-v3/userCallParse.ts

@@ -1,8 +1,6 @@
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { CompoundV3UserReserveResponse } from '../types'
 import {
-  getAssetMeta,
-  getCompoundV3Assets,
   toGenericPriceKey,
   toOracleKey,
 } from '../../../assets'
@@ -18,7 +16,7 @@ export const getCompoundV3UserDataConverter = (
   pricesHist: { [asset: string]: number },
   lenderData: any,
 ): [(data: any[]) => CompoundV3UserReserveResponse | undefined, number] => {
-  const assetAddresses = getCompoundV3Assets(chainId, lender)
+  const assetAddresses = Object.keys(lenderData)
   const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset
   const assetsNoBase = assetAddresses.filter((a) => a !== baseAsset)
   const expectedNumberOfCalls = assetsNoBase.length + 2 + 1
@@ -34,7 +32,7 @@ export const getCompoundV3UserDataConverter = (
       let result: { [asset: string]: any } = {}
       for (let i = 0; i < assetsNoBase.length; i++) {
         const asset = assetsNoBase[i]
-        const assetMeta = getAssetMeta(chainId, asset)
+        const assetMeta = lenderData[asset].asset
         const decimals = assetMeta?.decimals ?? 18
         const depositsRaw = data[i][0]?.toString()
         if (depositsRaw === '0') continue
@@ -67,7 +65,7 @@ export const getCompoundV3UserDataConverter = (
 
       const depositsRaw = data[assetsNoBase.length]?.toString()
       const debtRaw = data[assetsNoBase.length + 1]?.toString()
-      const baseMeta = getAssetMeta(chainId, baseAsset)
+      const baseMeta = lenderData[baseAsset].asset
       const baseDecimals = baseMeta.decimals ?? 18
       const deposits = parseRawAmount(depositsRaw, baseDecimals)
       const debt = parseRawAmount(debtRaw, baseDecimals)

package/src/lending/user-data/fetchUserData.ts

@@ -3,7 +3,7 @@ import {
   MULTICALL_DEFAULT_BATCH_SIZE,
   multicallViemAbiArray,
 } from '../../utils/multicall'
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import {
   isAaveV2Type,
   isAaveV3Type,

package/src/lending/user-data/init/userCallBuild.ts

@@ -1,9 +1,10 @@
-import { Chain, Lender } from "@1delta/asset-registry"
-import { Call } from "../../../utils/multicall"
-import { getInitLensAddress } from "../../addresses/init"
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
+import { Call } from '../../../utils/multicall'
+import { getInitLensAddress } from '../../addresses/init'
 
 export const initBrokerAddresses = {
-  [Chain.MANTLE]: '0xc08BFef7E778f3519D79E96780b77066F5d4FCC0'
+  [Chain.MANTLE]: '0xc08BFef7E778f3519D79E96780b77066F5d4FCC0',
 }
 
 export function getInitFlashAggregatorAddress(chainId?: string) {
@@ -11,7 +12,11 @@ export function getInitFlashAggregatorAddress(chainId?: string) {
   return initBrokerAddresses[chainId as keyof typeof initBrokerAddresses]
 }
 
-export const buildInitUserCall = (chainId: string, lender: Lender, account: string): Call[] => {
+export const buildInitUserCall = (
+  chainId: string,
+  lender: Lender,
+  account: string,
+): Call[] => {
   const lensContract = getInitLensAddress(chainId)
   const brokerAddress = getInitFlashAggregatorAddress(chainId)
 
@@ -22,5 +27,4 @@ export const buildInitUserCall = (chainId: string, lender: Lender, account: stri
   }
 
   return [call]
-
-}
+}

package/src/lending/user-data/init/userCallParse.ts

@@ -1,9 +1,9 @@
-import { Lender } from "@1delta/asset-registry"
+import { Lender } from '@1delta/lender-registry'
 import { InitUserReserveResponse } from "../types"
 import { getInitFlashAggregatorAddress } from "./userCallBuild"
 import { InitGetUserPositionDataIndexes } from "../../init/types"
 import { getLenderAssets } from "../../../utils"
-import { getAssetMeta, toOracleKey } from "../../../assets"
+import { toOracleKey } from "../../../assets"
 import { parseRawAmount } from "../../../utils/parsing"
 import { createMultiAccountTypeUserState } from "../utils/createMultiAccountStyleUserState"
 
@@ -41,14 +41,14 @@ export const getInitUserDataConverter = (
           const id = entry.posId.toString()
           const collatData = Object.assign({}, ...data[InitGetUserPositionDataIndexes.collaterals][index].map((c: any) => {
             const asset = c.underlying.toLowerCase()
-            const decimals = getAssetMeta(chainId, asset)?.decimals ?? 18
+            const decimals = lenderData[asset].asset?.decimals ?? 18
             const depositsRaw = c.amount.toString()
             return { [asset]: { deposits: parseRawAmount(depositsRaw, decimals), depositsRaw } }
           })
           )
           const debtData = Object.assign({}, ...data[InitGetUserPositionDataIndexes.debts][index].map((c: any) => {
             const asset = c.underlying.toLowerCase()
-            const decimals = getAssetMeta(chainId, asset)?.decimals ?? 18
+            const decimals =  lenderData[asset]?.asset?.decimals ?? 18
             return { [asset]: { debt: parseRawAmount(c.amount.toString(), decimals) } }
           })
           )
@@ -57,7 +57,7 @@ export const getInitUserDataConverter = (
             [id]: {
               mode,
               ...Object.assign({}, ...assets.map(a => {
-                const ams = toOracleKey(getAssetMeta(chainId, a)?.assetGroup!)
+                const ams = toOracleKey(lenderData[a]?.asset?.assetGroup!)
                 const price = prices[ams] ?? 1
                 const priceHist = pricesHist?.[ams] ?? price
                 if (!histData[id]) histData[id] = {

package/src/lending/user-data/morpho/userCallBuild.ts

@@ -1,6 +1,8 @@
-import { Chain, Lender, MORPHO_BLUE_POOL_DATA } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
+import { Chain } from '@1delta/chain-registry'
 import { Call } from '../../../utils/multicall'
 import { chunk } from 'lodash'
+import { morphoPools } from '@1delta/data-sdk'
 
 const MORPHO_LENS: { [c: string]: string } = {
   [Chain.BASE]: '0x98542B95B44a4732EffB1F4F01A696F1546236d3',
@@ -18,16 +20,17 @@ const getBaseMorphoCalls = (
   account: string,
   marketsToQuery: string[],
 ) => {
+  const mbPool = morphoPools()?.[lender]?.[chainId]
   return marketsToQuery.flatMap((id) => [
     {
       // @ts-ignore
-      address: MORPHO_BLUE_POOL_DATA[lender][chainId],
+      address: mbPool,
       name: 'position',
       params: ['0x' + id.split('_')[1], account],
     },
     {
       // @ts-ignore
-      address: MORPHO_BLUE_POOL_DATA[lender][chainId],
+      address: mbPool,
       name: 'market',
       params: ['0x' + id.split('_')[1]],
     },
@@ -60,7 +63,7 @@ export const buildMorphoUserCallWithLens = (
       marketsInChunk.map((a) => a.replace('MORPHO_BLUE_', '0x')),
       account,
       // @ts-ignore
-      MORPHO_BLUE_POOL_DATA[lender][chainId],
+      morphoPools()?.[lender]?.[chainId],
     ],
   }))
 }

package/src/lending/user-data/morpho/userCallParse.ts

@@ -1,5 +1,5 @@
-import { Lender } from '@1delta/asset-registry'
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../../../assets'
+import { Lender } from '@1delta/lender-registry'
+import { toGenericPriceKey, toOracleKey } from '../../../assets'
 import { MorphoUserReserveResponse } from '../types'
 import { createBaseTypeUserState } from '../utils'
 import { parseRawAmount } from '../../../utils/parsing'
@@ -100,6 +100,7 @@ export const getMorphoUserDataConverterWithlens = (
               balanceData,
               chainId,
               market,
+              lenderData[markeId].data,
               prices,
               pricesHist,
             )
@@ -157,11 +158,12 @@ function createMorphoEntryFromMarketWithLens(
   balanceInfo: BalanceInfo,
   chainId: string,
   market: MorphoMarket,
+  lenderData: any,
   prices: any,
   pricesHist: any,
 ) {
   const loanAddress = market.loanAddress.toLowerCase()
-  const loanMeta = getAssetMeta(chainId, loanAddress)
+  const loanMeta = lenderData[loanAddress].asset
 
   const loanKey =
     toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId)
@@ -181,8 +183,9 @@ function createMorphoEntryFromMarketWithLens(
     }
 
   const collateralAddress = market.collateralAddress.toLowerCase()
-  const collateralAssetMeta = getAssetMeta(chainId, collateralAddress)
-
+  
+  const collateralAssetMeta = lenderData[collateralAddress].asset
+  
   // loan asset deposits
   const loanDepositNumber = parseRawAmount(
     deposits.toString(),

package/src/lending/user-data/types.ts

@@ -1,4 +1,4 @@
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import { BaseYields, RewardsMap } from '../aave-v3-type/types'
 
 export type SerializedBigNumber = string

package/src/lending-pairs/computeLendingPairs.ts

@@ -1,4 +1,4 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../assets'
+import { toGenericPriceKey, toOracleKey } from '../assets'
 import {
   getLiquidityThresholds,
   meetsLiquidityThresholdsLong,
@@ -188,14 +188,8 @@ export function generateLendingPairs(
           const depositApr = long.depositRate + long.stakingYield
           const borrowApr = short.variableBorrowRate + short.stakingYield
 
-          const [assetGroupLong, keyLong] = getPriceKey(
-            long.underlying,
-            chainId,
-          )
-          const [assetGroupShort, keyShort] = getPriceKey(
-            short.underlying,
-            chainId,
-          )
+          const [assetGroupLong, keyLong] = getPriceKey(long.asset)
+          const [assetGroupShort, keyShort] = getPriceKey(short.asset)
           const priceLong = prices[keyLong] ?? 0
           const priceShort = prices[keyShort] ?? 0
 
@@ -254,11 +248,11 @@ export function generateLendingPairs(
   return pairs
 }
 
-function getPriceKey(asset: string, chainId: string): [string, string] {
-  const assetGroup = getAssetMeta(chainId, asset)?.assetGroup
+function getPriceKey(asset: GenericCurrency): [string, string] {
+  const assetGroup = asset?.assetGroup
   return [
     assetGroup,
-    toOracleKey(assetGroup) ?? toGenericPriceKey(asset, chainId),
+    toOracleKey(assetGroup) ?? toGenericPriceKey(asset.address, asset.chainId),
   ]
 }
 

package/src/prices/defillama/index.ts

@@ -132,6 +132,15 @@ const prefixSolana = 'solana:'
 const JITOSOL = 'J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn'
 const SOL = 'So11111111111111111111111111111111111111112'
 
+const prefixXdc = 'xdc:'
+const WXDC = '0x951857744785e80e2de051c32ee7b25f9c458c42'
+
+const prefixBera = 'berachain:'
+const WBERA = '0x6969696969696969696969696969696969696969'
+
+const prefixCronos = 'cronos:'
+const WCRO = '0x5c7f8a570d578ed84e63fdfa7b1ee72deae1ae23'
+
 // const prefixKaia = 'kaia:'
 // const WKAIA = '0x19aac5f612f524b754ca7e7c41cbfa2e981a4432'
 
@@ -150,6 +159,9 @@ const datasHyperEvm = [WYPE, WSTHYPE, kHYPE]
   .map((d) => prefixHyperEVM + d)
   .join(',')
 const datasSolana = [JITOSOL, SOL].map((d) => prefixSolana + d).join(',')
+const datasBera = [WBERA].map((d) => prefixBera + d).join(',')
+const datasXdc = [WXDC].map((d) => prefixXdc + d).join(',')
+const datasCrpnos = [WCRO].map((d) => prefixCronos + d).join(',')
 // const datasKaia = [WKAIA].map((d) => prefixKaia + d).join(',')
 
 const URL = `https://coins.llama.fi/prices/current/${[
@@ -166,6 +178,9 @@ const URL = `https://coins.llama.fi/prices/current/${[
   datasSonic,
   datasPolygon,
   datasSolana,
+  datasBera,
+  datasXdc,
+  datasCrpnos,
 ].join(',')}?searchWidth=4h`
 const URL_HIST = (ref: number) =>
   `https://coins.llama.fi/prices/historical/${ref}/${[
@@ -254,6 +269,9 @@ const SYMBOL_MAP = {
   woeth: 'Wrapped OETH::WOETH',
   jitosol: 'Jito Staked SOL::JitoSOL',
   sol: 'SOL',
+  wcro: 'WCRO',
+  wxdc: 'WXDC',
+  wbera: 'WBERA',
 }
 
 export async function fetchDefillamaData() {
@@ -276,6 +294,9 @@ export async function fetchDefillamaData() {
     prices['WSOL'] = prices['SOL']
     prices['AVAX'] = prices['WAVAX']
     prices['METIS'] = prices['WMETIS']
+    prices['CRO'] = prices['WCRO']
+    prices['XDC'] = prices['WXDC']
+    prices['BERA'] = prices['WBERA']
     // prices['WKAIA'] = prices['KAIA']
 
     prices['USDBC'] = prices['USDC']
@@ -321,6 +342,9 @@ export async function fetchDefillamaHistData() {
     histPrices['AVAX'] = histPrices['WAVAX']
     histPrices['METIS'] = histPrices['WMETIS']
     histPrices['HYPE'] = histPrices['WHYPE']
+    histPrices['BERA'] = histPrices['WBERA']
+    histPrices['CRO'] = histPrices['WCRO']
+    histPrices['XDC'] = histPrices['WXDC']
     // histPrices['WKAIA'] = histPrices['KAIA']
 
     histPrices['LUSD'] = histPrices['USDT']

package/src/prices/main-prices/addresses/api3.ts

@@ -1,4 +1,4 @@
-import { Chain } from "@1delta/asset-registry";
+import { Chain } from "@1delta/chain-registry";
 
 export const api3OracleAddresses: { [chainId: string]: { [asset: string]: string } } = {
   [Chain.MANTLE]: {

package/src/prices/main-prices/addresses/chainlink.ts

@@ -1,4 +1,4 @@
-import { Chain } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
 
 export enum ChainlinkAggregatorIndexes {
   roundId = 0,