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

package/src/compoundV3/merkl.ts

@@ -1,6 +1,6 @@
 import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { aprToApy } from '../moneymarket';
-import { fetchAllMerklOpportunities } from '../services/merkl';
+import { fetchMerklOpportunities } from '../services/merkl';
 import { compareAddresses, wethToEth } from '../services/utils';
 import {
   CompoundV3AssetData,
@@ -21,12 +21,13 @@ import {
  * be gated and sized by a curated check in EligibilityMapping; unknown ids apply
  * unconditionally, mirroring Aave V3.
  */
-export const getCompoundV3MerklOpportunities = async (): Promise<MerklOpportunity[]> => {
+export const getCompoundV3MerklOpportunities = async (asOfTimestamp?: number, chainId?: NetworkNumber): Promise<MerklOpportunity[]> => {
   try {
-    return await fetchAllMerklOpportunities({
+    return await fetchMerklOpportunities({
       mainProtocolId: 'compound-v3',
       status: OpportunityStatus.LIVE,
-    });
+      ...(chainId ? { chainId: chainId.toString() } : {}),
+    }, asOfTimestamp);
   } catch (e) {
     console.error('Failed to fetch Compound V3 Merkl campaigns', e);
     return [];

package/src/curveUsd/index.ts

@@ -22,7 +22,7 @@ const ammRateToBorrowApy = (rateWei: string) => {
   return new Dec(new Dec(2.718281828459).pow(exponent).minus(1)).mul(100).toString();
 };
 
-const getAndFormatBands = async (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData, _minBand: string, _maxBand: string) => {
+const getAndFormatBands = async (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData, _minBand: string, _maxBand: string, blockNumber: Blockish = 'latest') => {
   const contract = CrvUSDViewContractViem(provider, network);
   const minBand = parseInt(_minBand, 10);
   const maxBand = parseInt(_maxBand, 10);
@@ -46,7 +46,7 @@ const getAndFormatBands = async (provider: Client, network: NetworkNumber, selec
     } else {
       start = pivots[index - 1] + 1;
     }
-    const pivotedBandsData = await contract.read.getBandsData([selectedMarket.controllerAddress, BigInt(start), BigInt(pivot)]);
+    const pivotedBandsData = await contract.read.getBandsData([selectedMarket.controllerAddress, BigInt(start), BigInt(pivot)], setViemBlockNumber(blockNumber));
     return pivotedBandsData;
   }))).flat();
 
@@ -59,17 +59,17 @@ const getAndFormatBands = async (provider: Client, network: NetworkNumber, selec
   }));
 };
 
-export const _getCurveUsdGlobalData = async (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData): Promise<CrvUSDGlobalMarketData> => {
+export const _getCurveUsdGlobalData = async (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData, blockNumber: Blockish = 'latest'): Promise<CrvUSDGlobalMarketData> => {
   const contract = CrvUSDViewContractViem(provider, network);
   const factoryContract = CrvUSDFactoryContractViem(provider, network);
   const cntrollerContract = createViemContractFromConfigFunc('crvUSDwstETHController', selectedMarket.controllerAddress)(provider, network);
   const debtAsset = selectedMarket.baseAsset;
 
   const [debtCeiling, _, data, loanDiscountWei] = await Promise.all([
-    factoryContract.read.debt_ceiling([selectedMarket.controllerAddress]),
-    factoryContract.read.total_debt(),
-    contract.read.globalData([selectedMarket.controllerAddress]),
-    cntrollerContract.read.loan_discount(),
+    factoryContract.read.debt_ceiling([selectedMarket.controllerAddress], setViemBlockNumber(blockNumber)),
+    factoryContract.read.total_debt(setViemBlockNumber(blockNumber)),
+    contract.read.globalData([selectedMarket.controllerAddress], setViemBlockNumber(blockNumber)),
+    cntrollerContract.read.loan_discount(setViemBlockNumber(blockNumber)),
   ]);
 
   // all prices are in 18 decimals
@@ -79,7 +79,7 @@ export const _getCurveUsdGlobalData = async (provider: Client, network: NetworkN
   const borrowRate = ammRateToBorrowApy(data.ammRate.toString());
   const futureBorrowRate = ammRateToBorrowApy(data.monetaryPolicyRate.toString());
 
-  const bandsData = await getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
+  const bandsData = await getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString(), blockNumber);
 
   const leftToBorrow = new Dec(debtCeiling.toString()).minus(totalDebt).toString();
 
@@ -112,7 +112,8 @@ export const getCurveUsdGlobalData = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   selectedMarket: CrvUSDMarketData,
-): Promise<CrvUSDGlobalMarketData> => _getCurveUsdGlobalData(getViemProvider(provider, network), network, selectedMarket);
+  blockNumber: Blockish = 'latest',
+): Promise<CrvUSDGlobalMarketData> => _getCurveUsdGlobalData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
 
 const getStatusForUser = (bandRange: string[], activeBand: string, crvUSDSupplied: string, collSupplied: string, healthPercent: string) => {
   // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)
@@ -172,17 +173,17 @@ export const getCrvUsdAccountBalances = async (
 /**
  * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
  */
-export const _getCurveUsdUserData = async (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string): Promise<CrvUSDUserData> => {
+export const _getCurveUsdUserData = async (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string, blockNumber: Blockish = 'latest'): Promise<CrvUSDUserData> => {
   const contract = CrvUSDViewContractViem(provider, network);
   const collAsset = selectedMarket.collAsset;
   const debtAsset = selectedMarket.baseAsset;
 
   const [data, collStakingApy, marketBorrowRate] = await Promise.all([
-    contract.read.userData([selectedMarket.controllerAddress, address]),
+    contract.read.userData([selectedMarket.controllerAddress, address], setViemBlockNumber(blockNumber)),
     STAKING_ASSETS.includes(collAsset) ? getStakingApy(collAsset) : Promise.resolve('0'),
     borrowRate !== undefined
       ? Promise.resolve(borrowRate)
-      : contract.read.globalData([selectedMarket.controllerAddress]).then((globalData) => ammRateToBorrowApy(globalData.ammRate.toString())),
+      : contract.read.globalData([selectedMarket.controllerAddress], setViemBlockNumber(blockNumber)).then((globalData) => ammRateToBorrowApy(globalData.ammRate.toString())),
   ]);
 
   const health = assetAmountInEth(data.health.toString());
@@ -223,7 +224,7 @@ export const _getCurveUsdUserData = async (provider: Client, network: NetworkNum
   const priceHigh = assetAmountInEth(data.priceHigh.toString());
   const priceLow = assetAmountInEth(data.priceLow.toString());
 
-  const _userBands = data.loanExists ? (await getAndFormatBands(provider, network, selectedMarket, data.bandRange[0].toString(), data.bandRange[1].toString())) : [];
+  const _userBands = data.loanExists ? (await getAndFormatBands(provider, network, selectedMarket, data.bandRange[0].toString(), data.bandRange[1].toString(), blockNumber)) : [];
 
   const status = data.loanExists ? getStatusForUser(data.bandRange.map(b => b.toString()), activeBand, crvUSDSupplied, collSupplied, healthPercent) : CrvUSDStatus.Nonexistant;
 
@@ -267,10 +268,11 @@ export const getCurveUsdUserData = async (
   selectedMarket: CrvUSDMarketData,
   activeBand: string,
   borrowRate?: string,
-): Promise<CrvUSDUserData> => _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand, borrowRate);
+  blockNumber: Blockish = 'latest',
+): Promise<CrvUSDUserData> => _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand, borrowRate, blockNumber);
 
-export const getCurveUsdFullPositionData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData): Promise<CrvUSDUserData> => {
-  const marketData = await getCurveUsdGlobalData(provider, network, selectedMarket);
-  const positionData = await getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate);
+export const getCurveUsdFullPositionData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, blockNumber: Blockish = 'latest'): Promise<CrvUSDUserData> => {
+  const marketData = await getCurveUsdGlobalData(provider, network, selectedMarket, blockNumber);
+  const positionData = await getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate, blockNumber);
   return positionData;
 };

package/src/fluid/index.ts

@@ -22,6 +22,7 @@ import {
   FluidVaultDataStructOutputStruct,
   FluidVaultType,
   InnerFluidMarketData,
+  Blockish,
 } from '../types';
 import {
   BTCPriceFeedContractViem,
@@ -66,7 +67,7 @@ import {
   parseWstUSRPriceCalls,
 } from '../services/priceService';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { getViemProvider } from '../services/viem';
+import { getBlockTimestamp, getViemProvider, setViemBlockNumber } from '../services/viem';
 import { attachFluidMerklIncentives, getFluidMerklCampaigns } from './merkl';
 
 export {
@@ -101,6 +102,7 @@ const getChainLinkPricesForTokens = async (
   tokens: string[],
   network: NetworkNumber,
   client: PublicClient,
+  blockNumber: Blockish = 'latest',
 ): Promise<{ [key: string]: string }> => {
   const isMainnet = isMainnetNetwork(network);
 
@@ -158,7 +160,7 @@ const getChainLinkPricesForTokens = async (
 
   const calls = [...staticCalls, ..._calls].filter((call) => call);
   // @ts-ignore
-  const results = await client.multicall({ contracts: calls });
+  const results = await client.multicall({ contracts: calls, ...setViemBlockNumber(blockNumber) });
 
   const ethPriceChainlink = new Dec(results[0].result as string).div(1e8).toString();
   const btcPriceChainlink = new Dec(results[1].result as string).div(1e8).toString();
@@ -294,7 +296,7 @@ const getChainLinkPricesForTokens = async (
 };
 
 
-const getTokenPriceFromChainlink = async (asset: AssetData, network: NetworkNumber, provider: PublicClient) => {
+const getTokenPriceFromChainlink = async (asset: AssetData, network: NetworkNumber, provider: PublicClient, blockNumber: Blockish = 'latest') => {
   if (asset.symbol === 'sUSDS') {
     return new Dec('105276929').div(1e8).toString();
   }
@@ -305,15 +307,15 @@ const getTokenPriceFromChainlink = async (asset: AssetData, network: NetworkNumb
   let loanTokenPrice;
   if (asset.symbol === 'wstETH') {
     // need to handle wstETH for l2s inside getWstETHPrice
-    loanTokenPrice = await getWstETHPriceFluid(provider, network);
+    loanTokenPrice = await getWstETHPriceFluid(provider, network, blockNumber);
   } else if (isMainnet) {
     const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
-    loanTokenPrice = isTokenUSDA ? '100000000' : await feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]);
+    loanTokenPrice = isTokenUSDA ? '100000000' : await feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber));
   } else {
     // Currently only base network is supported
     const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
     try {
-      const roundPriceData = isTokenUSDA ? [0, '100000000'] : await feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]);
+      const roundPriceData = isTokenUSDA ? [0, '100000000'] : await feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber));
       loanTokenPrice = roundPriceData[1].toString();
     } catch (err) {
       console.error(`Error fetching price for ${asset.symbol} on ${network}: ${err}`);
@@ -364,7 +366,7 @@ const getTradingApy = async (poolAddress: EthAddress) => {
   return new Dec(data.tradingApy).div(100).toString();
 };
 
-const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
+const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null, blockNumber: Blockish = 'latest') => {
   const collAssetContract = getAssetInfoByAddress(data.supplyToken0, network);
   const collAsset = getAssetInfo(getNativeAssetFromWrapped(collAssetContract.symbol), network);
   const debtAssetContract = getAssetInfoByAddress(data.borrowToken0, network);
@@ -380,7 +382,7 @@ const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   if (tokenPrices) {
     debtPriceParsed = tokenPrices[debtAsset.symbol] || '0';
   } else {
-    debtPriceParsed = await getTokenPriceFromChainlink(debtAssetContract, network, provider);
+    debtPriceParsed = await getTokenPriceFromChainlink(debtAssetContract, network, provider, blockNumber);
   }
 
   const collAssetData: FluidAssetData = {
@@ -484,7 +486,7 @@ const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   } as FluidMarketData;
 };
 
-const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
+const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null, blockNumber: Blockish = 'latest') => {
   const collAsset0Contract = getAssetInfoByAddress(data.supplyToken0, network);
   const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(collAsset0Contract.symbol), network);
   const collAsset1Contract = getAssetInfoByAddress(data.supplyToken1, network);
@@ -501,7 +503,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   if (tokenPrices) {
     prices = tokenPrices;
   } else {
-    prices = await getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAssetContract.address], network, provider);
+    prices = await getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAssetContract.address], network, provider, blockNumber);
   }
 
   const {
@@ -677,7 +679,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   } as FluidMarketData;
 };
 
-const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
+const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null, blockNumber: Blockish = 'latest') => {
   const collAssetContract = getAssetInfoByAddress(data.supplyToken0, network);
   const collAsset = getAssetInfo(getNativeAssetFromWrapped(collAssetContract.symbol), network);
   const debtAsset0Contract = getAssetInfoByAddress(data.borrowToken0, network);
@@ -715,7 +717,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   if (tokenPrices) {
     prices = tokenPrices;
   } else {
-    prices = await getChainLinkPricesForTokens([collAssetContract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider);
+    prices = await getChainLinkPricesForTokens([collAssetContract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider, blockNumber);
   }
 
   const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
@@ -867,7 +869,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   } as FluidMarketData;
 };
 
-const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
+const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null, blockNumber: Blockish = 'latest') => {
   const collAsset0Contract = getAssetInfoByAddress(data.supplyToken0, network);
   const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(collAsset0Contract.symbol), network);
   const collAsset1Contract = getAssetInfoByAddress(data.supplyToken1, network);
@@ -889,7 +891,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   } else {
     prices = await getChainLinkPricesForTokens(
       [collAsset0Contract.address, collAsset1Contract.address, debtAsset0Contract.address, debtAsset1Contract.address],
-      network, provider);
+      network, provider, blockNumber);
   }
 
   const {
@@ -1124,7 +1126,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   } as FluidMarketData;
 };
 
-const parseMarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
+const parseMarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null, blockNumber: Blockish = 'latest') => {
   const marketInfo = getFluidMarketInfoById(+(data.vaultId.toString()), network);
   if (!marketInfo) {
     console.error(`Fluid market with address ${data.vault} not supported.`);
@@ -1133,13 +1135,13 @@ const parseMarketData = async (provider: PublicClient, data: FluidVaultDataStruc
   const vaultType = parseVaultType(+(data.vaultType.toString()));
   switch (vaultType) {
     case FluidVaultType.T1:
-      return parseT1MarketData(provider, data, network, tokenPrices);
+      return parseT1MarketData(provider, data, network, tokenPrices, blockNumber);
     case FluidVaultType.T2:
-      return parseT2MarketData(provider, data, network, tokenPrices);
+      return parseT2MarketData(provider, data, network, tokenPrices, blockNumber);
     case FluidVaultType.T3:
-      return parseT3MarketData(provider, data, network, tokenPrices);
+      return parseT3MarketData(provider, data, network, tokenPrices, blockNumber);
     case FluidVaultType.T4:
-      return parseT4MarketData(provider, data, network, tokenPrices);
+      return parseT4MarketData(provider, data, network, tokenPrices, blockNumber);
     default:
       throw new Error(`Unknown vault type: ${vaultType}`);
   }
@@ -1450,15 +1452,15 @@ const parseUserData = (userPositionData: FluidUserPositionStructOutputStruct, va
   }
 };
 
-export const _getFluidMarketData = async (provider: PublicClient, network: NetworkNumber, market: FluidMarketInfo) => {
+export const _getFluidMarketData = async (provider: PublicClient, network: NetworkNumber, market: FluidMarketInfo, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
 
   const [data, merklCampaigns] = await Promise.all([
-    view.read.getVaultData([market.marketAddress]),
+    view.read.getVaultData([market.marketAddress], setViemBlockNumber(blockNumber)),
     getFluidMerklCampaigns(network),
   ]);
 
-  const marketData = await parseMarketData(provider, data, network);
+  const marketData = await parseMarketData(provider, data, network, null, blockNumber);
   return marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData;
 };
 
@@ -1466,23 +1468,26 @@ export const getFluidMarketData = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   market: FluidMarketInfo,
-) => _getFluidMarketData(getViemProvider(provider, network), network, market);
+  blockNumber: Blockish = 'latest',
+) => _getFluidMarketData(getViemProvider(provider, network), network, market, blockNumber);
 
 export const _getFluidVaultIdsForUser = async (
   provider: Client,
   network: NetworkNumber,
   user: EthAddress,
+  blockNumber: Blockish = 'latest',
 ): Promise<string[]> => {
   const view = FluidViewContractViem(provider, network);
 
-  return (await view.read.getUserNftIds([user])).map((item: bigint) => item.toString());
+  return (await view.read.getUserNftIds([user], setViemBlockNumber(blockNumber))).map((item: bigint) => item.toString());
 };
 
 export const getFluidVaultIdsForUser = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   user: EthAddress,
-): Promise<string[]> => _getFluidVaultIdsForUser(getViemProvider(provider, network), network, user);
+  blockNumber: Blockish = 'latest',
+): Promise<string[]> => _getFluidVaultIdsForUser(getViemProvider(provider, network), network, user, blockNumber);
 
 
 export const _getFluidPosition = async (
@@ -1493,10 +1498,11 @@ export const _getFluidPosition = async (
     assetsData: FluidAssetsData
     marketData: InnerFluidMarketData,
   },
+  blockNumber: Blockish = 'latest',
 ): Promise<FluidVaultData> => {
   const view = FluidViewContractViem(provider, network);
 
-  const data = await view.read.getPositionByNftId([BigInt(vaultId)]);
+  const data = await view.read.getPositionByNftId([BigInt(vaultId)], setViemBlockNumber(blockNumber));
 
   const userPositionData = data[0];
 
@@ -1511,15 +1517,16 @@ export const getFluidPosition = async (
     assetsData: FluidAssetsData
     marketData: InnerFluidMarketData,
   },
-): Promise<FluidVaultData> => _getFluidPosition(getViemProvider(provider, network), network, vaultId, extractedState);
+  blockNumber: Blockish = 'latest',
+): Promise<FluidVaultData> => _getFluidPosition(getViemProvider(provider, network), network, vaultId, extractedState, blockNumber);
 
-export const _getFluidPositionWithMarket = async (provider: PublicClient, network: NetworkNumber, vaultId: string) => {
+export const _getFluidPositionWithMarket = async (provider: PublicClient, network: NetworkNumber, vaultId: string, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
   const [data, merklCampaigns] = await Promise.all([
-    view.read.getPositionByNftId([BigInt(vaultId)]),
+    view.read.getPositionByNftId([BigInt(vaultId)], setViemBlockNumber(blockNumber)),
     getFluidMerklCampaigns(network),
   ]);
-  const parsedMarketData = await parseMarketData(provider, data[1], network);
+  const parsedMarketData = await parseMarketData(provider, data[1], network, null, blockNumber);
   if (!parsedMarketData) {
     return;
   }
@@ -1536,17 +1543,18 @@ export const getFluidPositionWithMarket = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   vaultId: string,
-) => _getFluidPositionWithMarket(getViemProvider(provider, network), network, vaultId);
+  blockNumber: Blockish = 'latest',
+) => _getFluidPositionWithMarket(getViemProvider(provider, network), network, vaultId, blockNumber);
 
-export const _getAllFluidMarketDataChunked = async (network: NetworkNumber, provider: PublicClient) => {
+export const _getAllFluidMarketDataChunked = async (network: NetworkNumber, provider: PublicClient, blockNumber: Blockish = 'latest') => {
   const versions = getFluidVersionsDataForNetwork(network);
   const view = FluidViewContractViem(provider, network);
   const [data, merklCampaigns] = await Promise.all([
-    Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress]))),
+    Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress], setViemBlockNumber(blockNumber)))),
     getFluidMerklCampaigns(network),
   ]);
   return Promise.all(data.map(async (item) => {
-    const marketData = await parseMarketData(provider, item, network);
+    const marketData = await parseMarketData(provider, item, network, null, blockNumber);
     return marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData;
   }));
 };
@@ -1554,16 +1562,17 @@ export const _getAllFluidMarketDataChunked = async (network: NetworkNumber, prov
 export const getAllFluidMarketDataChunked = async (
   network: NetworkNumber,
   provider: EthereumProvider,
-) => _getAllFluidMarketDataChunked(network, getViemProvider(provider, network, { batch: { multicall: true } }));
+  blockNumber: Blockish = 'latest',
+) => _getAllFluidMarketDataChunked(network, getViemProvider(provider, network, { batch: { multicall: true } }), blockNumber);
 
-export const _getFluidTokenData = async (provider: Client, network: NetworkNumber, token: string) => {
+export const _getFluidTokenData = async (provider: Client, network: NetworkNumber, token: string, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
   const fTokenAddress = getFTokenAddress(token, network);
   const [
     data,
     rewardsApiResponse,
   ] = await Promise.all([
-    await view.read.getFTokenData([fTokenAddress]),
+    await view.read.getFTokenData([fTokenAddress], setViemBlockNumber(blockNumber)),
     fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
   ]);
   let rewardsData = { rewards: [] } as any;
@@ -1596,7 +1605,8 @@ export const getFluidTokenData = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   token: string,
-) => _getFluidTokenData(getViemProvider(provider, network), network, token);
+  blockNumber: Blockish = 'latest',
+) => _getFluidTokenData(getViemProvider(provider, network), network, token, blockNumber);
 
 const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string) => {
   const decimals = fTokenData.decimals.toString();
@@ -1619,14 +1629,14 @@ const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPos
   };
 };
 
-export const _getFluidDepositData = async (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => {
+export const _getFluidDepositData = async (provider: Client, network: NetworkNumber, token: string, address: EthAddress, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
   const fTokenAddress = getFTokenAddress(token, network);
   const [
     [userPosition, fTokenData],
     rewardsApiResponse,
   ] = await Promise.all([
-    view.read.getUserEarnPositionWithFToken([fTokenAddress, address]),
+    view.read.getUserEarnPositionWithFToken([fTokenAddress, address], setViemBlockNumber(blockNumber)),
     fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
   ]);
   let rewardsData = { rewards: [] };
@@ -1644,15 +1654,16 @@ export const getFluidDepositData = async (
   network: NetworkNumber,
   token: string,
   address: EthAddress,
-) => _getFluidDepositData(getViemProvider(provider, network), network, token, address);
+  blockNumber: Blockish = 'latest',
+) => _getFluidDepositData(getViemProvider(provider, network), network, token, address, blockNumber);
 
-export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress) => {
+export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
   const [
     [userPositions, fTokensData],
     rewardsApiResponse,
   ] = await Promise.all([
-    view.read.getAllUserEarnPositionsWithFTokens([user]),
+    view.read.getAllUserEarnPositionsWithFTokens([user], setViemBlockNumber(blockNumber)),
     fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens`),
   ]);
 
@@ -1685,17 +1696,18 @@ export const getAllUserEarnPositionsWithFTokens = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   user: EthAddress,
-) => _getAllUserEarnPositionsWithFTokens(getViemProvider(provider, network), network, user);
+  blockNumber: Blockish = 'latest',
+) => _getAllUserEarnPositionsWithFTokens(getViemProvider(provider, network), network, user, blockNumber);
 
-export const _getUserPositions = async (provider: PublicClient, network: NetworkNumber, user: EthAddress) => {
+export const _getUserPositions = async (provider: PublicClient, network: NetworkNumber, user: EthAddress, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
 
   const [data, merklCampaigns] = await Promise.all([
-    view.read.getUserPositions([user]),
+    view.read.getUserPositions([user], setViemBlockNumber(blockNumber)),
     getFluidMerklCampaigns(network),
   ]);
 
-  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network))))
+  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network, null, blockNumber))))
     .map(marketData => (marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData));
 
   const userData = data[0].map((position, i) => (parsedMarketData[i] && { ...parseUserData(position, parsedMarketData[i]) }));
@@ -1710,45 +1722,46 @@ export const getUserPositions = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   user: EthAddress,
-) => _getUserPositions(getViemProvider(provider, network), network, user);
+  blockNumber: Blockish = 'latest',
+) => _getUserPositions(getViemProvider(provider, network), network, user, blockNumber);
 
-const getTokenPricePortfolio = async (token: string, provider: PublicClient, network: NetworkNumber) => {
+const getTokenPricePortfolio = async (token: string, provider: PublicClient, network: NetworkNumber, blockNumber: Blockish = 'latest') => {
   if (token === 'ETH') {
     const ethFeedContract = ETHPriceFeedContractViem(provider, network);
-    return ethFeedContract.read.latestAnswer();
+    return ethFeedContract.read.latestAnswer(setViemBlockNumber(blockNumber));
   }
   if (token === 'WBTC') {
     const wbtcFeedContract = BTCPriceFeedContractViem(provider, network);
-    return wbtcFeedContract.read.latestAnswer();
+    return wbtcFeedContract.read.latestAnswer(setViemBlockNumber(blockNumber));
   }
   if (token === 'wstETH') {
-    return getWstETHPrice(provider, network);
+    return getWstETHPrice(provider, network, blockNumber);
   }
   if (token === 'weETH' && network !== NetworkNumber.Plasma) {
-    return getWeETHPrice(provider, network);
+    return getWeETHPrice(provider, network, blockNumber);
   }
 
   if (token === 'wrsETH') {
-    return getWsrETHPrice(provider, network);
+    return getWsrETHPrice(provider, network, blockNumber);
   }
 
   if (token === 'syrupUSDT') {
-    return getSyrupUSDTPrice(provider, network);
+    return getSyrupUSDTPrice(provider, network, blockNumber);
   }
 
   if (token === 'wstUSR') {
-    return getWstUSRPrice(provider, network);
+    return getWstUSRPrice(provider, network, blockNumber);
   }
 
   const isMainnet = isMainnetNetwork(network);
   const chainLinkFeedAddress = getChainlinkAssetAddress(token, network);
   if (isMainnet) {
     const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
-    return feedRegistryContract.read.latestAnswer([chainLinkFeedAddress, USD_QUOTE]);
+    return feedRegistryContract.read.latestAnswer([chainLinkFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber));
   }
 
   const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
-  return feedRegistryContract.read.latestRoundData([chainLinkFeedAddress, USD_QUOTE]);
+  return feedRegistryContract.read.latestRoundData([chainLinkFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber));
 };
 
 const tokensWithoutChainlinkPrices = ['sUSDS', 'USDA', 'ezETH', 'rsETH', 'weETHs', 'LBTC'];
@@ -1778,12 +1791,12 @@ const handleTokenWithoutChainlinkPrice = (token: string, prices: Record<string,
   return '0';
 };
 
-const getTokensPricesForPortfolio = async (tokens: string[], provider: PublicClient, network: NetworkNumber) => {
+const getTokensPricesForPortfolio = async (tokens: string[], provider: PublicClient, network: NetworkNumber, blockNumber: Blockish = 'latest') => {
   const tokensWithChainlinkPrices = tokens.filter((token) => !tokensWithoutChainlinkPrices.includes(token));
   const pricesFromChainlink: Record<string, string> = {};
   await Promise.all(tokensWithChainlinkPrices.map(async (token) => {
     try {
-      const price = await getTokenPricePortfolio(token, provider, network);
+      const price = await getTokenPricePortfolio(token, provider, network, blockNumber);
       if (typeof price === 'string') pricesFromChainlink[token] = price;
       else if (typeof price === 'bigint') pricesFromChainlink[token] = new Dec(price).div(1e8).toString();
       else pricesFromChainlink[token] = new Dec(price[1]!.toString() as string).div(1e8).toString();
@@ -1800,10 +1813,10 @@ const getTokensPricesForPortfolio = async (tokens: string[], provider: PublicCli
   return pricesFromChainlink;
 };
 
-export const _getUserPositionsPortfolio = async (provider: PublicClient, network: NetworkNumber, user: EthAddress) => {
+export const _getUserPositionsPortfolio = async (provider: PublicClient, network: NetworkNumber, user: EthAddress, blockNumber: Blockish = 'latest') => {
   const view = FluidViewContractViem(provider, network);
 
-  const data = await view.read.getUserPositions([user]);
+  const data = await view.read.getUserPositions([user], setViemBlockNumber(blockNumber));
   const tokens = Array.from(new Set(data[1].map((vaultData) => {
     const vaultTokens = [getAssetInfoByAddress(vaultData.supplyToken0, network).symbol, getAssetInfoByAddress(vaultData.borrowToken0, network).symbol];
     if (vaultData.supplyToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.supplyToken1)) vaultTokens.push(getAssetInfoByAddress(vaultData.supplyToken1, network).symbol);
@@ -1817,11 +1830,11 @@ export const _getUserPositionsPortfolio = async (provider: PublicClient, network
   if (!tokens.includes('WBTC')) tokens.push('WBTC');
 
   const [tokenPrices, merklCampaigns] = await Promise.all([
-    getTokensPricesForPortfolio(tokens, provider, network),
+    getTokensPricesForPortfolio(tokens, provider, network, blockNumber),
     getFluidMerklCampaigns(network),
   ]);
 
-  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices))))
+  const parsedMarketData = (await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices, blockNumber))))
     .map(marketData => (marketData ? attachFluidMerklIncentives(marketData, merklCampaigns) : marketData));
 
   const userData = data[0].map((position, i) => (parsedMarketData[i] && { ...parseUserData(position, parsedMarketData[i]) }));
@@ -1833,12 +1846,13 @@ export const _getUserPositionsPortfolio = async (provider: PublicClient, network
 };
 
 
-export const _getAllFluidMarketDataPortfolio = async (provider: PublicClient, network: NetworkNumber): Promise<Record<string, FluidMarketData>> => {
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
+export const _getAllFluidMarketDataPortfolio = async (provider: PublicClient, network: NetworkNumber, blockNumber: Blockish = 'latest', blockTimestamp?: number): Promise<Record<string, FluidMarketData>> => {
   const versions = getFluidVersionsDataForNetwork(network);
   if (versions.length === 0) return {};
 
   const view = FluidViewContractViem(provider, network);
-  const vaultsData = await Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
+  const vaultsData = await Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress], setViemBlockNumber(blockNumber))));
 
   const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
     const vaultTokens = [getAssetInfoByAddress(vaultData.supplyToken0, network).symbol, getAssetInfoByAddress(vaultData.borrowToken0, network).symbol];
@@ -1852,11 +1866,13 @@ export const _getAllFluidMarketDataPortfolio = async (provider: PublicClient, ne
   if (!tokens.includes('WBTC')) tokens.push('WBTC');
 
   const [tokenPrices, merklCampaigns] = await Promise.all([
-    getTokensPricesForPortfolio(tokens, provider, network),
-    getFluidMerklCampaigns(network),
+    getTokensPricesForPortfolio(tokens, provider, network, blockNumber),
+    // Merkl rewards are keyed by time: a historical block resolves to its timestamp first (one RPC
+    // call unless given, none for 'latest') so the rewards in force at that moment are attached.
+    getBlockTimestamp(provider, blockNumber, blockTimestamp).then((asOfTimestamp) => getFluidMerklCampaigns(network, asOfTimestamp)),
   ]);
 
-  const parsedMarketsData = await Promise.all(vaultsData.map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices)));
+  const parsedMarketsData = await Promise.all(vaultsData.map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices, blockNumber)));
 
   const marketsData: Record<string, FluidMarketData> = {};
   parsedMarketsData.forEach((marketData, i) => {
@@ -1870,4 +1886,6 @@ export const _getAllFluidMarketDataPortfolio = async (provider: PublicClient, ne
 export const getAllFluidMarketDataPortfolio = async (
   provider: EthereumProvider,
   network: NetworkNumber,
-): Promise<Record<string, FluidMarketData>> => _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network);
+  blockNumber: Blockish = 'latest',
+  blockTimestamp?: number,
+): Promise<Record<string, FluidMarketData>> => _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network, blockNumber, blockTimestamp);