@defisaver/positions-sdk 2.1.169-custom-fetching-dev → 2.1.169-custom-fetching-3-dev

package/src/morphoBlue/index.ts

@@ -17,7 +17,7 @@ import {
   getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
 } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
-import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getBlockTimestamp, getViemProvider, setViemBlockNumber } from '../services/viem';
 
 import { addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities } from './merkl';
 
@@ -62,6 +62,7 @@ async function getMorphoBlueMarketDataInternal(
   provider: Client,
   network: NetworkNumber,
   selectedMarket: MorphoBlueMarketData,
+  blockNumber: Blockish = 'latest',
 ): Promise<MorphoBlueMarketInfo> {
   const {
     loanToken, collateralToken, oracle, irm, lltv, oracleType,
@@ -82,8 +83,8 @@ async function getMorphoBlueMarketDataInternal(
   if (isMainnet) {
     const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
     const [_loanTokenPrice, _marketInfo] = await Promise.all([
-      isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]),
-      morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)]),
+      isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+      morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)], setViemBlockNumber(blockNumber)),
     ]);
     marketInfo = _marketInfo;
     loanTokenPrice = _loanTokenPrice;
@@ -93,8 +94,8 @@ async function getMorphoBlueMarketDataInternal(
 
     const [loanTokenPriceRound, _marketInfo] = await Promise.all([
       isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) // Normalize to match the expected object structure
-        : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]),
-      morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)]),
+        : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+      morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)], setViemBlockNumber(blockNumber)),
     ]);
     marketInfo = _marketInfo;
     loanTokenPrice = loanTokenPriceRound[1].toString();
@@ -159,14 +160,16 @@ async function getMorphoBlueMarketDataInternal(
   };
 }
 
-export async function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
+export async function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber: Blockish = 'latest'): Promise<MorphoBlueMarketInfo> {
   const [marketInfo, rewards, merklOpportunities] = await Promise.all([
-    getMorphoBlueMarketDataInternal(provider, network, selectedMarket),
+    getMorphoBlueMarketDataInternal(provider, network, selectedMarket, blockNumber),
     getRewardsForMarket(selectedMarket.marketId, network).catch((error) => {
       console.error(error);
       return { supplyApy: '0', borrowApy: '0' };
     }),
-    getMorphoBlueMerklOpportunities(),
+    // Merkl rewards are keyed by time: a historical block resolves to its timestamp first (one RPC
+    // call, none for 'latest') so the rewards in force at that moment are attached.
+    getBlockTimestamp(provider, blockNumber).then((asOfTimestamp) => getMorphoBlueMerklOpportunities(asOfTimestamp, network)),
   ]);
 
   return addMorphoBlueMerklOpportunitiesToMarketInfo(
@@ -177,16 +180,16 @@ export async function _getMorphoBlueMarketData(provider: Client, network: Networ
   );
 }
 
-export function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
-  return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+export function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber: Blockish = 'latest'): Promise<MorphoBlueMarketInfo> {
+  return getMorphoBlueMarketDataInternal(provider, network, selectedMarket, blockNumber);
 }
 
-export async function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
-  return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket);
+export async function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber: Blockish = 'latest'): Promise<MorphoBlueMarketInfo> {
+  return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
 }
 
-export function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
-  return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket);
+export function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber: Blockish = 'latest'): Promise<MorphoBlueMarketInfo> {
+  return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
 }
 
 export const getMorphoBluePositionDataWithMarketInfo = (
@@ -273,7 +276,7 @@ export const getMorphoBlueAccountBalances = async (
   selectedMarket: MorphoBlueMarketData,
 ): Promise<PositionBalances> => _getMorphoBlueAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, selectedMarket);
 
-export async function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
+export async function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo, blockNumber: Blockish = 'latest'): Promise<MorphoBluePositionData> {
   const {
     loanToken, collateralToken, oracle, irm, lltv,
   } = selectedMarket;
@@ -283,7 +286,7 @@ export async function _getMorphoBlueAccountData(provider: Client, network: Netwo
     {
       loanToken, collateralToken, oracle, irm, lltv: BigInt(lltvInWei),
     },
-    account]));
+    account], setViemBlockNumber(blockNumber)));
   const usedAssets: MMUsedAssets = {};
 
   const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
@@ -321,11 +324,11 @@ export async function _getMorphoBlueAccountData(provider: Client, network: Netwo
   };
 }
 
-export async function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
-  return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
+export async function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo, blockNumber: Blockish = 'latest'): Promise<MorphoBluePositionData> {
+  return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo, blockNumber);
 }
 
-export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData> {
+export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo, blockNumber: Blockish = 'latest'): Promise<MorphoBlueEarnData> {
   const {
     loanToken, collateralToken, oracle, irm, lltv,
   } = selectedMarket;
@@ -336,7 +339,7 @@ export async function getMorphoEarn(provider: Client, network: NetworkNumber, ac
     {
       loanToken, collateralToken, oracle, irm, lltv: BigInt(lltvInWei),
     },
-    account]));
+    account], setViemBlockNumber(blockNumber)));
 
   const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
   const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);

package/src/morphoBlue/merkl.ts

@@ -1,5 +1,5 @@
 import { aprToApy } from '../moneymarket';
-import { fetchAllMerklOpportunities } from '../services/merkl';
+import { fetchMerklOpportunities } from '../services/merkl';
 import {
   IncentiveData,
   IncentiveKind,
@@ -94,16 +94,19 @@ export const addMorphoBlueMerklOpportunitiesToMarketInfo = (
 };
 
 /**
- * Fetches live market-scoped Morpho Blue campaigns for all chains. Never throws — on any failure
- * it returns an empty list, so Merkl being down can't break market data.
+ * Fetches live market-scoped Morpho Blue campaigns for all chains (or one, when `chainId` is given).
+ * With `asOfTimestamp` (unix seconds) the campaigns and APRs are the ones Merkl had at that moment
+ * instead. Never throws — on any failure it returns an empty list, so Merkl being down can't break
+ * market data.
  */
-export const getMorphoBlueMerklOpportunities = async (): Promise<MerklOpportunity[]> => {
+export const getMorphoBlueMerklOpportunities = async (asOfTimestamp?: number, chainId?: NetworkNumber): Promise<MerklOpportunity[]> => {
   try {
-    return await fetchAllMerklOpportunities({
+    return await fetchMerklOpportunities({
       mainProtocolId: 'morpho',
       type: Object.values(MorphoBlueMerklOpportunityType).join(','),
       status: OpportunityStatus.LIVE,
-    });
+      ...(chainId ? { chainId: chainId.toString() } : {}),
+    }, asOfTimestamp);
   } catch (e) {
     console.error('Failed to fetch Morpho Blue Merkl campaigns', e);
     return [];

package/src/morphoMidnight/index.ts

@@ -20,7 +20,7 @@ import { getViemProvider, setViemBlockNumber } from '../services/viem';
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
 const nowInSeconds = () => Math.floor(Date.now() / 1000);
 
-export async function _getMorphoMidnightMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo> {
+export async function _getMorphoMidnightMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData, blockNumber: Blockish = 'latest'): Promise<MorphoMidnightMarketInfo> {
   const { loanToken, collaterals, marketId } = selectedMarket;
   const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
   const loanSym = wethToEth(loanTokenInfo.symbol);
@@ -34,8 +34,8 @@ export async function _getMorphoMidnightMarketData(provider: Client, network: Ne
   if (isMainnetNetwork(network)) {
     const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
     const [_loanTokenPrice, _marketInfo] = await Promise.all([
-      isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]),
-      viewContract.read.getMarketInfo([marketId as `0x${string}`]),
+      isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+      viewContract.read.getMarketInfo([marketId as `0x${string}`], setViemBlockNumber(blockNumber)),
     ]);
     marketInfo = _marketInfo;
     loanTokenPrice = _loanTokenPrice;
@@ -43,8 +43,8 @@ export async function _getMorphoMidnightMarketData(provider: Client, network: Ne
     // Currently only Base is supported
     const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
     const [loanTokenPriceRound, _marketInfo] = await Promise.all([
-      isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]),
-      viewContract.read.getMarketInfo([marketId as `0x${string}`]),
+      isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+      viewContract.read.getMarketInfo([marketId as `0x${string}`], setViemBlockNumber(blockNumber)),
     ]);
     marketInfo = _marketInfo;
     loanTokenPrice = loanTokenPriceRound[1].toString();
@@ -119,14 +119,14 @@ export async function _getMorphoMidnightMarketData(provider: Client, network: Ne
   };
 }
 
-export async function getMorphoMidnightMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo> {
-  return _getMorphoMidnightMarketData(getViemProvider(provider, network), network, selectedMarket);
+export async function getMorphoMidnightMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData, blockNumber: Blockish = 'latest'): Promise<MorphoMidnightMarketInfo> {
+  return _getMorphoMidnightMarketData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
 }
 
-export async function _getMorphoMidnightAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData> {
+export async function _getMorphoMidnightAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo, blockNumber: Blockish = 'latest'): Promise<MorphoMidnightPositionData> {
   const { marketId, collaterals } = selectedMarket;
   const viewContract = MorphoMidnightViewContractViem(provider, network);
-  const positionInfo = await viewContract.read.getPositionInfo([marketId as `0x${string}`, account]);
+  const positionInfo = await viewContract.read.getPositionInfo([marketId as `0x${string}`, account], setViemBlockNumber(blockNumber));
 
   const usedAssets: MMUsedAssets = {};
 
@@ -218,8 +218,8 @@ export async function _getMorphoMidnightAccountData(provider: Client, network: N
   };
 }
 
-export async function getMorphoMidnightAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData> {
-  return _getMorphoMidnightAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
+export async function getMorphoMidnightAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo, blockNumber: Blockish = 'latest'): Promise<MorphoMidnightPositionData> {
+  return _getMorphoMidnightAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo, blockNumber);
 }
 
 export const _getMorphoMidnightAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData, includeCredit = false): Promise<PositionBalances> => {
@@ -263,10 +263,10 @@ export const getMorphoMidnightAccountBalances = async (
 
 // Lender-side (credit-only) supply position, mirroring getMorphoEarn. `amount` is the credit face value
 // redeemable at maturity; `apy` is '0' in MVP because the fixed yield is orderbook-derived, not on-chain.
-export async function getMorphoMidnightEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<{ apy: string, amount: string, amountUsd: string }> {
+export async function getMorphoMidnightEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo, blockNumber: Blockish = 'latest'): Promise<{ apy: string, amount: string, amountUsd: string }> {
   const { marketId } = selectedMarket;
   const viewContract = MorphoMidnightViewContractViem(provider, network);
-  const positionInfo = await viewContract.read.getPositionInfo([marketId as `0x${string}`, account]);
+  const positionInfo = await viewContract.read.getPositionInfo([marketId as `0x${string}`, account], setViemBlockNumber(blockNumber));
 
   const loanTokenData = marketInfo.assetsData[marketInfo.loanToken];
   const credit = assetAmountInEth(positionInfo.credit.toString(), marketInfo.loanToken);

package/src/portfolio/customDeFiData.ts

@@ -1,5 +1,7 @@
 import Dec from 'decimal.js';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import {
+  Blockish, EthAddress, EthereumProvider, NetworkNumber,
+} from '../types/common';
 import {
   AaveMarkets,
   AaveV4Spokes,
@@ -22,7 +24,7 @@ import {
   PortfolioPositionsData,
   PortfolioProtocol,
 } from '../types';
-import { getViemProvider } from '../services/viem';
+import { getBlockTimestamp, getViemProvider } from '../services/viem';
 import { ZERO_ADDRESS } from '../constants';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
@@ -76,6 +78,11 @@ export async function getCustomDeFiData(
 
   const client = getViemProvider(provider, network, { batch: { multicall: { batchSize } } });
   const defaultClient = getViemProvider(defaultProvider, network, { batch: { multicall: { batchSize } } });
+  // Every fetch below takes the block explicitly and passes it to each of its contract reads.
+  // Time-keyed sources (Merkl rewards) need the block's timestamp instead, resolved once here (no
+  // RPC call for 'latest') and handed to the market fetches so they don't each look it up.
+  const blockNumber: Blockish = options.blockNumber ?? 'latest';
+  const blockTimestamp = await getBlockTimestamp(client, blockNumber);
 
   const aaveV3Markets = has(PortfolioProtocol.AaveV3)
     ? [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((v) => AaveMarkets(network)[v]).filter((m) => m.chainIds.includes(network))
@@ -169,33 +176,33 @@ export async function getCustomDeFiData(
   })();
 
   await Promise.allSettled([
-    ...morphoMarkets.map(async (m) => { markets.morphoMarketsData[m.value] = await _getMorphoBluePortfolioMarketData(client, network, m); }),
-    ...morphoMidnightMarkets.map(async (m) => { markets.morphoMidnightMarketsData[m.value] = await _getMorphoMidnightMarketData(client, network, m); }),
-    ...compoundV3Markets.map(async (m) => { markets.compoundV3MarketsData[m.value] = await _getCompoundV3MarketsData(client, network, m, defaultClient); }),
-    ...sparkMarkets.map(async (m) => { markets.sparkMarketsData[m.value] = await _getSparkMarketsData(client, network, m); }),
-    ...aaveV3Markets.map(async (m) => { markets.aaveV3MarketsData[m.value] = await _getAaveV3MarketData(client, network, m); }),
-    ...aaveV4Spokes.map(async (s) => { markets.aaveV4SpokesData[s.value] = await _getAaveV4SpokeData(client, network, s); }),
-    ...aaveV2Markets.map(async (m) => { markets.aaveV2MarketsData[m.value] = await _getAaveV2MarketsData(client, network, m); }),
-    ...compoundV2Markets.map(async (m) => { markets.compoundV2MarketsData[m.value] = await _getCompoundV2MarketsData(client, network); }),
-    ...crvUsdMarkets.map(async (m) => { markets.crvUsdMarketsData[m.value] = await _getCurveUsdGlobalData(client, network, m); }),
-    ...llamaLendMarkets.map(async (m) => { markets.llamaLendMarketsData[m.value] = await _getLlamaLendGlobalData(client, network, m); }),
-    ...liquityV2Markets.map(async (m) => { markets.liquityV2MarketsData[m.value] = await _getLiquityV2MarketData(client, network, m); }),
+    ...morphoMarkets.map(async (m) => { markets.morphoMarketsData[m.value] = await _getMorphoBluePortfolioMarketData(client, network, m, blockNumber); }),
+    ...morphoMidnightMarkets.map(async (m) => { markets.morphoMidnightMarketsData[m.value] = await _getMorphoMidnightMarketData(client, network, m, blockNumber); }),
+    ...compoundV3Markets.map(async (m) => { markets.compoundV3MarketsData[m.value] = await _getCompoundV3MarketsData(client, network, m, defaultClient, blockNumber, blockTimestamp); }),
+    ...sparkMarkets.map(async (m) => { markets.sparkMarketsData[m.value] = await _getSparkMarketsData(client, network, m, blockNumber); }),
+    ...aaveV3Markets.map(async (m) => { markets.aaveV3MarketsData[m.value] = await _getAaveV3MarketData(client, network, m, blockNumber, blockTimestamp); }),
+    ...aaveV4Spokes.map(async (s) => { markets.aaveV4SpokesData[s.value] = await _getAaveV4SpokeData(client, network, s, blockNumber, blockTimestamp); }),
+    ...aaveV2Markets.map(async (m) => { markets.aaveV2MarketsData[m.value] = await _getAaveV2MarketsData(client, network, m, blockNumber); }),
+    ...compoundV2Markets.map(async (m) => { markets.compoundV2MarketsData[m.value] = await _getCompoundV2MarketsData(client, network, blockNumber); }),
+    ...crvUsdMarkets.map(async (m) => { markets.crvUsdMarketsData[m.value] = await _getCurveUsdGlobalData(client, network, m, blockNumber); }),
+    ...llamaLendMarkets.map(async (m) => { markets.llamaLendMarketsData[m.value] = await _getLlamaLendGlobalData(client, network, m, blockNumber); }),
+    ...liquityV2Markets.map(async (m) => { markets.liquityV2MarketsData[m.value] = await _getLiquityV2MarketData(client, network, m, blockNumber); }),
     (async () => {
       if (!fetchFluid || !fetchFluidMarkets) return;
-      try { markets.fluidMarketsData = await _getAllFluidMarketDataPortfolio(client, network); } catch (error) { console.error('Error fetching Fluid markets data:', error); }
+      try { markets.fluidMarketsData = await _getAllFluidMarketDataPortfolio(client, network, blockNumber, blockTimestamp); } catch (error) { console.error('Error fetching Fluid markets data:', error); }
     })(),
     (async () => {
       if (!fetchMaker) return;
-      try { markets.makerMarketsData = await _getMakerIlksData(client, network, MakerActiveIlks); } catch (error) { console.error('Error fetching Maker ilks data:', error); }
+      try { markets.makerMarketsData = await _getMakerIlksData(client, network, MakerActiveIlks, blockNumber); } catch (error) { console.error('Error fetching Maker ilks data:', error); }
     })(),
 
     ...addresses.map(async (address) => {
       if (!fetchMaker) return;
-      makerCdps[lower(address)] = await _getUserCdps(client, network, address);
+      makerCdps[lower(address)] = await _getUserCdps(client, network, address, blockNumber);
     }),
     ...addresses.map((address) => fetchFluid && run(
       `Fluid positions for address ${address}`,
-      () => _getUserPositionsPortfolio(client, network, address),
+      () => _getUserPositionsPortfolio(client, network, address, blockNumber),
       (userPositions) => {
         for (const position of userPositions) {
           if (position.userData && positive(position.userData.suppliedUsd)) positions[lower(address)].fluid.data[position.userData.nftId] = position.userData;
@@ -207,40 +214,40 @@ export async function getCustomDeFiData(
     ...(fetchStaking ? [
       ...addresses.map((address) => fetchFluid && run(
         `Fluid lend data for address ${address}`,
-        () => _getAllUserEarnPositionsWithFTokens(client, network, address),
+        () => _getAllUserEarnPositionsWithFTokens(client, network, address, blockNumber),
         (data) => { stakingPositions[lower(address)].fluid = data; },
         (err) => { stakingPositions[lower(address)].fluid = err; },
       )),
       ...addresses.map((address) => fetchLiquity && run(
         `Liquity staking data for address ${address}`,
-        () => getLiquityStakingData(client, network, address),
+        () => getLiquityStakingData(client, network, address, blockNumber),
         (data) => { stakingPositions[lower(address)].liquity = data; },
         (err) => { stakingPositions[lower(address)].liquity = err; },
       )),
       ...addresses.map((address) => has(PortfolioProtocol.AaveV3) && isMainnet && run(
         `Aave V3 staking data for address ${address}`,
-        () => getStakeAaveData(client, network, address),
+        () => getStakeAaveData(client, network, address, blockNumber),
         (data) => { stakingPositions[lower(address)].aaveV3 = data; },
         (err) => { stakingPositions[lower(address)].aaveV3 = err; },
       )),
       ...addresses.map((address) => has(PortfolioProtocol.AaveV3) && isMainnet && run(
         `Umbrella staking data for address ${address}`,
-        () => getUmbrellaData(client, network, address),
+        () => getUmbrellaData(client, network, address, blockNumber),
         (data) => { stakingPositions[lower(address)].umbrella = data; },
         (err) => { stakingPositions[lower(address)].umbrella = err; },
       )),
       ...perAddress(liquityV2StakingMarkets, (market, address) => run(
         `Liquity V2 staking data for address ${address}, market ${market.value}`,
-        () => getLiquityV2Staking(client, network, market.value, address),
+        () => getLiquityV2Staking(client, network, market.value, address, blockNumber),
         (data) => { stakingPositions[lower(address)].liquityV2[market.value] = { error: '', data }; },
         (err) => { stakingPositions[lower(address)].liquityV2[market.value] = err; },
       )),
     ] : []),
 
     ...(fetchRewards ? [
-      batchRewards('king', 'King rewards data', () => getKingRewards(client, network, addresses), isMainnet),
-      batchRewards('uniswap', 'Uniswap rewards data', () => getUniswapRewards(client, network, addresses), isMainnet),
-      batchRewards('spk', 'Spark Airdrop rewards data', () => fetchSparkAirdropRewards(client, network, addresses), isMainnet && has(PortfolioProtocol.Spark)),
+      batchRewards('king', 'King rewards data', () => getKingRewards(client, network, addresses, blockNumber), isMainnet),
+      batchRewards('uniswap', 'Uniswap rewards data', () => getUniswapRewards(client, network, addresses, blockNumber), isMainnet),
+      batchRewards('spk', 'Spark Airdrop rewards data', () => fetchSparkAirdropRewards(client, network, addresses, blockNumber), isMainnet && has(PortfolioProtocol.Spark)),
       batchRewards('ethena', 'Ethena Airdrop rewards data', () => fetchEthenaAirdropRewards(addresses), isMainnet),
       ...addresses.map((address) => run(
         `Merkl rewards data for address ${address}`,
@@ -250,7 +257,7 @@ export async function getCustomDeFiData(
       )),
       ...perAddress(aaveV3Markets, (market, address) => run(
         `Aave V3 rewards data for address ${address}, market ${market.value}`,
-        () => getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress),
+        () => getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress, blockNumber),
         (data) => { rewardsData[lower(address)].aaveV3[market.value] = { error: '', data }; },
         (err) => { rewardsData[lower(address)].aaveV3[market.value] = err; },
       )),
@@ -261,7 +268,7 @@ export async function getCustomDeFiData(
         }
         return run(
           `Spark rewards data for address ${address}, market ${market.value}`,
-          () => fetchSparkRewards(client, network, address, market.providerAddress),
+          () => fetchSparkRewards(client, network, address, market.providerAddress, blockNumber),
           (data) => { rewardsData[lower(address)].spark[market.value] = { error: '', data }; },
           (err) => { rewardsData[lower(address)].spark[market.value] = err; },
         );
@@ -272,31 +279,31 @@ export async function getCustomDeFiData(
   await Promise.all([
     ...perAddress(aaveV3Markets, (market, address) => run(
       `AaveV3 account data for address ${address} on market ${market.value}`,
-      () => _getAaveV3AccountData(client, network, address, { selectedMarket: market, ...markets.aaveV3MarketsData[market.value] }),
+      () => _getAaveV3AccountData(client, network, address, { selectedMarket: market, ...markets.aaveV3MarketsData[market.value] }, blockNumber),
       (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd)) positions[lower(address)].aaveV3[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].aaveV3[market.value] = err; },
     )),
     ...perAddress(sparkMarkets, (market, address) => run(
       `Spark account data for address ${address} on market ${market.value}`,
-      () => _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData }),
+      () => _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData }, blockNumber),
       (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd)) positions[lower(address)].spark[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].spark[market.value] = err; },
     )),
     ...perAddress(aaveV4Spokes, (spoke, address) => run(
       `AaveV4 account data for address ${address} on spoke ${spoke.value}`,
-      () => _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address),
+      () => _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address, blockNumber),
       (data) => { if (positive(data.suppliedUsd)) positions[lower(address)].aaveV4[spoke.value] = { error: '', data }; },
       (err) => { positions[lower(address)].aaveV4[spoke.value] = err; },
     )),
     ...perAddress(morphoMarkets, (market, address) => run(
       `MorphoBlue account data for address ${address} on market ${market.value}`,
-      () => _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value]),
+      () => _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value], blockNumber),
       (data) => { if (positive(data.suppliedUsd)) positions[lower(address)].morphoBlue[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].morphoBlue[market.value] = err; },
     )),
     ...(fetchStaking ? perAddress(morphoMarkets, (market, address) => run(
       `MorphoBlue earn data for address ${address} on market ${market.value}`,
-      () => getMorphoEarn(client, network, address, market, markets.morphoMarketsData[market.value]),
+      () => getMorphoEarn(client, network, address, market, markets.morphoMarketsData[market.value], blockNumber),
       (data) => { if (data && positive(data.amount)) stakingPositions[lower(address)].morphoBlue[market.value] = { error: '', data }; },
       (err) => { stakingPositions[lower(address)].morphoBlue[market.value] = err; },
     )) : []),
@@ -304,38 +311,38 @@ export async function getCustomDeFiData(
       if (!markets.morphoMidnightMarketsData[market.value]?.isCreated) return Promise.resolve();
       return run(
         `MorphoMidnight account data for address ${address} on market ${market.value}`,
-        () => _getMorphoMidnightAccountData(client, network, address, market, markets.morphoMidnightMarketsData[market.value]),
+        () => _getMorphoMidnightAccountData(client, network, address, market, markets.morphoMidnightMarketsData[market.value], blockNumber),
         (data) => { if (positive(data.suppliedUsd)) positions[lower(address)].morphoMidnight[market.value] = { error: '', data }; },
         (err) => { positions[lower(address)].morphoMidnight[market.value] = err; },
       );
     }),
     ...perAddress(compoundV3Markets, (market, address) => run(
       `CompoundV3 account data for address ${address} on market ${market.value}`,
-      () => _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData }),
+      () => _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData }, blockNumber),
       (data) => { if (positive(data.suppliedUsd)) positions[lower(address)].compoundV3[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].compoundV3[market.value] = err; },
     )),
     ...perAddress(compoundV2Markets, (market, address) => run(
       `CompoundV2 account data for address ${address}`,
-      () => _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData),
+      () => _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData, blockNumber),
       (data) => { if (positive(data.suppliedUsd)) positions[lower(address)].compoundV2[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].compoundV2[market.value] = err; },
     )),
     ...perAddress(aaveV2Markets, (market, address) => run(
       `AaveV2 account data for address ${address}`,
-      () => _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market),
+      () => _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market, blockNumber),
       (data) => { if (positive(data.suppliedUsd)) positions[lower(address)].aaveV2[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].aaveV2[market.value] = err; },
     )),
     ...perAddress(crvUsdMarkets, (market, address) => run(
       `Curve USD account data for address ${address} on market ${market.value}`,
-      () => _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate),
+      () => _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate, blockNumber),
       (data) => { if (positive(data.suppliedUsd) || positive(data.borrowedUsd)) positions[lower(address)].crvUsd[market.value] = { error: '', data }; },
       (err) => { positions[lower(address)].crvUsd[market.value] = err; },
     )),
     ...perAddress(llamaLendMarkets, (market, address) => run(
       `LlamaLend account data for address ${address} on market ${market.value}`,
-      () => _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value]),
+      () => _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value], blockNumber),
       (data) => {
         if (positive(data.suppliedUsd) || positive(data.borrowedUsd)) {
           positions[lower(address)].llamaLend[market.value] = { error: '', data: { ...data, borrowRate: markets.llamaLendMarketsData[market.value].borrowRate } };
@@ -345,13 +352,13 @@ export async function getCustomDeFiData(
     )),
     ...addresses.map((address) => (makerCdps[lower(address)] || []).map((cdpInfo) => run(
       `Maker CDP data for address ${address} with ID ${cdpInfo.id}`,
-      () => _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]),
+      () => _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel], blockNumber),
       (data) => { if (data) positions[lower(address)].maker[cdpInfo.id] = { error: '', data }; },
       (err) => { positions[lower(address)].maker[cdpInfo.id] = err; },
     ))).flat(),
     ...addresses.map((address) => fetchLiquity && run(
       `Liquity trove info for address ${address}`,
-      () => _getLiquityTroveInfo(client, network, address),
+      () => _getLiquityTroveInfo(client, network, address, blockNumber),
       (data) => { if (positive(data.collateral)) positions[lower(address)].liquity = { error: '', data }; },
       (err) => { positions[lower(address)].liquity = err; },
     )),
@@ -362,7 +369,7 @@ export async function getCustomDeFiData(
       }
       return run(
         `sBold/yBold data for address ${address}`,
-        () => getLiquitySAndYBold(client, network, stakingPositions[lower(address)].liquityV2, address),
+        () => getLiquitySAndYBold(client, network, stakingPositions[lower(address)].liquityV2, address, blockNumber),
         (data) => { stakingPositions[lower(address)].liquityV2SBoldYBold = { error: '', data }; },
         (err) => { stakingPositions[lower(address)].liquityV2SBoldYBold = err; },
       );