@1delta/margin-fetcher 0.0.26 → 0.0.27

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

@@ -1,4 +1,3 @@
-import { GetEvmClientFunction } from '../../types';
 export declare const formatAavePrice: (price: string, isV2?: boolean) => number;
 export declare const formatMorphoPrice: (price: string, collateralDec: number, debtDec: number) => number;
 interface OracleData {
@@ -7,6 +6,8 @@ interface OracleData {
 /**
  * Fetches Aave and uniswap V2 oracle data
  */
-export declare const fetchMainPrices: (chainIds: string[], getEvmClient: GetEvmClientFunction) => Promise<OracleData>;
+export declare const fetchMainPrices: (chainIds: string[], rpcOverrides?: {
+    [chainId: string]: string;
+}) => Promise<OracleData>;
 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":"AAoBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKlD,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,cAAc,oBAAoB,KACjC,OAAO,CAAC,UAAU,CA8JpB,CAAA"}
+{"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"}

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

@@ -10,12 +10,12 @@ import { getAaveAssets } from '../../assets';
 import { chainlinkOracles, getChainLinkKeys, ChainlinkAggregatorIndexes, } from './addresses/chainlink';
 import { fetchDefillamaData } from '../defillama';
 import { fetchPendlePrices } from '../pendle';
-import { multicallViemAbiArray } from '../../utils/multicall';
 import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles';
 import { AAVES_PER_CHAIN } from '../../utils';
 import { parseRawAmount } from '../../utils/parsing';
 import { ProxyOracleAbi } from '../../abis/oracle/ProxyOracle';
 import { MrophoOracles } from './addresses/morpho';
+import { multicallRetry } from '@1delta/providers';
 export const formatAavePrice = (price, isV2 = false) => {
     try {
         return Number(formatEther(BigInt(price ?? '0') *
@@ -43,7 +43,7 @@ const RWA_DYNAMIC_ORACLE = '0xA96abbe61AfEdEB0D14a20440Ae7100D9aB4882f';
 /**
  * Fetches Aave and uniswap V2 oracle data
  */
-export const fetchMainPrices = async (chainIds, getEvmClient) => {
+export const fetchMainPrices = async (chainIds, rpcOverrides) => {
     const multicallPromises = chainIds.map(async (chainId) => {
         const aaveForks = AAVES_PER_CHAIN[chainId];
         const reservesToQuery = aaveForks?.map((a) => ({
@@ -87,7 +87,7 @@ export const fetchMainPrices = async (chainIds, getEvmClient) => {
             ...RWADynamicOracleAbi,
             ...ProxyOracleAbi,
         ];
-        const result = await multicallViemAbiArray(chainId, abis, allCalls, getEvmClient);
+        const result = await multicallRetry(chainId, allCalls, abis, undefined, 3, 0, true, rpcOverrides);
         return {
             chainId,
             result,

package/package.json

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

package/src/prices/main-prices/fetchOracleData.ts

@@ -15,13 +15,12 @@ import {
 } from './addresses/chainlink'
 import { fetchDefillamaData } from '../defillama'
 import { fetchPendlePrices } from '../pendle'
-import { multicallViemAbiArray } from '../../utils/multicall'
 import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles'
 import { AAVES_PER_CHAIN } from '../../utils'
-import { GetEvmClientFunction } from '../../types'
 import { parseRawAmount } from '../../utils/parsing'
 import { ProxyOracleAbi } from '../../abis/oracle/ProxyOracle'
 import { MrophoOracleInfo, MrophoOracles } from './addresses/morpho'
+import { multicallRetry } from '@1delta/providers'
 
 export const formatAavePrice = (price: string, isV2 = false): number => {
   try {
@@ -71,7 +70,7 @@ type QueryAave = { oracle: string; assets: string[]; fork: string }
  */
 export const fetchMainPrices = async (
   chainIds: string[],
-  getEvmClient: GetEvmClientFunction,
+  rpcOverrides?: { [chainId: string]: string },
 ): Promise<OracleData> => {
   const multicallPromises = chainIds.map(async (chainId) => {
     const aaveForks = AAVES_PER_CHAIN[chainId]
@@ -126,11 +125,15 @@ export const fetchMainPrices = async (
       ...ProxyOracleAbi,
     ]
 
-    const result = await multicallViemAbiArray(
+    const result = await multicallRetry(
       chainId,
-      abis,
       allCalls,
-      getEvmClient,
+      abis,
+      undefined,
+      3,
+      0,
+      true,
+      rpcOverrides,
     )
 
     return {

package/test/mainPrices.test.ts

@@ -10,16 +10,15 @@ describe(
     it('should return prices for valid tokens', async () => {
       const mainPrices = await fetchMainPrices(
         [
-          // Chain.MANTLE,
-          // Chain.BNB_SMART_CHAIN_MAINNET,
-          // Chain.OP_MAINNET,
-          // Chain.POLYGON_MAINNET,
-          // Chain.HEMI_NETWORK,
-          // Chain.ARBITRUM_ONE,
+          Chain.MANTLE,
+          Chain.BNB_SMART_CHAIN_MAINNET,
+          Chain.OP_MAINNET,
+          Chain.POLYGON_MAINNET,
+          Chain.HEMI_NETWORK,
+          Chain.ARBITRUM_ONE,
           Chain.HYPEREVM,
-          // Chain.ETHEREUM_MAINNET,
+          Chain.ETHEREUM_MAINNET,
         ],
-        getEvmClient,
       )
       prettyPrint(mainPrices)
     })