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

package/cjs/compoundV2/index.js

@@ -24,10 +24,10 @@ const markets_1 = require("../markets");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
 const viem_1 = require("../services/viem");
 const compAddress = '0xc00e94cb662c3520282e6f5717214004a7f26888';
-const _getCompoundV2MarketsData = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCompoundV2MarketsData = (provider_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, ...args_1], void 0, function* (provider, network, blockNumber = 'latest') {
     const cAddresses = markets_1.compoundV2CollateralAssets.map(a => a.address);
     const loanInfoContract = (0, contracts_1.CompoundLoanInfoContractViem)(provider, network);
-    const loanInfo = yield loanInfoContract.read.getFullTokensInfo([cAddresses]);
+    const loanInfo = yield loanInfoContract.read.getFullTokensInfo([cAddresses], (0, viem_1.setViemBlockNumber)(blockNumber));
     const compPrice = loanInfo.find(m => (0, utils_1.compareAddresses)(m.underlyingTokenAddress, compAddress)).price.toString();
     const assetsData = loanInfo
         .map((market, i) => {
@@ -85,7 +85,7 @@ const _getCompoundV2MarketsData = (provider, network) => __awaiter(void 0, void
     return { assetsData: payload };
 });
 exports._getCompoundV2MarketsData = _getCompoundV2MarketsData;
-const getCompoundV2MarketsData = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCompoundV2MarketsData)((0, viem_1.getViemProvider)(provider, network), network); });
+const getCompoundV2MarketsData = (provider_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, ...args_1], void 0, function* (provider, network, blockNumber = 'latest') { return (0, exports._getCompoundV2MarketsData)((0, viem_1.getViemProvider)(provider, network), network, blockNumber); });
 exports.getCompoundV2MarketsData = getCompoundV2MarketsData;
 exports.EMPTY_COMPOUND_DATA = {
     usedAssets: {},
@@ -101,9 +101,9 @@ exports.EMPTY_COMPOUND_DATA = {
     borrowStableSupplyUnstable: false,
     exposure: 'N/A',
 };
-const getCollateralAssetsAddresses = (provider, network, account) => __awaiter(void 0, void 0, void 0, function* () {
+const getCollateralAssetsAddresses = (provider_1, network_1, account_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, account_1, ...args_1], void 0, function* (provider, network, account, blockNumber = 'latest') {
     const contract = (0, contracts_1.ComptrollerContractViem)(provider, network);
-    return contract.read.getAssetsIn([account]);
+    return contract.read.getAssetsIn([account], (0, viem_1.setViemBlockNumber)(blockNumber));
 });
 const getAllMarketAddresses = (provider, network, block) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.ComptrollerContractViem)(provider, network);
@@ -140,14 +140,14 @@ const _getCompoundV2AccountBalances = (provider, network, block, addressMapping,
 exports._getCompoundV2AccountBalances = _getCompoundV2AccountBalances;
 const getCompoundV2AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCompoundV2AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address); });
 exports.getCompoundV2AccountBalances = getCompoundV2AccountBalances;
-const _getCompoundV2AccountData = (provider, network, address, assetsData) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCompoundV2AccountData = (provider_1, network_1, address_1, assetsData_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, assetsData_1, ...args_1], void 0, function* (provider, network, address, assetsData, blockNumber = 'latest') {
     if (!address)
         throw new Error('No address provided');
     let payload = Object.assign(Object.assign({}, exports.EMPTY_COMPOUND_DATA), { lastUpdated: Date.now() });
     const loanInfoContract = (0, contracts_1.CompoundLoanInfoContractViem)(provider, network);
     const [loanInfo, collateralAssetsAddresses] = yield Promise.all([
-        loanInfoContract.read.getTokenBalances([address, markets_1.compoundV2CollateralAssets.map(a => a.address)]),
-        getCollateralAssetsAddresses(provider, network, address),
+        loanInfoContract.read.getTokenBalances([address, markets_1.compoundV2CollateralAssets.map(a => a.address)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        getCollateralAssetsAddresses(provider, network, address, blockNumber),
     ]);
     const usedAssets = {};
     loanInfo[0].forEach((weiAmount, i) => {
@@ -179,7 +179,7 @@ const _getCompoundV2AccountData = (provider, network, address, assetsData) => __
     return payload;
 });
 exports._getCompoundV2AccountData = _getCompoundV2AccountData;
-const getCompoundV2AccountData = (provider, network, address, assetsData) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCompoundV2AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, assetsData); });
+const getCompoundV2AccountData = (provider_1, network_1, address_1, assetsData_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, assetsData_1, ...args_1], void 0, function* (provider, network, address, assetsData, blockNumber = 'latest') { return (0, exports._getCompoundV2AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, assetsData, blockNumber); });
 exports.getCompoundV2AccountData = getCompoundV2AccountData;
 const getCompoundV2FullPositionData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getCompoundV2MarketsData)(provider, network);

package/cjs/compoundV3/index.d.ts

@@ -2,8 +2,9 @@ import { Client } from 'viem';
 import { CompoundMarketData, CompoundV3AssetsData, CompoundV3MarketsData, CompoundV3PositionData } from '../types';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 export { getCompoundV3MerklOpportunities, attachCompoundV3MerklIncentives } from './merkl';
-export declare const _getCompoundV3MarketsData: (provider: Client, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultProvider: Client) => Promise<CompoundV3MarketsData>;
-export declare const getCompoundV3MarketsData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultProvider: EthereumProvider) => Promise<CompoundV3MarketsData>;
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
+export declare const _getCompoundV3MarketsData: (provider: Client, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultProvider: Client, blockNumber?: Blockish, blockTimestamp?: number) => Promise<CompoundV3MarketsData>;
+export declare const getCompoundV3MarketsData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultProvider: EthereumProvider, blockNumber?: Blockish, blockTimestamp?: number) => Promise<CompoundV3MarketsData>;
 export declare const EMPTY_COMPOUND_V3_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -37,9 +38,9 @@ export declare const getCompoundV3AccountBalances: (provider: EthereumProvider,
 export declare const _getCompoundV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, proxyAddress: EthAddress, extractedState: ({
     selectedMarket: CompoundMarketData;
     assetsData: CompoundV3AssetsData;
-})) => Promise<CompoundV3PositionData>;
+}), blockNumber?: Blockish) => Promise<CompoundV3PositionData>;
 export declare const getCompoundV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, proxyAddress: EthAddress, extractedState: ({
     selectedMarket: CompoundMarketData;
     assetsData: CompoundV3AssetsData;
-})) => Promise<CompoundV3PositionData>;
+}), blockNumber?: Blockish) => Promise<CompoundV3PositionData>;
 export declare const getCompoundV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, proxyAddress: EthAddress, selectedMarket: CompoundMarketData, defaultProvider: EthereumProvider) => Promise<CompoundV3PositionData>;

package/cjs/compoundV3/index.js

@@ -30,25 +30,29 @@ var merkl_2 = require("./merkl");
 Object.defineProperty(exports, "getCompoundV3MerklOpportunities", { enumerable: true, get: function () { return merkl_2.getCompoundV3MerklOpportunities; } });
 Object.defineProperty(exports, "attachCompoundV3MerklIncentives", { enumerable: true, get: function () { return merkl_2.attachCompoundV3MerklIncentives; } });
 const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(asset), network)).map(addr => addr.address.toLowerCase());
+// Every branch takes (client, block) so the caller can pin the price read to the market block.
 const getBaseAssetPriceFunction = (asset) => {
     switch (asset) {
         case 'wstETH':
-            return priceService_1.getWstETHPrice;
+            return (client, block) => (0, priceService_1.getWstETHPrice)(client, common_1.NetworkNumber.Eth, block);
         case 'ETH':
             return priceService_1.getEthPrice;
         default:
             return priceService_1.getUSDCPrice;
     }
 };
-const _getCompoundV3MarketsData = (provider, network, selectedMarket, defaultProvider) => __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 _getCompoundV3MarketsData = (provider_1, network_1, selectedMarket_1, defaultProvider_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, defaultProvider_1, ...args_1], void 0, function* (provider, network, selectedMarket, defaultProvider, blockNumber = 'latest', blockTimestamp) {
     const contract = (0, contracts_1.CompV3ViewContractViem)(provider, network);
     const [baseAssetPrice, compPrice, baseTokenInfo, collInfos, govInfo, merklOpportunities] = yield Promise.all([
-        getBaseAssetPriceFunction(selectedMarket.baseAsset)(defaultProvider),
-        (0, priceService_1.getCompPrice)(defaultProvider),
-        contract.read.getFullBaseTokenInfo([selectedMarket.baseMarketAddress]),
-        contract.read.getFullCollInfos([selectedMarket.baseMarketAddress]),
-        contract.read.getGovernanceInfoFull([selectedMarket.baseMarketAddress]),
-        (0, merkl_1.getCompoundV3MerklOpportunities)(),
+        getBaseAssetPriceFunction(selectedMarket.baseAsset)(defaultProvider, blockNumber),
+        (0, priceService_1.getCompPrice)(defaultProvider, blockNumber),
+        contract.read.getFullBaseTokenInfo([selectedMarket.baseMarketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        contract.read.getFullCollInfos([selectedMarket.baseMarketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        contract.read.getGovernanceInfoFull([selectedMarket.baseMarketAddress], (0, viem_1.setViemBlockNumber)(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.getCompoundV3MerklOpportunities)(asOfTimestamp, network)),
     ]);
     const { isSupplyPaused, isWithdrawPaused } = govInfo;
     const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
@@ -84,7 +88,7 @@ const _getCompoundV3MarketsData = (provider, network, selectedMarket, defaultPro
     };
 });
 exports._getCompoundV3MarketsData = _getCompoundV3MarketsData;
-const getCompoundV3MarketsData = (provider, network, selectedMarket, defaultProvider) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCompoundV3MarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, (0, viem_1.getViemProvider)(defaultProvider, network)); });
+const getCompoundV3MarketsData = (provider_1, network_1, selectedMarket_1, defaultProvider_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, defaultProvider_1, ...args_1], void 0, function* (provider, network, selectedMarket, defaultProvider, blockNumber = 'latest', blockTimestamp) { return (0, exports._getCompoundV3MarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, (0, viem_1.getViemProvider)(defaultProvider, network), blockNumber, blockTimestamp); });
 exports.getCompoundV3MarketsData = getCompoundV3MarketsData;
 exports.EMPTY_COMPOUND_V3_DATA = {
     usedAssets: {},
@@ -147,15 +151,15 @@ const _getCompoundV3AccountBalances = (provider, network, block, addressMapping,
 exports._getCompoundV3AccountBalances = _getCompoundV3AccountBalances;
 const getCompoundV3AccountBalances = (provider, network, block, addressMapping, address, marketAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCompoundV3AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address, marketAddress); });
 exports.getCompoundV3AccountBalances = getCompoundV3AccountBalances;
-const _getCompoundV3AccountData = (provider, network, address, proxyAddress, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCompoundV3AccountData = (provider_1, network_1, address_1, proxyAddress_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, proxyAddress_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, proxyAddress, extractedState, blockNumber = 'latest') {
     if (!address)
         throw new Error('No address provided');
     const { selectedMarket, assetsData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_COMPOUND_V3_DATA), { lastUpdated: Date.now() });
     const contract = (0, contracts_1.CompV3ViewContractViem)(provider, network);
     const [loanData, isAllowed] = yield Promise.all([
-        contract.read.getLoanData([selectedMarket.baseMarketAddress, address]),
-        contract.read.isAllowed([selectedMarket.baseMarketAddress, address, (proxyAddress || constants_1.ZERO_ADDRESS)]),
+        contract.read.getLoanData([selectedMarket.baseMarketAddress, address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        contract.read.isAllowed([selectedMarket.baseMarketAddress, address, (proxyAddress || constants_1.ZERO_ADDRESS)], (0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     const usedAssets = {};
     const baseAssetInfo = (0, tokens_1.getAssetInfo)(selectedMarket.baseAsset);
@@ -201,7 +205,7 @@ const _getCompoundV3AccountData = (provider, network, address, proxyAddress, ext
     return payload;
 });
 exports._getCompoundV3AccountData = _getCompoundV3AccountData;
-const getCompoundV3AccountData = (provider, network, address, proxyAddress, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCompoundV3AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, proxyAddress, extractedState); });
+const getCompoundV3AccountData = (provider_1, network_1, address_1, proxyAddress_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, proxyAddress_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, proxyAddress, extractedState, blockNumber = 'latest') { return (0, exports._getCompoundV3AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, proxyAddress, extractedState, blockNumber); });
 exports.getCompoundV3AccountData = getCompoundV3AccountData;
 const getCompoundV3FullPositionData = (provider, network, address, proxyAddress, selectedMarket, defaultProvider) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getCompoundV3MarketsData)(provider, network, selectedMarket, defaultProvider);

package/cjs/compoundV3/merkl.d.ts

@@ -7,7 +7,7 @@ import { CompoundV3AssetData, MerklOpportunity, NetworkNumber } from '../types';
  * be gated and sized by a curated check in EligibilityMapping; unknown ids apply
  * unconditionally, mirroring Aave V3.
  */
-export declare const getCompoundV3MerklOpportunities: () => Promise<MerklOpportunity[]>;
+export declare const getCompoundV3MerklOpportunities: (asOfTimestamp?: number, chainId?: NetworkNumber) => Promise<MerklOpportunity[]>;
 /**
  * Appends the comet's Merkl campaigns to its assets' incentive arrays (mutating them, like the
  * staking incentives are attached). BORROW campaigns land on the base asset — the only borrowable

package/cjs/compoundV3/merkl.js

@@ -23,12 +23,9 @@ const types_1 = require("../types");
  * be gated and sized by a curated check in EligibilityMapping; unknown ids apply
  * unconditionally, mirroring Aave V3.
  */
-const getCompoundV3MerklOpportunities = () => __awaiter(void 0, void 0, void 0, function* () {
+const getCompoundV3MerklOpportunities = (asOfTimestamp, chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        return yield (0, merkl_1.fetchAllMerklOpportunities)({
-            mainProtocolId: 'compound-v3',
-            status: types_1.OpportunityStatus.LIVE,
-        });
+        return yield (0, merkl_1.fetchMerklOpportunities)(Object.assign({ mainProtocolId: 'compound-v3', status: types_1.OpportunityStatus.LIVE }, (chainId ? { chainId: chainId.toString() } : {})), asOfTimestamp);
     }
     catch (e) {
         console.error('Failed to fetch Compound V3 Merkl campaigns', e);

package/cjs/curveUsd/index.d.ts

@@ -1,13 +1,13 @@
 import { Client } from 'viem';
 import { CrvUSDGlobalMarketData, CrvUSDMarketData, CrvUSDUserData } from '../types';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-export declare const _getCurveUsdGlobalData: (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDGlobalMarketData>;
-export declare const getCurveUsdGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDGlobalMarketData>;
+export declare const _getCurveUsdGlobalData: (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData, blockNumber?: Blockish) => Promise<CrvUSDGlobalMarketData>;
+export declare const getCurveUsdGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: CrvUSDMarketData, blockNumber?: Blockish) => Promise<CrvUSDGlobalMarketData>;
 export declare const _getCrvUsdAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress, includeDeposited?: boolean) => Promise<PositionBalances>;
 export declare const getCrvUsdAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
 /**
  * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
  */
-export declare const _getCurveUsdUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string) => Promise<CrvUSDUserData>;
-export declare const getCurveUsdUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string) => Promise<CrvUSDUserData>;
-export declare const getCurveUsdFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDUserData>;
+export declare const _getCurveUsdUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string, blockNumber?: Blockish) => Promise<CrvUSDUserData>;
+export declare const getCurveUsdUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string, blockNumber?: Blockish) => Promise<CrvUSDUserData>;
+export declare const getCurveUsdFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, blockNumber?: Blockish) => Promise<CrvUSDUserData>;

package/cjs/curveUsd/index.js

@@ -28,7 +28,7 @@ const ammRateToBorrowApy = (rateWei) => {
     const exponent = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(rateWei)).mul(365).mul(86400);
     return new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponent).minus(1)).mul(100).toString();
 };
-const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
+const getAndFormatBands = (provider_1, network_1, selectedMarket_1, _minBand_1, _maxBand_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, _minBand_1, _maxBand_1, ...args_1], void 0, function* (provider, network, selectedMarket, _minBand, _maxBand, blockNumber = 'latest') {
     const contract = (0, contracts_1.CrvUSDViewContractViem)(provider, network);
     const minBand = parseInt(_minBand, 10);
     const maxBand = parseInt(_maxBand, 10);
@@ -52,7 +52,7 @@ const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand
         else {
             start = pivots[index - 1] + 1;
         }
-        const pivotedBandsData = yield contract.read.getBandsData([selectedMarket.controllerAddress, BigInt(start), BigInt(pivot)]);
+        const pivotedBandsData = yield contract.read.getBandsData([selectedMarket.controllerAddress, BigInt(start), BigInt(pivot)], (0, viem_1.setViemBlockNumber)(blockNumber));
         return pivotedBandsData;
     })))).flat();
     return bandsData.map((band) => ({
@@ -63,23 +63,23 @@ const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand
         highPrice: (0, tokens_1.assetAmountInEth)(band.highPrice.toString()),
     }));
 });
-const _getCurveUsdGlobalData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCurveUsdGlobalData = (provider_1, network_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
     const contract = (0, contracts_1.CrvUSDViewContractViem)(provider, network);
     const factoryContract = (0, contracts_1.CrvUSDFactoryContractViem)(provider, network);
     const cntrollerContract = (0, contracts_1.createViemContractFromConfigFunc)('crvUSDwstETHController', selectedMarket.controllerAddress)(provider, network);
     const debtAsset = selectedMarket.baseAsset;
     const [debtCeiling, _, data, loanDiscountWei] = yield 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], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        factoryContract.read.total_debt((0, viem_1.setViemBlockNumber)(blockNumber)),
+        contract.read.globalData([selectedMarket.controllerAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        cntrollerContract.read.loan_discount((0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     // all prices are in 18 decimals
     const totalDebt = (0, tokens_1.assetAmountInEth)(data.totalDebt.toString(), debtAsset);
     const ammPrice = (0, tokens_1.assetAmountInEth)(data.ammPrice.toString(), debtAsset);
     const borrowRate = ammRateToBorrowApy(data.ammRate.toString());
     const futureBorrowRate = ammRateToBorrowApy(data.monetaryPolicyRate.toString());
-    const bandsData = yield getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
+    const bandsData = yield getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString(), blockNumber);
     const leftToBorrow = new decimal_js_1.default(debtCeiling.toString()).minus(totalDebt).toString();
     const loanDiscount = (0, tokens_1.assetAmountInEth)(loanDiscountWei.toString(), debtAsset);
     return Object.assign(Object.assign({}, data), { decimals: data.decimals.toString(), activeBand: data.activeBand.toString(), monetaryPolicyRate: data.monetaryPolicyRate.toString(), ammRate: data.ammRate.toString(), minBand: data.minBand.toString(), maxBand: data.maxBand.toString(), debtCeiling: debtCeiling.toString(), totalDebt,
@@ -88,7 +88,7 @@ const _getCurveUsdGlobalData = (provider, network, selectedMarket) => __awaiter(
         loanDiscount });
 });
 exports._getCurveUsdGlobalData = _getCurveUsdGlobalData;
-const getCurveUsdGlobalData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCurveUsdGlobalData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
+const getCurveUsdGlobalData = (provider_1, network_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') { return (0, exports._getCurveUsdGlobalData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, blockNumber); });
 exports.getCurveUsdGlobalData = getCurveUsdGlobalData;
 const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) => {
     // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)
@@ -139,16 +139,16 @@ exports.getCrvUsdAccountBalances = getCrvUsdAccountBalances;
 /**
  * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
  */
-const _getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand, borrowRate) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCurveUsdUserData = (provider_1, network_1, address_1, selectedMarket_1, activeBand_1, borrowRate_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, selectedMarket_1, activeBand_1, borrowRate_1, ...args_1], void 0, function* (provider, network, address, selectedMarket, activeBand, borrowRate, blockNumber = 'latest') {
     const contract = (0, contracts_1.CrvUSDViewContractViem)(provider, network);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
     const [data, collStakingApy, marketBorrowRate] = yield Promise.all([
-        contract.read.userData([selectedMarket.controllerAddress, address]),
+        contract.read.userData([selectedMarket.controllerAddress, address], (0, viem_1.setViemBlockNumber)(blockNumber)),
         staking_1.STAKING_ASSETS.includes(collAsset) ? (0, staking_1.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], (0, viem_1.setViemBlockNumber)(blockNumber)).then((globalData) => ammRateToBorrowApy(globalData.ammRate.toString())),
     ]);
     const health = (0, tokens_1.assetAmountInEth)(data.health.toString());
     const healthPercent = new decimal_js_1.default(health).mul(100).toString();
@@ -185,7 +185,7 @@ const _getCurveUsdUserData = (provider, network, address, selectedMarket, active
     } : {};
     const priceHigh = (0, tokens_1.assetAmountInEth)(data.priceHigh.toString());
     const priceLow = (0, tokens_1.assetAmountInEth)(data.priceLow.toString());
-    const _userBands = data.loanExists ? (yield getAndFormatBands(provider, network, selectedMarket, data.bandRange[0].toString(), data.bandRange[1].toString())) : [];
+    const _userBands = data.loanExists ? (yield 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) : types_1.CrvUSDStatus.Nonexistant;
     const userBands = _userBands.map((band, index) => (Object.assign(Object.assign({}, band), { userDebtAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[0][index].toString(), debtAsset), userCollAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[1][index].toString(), collAsset) }))).sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
     return Object.assign(Object.assign(Object.assign(Object.assign({}, data), { collRatio, collateralPrice: collPrice, debtAmount: (0, tokens_1.assetAmountInEth)(data.debtAmount.toString(), debtAsset), health,
@@ -203,11 +203,11 @@ const _getCurveUsdUserData = (provider, network, address, selectedMarket, active
     })), { userBands });
 });
 exports._getCurveUsdUserData = _getCurveUsdUserData;
-const getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand, borrowRate) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCurveUsdUserData)((0, viem_1.getViemProvider)(provider, network), network, address, selectedMarket, activeBand, borrowRate); });
+const getCurveUsdUserData = (provider_1, network_1, address_1, selectedMarket_1, activeBand_1, borrowRate_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, selectedMarket_1, activeBand_1, borrowRate_1, ...args_1], void 0, function* (provider, network, address, selectedMarket, activeBand, borrowRate, blockNumber = 'latest') { return (0, exports._getCurveUsdUserData)((0, viem_1.getViemProvider)(provider, network), network, address, selectedMarket, activeBand, borrowRate, blockNumber); });
 exports.getCurveUsdUserData = getCurveUsdUserData;
-const getCurveUsdFullPositionData = (provider, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield (0, exports.getCurveUsdGlobalData)(provider, network, selectedMarket);
-    const positionData = yield (0, exports.getCurveUsdUserData)(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate);
+const getCurveUsdFullPositionData = (provider_1, network_1, address_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, address, selectedMarket, blockNumber = 'latest') {
+    const marketData = yield (0, exports.getCurveUsdGlobalData)(provider, network, selectedMarket, blockNumber);
+    const positionData = yield (0, exports.getCurveUsdUserData)(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate, blockNumber);
     return positionData;
 });
 exports.getCurveUsdFullPositionData = getCurveUsdFullPositionData;

package/cjs/fluid/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { FluidAssetsData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
+import { FluidAssetsData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData, Blockish } from '../types';
 export { FluidMerklOpportunityType, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
@@ -29,29 +29,29 @@ export declare const EMPTY_FLUID_DATA: {
     automationResubscribeRequired: boolean;
     lastUpdated: number;
 };
-export declare const _getFluidMarketData: (provider: PublicClient, network: NetworkNumber, market: FluidMarketInfo) => Promise<FluidMarketData | undefined>;
-export declare const getFluidMarketData: (provider: EthereumProvider, network: NetworkNumber, market: FluidMarketInfo) => Promise<FluidMarketData | undefined>;
-export declare const _getFluidVaultIdsForUser: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<string[]>;
-export declare const getFluidVaultIdsForUser: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<string[]>;
+export declare const _getFluidMarketData: (provider: PublicClient, network: NetworkNumber, market: FluidMarketInfo, blockNumber?: Blockish) => Promise<FluidMarketData | undefined>;
+export declare const getFluidMarketData: (provider: EthereumProvider, network: NetworkNumber, market: FluidMarketInfo, blockNumber?: Blockish) => Promise<FluidMarketData | undefined>;
+export declare const _getFluidVaultIdsForUser: (provider: Client, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<string[]>;
+export declare const getFluidVaultIdsForUser: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<string[]>;
 export declare const _getFluidPosition: (provider: Client, network: NetworkNumber, vaultId: string, extractedState: {
     assetsData: FluidAssetsData;
     marketData: InnerFluidMarketData;
-}) => Promise<FluidVaultData>;
+}, blockNumber?: Blockish) => Promise<FluidVaultData>;
 export declare const getFluidPosition: (provider: EthereumProvider, network: NetworkNumber, vaultId: string, extractedState: {
     assetsData: FluidAssetsData;
     marketData: InnerFluidMarketData;
-}) => Promise<FluidVaultData>;
-export declare const _getFluidPositionWithMarket: (provider: PublicClient, network: NetworkNumber, vaultId: string) => Promise<{
+}, blockNumber?: Blockish) => Promise<FluidVaultData>;
+export declare const _getFluidPositionWithMarket: (provider: PublicClient, network: NetworkNumber, vaultId: string, blockNumber?: Blockish) => Promise<{
     userData: FluidVaultData;
     marketData: FluidMarketData;
 } | undefined>;
-export declare const getFluidPositionWithMarket: (provider: EthereumProvider, network: NetworkNumber, vaultId: string) => Promise<{
+export declare const getFluidPositionWithMarket: (provider: EthereumProvider, network: NetworkNumber, vaultId: string, blockNumber?: Blockish) => Promise<{
     userData: FluidVaultData;
     marketData: FluidMarketData;
 } | undefined>;
-export declare const _getAllFluidMarketDataChunked: (network: NetworkNumber, provider: PublicClient) => Promise<(FluidMarketData | undefined)[]>;
-export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, provider: EthereumProvider) => Promise<(FluidMarketData | undefined)[]>;
-export declare const _getFluidTokenData: (provider: Client, network: NetworkNumber, token: string) => Promise<{
+export declare const _getAllFluidMarketDataChunked: (network: NetworkNumber, provider: PublicClient, blockNumber?: Blockish) => Promise<(FluidMarketData | undefined)[]>;
+export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, provider: EthereumProvider, blockNumber?: Blockish) => Promise<(FluidMarketData | undefined)[]>;
+export declare const _getFluidTokenData: (provider: Client, network: NetworkNumber, token: string, blockNumber?: Blockish) => Promise<{
     fTokenAddress: any;
     fTokenSymbol: string;
     decimals: string;
@@ -61,7 +61,7 @@ export declare const _getFluidTokenData: (provider: Client, network: NetworkNumb
     depositRate: string;
     withdrawRate: string;
 }>;
-export declare const getFluidTokenData: (provider: EthereumProvider, network: NetworkNumber, token: string) => Promise<{
+export declare const getFluidTokenData: (provider: EthereumProvider, network: NetworkNumber, token: string, blockNumber?: Blockish) => Promise<{
     fTokenAddress: any;
     fTokenSymbol: string;
     decimals: string;
@@ -71,7 +71,7 @@ export declare const getFluidTokenData: (provider: EthereumProvider, network: Ne
     depositRate: string;
     withdrawRate: string;
 }>;
-export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress, blockNumber?: Blockish) => Promise<{
     fTokenAddress: string | undefined;
     fTokenSymbol: string;
     decimals: string;
@@ -83,7 +83,7 @@ export declare const _getFluidDepositData: (provider: Client, network: NetworkNu
     deposited: string;
     depositedShares: string;
 }>;
-export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress, blockNumber?: Blockish) => Promise<{
     fTokenAddress: string | undefined;
     fTokenSymbol: string;
     decimals: string;
@@ -95,7 +95,7 @@ export declare const getFluidDepositData: (provider: EthereumProvider, network:
     deposited: string;
     depositedShares: string;
 }>;
-export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<{
     fTokenAddress: string | undefined;
     fTokenSymbol: string;
     decimals: string;
@@ -107,7 +107,7 @@ export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, net
     deposited: string;
     depositedShares: string;
 }[]>;
-export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<{
     fTokenAddress: string | undefined;
     fTokenSymbol: string;
     decimals: string;
@@ -119,7 +119,7 @@ export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProv
     deposited: string;
     depositedShares: string;
 }[]>;
-export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<{
     marketData: FluidMarketData | undefined;
     userData: {
         suppliedUsd: string;
@@ -154,7 +154,7 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         nftId: string;
     } | undefined;
 }[]>;
-export declare const getUserPositions: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const getUserPositions: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<{
     marketData: FluidMarketData | undefined;
     userData: {
         suppliedUsd: string;
@@ -189,7 +189,7 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         nftId: string;
     } | undefined;
 }[]>;
-export declare const _getUserPositionsPortfolio: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const _getUserPositionsPortfolio: (provider: PublicClient, network: NetworkNumber, user: EthAddress, blockNumber?: Blockish) => Promise<{
     marketData: FluidMarketData | undefined;
     userData: {
         suppliedUsd: string;
@@ -224,5 +224,6 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         nftId: string;
     } | undefined;
 }[]>;
-export declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
-export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, 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 declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber, blockNumber?: Blockish, blockTimestamp?: number) => Promise<Record<string, FluidMarketData>>;
+export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, network: NetworkNumber, blockNumber?: Blockish, blockTimestamp?: number) => Promise<Record<string, FluidMarketData>>;