@1delta/margin-fetcher 0.0.31 → 0.0.33

package/dist/lending/user-data/morpho/userCallParse.d.ts

@@ -1,4 +1,4 @@
-import { Lender } from '@1delta/asset-registry';
+import { Lender } from '@1delta/lender-registry';
 import { MorphoUserReserveResponse } from '../types';
 export declare const getMorphoUserDataConverterWithlens: (lender: Lender, chainId: string, account: string, markets: string[], prices: {
     [asset: string]: number;

package/dist/lending/user-data/morpho/userCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAiDpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CA4FP,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAiDpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CA6FP,CAAA"}

package/dist/lending/user-data/morpho/userCallParse.js

@@ -1,4 +1,4 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../../../assets';
+import { toGenericPriceKey, toOracleKey } from '../../../assets';
 import { createBaseTypeUserState } from '../utils';
 import { parseRawAmount } from '../../../utils/parsing';
 import { decodePackedDataset } from './decoder';
@@ -69,7 +69,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                     const markeId = markets[mapMarketToChunk(balanceData.index, i)];
                     marketsHandled.push(markeId);
                     const market = lenderData[markeId]?.params?.market;
-                    const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(balanceData, chainId, market, prices, pricesHist);
+                    const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(balanceData, chainId, market, lenderData[markeId].data, prices, pricesHist);
                     const payload = {
                         chainId,
                         account,
@@ -110,9 +110,9 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
         expectedNumberOfCalls,
     ];
 };
-function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, prices, pricesHist) {
+function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lenderData, prices, pricesHist) {
     const loanAddress = market.loanAddress.toLowerCase();
-    const loanMeta = getAssetMeta(chainId, loanAddress);
+    const loanMeta = lenderData[loanAddress].asset;
     const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId);
     // prices
     const priceLoan = prices[loanKey] ?? 1;
@@ -129,7 +129,7 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, price
             addedDebt: 0,
         };
     const collateralAddress = market.collateralAddress.toLowerCase();
-    const collateralAssetMeta = getAssetMeta(chainId, collateralAddress);
+    const collateralAssetMeta = lenderData[collateralAddress].asset;
     // loan asset deposits
     const loanDepositNumber = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
     // collateral amount

package/dist/lending/user-data/types.js

@@ -1,4 +1,4 @@
-import { Lender } from '@1delta/asset-registry';
+import { Lender } from '@1delta/lender-registry';
 /** Filter all morphos into one for querying */
 export function organizeUserQueries(queries) {
     const morphos = queries.filter((q) => q.lender?.startsWith('MORPHO_BLUE'));

package/dist/lending-pairs/computeLendingPairs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeLendingPairs.d.ts","sourceRoot":"","sources":["../../src/lending-pairs/computeLendingPairs.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAe,UAAU,EAAY,MAAM,UAAU,CAAA;AAG5D,UAAU,eAAe;IACvB,KAAK,EAAE,eAAe,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,WAAW;IAE1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IAEd,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAElB,sBAAsB;IACtB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,eAAe,CAAA;IAG1B,cAAc,EAAE,MAAM,CAAA;IAEtB,eAAe,EAAE,MAAM,CAAA;IAEvB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IAGnB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IAGd,oBAAoB,EAAE,MAAM,CAAA;IAC5B,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,iBAAiB,EAAE,MAAM,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAG9B,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,OAAO,CAAA;IACtB,aAAa,EAAE,OAAO,CAAA;IACtB,qBAAqB,EAAE,OAAO,CAAA;CAC/B;AAmDD,kDAAkD;AAClD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC/B,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAClC,WAAW,EAAE,CA4If;AAkFD,wBAAgB,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE;;;;;EAyB/C;AAMD,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAAE,GACnB,WAAW,EAAE,CAwFf"}
+{"version":3,"file":"computeLendingPairs.d.ts","sourceRoot":"","sources":["../../src/lending-pairs/computeLendingPairs.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAe,UAAU,EAAY,MAAM,UAAU,CAAA;AAG5D,UAAU,eAAe;IACvB,KAAK,EAAE,eAAe,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,WAAW;IAE1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IAEd,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAElB,sBAAsB;IACtB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,eAAe,CAAA;IAG1B,cAAc,EAAE,MAAM,CAAA;IAEtB,eAAe,EAAE,MAAM,CAAA;IAEvB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IAGnB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IAGd,oBAAoB,EAAE,MAAM,CAAA;IAC5B,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,iBAAiB,EAAE,MAAM,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAG9B,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,OAAO,CAAA;IACtB,aAAa,EAAE,OAAO,CAAA;IACtB,qBAAqB,EAAE,OAAO,CAAA;CAC/B;AAmDD,kDAAkD;AAClD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC/B,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAClC,WAAW,EAAE,CAsIf;AAkFD,wBAAgB,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE;;;;;EAyB/C;AAMD,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAAE,GACnB,WAAW,EAAE,CAwFf"}

package/dist/lending-pairs/computeLendingPairs.js

@@ -1,4 +1,4 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../assets';
+import { toGenericPriceKey, toOracleKey } from '../assets';
 import { getLiquidityThresholds, meetsLiquidityThresholdsLong, meetsLiquidityThresholdsShort, } from '../assets/liquidityThresholds';
 import { isAaveV3Type, isInit } from '../utils';
 const isEMode = (longData, shortData) => Boolean(longData.eMode)
@@ -92,8 +92,8 @@ export function generateLendingPairs(lenderData, prices, histPrices) {
                     }
                     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;
                     const price24hLong = histPrices[keyLong] ?? priceLong;
@@ -141,11 +141,11 @@ export function generateLendingPairs(lenderData, prices, histPrices) {
     }
     return pairs;
 }
-function getPriceKey(asset, chainId) {
-    const assetGroup = getAssetMeta(chainId, asset)?.assetGroup;
+function getPriceKey(asset) {
+    const assetGroup = asset?.assetGroup;
     return [
         assetGroup,
-        toOracleKey(assetGroup) ?? toGenericPriceKey(asset, chainId),
+        toOracleKey(assetGroup) ?? toGenericPriceKey(asset.address, asset.chainId),
     ];
 }
 const MAX_ENTRIES = 10;

package/dist/prices/defillama/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/prices/defillama/index.ts"],"names":[],"mappings":"AAkQA,wBAAsB,kBAAkB,iBAyCvC;AAED,wBAAsB,sBAAsB,iBA6C3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/prices/defillama/index.ts"],"names":[],"mappings":"AAoRA,wBAAsB,kBAAkB,iBA4CvC;AAED,wBAAsB,sBAAsB,iBAgD3C"}

package/dist/prices/defillama/index.js

@@ -119,6 +119,12 @@ const kHYPE = '0xfd739d4e423301ce9385c1fb8850539d657c296d';
 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'
 const datasAvalanche = [WAVAX, SAVAX].map((d) => prefixAvalanche + d).join(',');
@@ -136,6 +142,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/${[
     datasEthereum,
@@ -151,6 +160,9 @@ const URL = `https://coins.llama.fi/prices/current/${[
     datasSonic,
     datasPolygon,
     datasSolana,
+    datasBera,
+    datasXdc,
+    datasCrpnos,
 ].join(',')}?searchWidth=4h`;
 const URL_HIST = (ref) => `https://coins.llama.fi/prices/historical/${ref}/${[
     datasEthereum,
@@ -237,6 +249,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() {
     try {
@@ -253,6 +268,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'];
         prices['BTCB'] = prices['WBTC'];
@@ -290,6 +308,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'];
         histPrices['XDAI'] = histPrices['DAI'];

package/dist/prices/main-prices/addresses/api3.js

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

package/dist/prices/main-prices/addresses/chainlink.js

@@ -1,4 +1,4 @@
-import { Chain } from '@1delta/asset-registry';
+import { Chain } from '@1delta/chain-registry';
 export var ChainlinkAggregatorIndexes;
 (function (ChainlinkAggregatorIndexes) {
     ChainlinkAggregatorIndexes[ChainlinkAggregatorIndexes["roundId"] = 0] = "roundId";

package/dist/prices/main-prices/fetchOracleData.d.ts

@@ -1,3 +1,4 @@
+import { TokenList } from '../../types';
 export declare const formatAavePrice: (price: string, isV2?: boolean) => number;
 export declare const formatMorphoPrice: (price: string, collateralDec: number, debtDec: number) => number;
 interface OracleData {
@@ -8,6 +9,11 @@ interface OracleData {
  */
 export declare const fetchMainPrices: (chainIds: string[], rpcOverrides?: {
     [chainId: string]: string;
+}, lists?: {
+    [chainId: string]: {
+        list: TokenList;
+    };
 }) => Promise<OracleData>;
+export declare function getV3PriceFromSqrt(sqrtPrice: bigint, t0d: number, t1d: number): number;
 export {};
 //# sourceMappingURL=fetchOracleData.d.ts.map

package/dist/prices/main-prices/fetchOracleData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchOracleData.d.ts","sourceRoot":"","sources":["../../../src/prices/main-prices/fetchOracleData.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAY7D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA;AAOD,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAID;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAAE,EAClB,eAAe;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,KAC3C,OAAO,CAAC,UAAU,CAkKpB,CAAA"}
+{"version":3,"file":"fetchOracleData.d.ts","sourceRoot":"","sources":["../../../src/prices/main-prices/fetchOracleData.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAIvC,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAY7D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA;AAOD,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAID;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAAE,EAClB,eAAe;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC5C,QAAO;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,SAAS,CAAA;KAAE,CAAA;CAAO,KACrD,OAAO,CAAC,UAAU,CAqMpB,CAAA;AAuDD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,UAiBZ"}

package/dist/prices/main-prices/fetchOracleData.js

@@ -4,18 +4,19 @@ import { ChainLinkAggregatorAbi } from '../../abis/oracle/ChainLinkAggregator';
 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 { chainlinkOracles, getChainLinkKeys, ChainlinkAggregatorIndexes, } 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 { MrophoOracles } from './addresses/morpho';
 import { multicallRetry } from '@1delta/providers';
+import { UniswapV3Abi } from '../../abis/oracle/UniV3';
+import { aaveOracles, morphoOracles } from '@1delta/data-sdk';
 export const formatAavePrice = (price, isV2 = false) => {
     try {
         return Number(formatEther(BigInt(price ?? '0') *
@@ -43,9 +44,10 @@ const RWA_DYNAMIC_ORACLE = '0xA96abbe61AfEdEB0D14a20440Ae7100D9aB4882f';
 /**
  * Fetches Aave and uniswap V2 oracle data
  */
-export const fetchMainPrices = async (chainIds, rpcOverrides) => {
+export const fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
+    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,
             assets: getAaveAssets(chainId, a),
@@ -58,23 +60,26 @@ export const fetchMainPrices = async (chainIds, rpcOverrides) => {
                 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((a) => !handled.has(a.collateralAsset) || !handled.has(a.loanAsset));
+        const morphoOraclesObtained = morphoOracles();
+        const morphoQueries = (morphoOraclesObtained[chainId] ?? []).filter((a) => !handled.has(a.collateralAsset) || !handled.has(a.loanAsset));
         const morphoCalls = getMorphoCalls(morphoQueries);
         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);
         const allCalls = [
             ...chainlinkCalls,
             ...aaveCalls,
             ...uniswapCalls,
+            ...uniswapV3Calls,
             ...api3Calls,
             ...rwaCalls,
             ...morphoCalls,
@@ -82,6 +87,7 @@ export const fetchMainPrices = async (chainIds, rpcOverrides) => {
         const abis = [
             ...ChainLinkAggregatorAbi,
             ...UniswapV2PairAbi,
+            ...UniswapV3Abi,
             ...AaveOracleAbi,
             ...Api3OracleAbi,
             ...RWADynamicOracleAbi,
@@ -98,6 +104,7 @@ export const fetchMainPrices = async (chainIds, rpcOverrides) => {
                 rwa: { calls: rwaCalls, names: rwaNames },
                 morpho: { queries: morphoQueries },
                 uniswapCalls,
+                uniswapV3Calls,
                 aaveCalls,
             },
         };
@@ -109,17 +116,20 @@ export const fetchMainPrices = async (chainIds, rpcOverrides) => {
     ]);
     let allPrices = {};
     // Parse all except morpho first
-    for (const { chainId, result, meta: { queries, chainlink, api3, rwa, uniswapCalls, aaveCalls }, } of chainResults) {
+    for (const { chainId, result, meta: { queries, chainlink, api3, rwa, uniswapCalls, uniswapV3Calls, aaveCalls, }, } of chainResults) {
         let offset = 0;
         const chainlinkSlice = result.slice(offset, offset + chainlink.calls.length);
         const chainlinkData = parseChainLinkResults(chainId, chainlinkSlice, chainlink.names);
         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;
@@ -131,20 +141,22 @@ export const fetchMainPrices = async (chainIds, rpcOverrides) => {
             ...chainlinkData,
             ...aaveData,
             ...uniswapData,
+            ...uniswapV3Data,
             ...api3Data,
             ...rwaData,
         };
     }
     allPrices = { ...allPrices, ...otherResults[0], ...otherResults[1] };
     // Parse morpho data (needs allPrices)
-    for (const { chainId, result, meta: { morpho, chainlink, aaveCalls, uniswapCalls, api3, rwa }, } of chainResults) {
+    for (const { chainId, result, 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);
+        const morphoData = parseMorphoResults(chainId, morphoResult, morpho.queries, allPrices, lists[chainId]?.list);
         allPrices = {
             ...allPrices,
             ...morphoData,
@@ -185,6 +197,55 @@ const getUniswapV2Calls = (chainId) => {
             return [];
     }
 };
+/**
+ * Gets the calls foir the uniswap pools
+ * @param chainId network id
+ * @returns array of calls
+ */
+const getUniswapV3Calls = (chainId) => {
+    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, t0d, t1d) {
+    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)); // in token1 / token0
+    return price0to1;
+}
+const parseUniswapV3results = (data, chainId) => {
+    switch (chainId) {
+        case Chain.HEMI_NETWORK: {
+            let uniswapData = {};
+            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
@@ -281,6 +342,8 @@ function lowDecimalOracle(chainId, fork) {
     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);
 }
@@ -291,31 +354,28 @@ function lowDecimalOracle(chainId, fork) {
  * @param assetName asset names (aligned with the originall addresses called)
  * @returns price mapping asset->number
  */
-const parseAaveResults = (chainId, data, queries) => {
+const parseAaveResults = (chainId, data, queries, list = {}) => {
     let prices = {};
     data.forEach((d, i) => {
         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));
             });
         }
     });
     return prices;
 };
-const parseMorphoResults = (chainId, data, queries, donePrices = {}) => {
+const parseMorphoResults = (chainId, data, queries, donePrices = {}, list = {}) => {
     let prices = {};
     data.forEach((d, i) => {
         const details = queries[i];
         const { loanAsset, collateralAsset, loanAssetDecimals, 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;
+        const oracleIdCollateral = list[collateralAsset]?.assetGroup ?? chainId + '-' + collateralAsset;
         // get price from map or just computed ones
         const collateralPrice = donePrices[oracleIdCollateral] ?? prices[oracleIdCollateral];
         const priceDebtToCollateral = formatMorphoPrice(d.toString(), loanAssetDecimals, collateralAssetDecimals);

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./apiReturnType";
+export * from './apiReturnType';
 export interface ParsedResponse {
     price: number;
     time: number;
@@ -38,5 +38,11 @@ export declare interface GeneralCall {
     name: string;
     params?: any[];
 }
-export * from "./providers";
+export type TokenList = {
+    [address: string]: {
+        decimals: number;
+        assetGroup?: string;
+    };
+};
+export * from './providers';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAE/B,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb;AACD,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,oBAAY,0BAA0B;IACpC,OAAO,IAAI;IACX,MAAM,IAAA;IACN,SAAS,IAAA;IACT,SAAS,IAAA;IACT,eAAe,IAAA;CAChB;AAED,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAAE,CAAA;AACpE,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AACjD,MAAM,MAAM,oBAAoB,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAA;CAAE,CAAA;AAChG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,SAAS,CAAA;IAC1B,aAAa,EAAE,oBAAoB,CAAA;IACnC,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AACD,MAAM,CAAC,OAAO,WAAW,WAAW;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;CACf;AAED,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAE/B,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb;AACD,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,oBAAY,0BAA0B;IACpC,OAAO,IAAI;IACX,MAAM,IAAA;IACN,SAAS,IAAA;IACT,SAAS,IAAA;IACT,eAAe,IAAA;CAChB;AAED,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAAE,CAAA;AACpE,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AACjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,CAAC,OAAO,EAAE,MAAM,GAAG;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAA;CAC1D,CAAA;AACD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,SAAS,CAAA;IAC1B,aAAa,EAAE,oBAAoB,CAAA;IACnC,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AACD,MAAM,CAAC,OAAO,WAAW,WAAW;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;CACf;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC7D,CAAA;AAED,cAAc,aAAa,CAAA"}

package/dist/types/index.js

@@ -1,4 +1,4 @@
-export * from "./apiReturnType";
+export * from './apiReturnType';
 export var ChainlinkAggregatorIndexes;
 (function (ChainlinkAggregatorIndexes) {
     ChainlinkAggregatorIndexes[ChainlinkAggregatorIndexes["roundId"] = 0] = "roundId";
@@ -7,4 +7,4 @@ export var ChainlinkAggregatorIndexes;
     ChainlinkAggregatorIndexes[ChainlinkAggregatorIndexes["updatedAt"] = 3] = "updatedAt";
     ChainlinkAggregatorIndexes[ChainlinkAggregatorIndexes["answeredInRound"] = 4] = "answeredInRound";
 })(ChainlinkAggregatorIndexes || (ChainlinkAggregatorIndexes = {}));
-export * from "./providers";
+export * from './providers';

package/dist/utils/constants.js

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

package/dist/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry";
+import { Lender } from '@1delta/lender-registry';
 export declare function isCompoundV3(lender: string): boolean;
 export declare function isCompoundV3Type(lender: string): boolean;
 export declare function isInit(lender: string): lender is Lender.INIT;
@@ -13,7 +13,7 @@ export declare const getLendersForChain: (c: string) => string[];
 /** Filter lenders by protocol list */
 export declare const filterLendersByProtocol: (allLenders: string[], protocolList?: string[]) => string[];
 /** All aave protocols per chain */
-export declare const AAVES_PER_CHAIN: {
+export declare const getAavesForChain: () => {
     [c: string]: string[];
 };
 export declare const getComposerAddress: (chainId: string) => string;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAKP,MAAM,wBAAwB,CAAA;AAO/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAAgD;AAE3F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAAgD;AAE/F,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAAmC;AAExE,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA4B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAS7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACpC,wBAAgC,KAC/B,MAAM,EAOR,CAAA;AAGD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAEP,MAAM,yBAAyB,CAAA;AAehC,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA2B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAAE,EACpB,eAAe,MAAM,EAAE,KACtB,MAAM,EAaR,CAAA;AAED,mCAAmC;AACnC,eAAO,MAAM,gBAAgB;;CAS5B,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACpC,wBAAgC,KAC/B,MAAM,EAOR,CAAA;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}

package/dist/utils/index.js

@@ -1,15 +1,22 @@
-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) { return lender?.startsWith(COMPOUND_V3_KEY); }
-export function isCompoundV3Type(lender) { return lender?.startsWith(COMPOUND_V3_KEY); }
-export function isInit(lender) { return lender === Lender.INIT; }
+import { AAVE_V2_LENDERS, AAVE_V3_LENDERS, Lender, AAVE_V32_LENDERS, } 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) {
+    return lender?.startsWith(COMPOUND_V3_KEY);
+}
+export function isCompoundV3Type(lender) {
+    return lender?.startsWith(COMPOUND_V3_KEY);
+}
+export function isInit(lender) {
+    return lender === Lender.INIT;
+}
 export function isMorphoType(lender) {
-    return lender?.startsWith("MORPHO_BLUE");
+    return lender?.startsWith('MORPHO_BLUE');
 }
-const SWAYLEND_KEY = "SWAYLEND";
+const SWAYLEND_KEY = 'SWAYLEND';
 export function isAaveV3Type(lender) {
     return AAVE_V3_LENDERS.includes(lender);
 }
@@ -31,25 +38,25 @@ export function isSwaylend(lender) {
 export const getLendersForChain = (c) => {
     let lenders = [];
     // 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);
@@ -64,11 +71,13 @@ export const filterLendersByProtocol = (allLenders, protocolList) => {
     }
     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 = {};
-    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] = [];
@@ -77,8 +86,6 @@ const getAavesForChain = () => {
     });
     return lenders;
 };
-/** All aave protocols per chain */
-export const AAVES_PER_CHAIN = getAavesForChain();
 export const getComposerAddress = (chainId) => {
     return COMPOSERS[chainId] ?? zeroAddress;
 };
@@ -86,15 +93,11 @@ export const getLenderAssets = (chainId, lendingProtocol = Lender.AAVE_V3) => {
     if (!chainId)
         return [];
     if (isAaveType(lendingProtocol))
-        return AAVE_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? [];
+        return aaveReserves()?.[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] ?? [];
+        return compoundV3Reserves()?.[lendingProtocol]?.[chainId] ?? [];
     return [];
 };
 export function isMultiMarket(lender) {
-    return lender?.startsWith("MORPHO_BLUE");
+    return lender?.startsWith('MORPHO_BLUE');
 }

package/dist/utils/parsing.d.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry";
+import { Lender } from '@1delta/lender-registry';
 export declare const BPS = 10000;
 export declare const parseRawAmount: (answer?: string, decimals?: number) => string;
 export declare enum TimeScale {

package/dist/utils/parsing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIvD,eAAO,MAAM,GAAG,QAAQ,CAAC;AAEzB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAC;AAEF,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAE1C,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAC;AAGF,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAC"}
+{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD,eAAO,MAAM,GAAG,QAAQ,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAA;AAED,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAI1C,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAA;AAGD,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAA"}