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

package/cjs/fluid/index.js

@@ -51,7 +51,7 @@ const parseVaultType = (vaultType) => {
         default: return types_1.FluidVaultType.Unknown;
     }
 };
-const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void 0, void 0, void 0, function* () {
+const getChainLinkPricesForTokens = (tokens_2, network_1, client_1, ...args_1) => __awaiter(void 0, [tokens_2, network_1, client_1, ...args_1], void 0, function* (tokens, network, client, blockNumber = 'latest') {
     const isMainnet = (0, utils_1.isMainnetNetwork)(network);
     const noDuplicateTokens = new Array(...new Set(tokens));
     const btcFeedContract = (0, contracts_1.BTCPriceFeedContractViem)(client, network);
@@ -106,7 +106,7 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
     });
     const calls = [...staticCalls, ..._calls].filter((call) => call);
     // @ts-ignore
-    const results = yield client.multicall({ contracts: calls });
+    const results = yield client.multicall(Object.assign({ contracts: calls }, (0, viem_1.setViemBlockNumber)(blockNumber)));
     const ethPriceChainlink = new decimal_js_1.default(results[0].result).div(1e8).toString();
     const btcPriceChainlink = new decimal_js_1.default(results[1].result).div(1e8).toString();
     let offset = 2; // wstETH and weETH has 3 calls, while others have only 1, so we need to keep track. First 2 are static calls for eth and btc prices
@@ -215,7 +215,7 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
         return acc;
     }, {});
 });
-const getTokenPriceFromChainlink = (asset, network, provider) => __awaiter(void 0, void 0, void 0, function* () {
+const getTokenPriceFromChainlink = (asset_1, network_1, provider_1, ...args_1) => __awaiter(void 0, [asset_1, network_1, provider_1, ...args_1], void 0, function* (asset, network, provider, blockNumber = 'latest') {
     if (asset.symbol === 'sUSDS') {
         return new decimal_js_1.default('105276929').div(1e8).toString();
     }
@@ -225,17 +225,17 @@ const getTokenPriceFromChainlink = (asset, network, provider) => __awaiter(void
     let loanTokenPrice;
     if (asset.symbol === 'wstETH') {
         // need to handle wstETH for l2s inside getWstETHPrice
-        loanTokenPrice = yield (0, priceService_1.getWstETHPriceFluid)(provider, network);
+        loanTokenPrice = yield (0, priceService_1.getWstETHPriceFluid)(provider, network, blockNumber);
     }
     else if (isMainnet) {
         const feedRegistryContract = (0, contracts_1.FeedRegistryContractViem)(provider, common_1.NetworkNumber.Eth);
-        loanTokenPrice = isTokenUSDA ? '100000000' : yield feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, constants_1.USD_QUOTE]);
+        loanTokenPrice = isTokenUSDA ? '100000000' : yield feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(blockNumber));
     }
     else {
         // Currently only base network is supported
         const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(provider, network);
         try {
-            const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, constants_1.USD_QUOTE]);
+            const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(blockNumber));
             loanTokenPrice = roundPriceData[1].toString();
         }
         catch (err) {
@@ -276,7 +276,7 @@ const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, functio
     const data = yield res.json();
     return new decimal_js_1.default(data.tradingApy).div(100).toString();
 });
-const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null, blockNumber = 'latest') {
     var _a, _b;
     const collAssetContract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAssetContract.symbol), network);
@@ -292,7 +292,7 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         debtPriceParsed = tokenPrices[debtAsset.symbol] || '0';
     }
     else {
-        debtPriceParsed = yield getTokenPriceFromChainlink(debtAssetContract, network, provider);
+        debtPriceParsed = yield getTokenPriceFromChainlink(debtAssetContract, network, provider, blockNumber);
     }
     const collAssetData = {
         symbol: collAsset.symbol,
@@ -388,7 +388,7 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         marketData,
     };
 });
-const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null, blockNumber = 'latest') {
     var _a, _b, _c;
     const collAsset0Contract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAsset0Contract.symbol), network);
@@ -405,7 +405,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         prices = tokenPrices;
     }
     else {
-        prices = yield getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAssetContract.address], network, provider);
+        prices = yield getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAssetContract.address], network, provider, blockNumber);
     }
     const { supplyDexFee, totalSupplyShares, supplyRate1, totalSupplyToken1, token0PerSupplyShare, token1PerSupplyShare, totalSupplyToken0, maxSupplyShares, withdrawableToken0, withdrawable0, withdrawableToken1, withdrawable1, supplyRate0, utilizationSupply0, utilizationSupply1, withdrawableShares, reservesSupplyToken0, reservesSupplyToken1, } = (0, fluidHelpers_1.parseDexSupplyData)(data.dexSupplyData, collAsset0.symbol, collAsset1.symbol);
     const collFirstAssetData = {
@@ -544,7 +544,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         marketData,
     };
 });
-const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null, blockNumber = 'latest') {
     var _a, _b, _c, _d;
     const collAssetContract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAssetContract.symbol), network);
@@ -562,7 +562,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         prices = tokenPrices;
     }
     else {
-        prices = yield getChainLinkPricesForTokens([collAssetContract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider);
+        prices = yield getChainLinkPricesForTokens([collAssetContract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider, blockNumber);
     }
     const supplyRate = new decimal_js_1.default(data.supplyRateVault).div(100).toString();
     const collAssetData = {
@@ -696,7 +696,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         marketData,
     };
 });
-const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null, blockNumber = 'latest') {
     var _a, _b, _c, _d;
     const collAsset0Contract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAsset0Contract.symbol), network);
@@ -716,7 +716,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         prices = tokenPrices;
     }
     else {
-        prices = yield getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider);
+        prices = yield getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider, blockNumber);
     }
     const { supplyDexFee, totalSupplyShares, supplyRate1, token0PerSupplyShare, token1PerSupplyShare, totalSupplyToken0, totalSupplyToken1, maxSupplyShares, withdrawableToken0, withdrawable0, withdrawableToken1, withdrawable1, supplyRate0, utilizationSupply0, utilizationSupply1, withdrawableShares, reservesSupplyToken0, reservesSupplyToken1, } = (0, fluidHelpers_1.parseDexSupplyData)(data.dexSupplyData, collAsset0.symbol, collAsset1.symbol);
     const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, quoteTokensPerShare, reservesBorrowToken0, reservesBorrowToken1, } = (0, fluidHelpers_1.parseDexBorrowData)(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
@@ -893,7 +893,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         marketData,
     };
 });
-const parseMarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+const parseMarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null, blockNumber = 'latest') {
     const marketInfo = (0, markets_1.getFluidMarketInfoById)(+(data.vaultId.toString()), network);
     if (!marketInfo) {
         console.error(`Fluid market with address ${data.vault} not supported.`);
@@ -902,13 +902,13 @@ const parseMarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(
     const vaultType = parseVaultType(+(data.vaultType.toString()));
     switch (vaultType) {
         case types_1.FluidVaultType.T1:
-            return parseT1MarketData(provider, data, network, tokenPrices);
+            return parseT1MarketData(provider, data, network, tokenPrices, blockNumber);
         case types_1.FluidVaultType.T2:
-            return parseT2MarketData(provider, data, network, tokenPrices);
+            return parseT2MarketData(provider, data, network, tokenPrices, blockNumber);
         case types_1.FluidVaultType.T3:
-            return parseT3MarketData(provider, data, network, tokenPrices);
+            return parseT3MarketData(provider, data, network, tokenPrices, blockNumber);
         case types_1.FluidVaultType.T4:
-            return parseT4MarketData(provider, data, network, tokenPrices);
+            return parseT4MarketData(provider, data, network, tokenPrices, blockNumber);
         default:
             throw new Error(`Unknown vault type: ${vaultType}`);
     }
@@ -1113,41 +1113,41 @@ const parseUserData = (userPositionData, vaultData) => {
             throw new Error(`Unknown vault type: ${vaultType}`);
     }
 };
-const _getFluidMarketData = (provider, network, market) => __awaiter(void 0, void 0, void 0, function* () {
+const _getFluidMarketData = (provider_1, network_1, market_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, market_1, ...args_1], void 0, function* (provider, network, market, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const [data, merklCampaigns] = yield Promise.all([
-        view.read.getVaultData([market.marketAddress]),
+        view.read.getVaultData([market.marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
         (0, merkl_1.getFluidMerklCampaigns)(network),
     ]);
-    const marketData = yield parseMarketData(provider, data, network);
+    const marketData = yield parseMarketData(provider, data, network, null, blockNumber);
     return marketData ? (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns) : marketData;
 });
 exports._getFluidMarketData = _getFluidMarketData;
-const getFluidMarketData = (provider, network, market) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidMarketData)((0, viem_1.getViemProvider)(provider, network), network, market); });
+const getFluidMarketData = (provider_1, network_1, market_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, market_1, ...args_1], void 0, function* (provider, network, market, blockNumber = 'latest') { return (0, exports._getFluidMarketData)((0, viem_1.getViemProvider)(provider, network), network, market, blockNumber); });
 exports.getFluidMarketData = getFluidMarketData;
-const _getFluidVaultIdsForUser = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+const _getFluidVaultIdsForUser = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
-    return (yield view.read.getUserNftIds([user])).map((item) => item.toString());
+    return (yield view.read.getUserNftIds([user], (0, viem_1.setViemBlockNumber)(blockNumber))).map((item) => item.toString());
 });
 exports._getFluidVaultIdsForUser = _getFluidVaultIdsForUser;
-const getFluidVaultIdsForUser = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidVaultIdsForUser)((0, viem_1.getViemProvider)(provider, network), network, user); });
+const getFluidVaultIdsForUser = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') { return (0, exports._getFluidVaultIdsForUser)((0, viem_1.getViemProvider)(provider, network), network, user, blockNumber); });
 exports.getFluidVaultIdsForUser = getFluidVaultIdsForUser;
-const _getFluidPosition = (provider, network, vaultId, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
+const _getFluidPosition = (provider_1, network_1, vaultId_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, vaultId_1, extractedState_1, ...args_1], void 0, function* (provider, network, vaultId, extractedState, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
-    const data = yield view.read.getPositionByNftId([BigInt(vaultId)]);
+    const data = yield view.read.getPositionByNftId([BigInt(vaultId)], (0, viem_1.setViemBlockNumber)(blockNumber));
     const userPositionData = data[0];
     return parseUserData(userPositionData, extractedState);
 });
 exports._getFluidPosition = _getFluidPosition;
-const getFluidPosition = (provider, network, vaultId, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidPosition)((0, viem_1.getViemProvider)(provider, network), network, vaultId, extractedState); });
+const getFluidPosition = (provider_1, network_1, vaultId_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, vaultId_1, extractedState_1, ...args_1], void 0, function* (provider, network, vaultId, extractedState, blockNumber = 'latest') { return (0, exports._getFluidPosition)((0, viem_1.getViemProvider)(provider, network), network, vaultId, extractedState, blockNumber); });
 exports.getFluidPosition = getFluidPosition;
-const _getFluidPositionWithMarket = (provider, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
+const _getFluidPositionWithMarket = (provider_1, network_1, vaultId_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, vaultId_1, ...args_1], void 0, function* (provider, network, vaultId, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const [data, merklCampaigns] = yield Promise.all([
-        view.read.getPositionByNftId([BigInt(vaultId)]),
+        view.read.getPositionByNftId([BigInt(vaultId)], (0, viem_1.setViemBlockNumber)(blockNumber)),
         (0, merkl_1.getFluidMerklCampaigns)(network),
     ]);
-    const parsedMarketData = yield parseMarketData(provider, data[1], network);
+    const parsedMarketData = yield parseMarketData(provider, data[1], network, null, blockNumber);
     if (!parsedMarketData) {
         return;
     }
@@ -1159,29 +1159,29 @@ const _getFluidPositionWithMarket = (provider, network, vaultId) => __awaiter(vo
     };
 });
 exports._getFluidPositionWithMarket = _getFluidPositionWithMarket;
-const getFluidPositionWithMarket = (provider, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidPositionWithMarket)((0, viem_1.getViemProvider)(provider, network), network, vaultId); });
+const getFluidPositionWithMarket = (provider_1, network_1, vaultId_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, vaultId_1, ...args_1], void 0, function* (provider, network, vaultId, blockNumber = 'latest') { return (0, exports._getFluidPositionWithMarket)((0, viem_1.getViemProvider)(provider, network), network, vaultId, blockNumber); });
 exports.getFluidPositionWithMarket = getFluidPositionWithMarket;
-const _getAllFluidMarketDataChunked = (network, provider) => __awaiter(void 0, void 0, void 0, function* () {
+const _getAllFluidMarketDataChunked = (network_1, provider_1, ...args_1) => __awaiter(void 0, [network_1, provider_1, ...args_1], void 0, function* (network, provider, blockNumber = 'latest') {
     const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const [data, merklCampaigns] = yield Promise.all([
-        Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress]))),
+        Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)))),
         (0, merkl_1.getFluidMerklCampaigns)(network),
     ]);
     return Promise.all(data.map((item) => __awaiter(void 0, void 0, void 0, function* () {
-        const marketData = yield parseMarketData(provider, item, network);
+        const marketData = yield parseMarketData(provider, item, network, null, blockNumber);
         return marketData ? (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns) : marketData;
     })));
 });
 exports._getAllFluidMarketDataChunked = _getAllFluidMarketDataChunked;
-const getAllFluidMarketDataChunked = (network, provider) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllFluidMarketDataChunked)(network, (0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } })); });
+const getAllFluidMarketDataChunked = (network_1, provider_1, ...args_1) => __awaiter(void 0, [network_1, provider_1, ...args_1], void 0, function* (network, provider, blockNumber = 'latest') { return (0, exports._getAllFluidMarketDataChunked)(network, (0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), blockNumber); });
 exports.getAllFluidMarketDataChunked = getAllFluidMarketDataChunked;
-const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () {
+const _getFluidTokenData = (provider_1, network_1, token_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, token_1, ...args_1], void 0, function* (provider, network, token, blockNumber = 'latest') {
     var _a, _b;
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
     const [data, rewardsApiResponse,] = yield Promise.all([
-        yield view.read.getFTokenData([fTokenAddress]),
+        yield view.read.getFTokenData([fTokenAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
         fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
     ]);
     let rewardsData = { rewards: [] };
@@ -1209,7 +1209,7 @@ const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void
     };
 });
 exports._getFluidTokenData = _getFluidTokenData;
-const getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidTokenData)((0, viem_1.getViemProvider)(provider, network), network, token); });
+const getFluidTokenData = (provider_1, network_1, token_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, token_1, ...args_1], void 0, function* (provider, network, token, blockNumber = 'latest') { return (0, exports._getFluidTokenData)((0, viem_1.getViemProvider)(provider, network), network, token, blockNumber); });
 exports.getFluidTokenData = getFluidTokenData;
 const parseFDepositTokenData = (fTokenData, userPosition, apiData, fTokenAddress) => {
     var _a, _b;
@@ -1232,11 +1232,11 @@ const parseFDepositTokenData = (fTokenData, userPosition, apiData, fTokenAddress
         depositedShares: (0, utils_1.getEthAmountForDecimals)(userPosition.fTokenShares.toString(), decimals),
     };
 };
-const _getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
+const _getFluidDepositData = (provider_1, network_1, token_1, address_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, token_1, address_1, ...args_1], void 0, function* (provider, network, token, address, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
     const [[userPosition, fTokenData], rewardsApiResponse,] = yield Promise.all([
-        view.read.getUserEarnPositionWithFToken([fTokenAddress, address]),
+        view.read.getUserEarnPositionWithFToken([fTokenAddress, address], (0, viem_1.setViemBlockNumber)(blockNumber)),
         fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
     ]);
     let rewardsData = { rewards: [] };
@@ -1249,12 +1249,12 @@ const _getFluidDepositData = (provider, network, token, address) => __awaiter(vo
     return parseFDepositTokenData(fTokenData, userPosition, rewardsData, fTokenAddress);
 });
 exports._getFluidDepositData = _getFluidDepositData;
-const getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidDepositData)((0, viem_1.getViemProvider)(provider, network), network, token, address); });
+const getFluidDepositData = (provider_1, network_1, token_1, address_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, token_1, address_1, ...args_1], void 0, function* (provider, network, token, address, blockNumber = 'latest') { return (0, exports._getFluidDepositData)((0, viem_1.getViemProvider)(provider, network), network, token, address, blockNumber); });
 exports.getFluidDepositData = getFluidDepositData;
-const _getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+const _getAllUserEarnPositionsWithFTokens = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const [[userPositions, fTokensData], rewardsApiResponse,] = yield Promise.all([
-        view.read.getAllUserEarnPositionsWithFTokens([user]),
+        view.read.getAllUserEarnPositionsWithFTokens([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
         fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens`),
     ]);
     let rewardsData = {
@@ -1279,15 +1279,15 @@ const _getAllUserEarnPositionsWithFTokens = (provider, network, user) => __await
     return parsedRes;
 });
 exports._getAllUserEarnPositionsWithFTokens = _getAllUserEarnPositionsWithFTokens;
-const getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllUserEarnPositionsWithFTokens)((0, viem_1.getViemProvider)(provider, network), network, user); });
+const getAllUserEarnPositionsWithFTokens = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') { return (0, exports._getAllUserEarnPositionsWithFTokens)((0, viem_1.getViemProvider)(provider, network), network, user, blockNumber); });
 exports.getAllUserEarnPositionsWithFTokens = getAllUserEarnPositionsWithFTokens;
-const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+const _getUserPositions = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const [data, merklCampaigns] = yield Promise.all([
-        view.read.getUserPositions([user]),
+        view.read.getUserPositions([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
         (0, merkl_1.getFluidMerklCampaigns)(network),
     ]);
-    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); }))))
+    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, null, blockNumber); }))))
         .map(marketData => (marketData ? (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns) : marketData));
     const userData = data[0].map((position, i) => (parsedMarketData[i] && Object.assign({}, parseUserData(position, parsedMarketData[i]))));
     return parsedMarketData.map((market, i) => ({
@@ -1296,40 +1296,40 @@ const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0,
     })).filter(md => md.marketData !== undefined);
 });
 exports._getUserPositions = _getUserPositions;
-const getUserPositions = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getUserPositions)((0, viem_1.getViemProvider)(provider, network), network, user); });
+const getUserPositions = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') { return (0, exports._getUserPositions)((0, viem_1.getViemProvider)(provider, network), network, user, blockNumber); });
 exports.getUserPositions = getUserPositions;
-const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getTokenPricePortfolio = (token_1, provider_1, network_1, ...args_1) => __awaiter(void 0, [token_1, provider_1, network_1, ...args_1], void 0, function* (token, provider, network, blockNumber = 'latest') {
     if (token === 'ETH') {
         const ethFeedContract = (0, contracts_1.ETHPriceFeedContractViem)(provider, network);
-        return ethFeedContract.read.latestAnswer();
+        return ethFeedContract.read.latestAnswer((0, viem_1.setViemBlockNumber)(blockNumber));
     }
     if (token === 'WBTC') {
         const wbtcFeedContract = (0, contracts_1.BTCPriceFeedContractViem)(provider, network);
-        return wbtcFeedContract.read.latestAnswer();
+        return wbtcFeedContract.read.latestAnswer((0, viem_1.setViemBlockNumber)(blockNumber));
     }
     if (token === 'wstETH') {
-        return (0, priceService_1.getWstETHPrice)(provider, network);
+        return (0, priceService_1.getWstETHPrice)(provider, network, blockNumber);
     }
     if (token === 'weETH' && network !== common_1.NetworkNumber.Plasma) {
-        return (0, priceService_1.getWeETHPrice)(provider, network);
+        return (0, priceService_1.getWeETHPrice)(provider, network, blockNumber);
     }
     if (token === 'wrsETH') {
-        return (0, priceService_1.getWsrETHPrice)(provider, network);
+        return (0, priceService_1.getWsrETHPrice)(provider, network, blockNumber);
     }
     if (token === 'syrupUSDT') {
-        return (0, priceService_1.getSyrupUSDTPrice)(provider, network);
+        return (0, priceService_1.getSyrupUSDTPrice)(provider, network, blockNumber);
     }
     if (token === 'wstUSR') {
-        return (0, priceService_1.getWstUSRPrice)(provider, network);
+        return (0, priceService_1.getWstUSRPrice)(provider, network, blockNumber);
     }
     const isMainnet = (0, utils_1.isMainnetNetwork)(network);
     const chainLinkFeedAddress = (0, priceService_1.getChainlinkAssetAddress)(token, network);
     if (isMainnet) {
         const feedRegistryContract = (0, contracts_1.FeedRegistryContractViem)(provider, common_1.NetworkNumber.Eth);
-        return feedRegistryContract.read.latestAnswer([chainLinkFeedAddress, constants_1.USD_QUOTE]);
+        return feedRegistryContract.read.latestAnswer([chainLinkFeedAddress, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(blockNumber));
     }
     const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(provider, network);
-    return feedRegistryContract.read.latestRoundData([chainLinkFeedAddress, constants_1.USD_QUOTE]);
+    return feedRegistryContract.read.latestRoundData([chainLinkFeedAddress, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(blockNumber));
 });
 const tokensWithoutChainlinkPrices = ['sUSDS', 'USDA', 'ezETH', 'rsETH', 'weETHs', 'LBTC'];
 const handleTokenWithoutChainlinkPrice = (token, prices) => {
@@ -1356,12 +1356,12 @@ const handleTokenWithoutChainlinkPrice = (token, prices) => {
     }
     return '0';
 };
-const getTokensPricesForPortfolio = (tokens, provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getTokensPricesForPortfolio = (tokens_2, provider_1, network_1, ...args_1) => __awaiter(void 0, [tokens_2, provider_1, network_1, ...args_1], void 0, function* (tokens, provider, network, blockNumber = 'latest') {
     const tokensWithChainlinkPrices = tokens.filter((token) => !tokensWithoutChainlinkPrices.includes(token));
     const pricesFromChainlink = {};
     yield Promise.all(tokensWithChainlinkPrices.map((token) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const price = yield getTokenPricePortfolio(token, provider, network);
+            const price = yield getTokenPricePortfolio(token, provider, network, blockNumber);
             if (typeof price === 'string')
                 pricesFromChainlink[token] = price;
             else if (typeof price === 'bigint')
@@ -1380,9 +1380,9 @@ const getTokensPricesForPortfolio = (tokens, provider, network) => __awaiter(voi
     });
     return pricesFromChainlink;
 });
-const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+const _getUserPositionsPortfolio = (provider_1, network_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, user_1, ...args_1], void 0, function* (provider, network, user, blockNumber = 'latest') {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
-    const data = yield view.read.getUserPositions([user]);
+    const data = yield view.read.getUserPositions([user], (0, viem_1.setViemBlockNumber)(blockNumber));
     const tokens = Array.from(new Set(data[1].map((vaultData) => {
         const vaultTokens = [(0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken0, network).symbol, (0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken0, network).symbol];
         if (vaultData.supplyToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.supplyToken1))
@@ -1399,10 +1399,10 @@ const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0
     if (!tokens.includes('WBTC'))
         tokens.push('WBTC');
     const [tokenPrices, merklCampaigns] = yield Promise.all([
-        getTokensPricesForPortfolio(tokens, provider, network),
+        getTokensPricesForPortfolio(tokens, provider, network, blockNumber),
         (0, merkl_1.getFluidMerklCampaigns)(network),
     ]);
-    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); }))))
+    const parsedMarketData = (yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices, blockNumber); }))))
         .map(marketData => (marketData ? (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns) : marketData));
     const userData = data[0].map((position, i) => (parsedMarketData[i] && Object.assign({}, parseUserData(position, parsedMarketData[i]))));
     return parsedMarketData.map((market, i) => ({
@@ -1411,12 +1411,13 @@ const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0
     })).filter(md => md.marketData !== undefined);
 });
 exports._getUserPositionsPortfolio = _getUserPositionsPortfolio;
-const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
+const _getAllFluidMarketDataPortfolio = (provider_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, ...args_1], void 0, function* (provider, network, blockNumber = 'latest', blockTimestamp) {
     const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
     if (versions.length === 0)
         return {};
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
-    const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
+    const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber))));
     const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
         const vaultTokens = [(0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken0, network).symbol, (0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken0, network).symbol];
         if (vaultData.supplyToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.supplyToken1))
@@ -1431,10 +1432,12 @@ const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0,
     if (!tokens.includes('WBTC'))
         tokens.push('WBTC');
     const [tokenPrices, merklCampaigns] = yield Promise.all([
-        getTokensPricesForPortfolio(tokens, provider, network),
-        (0, merkl_1.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.
+        (0, viem_1.getBlockTimestamp)(provider, blockNumber, blockTimestamp).then((asOfTimestamp) => (0, merkl_1.getFluidMerklCampaigns)(network, asOfTimestamp)),
     ]);
-    const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); })));
+    const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices, blockNumber); })));
     const marketsData = {};
     parsedMarketsData.forEach((marketData, i) => {
         if (!marketData)
@@ -1444,5 +1447,5 @@ const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0,
     return marketsData;
 });
 exports._getAllFluidMarketDataPortfolio = _getAllFluidMarketDataPortfolio;
-const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllFluidMarketDataPortfolio)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network); });
+const getAllFluidMarketDataPortfolio = (provider_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, ...args_1], void 0, function* (provider, network, blockNumber = 'latest', blockTimestamp) { return (0, exports._getAllFluidMarketDataPortfolio)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, blockNumber, blockTimestamp); });
 exports.getAllFluidMarketDataPortfolio = getAllFluidMarketDataPortfolio;

package/cjs/fluid/merkl.d.ts

@@ -20,10 +20,12 @@ export declare enum FluidMerklOpportunityType {
 }
 export declare const buildFluidMerklRewardMap: (opportunities: MerklOpportunity[], chainId: NetworkNumber) => FluidMerklRewardMap;
 /**
- * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
- * on any failure it returns an empty map, so Merkl being down can't break market data.
+ * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. 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 map, so Merkl being down can't break
+ * market data.
  */
-export declare const getFluidMerklCampaigns: ((chainId: NetworkNumber) => Promise<FluidMerklRewardMap>) & memoize.Memoized<(chainId: NetworkNumber) => Promise<FluidMerklRewardMap>>;
+export declare const getFluidMerklCampaigns: ((chainId: NetworkNumber, asOfTimestamp?: number) => Promise<FluidMerklRewardMap>) & memoize.Memoized<(chainId: NetworkNumber, asOfTimestamp?: number) => Promise<FluidMerklRewardMap>>;
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every
  * suppliable asset and borrow rewards on every borrowable one. Smart collateral/debt vaults hold

package/cjs/fluid/merkl.js

@@ -70,23 +70,28 @@ const buildFluidMerklRewardMap = (opportunities, chainId) => {
 };
 exports.buildFluidMerklRewardMap = buildFluidMerklRewardMap;
 /**
- * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. Never throws —
- * on any failure it returns an empty map, so Merkl being down can't break market data.
+ * Fetches live vault-scoped Fluid campaigns for the chain, keyed by vault address. 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 map, so Merkl being down can't break
+ * market data.
  */
-exports.getFluidMerklCampaigns = (0, memoizee_1.default)((chainId) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getFluidMerklCampaigns = (0, memoizee_1.default)((chainId, asOfTimestamp) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const opportunities = yield (0, merkl_1.fetchAllMerklOpportunities)({
+        const opportunities = yield (0, merkl_1.fetchMerklOpportunities)({
             mainProtocolId: 'fluid',
+            chainId: chainId.toString(),
             type: Object.values(FluidMerklOpportunityType).join(','),
             status: types_1.OpportunityStatus.LIVE,
-        });
+        }, asOfTimestamp);
         return (0, exports.buildFluidMerklRewardMap)(opportunities, chainId);
     }
     catch (e) {
         console.error('Failed to fetch Fluid Merkl campaigns', e);
         return {};
     }
-}), { promise: true, maxAge: 60 * 1000 });
+    // memoizee keys on the declared arity, which excludes optional params — `length: 2` keeps the
+    // timestamp in the cache key so a historical lookup never serves (or is served by) the live one
+}), { promise: true, maxAge: 60 * 1000, length: 2 });
 /**
  * Appends the vault's Merkl campaigns to its assets' incentive arrays — supply rewards on every
  * suppliable asset and borrow rewards on every borrowable one. Smart collateral/debt vaults hold

package/cjs/liquity/index.d.ts

@@ -5,10 +5,10 @@ export declare const LIQUITY_NORMAL_MODE_RATIO = 110;
 export declare const LIQUITY_RECOVERY_MODE_RATIO = 150;
 export declare const _getLiquityAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getLiquityAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getDebtInFront: (provider: EthereumProvider, address: EthAddress) => Promise<string>;
-export declare const _getLiquityTroveInfo: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
-export declare const getLiquityTroveInfo: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
-export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+export declare const getDebtInFront: (provider: EthereumProvider, address: EthAddress, blockNumber?: Blockish) => Promise<string>;
+export declare const _getLiquityTroveInfo: (provider: Client, network: NetworkNumber, address: EthAddress, blockNumber?: Blockish) => Promise<LiquityTroveInfo>;
+export declare const getLiquityTroveInfo: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, blockNumber?: Blockish) => Promise<LiquityTroveInfo>;
+export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress, blockNumber?: Blockish) => Promise<{
     totalLUSDDeposited: string;
     totalLQTYStaked: string;
     stakedLQTY: string;

package/cjs/liquity/index.js

@@ -48,34 +48,34 @@ const _getLiquityAccountBalances = (provider, network, block, addressMapping, ad
 exports._getLiquityAccountBalances = _getLiquityAccountBalances;
 const getLiquityAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLiquityAccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address); });
 exports.getLiquityAccountBalances = getLiquityAccountBalances;
-const _getDebtInFront = (viewContract_1, address_1, ...args_1) => __awaiter(void 0, [viewContract_1, address_1, ...args_1], void 0, function* (viewContract, address, accumulatedSum = '0', iterations = 2000) {
-    const res = yield viewContract.read.getDebtInFront([address, accumulatedSum, iterations]);
+const _getDebtInFront = (viewContract_1, address_1, ...args_1) => __awaiter(void 0, [viewContract_1, address_1, ...args_1], void 0, function* (viewContract, address, accumulatedSum = '0', iterations = 2000, blockNumber = 'latest') {
+    const res = yield viewContract.read.getDebtInFront([address, accumulatedSum, iterations], (0, viem_1.setViemBlockNumber)(blockNumber));
     const debt = res[1].toString();
     const next = res[0];
     if (next === constants_1.ZERO_ADDRESS)
         return (0, tokens_1.assetAmountInEth)(debt, 'LUSD');
-    return _getDebtInFront(viewContract, next, debt, iterations);
+    return _getDebtInFront(viewContract, next, debt, iterations, blockNumber);
 });
-const getDebtInFront = (provider, address) => __awaiter(void 0, void 0, void 0, function* () {
+const getDebtInFront = (provider_1, address_1, ...args_1) => __awaiter(void 0, [provider_1, address_1, ...args_1], void 0, function* (provider, address, blockNumber = 'latest') {
     const client = (0, viem_1.getViemProvider)(provider, common_1.NetworkNumber.Eth);
     const viewContract = (0, contracts_1.LiquityViewContractViem)(client, common_1.NetworkNumber.Eth);
-    return _getDebtInFront(viewContract, address);
+    return _getDebtInFront(viewContract, address, '0', 2000, blockNumber);
 });
 exports.getDebtInFront = getDebtInFront;
-const _getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+const _getLiquityTroveInfo = (provider_1, network_1, address_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, ...args_1], void 0, function* (provider, network, address, blockNumber = 'latest') {
     const viewContract = (0, contracts_1.LiquityViewContractViem)(provider, network);
     const collSurplusPoolContract = (0, contracts_1.LiquityCollSurplusPoolContractViem)(provider, network);
     const troveManagerContract = (0, contracts_1.LiquityTroveManagerContractViem)(provider, network);
     const priceFeedContract = (0, contracts_1.LiquityPriceFeedContractViem)(provider, network);
     const activePoolContract = (0, contracts_1.LiquityActivePoolContractViem)(provider, network);
     const [troveInfo, collSurplusInfo, borrowingRateWithDecay, assetPrice, totalETH, totalLUSD, debtInFront,] = yield Promise.all([
-        viewContract.read.getTroveInfo([address]),
-        collSurplusPoolContract.read.getCollateral([address]),
-        troveManagerContract.read.getBorrowingRateWithDecay(),
-        priceFeedContract.read.fetchPrice(),
-        activePoolContract.read.getETH(),
-        activePoolContract.read.getLUSDDebt(),
-        _getDebtInFront(viewContract, address),
+        viewContract.read.getTroveInfo([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        collSurplusPoolContract.read.getCollateral([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        troveManagerContract.read.getBorrowingRateWithDecay((0, viem_1.setViemBlockNumber)(blockNumber)),
+        priceFeedContract.read.fetchPrice((0, viem_1.setViemBlockNumber)(blockNumber)),
+        activePoolContract.read.getETH((0, viem_1.setViemBlockNumber)(blockNumber)),
+        activePoolContract.read.getLUSDDebt((0, viem_1.setViemBlockNumber)(blockNumber)),
+        _getDebtInFront(viewContract, address, '0', 2000, blockNumber),
     ]);
     const recoveryMode = troveInfo[6];
     const minCollateralRatio = recoveryMode ? exports.LIQUITY_RECOVERY_MODE_RATIO : exports.LIQUITY_NORMAL_MODE_RATIO;
@@ -110,20 +110,20 @@ const _getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, v
     return payload;
 });
 exports._getLiquityTroveInfo = _getLiquityTroveInfo;
-const getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLiquityTroveInfo)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, address); });
+const getLiquityTroveInfo = (provider_1, network_1, address_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, ...args_1], void 0, function* (provider, network, address, blockNumber = 'latest') { return (0, exports._getLiquityTroveInfo)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, address, blockNumber); });
 exports.getLiquityTroveInfo = getLiquityTroveInfo;
-const getLiquityStakingData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+const getLiquityStakingData = (provider_1, network_1, address_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, ...args_1], void 0, function* (provider, network, address, blockNumber = 'latest') {
     const lqtyStakingView = (0, contracts_1.LiquityLQTYStakingViem)(provider, network);
     const stabilityPoolView = (0, contracts_1.LiquityStabilityPoolViem)(provider, network);
     const [stakes, pendingETHGain, pendingLUSDGain, totalLQTYStakes, stabilityPoolETHGain, stabilityPoolLQTYGain, compoundedLUSDDeposit, totalLUSDDeposits,] = yield Promise.all([
-        lqtyStakingView.read.stakes([address]),
-        lqtyStakingView.read.getPendingETHGain([address]),
-        lqtyStakingView.read.getPendingLUSDGain([address]),
-        lqtyStakingView.read.totalLQTYStaked(),
-        stabilityPoolView.read.getDepositorETHGain([address]),
-        stabilityPoolView.read.getDepositorLQTYGain([address]),
-        stabilityPoolView.read.getCompoundedLUSDDeposit([address]),
-        stabilityPoolView.read.getTotalLUSDDeposits(),
+        lqtyStakingView.read.stakes([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        lqtyStakingView.read.getPendingETHGain([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        lqtyStakingView.read.getPendingLUSDGain([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        lqtyStakingView.read.totalLQTYStaked((0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getDepositorETHGain([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getDepositorLQTYGain([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getCompoundedLUSDDeposit([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getTotalLUSDDeposits((0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     const totalLUSDDeposited = (0, utils_1.getEthAmountForDecimals)(totalLUSDDeposits, 18);
     const totalLQTYStaked = (0, utils_1.getEthAmountForDecimals)(totalLQTYStakes, 18);