@1delta/margin-fetcher 0.0.26 → 0.0.28

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

@@ -1,5 +1,5 @@
-import { Lender } from "@1delta/asset-registry";
-import { AaveV3UserReserveResponse } from "../types";
+import { Lender } from '@1delta/asset-registry';
+import { AaveV3UserReserveResponse } from '../types';
 export declare const getAaveV3UserDataConverter: (lender: Lender, chainId: string, account: string, prices: {
     [asset: string]: number;
 }, pricesHist: {

package/dist/lending/user-data/aave-v3-type/userCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v3-type/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAKpD,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,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,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,yBAAyB,GAAG,SAAS,EAAE,MAAM,CAqDjE,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v3-type/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAO/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAKpD,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,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,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,yBAAyB,GAAG,SAAS,EAAE,MAAM,CAqDjE,CAAA"}

package/dist/lending/user-data/aave-v3-type/userCallParse.js

@@ -1,7 +1,7 @@
-import { getAaveAssets, getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets";
-import { createBaseTypeUserState } from "../utils";
-import { AaveTypeGetUserReserveIndexes } from "../../aave-v3-type/types";
-import { parseRawAmount } from "../../../utils/parsing";
+import { getAaveAssets, getAssetMeta, toGenericPriceKey, toOracleKey, } from '../../../assets';
+import { createBaseTypeUserState } from '../utils';
+import { AaveTypeGetUserReserveIndexes } from '../../aave-v3-type/types';
+import { parseRawAmount } from '../../../utils/parsing';
 export const getAaveV3UserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
     const assetsToQuery = getAaveAssets(chainId, lender);
     const expectedNumberOfCalls = assetsToQuery.length + 1;
@@ -26,14 +26,14 @@ export const getAaveV3UserDataConverter = (lender, chainId, account, prices, pri
             const payload = {
                 chainId,
                 account,
-                lendingPositions: { "0": lendingPositions },
+                lendingPositions: { '0': lendingPositions },
                 rewards: {},
                 userEMode,
             };
             const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h);
             return {
                 ...payload,
-                ...userData
+                ...userData,
             };
         },
         expectedNumberOfCalls,
@@ -44,13 +44,13 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
     const currentATokenBalanceRaw = reserveData[AaveTypeGetUserReserveIndexes.currentATokenBalance]?.toString();
     const currentStableDebtRaw = reserveData[AaveTypeGetUserReserveIndexes.currentStableDebt]?.toString();
     const currentVariableDebtRaw = reserveData[AaveTypeGetUserReserveIndexes.currentVariableDebt]?.toString();
-    if (currentATokenBalanceRaw === "0" &&
-        currentStableDebtRaw === "0" &&
-        currentVariableDebtRaw === "0") {
+    if (currentATokenBalanceRaw === '0' &&
+        currentStableDebtRaw === '0' &&
+        currentVariableDebtRaw === '0') {
         return {
             dataForAsset: undefined,
             addedDeposits: 0,
-            addedDebt: 0
+            addedDebt: 0,
         };
     }
     const assetMeta = getAssetMeta(chainId, asset);
@@ -72,13 +72,14 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
         depositsUSD: Number(currentATokenBalance) * price,
         debtStableUSD: Number(currentStableDebt) * price,
         debtUSD: Number(currentVariableDebt) * price,
-        stableBorrowRate: reserveData[AaveTypeGetUserReserveIndexes.stableBorrowRate]?.toString() ?? "0",
+        stableBorrowRate: reserveData[AaveTypeGetUserReserveIndexes.stableBorrowRate]?.toString() ??
+            '0',
         collateralActive: Boolean(reserveData[AaveTypeGetUserReserveIndexes.usageAsCollateralEnabled]),
         claimableRewards: 0,
     };
     return {
         dataForAsset,
         addedDeposits: Number(currentATokenBalance) * priceHist,
-        addedDebt: (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist
+        addedDebt: (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist,
     };
 }

package/dist/lending/user-data/fetchUserData.d.ts

@@ -5,9 +5,12 @@ import { GetEvmClientFunction } from '../../types';
  * @param chainId - The chain ID
  * @param queries - The queries to fetch data for
  * @param getEvmClient - Injected function to get EVM client
- * @returns The raw results from the multicall
+ * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
+ * @param batchSize - multicall batch size, default is 4096
+ * @param logs - show multicall error logs, default is false
+ * @returns The raw results from the multicall, "0x" for failures
  */
-export declare const getLenderUserDataResult: (chainId: string, queriesRaw: LenderUserQuery[], getEvmClient: GetEvmClientFunction) => Promise<any[]>;
+export declare const getLenderUserDataResult: (chainId: string, queriesRaw: LenderUserQuery[], getEvmClient: GetEvmClientFunction, allowFailure?: boolean, batchSize?: number, retries?: number, logs?: boolean) => Promise<any[]>;
 /**
  * Converts the raw results into the desired format
  * @param chainId - The chain ID

package/dist/lending/user-data/fetchUserData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CA4Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAsCzB,CAAA"}
+{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;;;;GASG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,EAClC,sBAAmB,EACnB,kBAAwC,EACxC,gBAAW,EACX,cAAY,KACX,OAAO,CAAC,GAAG,EAAE,CA+Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAsCzB,CAAA"}

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

@@ -1,4 +1,4 @@
-import { multicallViemAbiArray } from '../../utils/multicall';
+import { MULTICALL_DEFAULT_BATCH_SIZE, multicallViemAbiArray, } from '../../utils/multicall';
 import { isAaveV2Type, isAaveV3Type, isInit, isMorphoType, isMultiMarket, isYLDR, } from '../../utils';
 import { organizeUserQueries } from './types';
 import { buildAaveV2UserCall } from './aave-v2-type/userCallBuild';
@@ -42,9 +42,12 @@ function getUserDataConverter(lender, chainId, account, prices, pricesHist, lend
  * @param chainId - The chain ID
  * @param queries - The queries to fetch data for
  * @param getEvmClient - Injected function to get EVM client
- * @returns The raw results from the multicall
+ * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
+ * @param batchSize - multicall batch size, default is 4096
+ * @param logs - show multicall error logs, default is false
+ * @returns The raw results from the multicall, "0x" for failures
  */
-export const getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient) => {
+export const getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false) => {
     let calls = [];
     const queries = organizeUserQueries(queriesRaw);
     for (const query of queries) {
@@ -53,7 +56,7 @@ export const getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient)
         const mappedCalls = callData.map((call) => ({ call, abi }));
         calls = [...calls, ...mappedCalls];
     }
-    return await multicallViemAbiArray(chainId, calls.map((call) => call.abi), calls.map((call) => call.call), getEvmClient, true, 0, 3);
+    return await multicallViemAbiArray(chainId, calls.map((call) => call.abi), calls.map((call) => call.call), getEvmClient, true, 0, retries, allowFailure, batchSize, logs);
 };
 /**
  * Converts the raw results into the desired format

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/dist/utils/multicall.d.ts

@@ -1,5 +1,6 @@
 import { GeneralCall, GetEvmClientFunction } from '../types';
 export type Call = GeneralCall;
+export declare const MULTICALL_DEFAULT_BATCH_SIZE = 4096;
 /** Same as Multicall viem except that the abi param is supposed to be the abi per call */
-export declare const multicallViemAbiArray: (chainId: string, abi: any[], calls: Call[], getEvmClient: GetEvmClientFunction, retry?: boolean, providerId?: number, retries?: number) => Promise<any[]>;
+export declare const multicallViemAbiArray: (chainId: string, abi: any[], calls: Call[], getEvmClient: GetEvmClientFunction, retry?: boolean, providerId?: number, retries?: number, allowFailure?: boolean, batchSize?: number, logs?: boolean) => Promise<any[]>;
 //# sourceMappingURL=multicall.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/utils/multicall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE5D,MAAM,MAAM,IAAI,GAAG,WAAW,CAAA;AAW9B,0FAA0F;AAC1F,eAAO,MAAM,qBAAqB,GAChC,SAAS,MAAM,EACf,KAAK,GAAG,EAAE,EACV,OAAO,IAAI,EAAE,EACb,cAAc,oBAAoB,EAClC,eAAY,EACZ,mBAAc,EACd,gBAAoB,KACnB,OAAO,CAAC,GAAG,EAAE,CAqCf,CAAA"}
+{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/utils/multicall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE5D,MAAM,MAAM,IAAI,GAAG,WAAW,CAAA;AAO9B,eAAO,MAAM,4BAA4B,OAAO,CAAA;AAIhD,0FAA0F;AAC1F,eAAO,MAAM,qBAAqB,GAChC,SAAS,MAAM,EACf,KAAK,GAAG,EAAE,EACV,OAAO,IAAI,EAAE,EACb,cAAc,oBAAoB,EAClC,eAAY,EACZ,mBAAc,EACd,gBAAoB,EACpB,sBAAmB,EACnB,kBAAwC,EACxC,cAAY,KACX,OAAO,CAAC,GAAG,EAAE,CA6Cf,CAAA"}

package/dist/utils/multicall.js

@@ -1,14 +1,14 @@
 import { isArray } from 'lodash';
-const MULTICALL_DEFAULT_BATCH_SIZE = 4096;
+export const MULTICALL_DEFAULT_BATCH_SIZE = 4096;
 const maxRetries = 3;
 /** Same as Multicall viem except that the abi param is supposed to be the abi per call */
-export const multicallViemAbiArray = async (chainId, abi, calls, getEvmClient, retry = true, providerId = 0, retries = maxRetries) => {
+export const multicallViemAbiArray = async (chainId, abi, calls, getEvmClient, retry = true, providerId = 0, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
     try {
         const provider = getEvmClient(chainId, providerId);
         const abiIsArray = isArray(abi[0]);
         const returnData = await provider.multicall({
-            allowFailure: true,
-            batchSize: MULTICALL_DEFAULT_BATCH_SIZE,
+            allowFailure,
+            batchSize,
             contracts: calls.map(({ address, name, params }, i) => ({
                 abi: abiIsArray ? abi?.[i] : abi,
                 address: address,
@@ -16,15 +16,21 @@ export const multicallViemAbiArray = async (chainId, abi, calls, getEvmClient, r
                 args: params,
             })),
         });
+        // no failure - result is directly exposed
+        if (!allowFailure)
+            return returnData;
+        // allow failure, return 0x in case of errors
         const res = returnData.map(({ result, status }) => status !== 'success' ? '0x' : result);
         return res;
     }
     catch (error) {
-        console.log('error in multicall', error);
+        // optionally log errors
+        if (logs)
+            console.log('error in multicall', error);
         retries--;
         if (retries < 0)
             throw new Error('Failed too often');
         providerId++;
-        return multicallViemAbiArray(chainId, abi, calls, getEvmClient, retry, providerId, retries);
+        return multicallViemAbiArray(chainId, abi, calls, getEvmClient, retry, providerId, retries, allowFailure, batchSize, logs);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "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/lending/user-data/aave-v3-type/userCallParse.ts

@@ -1,9 +1,14 @@
-import { Lender } from "@1delta/asset-registry"
-import { getAaveAssets, getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { AaveV3UserReserveResponse } from "../types"
-import { createBaseTypeUserState } from "../utils"
-import { AaveTypeGetUserReserveIndexes } from "../../aave-v3-type/types"
-import { parseRawAmount } from "../../../utils/parsing"
+import { Lender } from '@1delta/asset-registry'
+import {
+  getAaveAssets,
+  getAssetMeta,
+  toGenericPriceKey,
+  toOracleKey,
+} from '../../../assets'
+import { AaveV3UserReserveResponse } from '../types'
+import { createBaseTypeUserState } from '../utils'
+import { AaveTypeGetUserReserveIndexes } from '../../aave-v3-type/types'
+import { parseRawAmount } from '../../../utils/parsing'
 
 export const getAaveV3UserDataConverter = (
   lender: Lender,
@@ -11,12 +16,11 @@ export const getAaveV3UserDataConverter = (
   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 expectedNumberOfCalls = assetsToQuery.length + 1
-  
+
   return [
     (data: any[]) => {
       if (data.length !== expectedNumberOfCalls) {
@@ -31,11 +35,7 @@ export const getAaveV3UserDataConverter = (
 
       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,
@@ -43,7 +43,7 @@ export const getAaveV3UserDataConverter = (
           prices,
           pricesHist,
         )
-        if (!dataForAsset) continue;
+        if (!dataForAsset) continue
 
         totalDebt24h += addedDebt
         totalDeposits24h += addedDeposits
@@ -53,14 +53,19 @@ export const getAaveV3UserDataConverter = (
       const payload = {
         chainId,
         account,
-        lendingPositions: { "0": lendingPositions },
+        lendingPositions: { '0': lendingPositions },
         rewards: {},
         userEMode,
       }
-      const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+      const userData = createBaseTypeUserState(
+        payload,
+        lenderData,
+        totalDeposits24h,
+        totalDebt24h,
+      )
       return {
         ...payload,
-        ...userData
+        ...userData,
       }
     },
     expectedNumberOfCalls,
@@ -77,18 +82,22 @@ function createAaveV3Entry(
 ) {
   const reserveData = data[i]
 
-  const currentATokenBalanceRaw = reserveData[AaveTypeGetUserReserveIndexes.currentATokenBalance]?.toString()
-  const currentStableDebtRaw = reserveData[AaveTypeGetUserReserveIndexes.currentStableDebt]?.toString()
-  const currentVariableDebtRaw = reserveData[AaveTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
+  const currentATokenBalanceRaw =
+    reserveData[AaveTypeGetUserReserveIndexes.currentATokenBalance]?.toString()
+  const currentStableDebtRaw =
+    reserveData[AaveTypeGetUserReserveIndexes.currentStableDebt]?.toString()
+  const currentVariableDebtRaw =
+    reserveData[AaveTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
 
   if (
-    currentATokenBalanceRaw === "0" &&
-    currentStableDebtRaw === "0" &&
-    currentVariableDebtRaw === "0") {
+    currentATokenBalanceRaw === '0' &&
+    currentStableDebtRaw === '0' &&
+    currentVariableDebtRaw === '0'
+  ) {
     return {
       dataForAsset: undefined,
       addedDeposits: 0,
-      addedDebt: 0
+      addedDebt: 0,
     }
   }
 
@@ -99,8 +108,8 @@ function createAaveV3Entry(
   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, chainId)
   // prices
   const price = prices[key] ?? 1
   const priceHist = pricesHist?.[key] ?? price
@@ -115,14 +124,19 @@ function createAaveV3Entry(
     depositsUSD: Number(currentATokenBalance) * price,
     debtStableUSD: Number(currentStableDebt) * price,
     debtUSD: Number(currentVariableDebt) * price,
-    stableBorrowRate: reserveData[AaveTypeGetUserReserveIndexes.stableBorrowRate]?.toString() ?? "0",
-    collateralActive: Boolean(reserveData[AaveTypeGetUserReserveIndexes.usageAsCollateralEnabled]),
+    stableBorrowRate:
+      reserveData[AaveTypeGetUserReserveIndexes.stableBorrowRate]?.toString() ??
+      '0',
+    collateralActive: Boolean(
+      reserveData[AaveTypeGetUserReserveIndexes.usageAsCollateralEnabled],
+    ),
     claimableRewards: 0,
   }
 
   return {
     dataForAsset,
     addedDeposits: Number(currentATokenBalance) * priceHist,
-    addedDebt: (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist
+    addedDebt:
+      (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist,
   }
-}
+}

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

@@ -1,4 +1,8 @@
-import { Call, multicallViemAbiArray } from '../../utils/multicall'
+import {
+  Call,
+  MULTICALL_DEFAULT_BATCH_SIZE,
+  multicallViemAbiArray,
+} from '../../utils/multicall'
 import { Lender } from '@1delta/asset-registry'
 import {
   isAaveV2Type,
@@ -107,12 +111,19 @@ function getUserDataConverter(
  * @param chainId - The chain ID
  * @param queries - The queries to fetch data for
  * @param getEvmClient - Injected function to get EVM client
- * @returns The raw results from the multicall
+ * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
+ * @param batchSize - multicall batch size, default is 4096
+ * @param logs - show multicall error logs, default is false
+ * @returns The raw results from the multicall, "0x" for failures
  */
 export const getLenderUserDataResult = async (
   chainId: string,
   queriesRaw: LenderUserQuery[],
   getEvmClient: GetEvmClientFunction,
+  allowFailure = true,
+  batchSize = MULTICALL_DEFAULT_BATCH_SIZE,
+  retries = 3,
+  logs = false,
 ): Promise<any[]> => {
   let calls: {
     call: Call
@@ -131,7 +142,7 @@ export const getLenderUserDataResult = async (
     const mappedCalls = callData.map((call) => ({ call, abi }))
     calls = [...calls, ...mappedCalls]
   }
-
+  
   return await multicallViemAbiArray(
     chainId,
     calls.map((call) => call.abi),
@@ -139,7 +150,10 @@ export const getLenderUserDataResult = async (
     getEvmClient,
     true,
     0,
-    3,
+    retries,
+    allowFailure,
+    batchSize,
+    logs,
   )
 }
 

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/src/utils/multicall.ts

@@ -8,7 +8,7 @@ interface ViemMulticallresult {
   status: string
 }
 
-const MULTICALL_DEFAULT_BATCH_SIZE = 4096
+export const MULTICALL_DEFAULT_BATCH_SIZE = 4096
 
 const maxRetries = 3
 
@@ -21,14 +21,17 @@ export const multicallViemAbiArray = async (
   retry = true,
   providerId = 0,
   retries = maxRetries,
+  allowFailure = true,
+  batchSize = MULTICALL_DEFAULT_BATCH_SIZE,
+  logs = false,
 ): Promise<any[]> => {
   try {
     const provider = getEvmClient(chainId, providerId)
 
     const abiIsArray = isArray(abi[0])
     const returnData = await provider.multicall({
-      allowFailure: true,
-      batchSize: MULTICALL_DEFAULT_BATCH_SIZE,
+      allowFailure,
+      batchSize,
       contracts: calls.map(({ address, name, params }, i) => ({
         abi: abiIsArray ? (abi?.[i] as any) : abi,
         address: address as any,
@@ -37,13 +40,18 @@ export const multicallViemAbiArray = async (
       })),
     })
 
+    // no failure - result is directly exposed
+    if (!allowFailure) return returnData
+
+    // allow failure, return 0x in case of errors
     const res = (returnData as any[]).map(
       ({ result, status }: ViemMulticallresult) =>
         status !== 'success' ? '0x' : result,
     )
     return res
   } catch (error: any) {
-    console.log('error in multicall', error)
+    // optionally log errors
+    if (logs) console.log('error in multicall', error)
     retries--
     if (retries < 0) throw new Error('Failed too often')
     providerId++
@@ -56,6 +64,9 @@ export const multicallViemAbiArray = async (
       retry,
       providerId,
       retries,
+      allowFailure,
+      batchSize,
+      logs,
     )
   }
 }