@1delta/margin-fetcher 0.0.31 → 0.0.33

package/src/lending/meta/index.ts

@@ -0,0 +1,124 @@
+import { initializeChainData, initializeLenderData } from '@1delta/data-sdk'
+
+const baseUrl =
+  'https://raw.githubusercontent.com/1delta-DAO/lender-metadata/multi-fetch'
+const aavePools = baseUrl + '/config/aave-pools.json'
+const aaveOracles = baseUrl + '/data/aave-oracles.json'
+const morphoOracles = baseUrl + '/data/morpho-oracles.json'
+const compoundV2Pools = baseUrl + '/config/compound-v2-pools.json'
+const compoundV3Pools = baseUrl + '/config/compound-v3-pools.json'
+// const initPools = baseUrl + '/config/init-pools.json'
+const morphoPools = baseUrl + '/config/morpho-pools.json'
+
+const aaveReserves = baseUrl + '/data/aave-reserves.json'
+const compoundV2Reserves = baseUrl + '/data/compound-v2-reserves.json'
+const compoundV3Reserves = baseUrl + '/data/compound-v3-reserves.json'
+const initConfig = baseUrl + '/data/init-config.json'
+const aaveTokens = baseUrl + '/data/aave-tokens.json'
+const compoundV2CTokens = baseUrl + '/data/compound-v2-c-tokens.json'
+const compoundV3Base = baseUrl + '/data/compound-v3-base-data.json'
+const baseUrlChains = 'https://raw.githubusercontent.com/1delta-DAO/chains/main'
+
+const chains = baseUrlChains + '/data.json'
+
+export function inititalizeAllData(params: any) {
+  const { chainsOverride, ...lenderOverrides } = params
+
+  initializeLenderData(lenderOverrides)
+
+  initializeChainData({ chainsOverride })
+}
+
+export async function fetchLenderMetaFromDirAndInitialize() {
+  const {
+    aavePoolsOverride,
+    compoundV2PoolsOverride,
+    compoundV3PoolsOverride,
+    // initPoolsOverride,
+    morphoPoolsOverride,
+    aaveReservesOverride,
+    compoundV2ReservesOverride,
+    compoundV3ReservesOverride,
+    initConfigOverride,
+    aaveTokensOverride,
+    compoundV2TokensOverride,
+    compoundV3BaseDataOverride,
+    aaveOraclesOverride,
+    morphoOraclesOverride,
+    chainsOverride,
+  } = await fetchLenderMetaFromDir()
+
+  initializeLenderData({
+    aaveTokensOverride,
+    aavePoolsOverride,
+    compoundV3PoolsOverride,
+    compoundV3BaseDataOverride,
+    morphoPoolsOverride,
+    compoundV2TokensOverride,
+    compoundV2PoolsOverride,
+    initConfigOverride,
+    aaveReservesOverride,
+    compoundV3ReservesOverride,
+    compoundV2ReservesOverride,
+    aaveOraclesOverride,
+    morphoOraclesOverride,
+  })
+
+  initializeChainData({ chainsOverride })
+}
+
+export async function fetchLenderMetaFromDir() {
+  const promises = [
+    aavePools,
+    compoundV2Pools,
+    compoundV3Pools,
+    // initPools,
+    morphoPools,
+    aaveReserves,
+    compoundV2Reserves,
+    compoundV3Reserves,
+    initConfig,
+    aaveTokens,
+    compoundV2CTokens,
+    compoundV3Base,
+    aaveOracles,
+    morphoOracles,
+    chains,
+  ].map(async (a) => fetch(a).then(async (b) => await b.json()))
+
+  const [
+    aavePoolsOverride,
+    compoundV2PoolsOverride,
+    compoundV3PoolsOverride,
+    // initPoolsOverride,
+    morphoPoolsOverride,
+    aaveReservesOverride,
+    compoundV2ReservesOverride,
+    compoundV3ReservesOverride,
+    initConfigOverride,
+    aaveTokensOverride,
+    compoundV2TokensOverride,
+    compoundV3BaseDataOverride,
+    aaveOraclesOverride,
+    morphoOraclesOverride,
+    chainsOverride,
+  ] = await Promise.all(promises)
+
+  return {
+    aavePoolsOverride,
+    compoundV2PoolsOverride,
+    compoundV3PoolsOverride,
+    // initPoolsOverride,
+    morphoPoolsOverride,
+    aaveReservesOverride,
+    compoundV2ReservesOverride,
+    compoundV3ReservesOverride,
+    initConfigOverride,
+    aaveTokensOverride,
+    compoundV2TokensOverride,
+    compoundV3BaseDataOverride,
+    aaveOraclesOverride,
+    morphoOraclesOverride,
+    chainsOverride,
+  }
+}

package/src/lending/morpho/publicCallBuild.ts

@@ -1,4 +1,3 @@
-import { Chain } from '@1delta/asset-registry'
 import { AdditionalYields } from '../../types'
 import { convertMarketsToMorphoResponse } from './convertPublic'
 import { fetchMorphoMarkets } from './fetchPublic'

package/src/lending/user-data/aave-v2-type/userCallBuild.ts

@@ -1,5 +1,5 @@
 import { Call } from "../../../utils/multicall"
-import { Lender } from "@1delta/asset-registry"
+import { Lender } from '@1delta/lender-registry'
 import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress } from "../../../assets"
 import { getAaveTypeIncentivesControllerAddress, getAaveTypeMultiFeeDistribution } from "../../addresses"
 

package/src/lending/user-data/aave-v2-type/userCallParse.ts

@@ -1,11 +1,14 @@
-import { Lender } from "@1delta/asset-registry"
-import { getAaveAssets, getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { AaveV2TypeGetUserReserveData, AaveV2UserReserveResponse, UserRewardEntry } from "../types"
-import { AURELIUS_REWARD_ASSETS } from "../../aave-v2-type/misc"
-import { getLenderAssets } from "../../../utils"
-import { createBaseTypeUserState } from "../utils"
-import { parseRawAmount } from "../../../utils/parsing"
-
+import { Lender } from '@1delta/lender-registry'
+import { toGenericPriceKey, toOracleKey } from '../../../assets'
+import {
+  AaveV2TypeGetUserReserveData,
+  AaveV2UserReserveResponse,
+  UserRewardEntry,
+} from '../types'
+import { AURELIUS_REWARD_ASSETS } from '../../aave-v2-type/misc'
+import { createBaseTypeUserState } from '../utils'
+import { parseRawAmount } from '../../../utils/parsing'
+import { GenericCurrency } from '../../types'
 
 export const getAaveV2UserDataConverter = (
   lender: Lender,
@@ -13,11 +16,11 @@ export const getAaveV2UserDataConverter = (
   account: string,
   prices: { [asset: string]: number },
   pricesHist: { [asset: string]: number },
-  lenderData: any
+  lenderData: any,
 ): [(data: any[]) => AaveV2UserReserveResponse | undefined, number] => {
   switch (lender) {
     case Lender.AURELIUS: {
-      const assetsToQuery = getAaveAssets(chainId, lender)
+      const assetsToQuery = Object.keys(lenderData)
       const expectedNumberOfCalls = assetsToQuery.length + 1
       return [
         (data: any[]) => {
@@ -32,20 +35,17 @@ export const getAaveV2UserDataConverter = (
 
           for (let i = 0; i < assetsToQuery.length; i++) {
             const asset = assetsToQuery[i]
-            const {
-              dataForAsset,
-              addedDebt,
-              addedDeposits
-            } = createAaveV2Entry(
-              i,
-              data,
-              chainId,
-              asset,
-              prices,
-              pricesHist,
-              0,
-            )
-            if(!dataForAsset) continue;
+            const { dataForAsset, addedDebt, addedDeposits } =
+              createAaveV2Entry(
+                i,
+                data,
+                chainId,
+                lenderData[asset].asset,
+                prices,
+                pricesHist,
+                0,
+              )
+            if (!dataForAsset) continue
 
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
@@ -53,24 +53,39 @@ export const getAaveV2UserDataConverter = (
           }
 
           const startIndex = assetsToQuery.length
-          const rewardMapping = Object.fromEntries(data[startIndex][0].map((key: string, index: number) => [key.toLowerCase(), data[startIndex][1][index]]))
+          const rewardMapping = Object.fromEntries(
+            data[startIndex][0].map((key: string, index: number) => [
+              key.toLowerCase(),
+              data[startIndex][1][index],
+            ]),
+          )
           const rewards: UserRewardEntry = {}
           for (let i = 0; i < AURELIUS_REWARD_ASSETS.length; i++) {
             const asset = AURELIUS_REWARD_ASSETS[i]
-            const reward = Number(parseRawAmount(rewardMapping[asset.address.toLowerCase()].toString(), asset.decimals))
+            const reward = Number(
+              parseRawAmount(
+                rewardMapping[asset.address.toLowerCase()].toString(),
+                asset.decimals,
+              ),
+            )
             rewards[asset.symbol!] = {
               totalRewards: reward,
-              claimableRewards: reward
+              claimableRewards: reward,
             }
           }
 
           const payload = {
             chainId,
             account,
-            lendingPositions: { "0": lendingPositions },
-            rewards
+            lendingPositions: { '0': lendingPositions },
+            rewards,
           }
-          const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+          const userData = createBaseTypeUserState(
+            payload,
+            lenderData,
+            totalDeposits24h,
+            totalDebt24h,
+          )
 
           return {
             ...payload,
@@ -81,7 +96,7 @@ export const getAaveV2UserDataConverter = (
       ]
     }
     case Lender.LENDLE: {
-      const assetsToQuery = getAaveAssets(chainId, lender)
+      const assetsToQuery = Object.keys(lenderData)
       const expectedNumberOfCalls = assetsToQuery.length + 2
 
       return [
@@ -93,17 +108,28 @@ export const getAaveV2UserDataConverter = (
           const claimableRewards = data[expectedNumberOfCalls - 2]
           // map claimable rewards to tokens
           // foreach asset, we sum the l and v token rewards
-          const mappedClaimableRewardsToTokens = assetsToQuery.map((name, index) => {
-            return {
-              [name]:
-                Number(parseRawAmount(claimableRewards?.[index * 2]?.toString(), 18)) +
-                Number(parseRawAmount(claimableRewards?.[index * 2 + 1]?.toString(), 18))
-            }
-          })
+          const mappedClaimableRewardsToTokens = assetsToQuery.map(
+            (name, index) => {
+              return {
+                [name]:
+                  Number(
+                    parseRawAmount(
+                      claimableRewards?.[index * 2]?.toString(),
+                      18,
+                    ),
+                  ) +
+                  Number(
+                    parseRawAmount(
+                      claimableRewards?.[index * 2 + 1]?.toString(),
+                      18,
+                    ),
+                  ),
+              }
+            },
+          )
 
           const lendingPositions: { [asset: string]: any } = {}
 
-
           let totalClaimableLend = 0
           let totalDebt24h = 0
           let totalDeposits24h = 0
@@ -111,20 +137,17 @@ export const getAaveV2UserDataConverter = (
           for (let i = 0; i < assetsToQuery.length; i++) {
             const asset = assetsToQuery[i]
             totalClaimableLend += mappedClaimableRewardsToTokens[i][asset]
-            const {
-              dataForAsset,
-              addedDebt,
-              addedDeposits
-            } = createAaveV2Entry(
-              i,
-              data,
-              chainId,
-              asset,
-              prices,
-              pricesHist,
-              mappedClaimableRewardsToTokens[i][asset],
-            )
-            if(!dataForAsset) continue;
+            const { dataForAsset, addedDebt, addedDeposits } =
+              createAaveV2Entry(
+                i,
+                data,
+                chainId,
+                lenderData[asset].asset,
+                prices,
+                pricesHist,
+                mappedClaimableRewardsToTokens[i][asset],
+              )
+            if (!dataForAsset) continue
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
@@ -133,17 +156,27 @@ export const getAaveV2UserDataConverter = (
           const rewards: UserRewardEntry = {}
 
           const earnedBalances = data[expectedNumberOfCalls - 1]
-          const lendRewards = Number(parseRawAmount(earnedBalances[0].toString(), 18))
+          const lendRewards = Number(
+            parseRawAmount(earnedBalances[0].toString(), 18),
+          )
 
-          rewards["LEND"] = { totalRewards: lendRewards + totalClaimableLend, claimableRewards: totalClaimableLend }
+          rewards['LEND'] = {
+            totalRewards: lendRewards + totalClaimableLend,
+            claimableRewards: totalClaimableLend,
+          }
 
           const payload = {
             chainId,
             account,
-            lendingPositions: { "0": lendingPositions },
-            rewards
+            lendingPositions: { '0': lendingPositions },
+            rewards,
           }
-          const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+          const userData = createBaseTypeUserState(
+            payload,
+            lenderData,
+            totalDeposits24h,
+            totalDebt24h,
+          )
 
           return {
             ...payload,
@@ -154,7 +187,7 @@ export const getAaveV2UserDataConverter = (
       ]
     }
     case Lender.MERIDIAN: {
-      const assetsToQuery = getLenderAssets(chainId, lender)
+      const assetsToQuery = Object.keys(lenderData)
       const expectedNumberOfCalls = assetsToQuery.length + 2
 
       return [
@@ -163,21 +196,34 @@ export const getAaveV2UserDataConverter = (
             return undefined
           }
 
-
           const rewardsBalanceArray = data[expectedNumberOfCalls - 2]
           const totalUnclaimedRewards = data[expectedNumberOfCalls - 1]
 
-          const totalRewards = Number(parseRawAmount(totalUnclaimedRewards.toString(), 18))
+          const totalRewards = Number(
+            parseRawAmount(totalUnclaimedRewards.toString(), 18),
+          )
 
           // map claimable rewards to tokens
           // foreach asset, we sum the l and v token rewards from the rewards balance array
-          const mappedClaimableRewardsToTokens = assetsToQuery.map((name, index) => {
-            return {
-              [name]:
-                Number(parseRawAmount(rewardsBalanceArray[index * 2]?.toString() || "0", 18)) +
-                Number(parseRawAmount(rewardsBalanceArray[index * 2 + 1]?.toString() || "0", 18))
-            }
-          })
+          const mappedClaimableRewardsToTokens = assetsToQuery.map(
+            (name, index) => {
+              return {
+                [name]:
+                  Number(
+                    parseRawAmount(
+                      rewardsBalanceArray[index * 2]?.toString() || '0',
+                      18,
+                    ),
+                  ) +
+                  Number(
+                    parseRawAmount(
+                      rewardsBalanceArray[index * 2 + 1]?.toString() || '0',
+                      18,
+                    ),
+                  ),
+              }
+            },
+          )
 
           const lendingPositions: { [asset: string]: any } = {}
           let totalDebt24h = 0
@@ -186,23 +232,21 @@ export const getAaveV2UserDataConverter = (
 
           for (let i = 0; i < assetsToQuery.length; i++) {
             const asset = assetsToQuery[i]
-            const assetClaimableRewards = mappedClaimableRewardsToTokens[i][asset]
+            const assetClaimableRewards =
+              mappedClaimableRewardsToTokens[i][asset]
             totalClaimableRewards += assetClaimableRewards
 
-            const {
-              dataForAsset,
-              addedDebt,
-              addedDeposits
-            } = createAaveV2Entry(
-              i,
-              data,
-              chainId,
-              asset,
-              prices,
-              pricesHist,
-              assetClaimableRewards,
-            )
-            if(!dataForAsset) continue;
+            const { dataForAsset, addedDebt, addedDeposits } =
+              createAaveV2Entry(
+                i,
+                data,
+                chainId,
+                lenderData[asset].asset,
+                prices,
+                pricesHist,
+                assetClaimableRewards,
+              )
+            if (!dataForAsset) continue
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
@@ -210,18 +254,23 @@ export const getAaveV2UserDataConverter = (
 
           const rewards: UserRewardEntry = {}
 
-          rewards["TAIKO"] = {
+          rewards['TAIKO'] = {
             totalRewards,
-            claimableRewards: totalClaimableRewards
+            claimableRewards: totalClaimableRewards,
           }
 
           const payload = {
             chainId,
             account,
-            lendingPositions: { "0": lendingPositions },
-            rewards
+            lendingPositions: { '0': lendingPositions },
+            rewards,
           }
-          const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+          const userData = createBaseTypeUserState(
+            payload,
+            lenderData,
+            totalDeposits24h,
+            totalDebt24h,
+          )
           return {
             ...payload,
             ...userData,
@@ -231,7 +280,7 @@ export const getAaveV2UserDataConverter = (
       ]
     }
     default: {
-      const assetsToQuery = getLenderAssets(chainId, lender)
+      const assetsToQuery = Object.keys(lenderData)
       const expectedNumberOfCalls = assetsToQuery.length
       return [
         (data: any[]) => {
@@ -245,20 +294,17 @@ export const getAaveV2UserDataConverter = (
 
           for (let i = 0; i < assetsToQuery.length; i++) {
             const asset = assetsToQuery[i]
-            const {
-              dataForAsset,
-              addedDebt,
-              addedDeposits
-            } = createAaveV2Entry(
-              i,
-              data,
-              chainId,
-              asset,
-              prices,
-              pricesHist,
-              0,
-            )
-            if(!dataForAsset) continue;
+            const { dataForAsset, addedDebt, addedDeposits } =
+              createAaveV2Entry(
+                i,
+                data,
+                chainId,
+                lenderData[asset].asset,
+                prices,
+                pricesHist,
+                0,
+              )
+            if (!dataForAsset) continue
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
@@ -267,10 +313,15 @@ export const getAaveV2UserDataConverter = (
           const payload = {
             chainId,
             account,
-            lendingPositions: { "0": lendingPositions },
-            rewards: {}
+            lendingPositions: { '0': lendingPositions },
+            rewards: {},
           }
-          const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+          const userData = createBaseTypeUserState(
+            payload,
+            lenderData,
+            totalDeposits24h,
+            totalDebt24h,
+          )
           return {
             ...payload,
             ...userData,
@@ -282,39 +333,44 @@ export const getAaveV2UserDataConverter = (
   }
 }
 
-
 function createAaveV2Entry(
   i: number,
   data: any[],
   chainId: string,
-  asset: string,
+  asset: GenericCurrency,
   prices: any,
   pricesHist: any,
   claimableRewards: any,
 ) {
   const reserveData = data[i]
-  const currentATokenBalanceRaw = reserveData[AaveV2TypeGetUserReserveData.currentATokenBalance]?.toString()
-  const currentStableDebtRaw = reserveData[AaveV2TypeGetUserReserveData.currentStableDebt]?.toString()
-  const currentVariableDebtRaw = reserveData[AaveV2TypeGetUserReserveData.currentVariableDebt]?.toString()
+  const currentATokenBalanceRaw =
+    reserveData[AaveV2TypeGetUserReserveData.currentATokenBalance]?.toString()
+  const currentStableDebtRaw =
+    reserveData[AaveV2TypeGetUserReserveData.currentStableDebt]?.toString()
+  const currentVariableDebtRaw =
+    reserveData[AaveV2TypeGetUserReserveData.currentVariableDebt]?.toString()
 
   if (
-    currentATokenBalanceRaw === "0" &&
-    currentStableDebtRaw === "0" &&
-    currentVariableDebtRaw === "0") {
+    currentATokenBalanceRaw === '0' &&
+    currentStableDebtRaw === '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 currentStableDebt = parseRawAmount(currentStableDebtRaw, decimals)
   const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals)
 
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
+  const key =
+    toOracleKey(assetMeta?.assetGroup) ??
+    toGenericPriceKey(asset.address, chainId)
   const price = prices[key] ?? 1
   const priceHist = pricesHist?.[key] ?? price
 
@@ -328,15 +384,18 @@ function createAaveV2Entry(
     depositsUSD: Number(currentATokenBalance) * price,
     debtStableUSD: Number(currentStableDebt) * price,
     debtUSD: Number(currentVariableDebt) * price,
-    stableBorrowRate: reserveData[AaveV2TypeGetUserReserveData.stableBorrowRate]?.toString(),
-    collateralActive: Boolean(reserveData[AaveV2TypeGetUserReserveData.usageAsCollateralEnabled]),
+    stableBorrowRate:
+      reserveData[AaveV2TypeGetUserReserveData.stableBorrowRate]?.toString(),
+    collateralActive: Boolean(
+      reserveData[AaveV2TypeGetUserReserveData.usageAsCollateralEnabled],
+    ),
     claimableRewards,
-
   }
 
   return {
     dataForAsset,
     addedDeposits: Number(currentATokenBalance) * priceHist,
-    addedDebt: (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist
+    addedDebt:
+      (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist,
   }
-}
+}

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

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

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

@@ -1,7 +1,5 @@
-import { Lender } from '@1delta/asset-registry'
+import { Lender } from '@1delta/lender-registry'
 import {
-  getAaveAssets,
-  getAssetMeta,
   toGenericPriceKey,
   toOracleKey,
 } from '../../../assets'
@@ -9,6 +7,7 @@ import { AaveV3UserReserveResponse } from '../types'
 import { createBaseTypeUserState } from '../utils'
 import { AaveTypeGetUserReserveIndexes } from '../../aave-v3-type/types'
 import { parseRawAmount } from '../../../utils/parsing'
+import { GenericCurrency } from '../../types'
 
 export const getAaveV3UserDataConverter = (
   lender: Lender,
@@ -18,7 +17,7 @@ export const getAaveV3UserDataConverter = (
   pricesHist: { [asset: string]: number },
   lenderData: any,
 ): [(data: any[]) => AaveV3UserReserveResponse | undefined, number] => {
-  const assetsToQuery = getAaveAssets(chainId, lender)
+  const assetsToQuery = Object.keys(lenderData)
   const expectedNumberOfCalls = assetsToQuery.length + 1
 
   return [
@@ -39,7 +38,7 @@ export const getAaveV3UserDataConverter = (
           i,
           data,
           chainId,
-          asset,
+          lenderData[asset].asset,
           prices,
           pricesHist,
         )
@@ -76,7 +75,7 @@ function createAaveV3Entry(
   i: number,
   data: any[],
   chainId: string,
-  asset: string,
+  asset: GenericCurrency,
   prices: any,
   pricesHist: any,
 ) {
@@ -101,7 +100,7 @@ function createAaveV3Entry(
     }
   }
 
-  const assetMeta = getAssetMeta(chainId, asset)
+  const assetMeta = asset
   const decimals = assetMeta?.decimals ?? 18
 
   const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals)
@@ -109,7 +108,7 @@ function createAaveV3Entry(
   const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals)
 
   const key =
-    toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
+    toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset.address, chainId)
   // prices
   const price = prices[key] ?? 1
   const priceHist = pricesHist?.[key] ?? price