@1delta/margin-fetcher 0.0.211 → 0.0.213

package/dist/flash-liquidity/fetchLiquidity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchLiquidity.d.ts","sourceRoot":"","sources":["../../src/flash-liquidity/fetchLiquidity.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAE5D,OAAO,EAAE,uBAAuB,EAAgB,MAAM,SAAS,CAAA;AAsB/D,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,sBAAsB,EACtC,IAAI,GAAE,SAAc,oCA8SrB"}
+{"version":3,"file":"fetchLiquidity.d.ts","sourceRoot":"","sources":["../../src/flash-liquidity/fetchLiquidity.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAE5D,OAAO,EAAE,uBAAuB,EAAgB,MAAM,SAAS,CAAA;AAwB/D,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,sBAAsB,EACtC,IAAI,GAAE,SAAc,oCA6PrB"}

package/dist/index.js

@@ -6264,10 +6264,11 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
   compoundV3Reserves: {},
   aaveOracles: {},
   compoundV2Oracles: {},
-  compoundV3Oracles: {},
+  compoundV3OraclesData: {},
   morphoOracles: {},
   morphoTypeOracles: {},
   morphoTypeMarkets: {},
+  aaveOraclesConfig: {},
   aaveWethGateway: {},
   morphoBundler3: {},
   listaNativeProvider: {},
@@ -6282,7 +6283,7 @@ var aaveTokens = () => getGlobalData2()?.aaveTokens;
 var aavePools = () => getGlobalData2()?.aavePools;
 var aaveOracles = () => getGlobalData2()?.aaveOracles;
 var compoundV2Oracles = () => getGlobalData2()?.compoundV2Oracles;
-var compoundV3Oracles = () => getGlobalData2()?.compoundV3Oracles;
+var compoundV3OraclesData = () => getGlobalData2()?.compoundV3OraclesData;
 var morphoTypeOracles = () => getGlobalData2()?.morphoTypeOracles;
 var morphoTypeMarkets = () => getGlobalData2()?.morphoTypeMarkets;
 var aaveReserves = () => getGlobalData2()?.aaveReserves;
@@ -6295,6 +6296,7 @@ var compoundV2Pools = () => getGlobalData2()?.compoundV2Pools;
 var compoundV2Tokens = () => getGlobalData2()?.compoundV2Tokens;
 var compoundV2TokenArray = () => getGlobalData2()?.compoundV2TokenArray;
 var initConfig = () => getGlobalData2()?.initConfig;
+var aaveOraclesConfig = () => getGlobalData2()?.aaveOraclesConfig;
 var eulerConfigs = () => getGlobalData2()?.eulerConfigs;
 var eulerVaults = () => getGlobalData2()?.eulerVaults;
 var getListUrl = (chainId) => `https://raw.githubusercontent.com/1delta-DAO/token-lists/main/${chainId}.json`;
@@ -7607,7 +7609,7 @@ var buildAaveV2StyleLenderReserveCall = (chainId, lender) => {
   }
 };
 function range(n) {
-  return Array.from({ length: n + 1 }, (_2, i) => i);
+  return Array.from({ length: n + 1 }, (_3, i) => i);
 }
 var AAVE_V3_EMODES = (chain, lender) => {
   if (chain === Chain.ETHEREUM_MAINNET) {
@@ -8847,7 +8849,7 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
         });
       });
       Object.entries(eModes).forEach(([modeId, data2]) => {
-        Object.entries(result)?.forEach(([key, _2]) => {
+        Object.entries(result)?.forEach(([key, _3]) => {
           if (!result[key].config[modeId]) {
             let mode = {
               ...data2,
@@ -18415,7 +18417,7 @@ function createCompoundV2Entry(i, data, key, assetsIn, vToken, meta, claimableRe
 // src/lending/user-data/euler/userCallBuild.ts
 Array.from(
   { length: 256 },
-  (_2, i) => i
+  (_3, i) => i
 );
 var EULER_SUBGRAPH_BASE = "https://api.goldsky.com/api/public/project_cm4iagnemt1wp01xn4gh1agft/subgraphs";
 var EULER_SUBGRAPH_URLS = {
@@ -18962,7 +18964,13 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, metaMap) => {
       const payload = {
         lendingPositions: { ...result, ...resultBase },
         chainId,
-        rewards: COMP_ADDRESSES[chainId] ? [{ asset: COMP_ADDRESSES[chainId], totalRewards: compRewards, claimableRewards: compRewards }] : [],
+        rewards: COMP_ADDRESSES[chainId] ? [
+          {
+            asset: COMP_ADDRESSES[chainId],
+            totalRewards: compRewards,
+            claimableRewards: compRewards
+          }
+        ] : [],
         account
       };
       const userData = createBaseTypeUserState(
@@ -25118,7 +25126,7 @@ function filterActiveLenders(summary) {
 function fuseLenderData(userDataResult, summary) {
   const entries = [];
   for (const lenderSummary of summary.lenders) {
-    const { lender, chainId, subAccounts: _2, ...summaryFields } = lenderSummary;
+    const { lender, chainId, subAccounts: _3, ...summaryFields } = lenderSummary;
     const userData = userDataResult[chainId]?.[lender];
     if (!userData) continue;
     entries.push({
@@ -30390,38 +30398,8 @@ var parseRWADynamicOracleResults = (chainId, data, assetName) => {
     }
   }
 };
-var AAVE_LENDER_OVERRIDES = {
-  [Lender.KLAYBANK]: {
-    [Chain.KAIA_MAINNET]: {
-      // KLAYBANK on KAIA uses WKLAY as base asset
-      baseAsset: "0x19aac5f612f524b754ca7e7c41cbfa2e981a4432",
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals
-      baseCurrencyUnit: 1000000000000000000n,
-      // Use RHOMBUS oracle for WKLAY USD price
-      baseAssetSource: Lender.AVALON
-    }
-  },
-  [Lender.KLAP]: {
-    [Chain.KAIA_MAINNET]: {
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
-      baseCurrencyUnit: 1000000000000000000n
-    }
-  },
-  [Lender.MOLEND]: {
-    [Chain.MODE]: {
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
-      baseCurrencyUnit: 100000000n
-    }
-  },
-  [Lender.MOOLA]: {
-    [Chain.CELO_MAINNET]: {
-      baseAsset: "0x471ece3750da237f93b8e339c536989b8978a438",
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals
-      baseCurrencyUnit: 1000000000000000000n,
-      baseAssetSource: Lender.AAVE_V3
-    }
-  }
-};
+
+// src/prices/oracle-prices/fetchers/aave.ts
 function getAaveLendersForChain(chainId) {
   const oracles = aaveOracles() ?? {};
   const reserves = aaveReserves() ?? {};
@@ -30455,7 +30433,8 @@ function getAaveCalls2(chainId) {
         params: [asset]
       });
     }
-    const lenderOverride = AAVE_LENDER_OVERRIDES[lender]?.[chainId];
+    const config = aaveOraclesConfig() ?? {};
+    const lenderOverride = config[lender]?.[chainId];
     results.push({
       calls,
       meta: {
@@ -30465,7 +30444,7 @@ function getAaveCalls2(chainId) {
         baseCurrencyUnitIndex: 0,
         assetCallCount: assets.length,
         baseAssetOverride: lenderOverride?.baseAsset,
-        baseCurrencyUnitOverride: lenderOverride?.baseCurrencyUnit,
+        baseCurrencyUnitOverride: lenderOverride?.baseCurrencyUnit ? BigInt(lenderOverride.baseCurrencyUnit) : void 0,
         baseAssetSource: lenderOverride?.baseAssetSource
       },
       lender
@@ -30505,12 +30484,15 @@ function parseAaveResults2(data, meta, context) {
       );
       if (isNaN(rawPriceNum) || rawPriceNum === 0) continue;
       const priceUSD = rawPriceNum * baseAssetUSD;
+      const isBaseAsset = meta.baseAssetOverride && asset.toLowerCase() === meta.baseAssetOverride.toLowerCase();
       entries.push({
         asset: asset.toLowerCase(),
         price: rawPriceNum,
         // Raw price (in base asset terms)
         priceUSD,
-        marketUid: createMarketUid(chainId, meta.fork, asset)
+        marketUid: createMarketUid(chainId, meta.fork, asset),
+        staticBase: isBaseAsset || void 0,
+        baseAsset: meta.baseAssetOverride
       });
     } catch {
       continue;
@@ -30560,7 +30542,11 @@ function getMorphoMarketsForChain(chainId, marketOverrides) {
     loanAssetDecimals: override.loanAssetDecimals,
     collateralAssetDecimals: override.collateralAssetDecimals,
     fork: Lender.MORPHO_BLUE,
-    marketId: override.marketId ?? generateMarketId(override.oracle, override.loanAsset, override.collateralAsset)
+    marketId: override.marketId ?? generateMarketId(
+      override.oracle,
+      override.loanAsset,
+      override.collateralAsset
+    )
   }));
 }
 function getMorphoCalls2(chainId, context) {
@@ -30604,11 +30590,20 @@ function parseMorphoResults2(data, meta, context) {
     );
     if (isNaN(priceDebtToCollateral) || priceDebtToCollateral === 0) continue;
     const loanOracleKey = tokenList?.[loanAsset]?.assetGroup ?? `${chainId}-${loanAsset}`;
-    const collateralOracleKey = tokenList?.[collateralAsset]?.assetGroup ?? `${chainId}-${collateralAsset}`;
     const loanAssetUSD = usdPrices[loanOracleKey] ?? usdPrices[loanAsset];
-    const collateralAssetUSD = usdPrices[collateralOracleKey] ?? usdPrices[collateralAsset];
     const lenderKey = generateMorphoLenderKey(market.marketId);
     if (loanAssetUSD) {
+      entries.push({
+        asset: loanAsset,
+        price: 1,
+        // Loan token = 1 in oracle's own denomination
+        priceUSD: loanAssetUSD,
+        marketUid: createMarketUid(chainId, lenderKey, loanAsset),
+        targetLender: lenderKey,
+        description: "Morpho loan asset",
+        staticBase: true,
+        baseAsset: loanAsset
+      });
       const collateralPriceUSD = priceDebtToCollateral * loanAssetUSD;
       entries.push({
         asset: collateralAsset,
@@ -30616,18 +30611,8 @@ function parseMorphoResults2(data, meta, context) {
         // Raw: collateral price in loan asset terms
         priceUSD: collateralPriceUSD,
         marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
-        targetLender: lenderKey
-      });
-    }
-    if (collateralAssetUSD) {
-      const loanPriceUSD = collateralAssetUSD / priceDebtToCollateral;
-      entries.push({
-        asset: loanAsset,
-        price: 1 / priceDebtToCollateral,
-        // Raw: loan price in collateral terms
-        priceUSD: loanPriceUSD,
-        marketUid: createMarketUid(chainId, lenderKey, loanAsset),
-        targetLender: lenderKey
+        targetLender: lenderKey,
+        baseAsset: loanAsset
       });
     }
   }
@@ -30640,8 +30625,7 @@ var MORPHO_GRAPHQL_URL = "https://blue-api.morpho.org/graphql";
 var PRICE_QUERY = (first, skip, chainId) => `
 query GetMarketPrices {
   markets(first: ${first}, skip: ${skip}, where: {
-    chainId_in: [${chainId}],
-    whitelisted: true
+    chainId_in: [${chainId}]${chainId != Chain.ETHEREUM_MAINNET ? `,whitelisted: true` : ""}
   },
   orderBy: SupplyAssetsUsd,
   orderDirection: Desc
@@ -30669,7 +30653,7 @@ query GetMarketPrices {
 async function fetchMorphoGraphQLPrices(chainId) {
   if (!morphoApiAvailable(chainId)) return null;
   try {
-    const pages = chainId === "1" ? [
+    const pages = chainId === Chain.ETHEREUM_MAINNET ? [
       fetch(MORPHO_GRAPHQL_URL, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -30698,14 +30682,19 @@ async function fetchMorphoGraphQLPrices(chainId) {
     for (const result of results) {
       const items = result?.data?.markets?.items;
       if (!Array.isArray(items)) {
-        console.warn(`[morpho-gql] chain ${chainId}: unexpected API shape, items is not an array`);
+        console.warn(
+          `[morpho-gql] chain ${chainId}: unexpected API shape, items is not an array`
+        );
         return null;
       }
       allMarkets.push(...items);
     }
     return processMarketsToEntries(chainId, allMarkets, "morpho-gql");
   } catch (err) {
-    console.warn(`[morpho-gql] chain ${chainId}: API error, falling back to on-chain`, err);
+    console.warn(
+      `[morpho-gql] chain ${chainId}: API error, falling back to on-chain`,
+      err
+    );
     return null;
   }
 }
@@ -30716,8 +30705,7 @@ function processMarketsToEntries(chainId, allMarkets, source) {
   }
   const entries = [];
   for (const market of allMarkets) {
-    if (!market.collateralAsset?.address || !market.loanAsset?.address)
-      continue;
+    if (!market.collateralAsset?.address || !market.loanAsset?.address) continue;
     const oracle = market.oracleAddress;
     const loanAsset = market.loanAsset.address.toLowerCase();
     const collateralAsset = market.collateralAsset.address.toLowerCase();
@@ -30731,53 +30719,36 @@ function processMarketsToEntries(chainId, allMarkets, source) {
       market.loanAsset.decimals,
       market.collateralAsset.decimals
     ) : 0;
-    if (loanPriceUSD != null && loanPriceUSD > 0) {
-      const collateralUSD = oracleRatio > 0 ? oracleRatio * loanPriceUSD : collateralPriceUSD ?? 0;
-      if (collateralUSD > 0) {
-        entries.push({
-          asset: collateralAsset,
-          price: oracleRatio,
-          // Raw: collateral price in loan asset terms
-          priceUSD: collateralUSD,
-          marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
-          targetLender: lenderKey
-        });
-      }
-    } else if (collateralPriceUSD != null && collateralPriceUSD > 0) {
+    const resolvedLoanUSD = loanPriceUSD != null && loanPriceUSD > 0 ? loanPriceUSD : collateralPriceUSD != null && collateralPriceUSD > 0 && oracleRatio > 0 ? collateralPriceUSD / oracleRatio : 0;
+    const resolvedCollateralUSD = collateralPriceUSD != null && collateralPriceUSD > 0 ? collateralPriceUSD : loanPriceUSD != null && loanPriceUSD > 0 && oracleRatio > 0 ? oracleRatio * loanPriceUSD : 0;
+    if (resolvedCollateralUSD > 0) {
       entries.push({
         asset: collateralAsset,
         price: oracleRatio,
-        // Raw oracle ratio
-        priceUSD: collateralPriceUSD,
+        // Raw: collateral price in loan asset terms
+        priceUSD: resolvedCollateralUSD,
         marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
-        targetLender: lenderKey
+        targetLender: lenderKey,
+        baseAsset: loanAsset
       });
     }
-    if (collateralPriceUSD != null && collateralPriceUSD > 0) {
-      const loanUSD = oracleRatio > 0 ? collateralPriceUSD / oracleRatio : loanPriceUSD ?? 0;
-      if (loanUSD > 0) {
-        entries.push({
-          asset: loanAsset,
-          price: oracleRatio > 0 ? 1 / oracleRatio : 0,
-          // Raw: loan price in collateral terms
-          priceUSD: loanUSD,
-          marketUid: createMarketUid(chainId, lenderKey, loanAsset),
-          targetLender: lenderKey
-        });
-      }
-    } else if (loanPriceUSD != null && loanPriceUSD > 0) {
+    if (resolvedLoanUSD > 0) {
       entries.push({
         asset: loanAsset,
         price: oracleRatio > 0 ? 1 / oracleRatio : 0,
-        // Raw oracle ratio
-        priceUSD: loanPriceUSD,
+        priceUSD: resolvedLoanUSD,
         marketUid: createMarketUid(chainId, lenderKey, loanAsset),
-        targetLender: lenderKey
+        targetLender: lenderKey,
+        description: "Morpho loan asset",
+        staticBase: true,
+        baseAsset: loanAsset
       });
     }
   }
   if (entries.length === 0) {
-    console.warn(`[${source}] chain ${chainId}: ${allMarkets.length} markets fetched but 0 price entries produced`);
+    console.warn(
+      `[${source}] chain ${chainId}: ${allMarkets.length} markets fetched but 0 price entries produced`
+    );
     return null;
   }
   return entries;
@@ -30887,27 +30858,34 @@ var USD_PRICED_OVERRIDES = {
   // BASE - prices already in USD
 };
 function getCompoundV3Calls(chainId) {
-  const oracles = compoundV3Oracles() ?? {};
+  const oraclesData = compoundV3OraclesData() ?? {};
   const baseData = compoundV3BaseData() ?? {};
   const results = [];
-  for (const [lender, chainOracles] of Object.entries(oracles)) {
+  for (const [lender, chainOracles] of Object.entries(oraclesData)) {
     const assetOracles = chainOracles[chainId];
     if (!assetOracles) continue;
     const skipBaseScaling = USD_PRICED_OVERRIDES[lender]?.has(chainId);
     const baseAsset = skipBaseScaling ? void 0 : baseData[lender]?.[chainId]?.baseAsset?.toLowerCase();
+    const entries = Object.entries(assetOracles);
+    const hasConstantFeed = entries.some(
+      ([, e]) => e.description?.toLowerCase().includes("constant price")
+    );
     const calls = [];
     const meta = [];
-    for (const [asset, oracleAddress] of Object.entries(assetOracles)) {
+    for (const [asset, entry] of entries) {
       calls.push({
-        address: oracleAddress,
+        address: entry.oracle,
         name: "latestRoundData",
         params: []
       });
+      const isBaseAsset = hasConstantFeed && baseAsset && asset.toLowerCase() === baseAsset;
       meta.push({
         asset,
-        oracle: oracleAddress,
+        oracle: entry.oracle,
         baseAsset,
-        lender
+        lender,
+        description: entry.description,
+        staticBase: isBaseAsset || void 0
       });
     }
     if (calls.length > 0) {
@@ -30948,7 +30926,10 @@ function parseCompoundV3Results(data, meta, context) {
         price: rawPrice,
         // Raw price (in base asset terms if applicable)
         priceUSD,
-        marketUid: createMarketUid(chainId, queryMeta.lender, queryMeta.asset)
+        marketUid: createMarketUid(chainId, queryMeta.lender, queryMeta.asset),
+        description: queryMeta.description,
+        staticBase: queryMeta.staticBase || void 0,
+        baseAsset: queryMeta.baseAsset
       });
     } catch {
     }
@@ -31880,6 +31861,7 @@ var FlashAbi = [
   }
 ];
 var DEFAULT_BATCH_SIZE = 4096;
+var isValidResult = (v) => typeof v === "bigint";
 var FLASHLOAN_ENABLED_MASK = BigInt(
   "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFFFFFF"
 );
@@ -31892,108 +31874,57 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
   let aaveCalls = [];
   const aaves = getAavesForChain();
   const aaveProtocols = aaves[chain] ?? [];
+  const allAaveUnderlyings = [];
   aaveProtocols.forEach((aaveFork) => {
     const underlyingsAndATokens = Object.entries(
       getAaveStyleProtocolTokenMap(chain, aaveFork)
     );
     const pool = getAaveTypePoolAddress(chain, aaveFork);
-    const tokenCalls = underlyingsAndATokens.map(([a, b]) => [
-      { name: "balanceOf" /* balanceOf */, address: a, args: [b.aToken] },
-      { name: "getConfiguration", address: pool, args: [a] }
-    ]).reduce((acc, b) => [...acc, ...b], []);
-    aaveAssets[aaveFork] = underlyingsAndATokens.map((a) => a[0]);
+    const tokenCalls = underlyingsAndATokens.flatMap(
+      ([a, b]) => [
+        { name: "balanceOf" /* balanceOf */, address: a, params: [b.aToken] },
+        { name: "getConfiguration", address: pool, params: [a] }
+      ]
+    );
+    const underlyings = underlyingsAndATokens.map((a) => a[0]);
+    aaveAssets[aaveFork] = underlyings;
+    allAaveUnderlyings.push(...underlyings);
     callLengths[aaveFork] = tokenCalls.length * 2 + 1;
-    aaveCalls = [
-      ...aaveCalls,
-      ...tokenCalls,
-      { name: "FLASHLOAN_PREMIUM_TOTAL", address: pool }
-    ];
+    aaveCalls.push(...tokenCalls, {
+      name: "FLASHLOAN_PREMIUM_TOTAL",
+      address: pool
+    });
   });
+  const lendingAssets = RELEVANT_LENDING_ASSETS()?.[chain] ?? [];
+  const unifiedAssets = lodash.uniq([...allAaveUnderlyings, ...lendingAssets]);
   const morphoBs = RELEVANT_MORPHOB_FORKS()?.[chain] ?? [];
-  const otherAssets = RELEVANT_LENDING_ASSETS()?.[chain] ?? [];
-  let morphoCalls = [];
-  if (morphoBs && morphoBs.length > 0) {
-    morphoBs.forEach((bFork) => {
-      callLengths[bFork.pool] = otherAssets.length;
-      morphoCalls = [
-        ...morphoCalls,
-        ...otherAssets.map(
-          (address) => address === zeroAddress ? {
+  const buildBalanceCalls = (forks) => {
+    const result = [];
+    for (const fork of forks) {
+      callLengths[fork.pool] = unifiedAssets.length;
+      for (const address of unifiedAssets) {
+        result.push(
+          address === zeroAddress ? {
             name: "getEthBalance" /* getEthBalance */,
             address: MULTICALL_ADDRESS[chain],
-            args: [bFork.address]
+            params: [fork.address]
           } : {
             name: "balanceOf" /* balanceOf */,
             address,
-            args: [bFork.address]
+            params: [fork.address]
           }
-        )
-      ];
-    });
-  }
+        );
+      }
+    }
+    return result;
+  };
+  const morphoCalls = buildBalanceCalls(morphoBs);
   const balancerV2s = RELEVANT_BALANCER_V2_FORKS[chain] ?? [];
-  let balancerV2Calls = [];
-  if (balancerV2s && balancerV2s.length > 0) {
-    balancerV2s.forEach((bFork) => {
-      callLengths[bFork.pool] = otherAssets.length;
-      balancerV2Calls = [
-        ...balancerV2Calls,
-        ...otherAssets.map(
-          (address) => address === zeroAddress ? {
-            name: "getEthBalance" /* getEthBalance */,
-            address: MULTICALL_ADDRESS[chain],
-            args: [bFork.address]
-          } : {
-            name: "balanceOf" /* balanceOf */,
-            address,
-            args: [bFork.address]
-          }
-        )
-      ];
-    });
-  }
+  const balancerV2Calls = buildBalanceCalls(balancerV2s);
   const balancerV3s = RELEVANT_BALANCER_V3_FORKS[chain] ?? [];
-  let balancerV3Calls = [];
-  if (balancerV3s && balancerV3s.length > 0) {
-    balancerV3s.forEach((bFork) => {
-      callLengths[bFork.pool] = otherAssets.length;
-      balancerV3Calls = [
-        ...balancerV3Calls,
-        ...otherAssets.map(
-          (address) => address === zeroAddress ? {
-            name: "getEthBalance" /* getEthBalance */,
-            address: MULTICALL_ADDRESS[chain],
-            args: [bFork.address]
-          } : {
-            name: "balanceOf" /* balanceOf */,
-            address,
-            args: [bFork.address]
-          }
-        )
-      ];
-    });
-  }
+  const balancerV3Calls = buildBalanceCalls(balancerV3s);
   const uniswapV4s = RELEVANT_UNISWAP_V4_FORKS[chain] ?? [];
-  let uniswapV4Calls = [];
-  if (uniswapV4s && uniswapV4s.length > 0) {
-    uniswapV4s.forEach((u4Fork) => {
-      callLengths[u4Fork.pool] = otherAssets.length;
-      uniswapV4Calls = [
-        ...uniswapV4Calls,
-        ...otherAssets.map(
-          (address) => address === zeroAddress ? {
-            name: "getEthBalance" /* getEthBalance */,
-            address: MULTICALL_ADDRESS[chain],
-            args: [u4Fork.address]
-          } : {
-            name: "balanceOf" /* balanceOf */,
-            address,
-            args: [u4Fork.address]
-          }
-        )
-      ];
-    });
-  }
+  const uniswapV4Calls = buildBalanceCalls(uniswapV4s);
   const calls = [
     ...aaveCalls,
     ...balancerV2Calls,
@@ -32006,9 +31937,9 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
     calls,
     abi: FlashAbi,
     batchSize: DEFAULT_BATCH_SIZE,
-    maxRetries: 3,
+    maxRetries: 5,
     providerId: 0,
-    allowFailure: false
+    allowFailure: true
   });
   let liquidity = {};
   let currentOffset = 0;
@@ -32017,10 +31948,12 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
     const data = rawResults.slice(currentOffset, callLen + currentOffset);
     const fee = data[callLen - 1];
     currentOffset += callLen;
+    if (typeof fee !== "bigint") return;
     aaveAssets[aave].forEach((asset, i) => {
-      const decimals = list[asset]?.decimals;
       const rawAmount = data[2 * i];
       const config = data[2 * i + 1];
+      if (typeof rawAmount !== "bigint" || typeof config !== "bigint") return;
+      const decimals = list[asset]?.decimals;
       const enabled = !AAVE_V3_LENDERS.includes(aave) || getFlashLoanEnabled(config);
       if (enabled && rawAmount > 0n && FLASH_LOAN_IDS[aave] !== void 0) {
         if (!liquidity[asset]) liquidity[asset] = [];
@@ -32038,13 +31971,13 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
     });
   });
   balancerV2s.forEach((balancer) => {
-    const callLen = otherAssets.length;
+    const callLen = unifiedAssets.length;
     const data = rawResults.slice(currentOffset, callLen + currentOffset);
     currentOffset += callLen;
-    otherAssets.forEach((asset, i) => {
+    unifiedAssets.forEach((asset, i) => {
       const decimals = list[asset]?.decimals;
       const rawAmount = data[i];
-      if (rawAmount > 0n) {
+      if (isValidResult(rawAmount) && rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = [];
         liquidity[asset].push({
           id: FLASH_LOAN_IDS[balancer.pool],
@@ -32060,12 +31993,12 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
     });
   });
   morphoBs.forEach((morpho) => {
-    const callLen = otherAssets.length;
+    const callLen = unifiedAssets.length;
     const data = rawResults.slice(currentOffset, callLen + currentOffset);
     currentOffset += callLen;
-    otherAssets.forEach((asset, i) => {
+    unifiedAssets.forEach((asset, i) => {
       const rawAmount = data[i];
-      if (rawAmount > 0n) {
+      if (isValidResult(rawAmount) && rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = [];
         const decimals = list[asset]?.decimals;
         liquidity[asset].push({
@@ -32082,13 +32015,13 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
     });
   });
   balancerV3s.forEach((balancerV3) => {
-    const callLen = otherAssets.length;
+    const callLen = unifiedAssets.length;
     const data = rawResults.slice(currentOffset, callLen + currentOffset);
     currentOffset += callLen;
-    otherAssets.forEach((asset, i) => {
+    unifiedAssets.forEach((asset, i) => {
       const decimals = list[asset]?.decimals;
       const rawAmount = data[i];
-      if (rawAmount > 0n) {
+      if (isValidResult(rawAmount) && rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = [];
         liquidity[asset].push({
           id: FLASH_LOAN_IDS[balancerV3.pool],
@@ -32104,13 +32037,13 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry, list = {}) {
     });
   });
   uniswapV4s.forEach((uniV4) => {
-    const callLen = otherAssets.length;
+    const callLen = unifiedAssets.length;
     const data = rawResults.slice(currentOffset, callLen + currentOffset);
     currentOffset += callLen;
-    otherAssets.forEach((asset, i) => {
+    unifiedAssets.forEach((asset, i) => {
       const decimals = list[asset]?.decimals;
       const rawAmount = data[i];
-      if (rawAmount > 0n) {
+      if (isValidResult(rawAmount) && rawAmount > 0n) {
         if (!liquidity[asset]) liquidity[asset] = [];
         liquidity[asset].push({
           id: FLASH_LOAN_IDS[uniV4.pool],