@defisaver/positions-sdk 2.1.169-custom-fetching-2-dev → 2.1.169-custom-fetching-4-dev

package/cjs/aaveV2/index.d.ts

@@ -1,14 +1,14 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 import { AaveMarketInfo, AaveV2AssetsData, AaveV2PositionData } from '../types';
-export declare const _getAaveV2MarketsData: (provider: Client, network: NetworkNumber, selectedMarket: AaveMarketInfo) => Promise<{
+export declare const _getAaveV2MarketsData: (provider: Client, network: NetworkNumber, selectedMarket: AaveMarketInfo, blockNumber?: Blockish) => Promise<{
     assetsData: AaveV2AssetsData;
 }>;
-export declare const getAaveV2MarketsData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: AaveMarketInfo) => Promise<{
+export declare const getAaveV2MarketsData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: AaveMarketInfo, blockNumber?: Blockish) => Promise<{
     assetsData: AaveV2AssetsData;
 }>;
 export declare const _getAaveV2AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getAaveV2AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const _getAaveV2AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, assetsData: AaveV2AssetsData, market: AaveMarketInfo) => Promise<AaveV2PositionData>;
-export declare const getAaveV2AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, assetsData: AaveV2AssetsData, market: AaveMarketInfo) => Promise<AaveV2PositionData>;
+export declare const _getAaveV2AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, assetsData: AaveV2AssetsData, market: AaveMarketInfo, blockNumber?: Blockish) => Promise<AaveV2PositionData>;
+export declare const getAaveV2AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, assetsData: AaveV2AssetsData, market: AaveMarketInfo, blockNumber?: Blockish) => Promise<AaveV2PositionData>;
 export declare const getAaveV2FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV2PositionData>;

package/cjs/aaveV2/index.js

@@ -26,13 +26,13 @@ const aave_1 = require("../markets/aave");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const priceService_1 = require("../services/priceService");
 const viem_1 = require("../services/viem");
-const _getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const _getAaveV2MarketsData = (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 _addresses = selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address);
     const loanInfoContract = (0, contracts_1.AaveLoanInfoV2ContractViem)(provider, network);
     const marketAddress = selectedMarket.providerAddress;
     const [loanInfo, ethPrice] = yield Promise.all([
-        loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses]),
-        (0, priceService_1.getEthPrice)(provider),
+        loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        (0, priceService_1.getEthPrice)(provider, blockNumber),
     ]);
     const markets = loanInfo
         .map((market, i) => ({
@@ -91,7 +91,7 @@ const _getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(v
     return { assetsData: payload };
 });
 exports._getAaveV2MarketsData = _getAaveV2MarketsData;
-const getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV2MarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
+const getAaveV2MarketsData = (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._getAaveV2MarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, blockNumber); });
 exports.getAaveV2MarketsData = getAaveV2MarketsData;
 const _getAaveV2AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -107,14 +107,14 @@ const _getAaveV2AccountBalances = (provider, network, block, addressMapping, add
 exports._getAaveV2AccountBalances = _getAaveV2AccountBalances;
 const getAaveV2AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV2AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address); });
 exports.getAaveV2AccountBalances = getAaveV2AccountBalances;
-const _getAaveV2AccountData = (provider, network, address, assetsData, market) => __awaiter(void 0, void 0, void 0, function* () {
+const _getAaveV2AccountData = (provider_1, network_1, address_1, assetsData_1, market_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, assetsData_1, market_1, ...args_1], void 0, function* (provider, network, address, assetsData, market, blockNumber = 'latest') {
     if (!address)
         throw new Error('Address is required');
     let payload = Object.assign(Object.assign({}, aaveV3_1.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     const loanInfoContract = (0, contracts_1.AaveLoanInfoV2ContractViem)(provider, network);
     const marketAddress = market.providerAddress;
     const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address);
-    const loanInfo = yield loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses]);
+    const loanInfo = yield loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber));
     const usedAssets = {};
     loanInfo.forEach((_tokenInfo, i) => {
         const asset = market.assets[i];
@@ -176,7 +176,7 @@ const _getAaveV2AccountData = (provider, network, address, assetsData, market) =
     return payload;
 });
 exports._getAaveV2AccountData = _getAaveV2AccountData;
-const getAaveV2AccountData = (provider, network, address, assetsData, market) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV2AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, assetsData, market); });
+const getAaveV2AccountData = (provider_1, network_1, address_1, assetsData_1, market_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, assetsData_1, market_1, ...args_1], void 0, function* (provider, network, address, assetsData, market, blockNumber = 'latest') { return (0, exports._getAaveV2AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, assetsData, market, blockNumber); });
 exports.getAaveV2AccountData = getAaveV2AccountData;
 const getAaveV2FullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getAaveV2MarketsData)(provider, network, market);

package/cjs/aaveV3/index.d.ts

@@ -6,8 +6,9 @@ import { getMerkleCampaigns } from './merkl';
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };
-export declare function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
-export declare function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
+export declare function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number, blockTimestamp?: number): Promise<AaveV3MarketData>;
+export declare function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number, blockTimestamp?: number): Promise<AaveV3MarketData>;
 export declare const EMPTY_AAVE_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -76,7 +77,7 @@ export declare const getAaveV3AccountData: (provider: EthereumProvider, network:
 export declare const getAaveV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV3PositionData>;
 export declare const REWARDABLE_ASSETS: readonly ["0x028171bCA77440897B824Ca71D1c56caC55b68A3", "0x6C3c78838c761c6Ac7bE9F59fe808ea2A6E4379d", "0xD37EE7e4f452C6638c96536e68090De8cBcdb583", "0x279AF5b99540c1A3A7E3CDd326e19659401eF99e", "0xBcca60bB61934080951369a648Fb03DF4F96263C", "0x619beb58998eD2278e08620f97007e1116D5D25b", "0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811", "0x531842cEbbdD378f8ee36D171d6cC9C4fcf475Ec", "0x9ff58f4fFB29fA2266Ab25e75e2A8b3503311656", "0x9c39809Dec7F95F5e0713634a4D0701329B3b4d2", "0x030bA81f1c18d280636F32af80b9AAd02Cf0854e", "0xF63B34710400CAd3e044cFfDcAb00a0f32E33eCf", "0xa06bC25B5805d5F8d82847D191Cb4Af5A3e873E0", "0x0b8f12b1788BFdE65Aa1ca52E3e9F3Ba401be16D", "0x6C5024Cd4F8A59110119C56f8933403A539555EB", "0xdC6a3Ab17299D9C2A412B0e0a4C1f55446AE0817", "0x5165d24277cD063F5ac44Efd447B27025e888f37", "0x7EbD09022Be45AD993BAA1CEc61166Fcc8644d97", "0xF256CC7847E919FAc9B808cC216cAc87CCF2f47a", "0xfAFEDF95E21184E3d880bd56D4806c4b8d31c69A", "0xB9D7CB55f463405CDfBe4E90a6D2Df01C2B92BF1", "0x5BdB050A92CADcCfCDcCCBFC17204a1C9cC0Ab73", "0xc713e5E149D5D0715DcD1c156a020976e7E56B88", "0xba728eAd5e496BE00DCF66F650b6d7758eCB50f8", "0x101cc05f4A51C0319f570d5E146a8C625198e636", "0x01C0eb1f8c6F1C1bF74ae028697ce7AA2a8b0E92", "0xc9BC48c72154ef3e5425641a3c747242112a46AF", "0xB5385132EE8321977FfF44b60cDE9fE9AB0B4e6b", "0x272F97b7a56a387aE942350bBC7Df5700f8a4576", "0x13210D4Fe0d5402bd7Ecbc4B5bC5cFcA3b71adB0", "0x2e8f4bdbe3d47d7d7de490437aea9915d930f1a3", "0xfdb93b3b10936cf81fa59a02a7523b6e2149b2b7", "0xA361718326c15715591c299427c62086F69923D9", "0xbA429f7011c9fa04cDd46a2Da24dc0FF0aC6099c", "0xd4937682df3C8aEF4FE912A96A74121C0829E664", "0xfE8F19B17fFeF0fDbfe2671F248903055AFAA8Ca", "0x683923dB55Fead99A79Fa01A27EeC3cB19679cC3", "0xC2e10006AccAb7B45D9184FcF5b7EC7763f5BaAe", "0x8dAE6Cb04688C62d939ed9B68d32Bc62e49970b1", "0x00ad8eBF64F141f1C81e9f8f792d3d1631c6c684", "0x6F634c6135D2EBD550000ac92F494F9CB8183dAe", "0x4dDff5885a67E4EffeC55875a3977D7E60F82ae0"];
 export declare const fetchYearlyMeritApyForStakingGho: () => Promise<string>;
-export declare const getStakeAaveData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+export declare const getStakeAaveData: (provider: Client, network: NetworkNumber, address: EthAddress, blockNumber?: Blockish) => Promise<{
     activatedCooldown: string;
     activatedCooldownAmount: string;
     stkAaveRewardsBalance: string;

package/cjs/aaveV3/index.js

@@ -61,8 +61,9 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     return categoriesMapping;
 };
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
 function _getAaveV3MarketData(provider_1, network_1, market_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest', blockTimestamp) {
         var _a;
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
@@ -75,12 +76,15 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             ? Array.from({ length: Math.ceil(_addresses.length / addressesPerRequest) }, (_, index) => _addresses.slice(index * addressesPerRequest, (index + 1) * addressesPerRequest))
             : [_addresses];
         const loanInfoPromise = Promise.all(addressChunks.map((addresses) => loanInfoContract.read.getFullTokensInfo([marketAddress, addresses], (0, viem_1.setViemBlockNumber)(blockNumber)))).then((loanInfoChunks) => loanInfoChunks.flat());
+        // Merkl rewards are keyed by time, so a historical block resolves to its timestamp first (one
+        // RPC call unless given, none for 'latest') and the rewards in force at that moment are attached.
+        const merkleRewardsPromise = (0, viem_1.getBlockTimestamp)(provider, blockNumber, blockTimestamp).then((asOfTimestamp) => (0, merkl_1.getMerkleCampaigns)(network, asOfTimestamp));
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
             loanInfoPromise,
             loanInfoContract.read.getAllEmodes([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
             networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)) : null,
-            (0, merkl_1.getMerkleCampaigns)(network),
+            merkleRewardsPromise,
             (0, merit_1.getMeritCampaigns)(network, market.value),
         ]);
         // same break logic as view contract
@@ -319,8 +323,8 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
     });
 }
 function getAaveV3MarketData(provider_1, network_1, market_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
-        return _getAaveV3MarketData((0, viem_1.getViemProvider)(provider, network), network, market, blockNumber);
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest', blockTimestamp) {
+        return _getAaveV3MarketData((0, viem_1.getViemProvider)(provider, network), network, market, blockNumber, blockTimestamp);
     });
 }
 exports.EMPTY_AAVE_DATA = {
@@ -726,18 +730,18 @@ const fetchYearlyMeritApyForStakingGho = () => __awaiter(void 0, void 0, void 0,
     }
 });
 exports.fetchYearlyMeritApyForStakingGho = fetchYearlyMeritApyForStakingGho;
-const getStakeAaveData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+const getStakeAaveData = (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 stkGhoAddress = (0, tokens_1.getAssetInfo)('stkGHO').address;
     const stkAaveAddress = (0, tokens_1.getAssetInfo)('stkAAVE').address;
     const AaveIncentivesController = (0, contracts_1.AaveIncentivesControllerViem)(provider, network);
     const stkAAVE = (0, contracts_1.StkAAVEViem)(provider, network);
     const stkGHO = (0, contracts_1.createViemContractFromConfigFunc)('Erc20', stkGhoAddress)(provider, network);
     const [aaveRewardsBalance, emissionsPerSecond, stkAAVEBalance, stkAAVETotalSupply, stkGHOBalance, ghoMeritApy, sgho] = yield Promise.all([
-        AaveIncentivesController.read.getRewardsBalance([exports.REWARDABLE_ASSETS, address]),
-        stkAAVE.read.assets([stkAaveAddress]),
-        stkAAVE.read.balanceOf([address]),
-        stkAAVE.read.totalSupply(),
-        stkGHO.read.balanceOf([address]),
+        AaveIncentivesController.read.getRewardsBalance([exports.REWARDABLE_ASSETS, address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stkAAVE.read.assets([stkAaveAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stkAAVE.read.balanceOf([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stkAAVE.read.totalSupply((0, viem_1.setViemBlockNumber)(blockNumber)),
+        stkGHO.read.balanceOf([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
         (0, exports.fetchYearlyMeritApyForStakingGho)(),
         (0, sgho_1.getSghoData)(network, address),
     ]);

package/cjs/aaveV3/merkl.d.ts

@@ -5,4 +5,8 @@ export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;
  * USDC -> USDC
  */
 export declare const formatAaveAsset: (_symbol: string) => string;
-export declare const getMerkleCampaigns: (chainId: NetworkNumber) => Promise<MerkleRewardMap>;
+/**
+ * Live Merkl reward campaigns for Aave V3 on the chain, keyed by aToken. With `asOfTimestamp` (unix
+ * seconds) the campaigns and APRs are the ones Merkl had at that moment instead.
+ */
+export declare const getMerkleCampaigns: (chainId: NetworkNumber, asOfTimestamp?: number) => Promise<MerkleRewardMap>;

package/cjs/aaveV3/merkl.js

@@ -39,12 +39,17 @@ const formatAaveAsset = (_symbol) => {
     return _symbol;
 };
 exports.formatAaveAsset = formatAaveAsset;
-const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * Live Merkl reward campaigns for Aave V3 on the chain, keyed by aToken. With `asOfTimestamp` (unix
+ * seconds) the campaigns and APRs are the ones Merkl had at that moment instead.
+ */
+const getMerkleCampaigns = (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: 'aave',
+            chainId: chainId.toString(),
             status: types_1.OpportunityStatus.LIVE,
-        });
+        }, asOfTimestamp, (o) => { var _a; return !((_a = o.type) === null || _a === void 0 ? void 0 : _a.startsWith('AAVE_V4_')); });
         const relevantOpportunities = opportunities
             .filter((o) => o.chainId === chainId)
             .filter((o) => o.status === types_1.OpportunityStatus.LIVE);

package/cjs/aaveV4/index.d.ts

@@ -2,8 +2,9 @@ import { Client } from 'viem';
 import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber, Blockish, PositionBalances } from '../types';
 export * as lend from './lend';
 export { getAaveV4MerkleCampaigns } from './merkl';
-export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
-export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
+export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number, blockTimestamp?: number): Promise<AaveV4SpokeData>;
+export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number, blockTimestamp?: number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;
 /** Shared raw read; no spoke metadata or market enrichment. */
 export declare const _getAaveV4LoanBalances: (provider: Client, network: NetworkNumber, block: Blockish, address: EthAddress, spoke: EthAddress) => Promise<{
@@ -39,4 +40,4 @@ export declare const _getAaveV4AccountHasAnyBalance: (provider: Client, network:
 export declare function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;
 export declare const _getAaveV4AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, spokeAddress: EthAddress, spokeData?: AaveV4SpokeData) => Promise<PositionBalances>;
 export declare const getAaveV4AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, spokeAddress: EthAddress, spokeData?: AaveV4SpokeData) => Promise<PositionBalances>;
-export declare function getAaveV4UnderlyingFromReserveId(provider: EthereumProvider, network: NetworkNumber, spoke: EthAddress, reserveId: number): Promise<any>;
+export declare function getAaveV4UnderlyingFromReserveId(provider: EthereumProvider, network: NetworkNumber, spoke: EthAddress, reserveId: number, blockNumber?: Blockish): Promise<any>;

package/cjs/aaveV4/index.js

@@ -65,8 +65,8 @@ const merkl_1 = require("./merkl");
 exports.lend = __importStar(require("./lend"));
 var merkl_2 = require("./merkl");
 Object.defineProperty(exports, "getAaveV4MerkleCampaigns", { enumerable: true, get: function () { return merkl_2.getAaveV4MerkleCampaigns; } });
-const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
+const fetchHubData = (viewContract_1, hubAddress_1, ...args_1) => __awaiter(void 0, [viewContract_1, hubAddress_1, ...args_1], void 0, function* (viewContract, hubAddress, blockNumber = 'latest') {
+    const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
     return {
         assets: hubData.reduce((acc, assetOnChainData) => {
             acc[assetOnChainData.assetId] = {
@@ -188,18 +188,21 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         liquidityFee: liquidityFee.toString(),
     });
 });
+/** `blockTimestamp` (unix seconds) is the historical block's timestamp when already known; otherwise it is read from the block. */
 function _getAaveV4SpokeData(provider_1, network_1, market_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest', blockTimestamp) {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
         const hubsData = {};
         const loadHubData = (hubAddress) => __awaiter(this, void 0, void 0, function* () {
-            hubsData[hubAddress.toLowerCase()] = yield fetchHubData(viewContract, hubAddress);
+            hubsData[hubAddress.toLowerCase()] = yield fetchHubData(viewContract, hubAddress, blockNumber);
         });
         // market.hubs is only a prefetch hint (lets known hubs load in parallel with the spoke data), so
         // failures are tolerated here — any hub the reserves actually reference is (re)fetched below.
         const [spokeData, merklCampaigns] = yield Promise.all([
-            viewContract.read.getSpokeDataFull([market.address]),
-            (0, merkl_1.getAaveV4MerkleCampaigns)(network),
+            viewContract.read.getSpokeDataFull([market.address], (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.getAaveV4MerkleCampaigns)(network, asOfTimestamp)),
             ...market.hubs.map((hubAddress) => loadHubData(hubAddress).catch(() => { })),
         ]);
         // The on-chain reserves are the source of truth for which hubs the spoke uses — fetch any hub
@@ -229,14 +232,14 @@ function _getAaveV4SpokeData(provider_1, network_1, market_1) {
     });
 }
 function getAaveV4SpokeData(provider_1, network_1, spoke_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, spoke, blockNumber = 'latest') {
-        return _getAaveV4SpokeData((0, viem_1.getViemProvider)(provider, network), network, spoke, blockNumber);
+    return __awaiter(this, arguments, void 0, function* (provider, network, spoke, blockNumber = 'latest', blockTimestamp) {
+        return _getAaveV4SpokeData((0, viem_1.getViemProvider)(provider, network), network, spoke, blockNumber, blockTimestamp);
     });
 }
 function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, spokeData, address, blockNumber = 'latest') {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
-        const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
+        const loanData = yield viewContract.read.getLoanData([spokeData.address, address], (0, viem_1.setViemBlockNumber)(blockNumber));
         const healthFactorFromContract = new decimal_js_1.default(loanData.healthFactor.toString());
         const healthFactor = (0, utils_1.isMaxUint)(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
@@ -309,7 +312,7 @@ const _getAaveV4AccountHasAnyBalance = (provider, network, block, address, spoke
         return false;
     const blockNumber = block === 'latest' ? 'latest' : Number(block);
     const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
-    const loanData = yield viewContract.read.getLoanData([spokeAddress, address]);
+    const loanData = yield viewContract.read.getLoanData([spokeAddress, address], (0, viem_1.setViemBlockNumber)(blockNumber));
     const reserves = (loanData === null || loanData === void 0 ? void 0 : loanData.reserves) || [];
     return reserves.some((reserveAsset) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -364,13 +367,13 @@ const getAaveV4AccountBalances = (provider, network, block, addressMapping, addr
     return (0, exports._getAaveV4AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address, spokeAddress, spokeData);
 });
 exports.getAaveV4AccountBalances = getAaveV4AccountBalances;
-const _getAaveV4UnderlyingFromReserveId = (provider, network, spoke, reserveId) => __awaiter(void 0, void 0, void 0, function* () {
-    const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network);
-    const reserveData = yield viewContract.read.getReserveData([spoke, BigInt(reserveId)]);
+const _getAaveV4UnderlyingFromReserveId = (provider_1, network_1, spoke_1, reserveId_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, spoke_1, reserveId_1, ...args_1], void 0, function* (provider, network, spoke, reserveId, blockNumber = 'latest') {
+    const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
+    const reserveData = yield viewContract.read.getReserveData([spoke, BigInt(reserveId)], (0, viem_1.setViemBlockNumber)(blockNumber));
     return reserveData.underlying;
 });
-function getAaveV4UnderlyingFromReserveId(provider, network, spoke, reserveId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getAaveV4UnderlyingFromReserveId((0, viem_1.getViemProvider)(provider, network), network, spoke, reserveId);
+function getAaveV4UnderlyingFromReserveId(provider_1, network_1, spoke_1, reserveId_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, spoke, reserveId, blockNumber = 'latest') {
+        return _getAaveV4UnderlyingFromReserveId((0, viem_1.getViemProvider)(provider, network), network, spoke, reserveId, blockNumber);
     });
 }

package/cjs/aaveV4/merkl.d.ts

@@ -1,6 +1,14 @@
 import { AaveV4MerklRewardMap, AaveV4ReserveAssetData, MerklOpportunity, NetworkNumber } from '../types';
-export declare const buildAaveV4MerklRewardMap: (opportunities: MerklOpportunity[], chainId: NetworkNumber) => AaveV4MerklRewardMap;
-export declare const getAaveV4MerkleCampaigns: (chainId: NetworkNumber) => Promise<AaveV4MerklRewardMap>;
+/**
+ * `asOfTimestamp` (unix seconds, defaults to now) decides which of an opportunity's campaigns count
+ * as running, so historical opportunity lists are judged at their own moment rather than today's.
+ */
+export declare const buildAaveV4MerklRewardMap: (opportunities: MerklOpportunity[], chainId: NetworkNumber, asOfTimestamp?: number) => AaveV4MerklRewardMap;
+/**
+ * Live Aave V4 Merkl reward campaigns for the chain, split by hub/spoke scope. With `asOfTimestamp`
+ * (unix seconds) the campaigns and APRs are the ones Merkl had at that moment instead.
+ */
+export declare const getAaveV4MerkleCampaigns: (chainId: NetworkNumber, asOfTimestamp?: number) => Promise<AaveV4MerklRewardMap>;
 /**
  * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's
  * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.

package/cjs/aaveV4/merkl.js

@@ -45,7 +45,11 @@ const buildIncentive = (opportunity) => {
         description: opportunity.description || `Eligible for ${token} rewards through Merkl.`,
     };
 };
-const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
+/**
+ * `asOfTimestamp` (unix seconds, defaults to now) decides which of an opportunity's campaigns count
+ * as running, so historical opportunity lists are judged at their own moment rather than today's.
+ */
+const buildAaveV4MerklRewardMap = (opportunities, chainId, asOfTimestamp = Date.now() / 1000) => {
     const result = { hub: {}, spoke: {} };
     const endByCampaignId = {};
     opportunities.forEach((o) => {
@@ -63,7 +67,7 @@ const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
         .forEach((o) => {
         var _a, _b, _c;
         const side = o.action === types_1.OpportunityAction.BORROW ? types_1.IncentiveSide.Borrow : types_1.IncentiveSide.Supply;
-        const now = Date.now() / 1000;
+        const now = asOfTimestamp;
         const methods = (_a = o.campaigns) === null || _a === void 0 ? void 0 : _a.filter((c) => (c.startTimestamp === undefined || c.startTimestamp <= now)
             && (c.endTimestamp === undefined || c.endTimestamp > now)).map((c) => { var _a, _b; return (_b = (_a = c.params) === null || _a === void 0 ? void 0 : _a.distributionMethodParameters) === null || _b === void 0 ? void 0 : _b.distributionMethod; });
         // An opportunity-level APR cannot be split between simultaneous net and additive campaigns.
@@ -142,15 +146,20 @@ const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
     return result;
 };
 exports.buildAaveV4MerklRewardMap = buildAaveV4MerklRewardMap;
-const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * Live Aave V4 Merkl reward campaigns for the chain, split by hub/spoke scope. With `asOfTimestamp`
+ * (unix seconds) the campaigns and APRs are the ones Merkl had at that moment instead.
+ */
+const getAaveV4MerkleCampaigns = (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: 'aave',
+            chainId: chainId.toString(),
             type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW,AAVE_V4_HUB_NET_LENDING,AAVE_V4_HUB_NET_BORROWING,AAVE_V4_SPOKE_NET_LENDING,AAVE_V4_SPOKE_NET_BORROWING',
             status: types_1.OpportunityStatus.LIVE,
             campaigns: 'true',
-        });
-        return (0, exports.buildAaveV4MerklRewardMap)(opportunities, chainId);
+        }, asOfTimestamp);
+        return (0, exports.buildAaveV4MerklRewardMap)(opportunities, chainId, asOfTimestamp);
     }
     catch (e) {
         console.error('Failed to fetch Aave V4 Merkle campaigns', e);

package/cjs/claiming/aaveV3.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types';
+import { Blockish, EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken, MerklRewardsClaimableToken } from '../types/claiming';
-export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
+export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress, blockNumber?: Blockish): Promise<ClaimableToken[]>;
 export declare function getMerklUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<MerklRewardsClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/cjs/claiming/aaveV3.js

@@ -19,6 +19,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const claiming_1 = require("../types/claiming");
 const contracts_1 = require("../contracts");
 const utils_1 = require("../services/utils");
+const viem_1 = require("../services/viem");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const mapAaveRewardsToClaimableTokens = (aaveRewards, marketAddress, walletAddress) => aaveRewards.map(reward => ({
     symbol: reward.symbol,
@@ -34,10 +35,10 @@ const mapAaveRewardsToClaimableTokens = (aaveRewards, marketAddress, walletAddre
         isAaveToken: reward.symbol.startsWith('a'),
     },
 }));
-function getUnclaimedRewardsForAllMarkets(provider, network, walletAddress, marketAddress) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getUnclaimedRewardsForAllMarkets(provider_1, network_1, walletAddress_1, marketAddress_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, walletAddress, marketAddress, blockNumber = 'latest') {
         const contract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
-        const tokensData = yield contract.read.getUserReservesIncentivesData([marketAddress, walletAddress]);
+        const tokensData = yield contract.read.getUserReservesIncentivesData([marketAddress, walletAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
         const allTokensDataArrays = tokensData.reduce((acc, val) => {
             acc.push(val.aTokenIncentivesUserData.userRewardsInformation);
             acc.push(val.vTokenIncentivesUserData.userRewardsInformation);
@@ -51,7 +52,7 @@ function getUnclaimedRewardsForAllMarkets(provider, network, walletAddress, mark
         // array of rewards for each market (aToken/vToken)
         // reward can be any token like wstETH, but also aToken like aWETH
         const aaveRewardsController = (0, contracts_1.AaveRewardsControllerViem)(provider, network);
-        const rewardsPerAAsset = yield Promise.all(allATokens.map((token) => aaveRewardsController.read.getAllUserRewards([[token], walletAddress])));
+        const rewardsPerAAsset = yield Promise.all(allATokens.map((token) => aaveRewardsController.read.getAllUserRewards([[token], walletAddress], (0, viem_1.setViemBlockNumber)(blockNumber))));
         // match amounts to token symbol, parse decimal amounts
         const rewardsPerAAssetWithInfo = rewardsPerAAsset.map((rewardForAAsset, aaIndex) => {
             const rewardsList = rewardForAAsset[0];

package/cjs/claiming/king.d.ts

@@ -1,4 +1,4 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { Blockish, EthAddress, NetworkNumber } from '../types/common';
 export declare const fetchKingRewards: (walletAddress: EthAddress) => Promise<any>;
-export declare const getKingRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;
+export declare const getKingRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[], blockNumber?: Blockish) => Promise<Record<string, any[]>>;

package/cjs/claiming/king.js

@@ -16,6 +16,7 @@ exports.getKingRewards = exports.fetchKingRewards = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
+const viem_1 = require("../services/viem");
 const claiming_1 = require("../types/claiming");
 const fetchKingRewards = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -30,13 +31,13 @@ const fetchKingRewards = (walletAddress) => __awaiter(void 0, void 0, void 0, fu
     }
 });
 exports.fetchKingRewards = fetchKingRewards;
-const getKingRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
+const getKingRewards = (provider_1, network_1, walletAddresses_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, walletAddresses_1, ...args_1], void 0, function* (provider, network, walletAddresses, blockNumber = 'latest') {
     // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
     const apiDataPromises = walletAddresses.map(address => (0, exports.fetchKingRewards)(address));
     const apiDataArray = yield Promise.all(apiDataPromises);
     // Batch all contract calls using multicall
     const contract = (0, contracts_1.UUPSViem)(provider, network);
-    const cumulativePromises = walletAddresses.map(address => contract.read.cumulativeClaimed([address]));
+    const cumulativePromises = walletAddresses.map(address => contract.read.cumulativeClaimed([address], (0, viem_1.setViemBlockNumber)(blockNumber)));
     const cumulativeResults = yield Promise.all(cumulativePromises);
     // Process results
     const results = {};

package/cjs/claiming/spark.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { Blockish, EthAddress, NetworkNumber } from '../types/common';
 import { SparkRewardsClaimableToken } from '../types/claiming';
 export declare const fetchSpkAirdropRewards: (walletAddress: EthAddress) => Promise<any>;
-export declare const fetchSparkAirdropRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;
-export declare const fetchSparkRewards: (provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress) => Promise<SparkRewardsClaimableToken[]>;
+export declare const fetchSparkAirdropRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[], blockNumber?: Blockish) => Promise<Record<string, any[]>>;
+export declare const fetchSparkRewards: (provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress, blockNumber?: Blockish) => Promise<SparkRewardsClaimableToken[]>;

package/cjs/claiming/spark.js

@@ -18,6 +18,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const contracts_1 = require("../contracts");
 const claiming_1 = require("../types/claiming");
 const utils_1 = require("../services/utils");
+const viem_1 = require("../services/viem");
 const IGNITION_REWARDS = '0xCBA0C0a2a0B6Bb11233ec4EA85C5bFfea33e724d';
 const PFL3_REWARDS = '0x7ac96180C4d6b2A328D3a19ac059D0E7Fc3C6d41';
 const fetchSpkAirdropRewards = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
@@ -33,17 +34,17 @@ const fetchSpkAirdropRewards = (walletAddress) => __awaiter(void 0, void 0, void
     }
 });
 exports.fetchSpkAirdropRewards = fetchSpkAirdropRewards;
-const getCumulativeClaimedSpkAirdrop = (provider, network, data) => __awaiter(void 0, void 0, void 0, function* () {
+const getCumulativeClaimedSpkAirdrop = (provider_1, network_1, data_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, data_1, ...args_1], void 0, function* (provider, network, data, blockNumber = 'latest') {
     const contractIgnition = (0, contracts_1.createViemContractFromConfigFunc)('SparkAirdrop', IGNITION_REWARDS)(provider, network);
     const contractPFL = (0, contracts_1.createViemContractFromConfigFunc)('SparkAirdrop', PFL3_REWARDS)(provider, network);
     const cumulativeAmounts = yield Promise.all(data.map((airdrop) => {
         const { user, tokenAddress, epoch, type, } = airdrop;
         const contract = type === claiming_1.SparkAirdropType.SPARK_IGNITION ? contractIgnition : contractPFL;
-        return contract.read.cumulativeClaimed([user, tokenAddress, BigInt(epoch)]);
+        return contract.read.cumulativeClaimed([user, tokenAddress, BigInt(epoch)], (0, viem_1.setViemBlockNumber)(blockNumber));
     }));
     return cumulativeAmounts.map((amount, i) => (0, tokens_1.assetAmountInEth)(amount.toString(), (0, tokens_1.getAssetInfoByAddress)(data[i].tokenAddress).symbol).toString());
 });
-const fetchSparkAirdropRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchSparkAirdropRewards = (provider_1, network_1, walletAddresses_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, walletAddresses_1, ...args_1], void 0, function* (provider, network, walletAddresses, blockNumber = 'latest') {
     // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
     const apiDataPromises = walletAddresses.map(address => (0, exports.fetchSpkAirdropRewards)(address));
     const apiDataArray = yield Promise.all(apiDataPromises);
@@ -74,7 +75,7 @@ const fetchSparkAirdropRewards = (provider, network, walletAddresses) => __await
         });
     }
     // Batch all contract calls
-    const cumulativeClaimedAmounts = yield getCumulativeClaimedSpkAirdrop(provider, network, contractCallsData);
+    const cumulativeClaimedAmounts = yield getCumulativeClaimedSpkAirdrop(provider, network, contractCallsData, blockNumber);
     // Process results
     const results = {};
     let contractCallIndex = 0;
@@ -114,9 +115,9 @@ const fetchSparkAirdropRewards = (provider, network, walletAddresses) => __await
     return results;
 });
 exports.fetchSparkAirdropRewards = fetchSparkAirdropRewards;
-const fetchSparkRewards = (provider, network, walletAddress, marketAddress) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchSparkRewards = (provider_1, network_1, walletAddress_1, marketAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, walletAddress_1, marketAddress_1, ...args_1], void 0, function* (provider, network, walletAddress, marketAddress, blockNumber = 'latest') {
     const contract = (0, contracts_1.SparkIncentiveDataProviderContractViem)(provider, network);
-    const tokensData = yield contract.read.getUserReservesIncentivesData([marketAddress, walletAddress]);
+    const tokensData = yield contract.read.getUserReservesIncentivesData([marketAddress, walletAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
     const allTokensDataArrays = tokensData.reduce((acc, val) => {
         acc.push(val.aTokenIncentivesUserData.userRewardsInformation);
         acc.push(val.vTokenIncentivesUserData.userRewardsInformation);
@@ -129,7 +130,7 @@ const fetchSparkRewards = (provider, network, walletAddress, marketAddress) => _
     }, []);
     const rewardsPerAAsset = yield Promise.all(allATokens.map((token) => {
         const sparkRewardsContract = (0, contracts_1.SparkRewardsControllerViem)(provider, network);
-        return sparkRewardsContract.read.getAllUserRewards([[token], walletAddress]);
+        return sparkRewardsContract.read.getAllUserRewards([[token], walletAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
     }));
     // match amounts to token symbol, parse decimal amounts
     const rewardsPerAAssetWithInfo = rewardsPerAAsset.map((rewardForAAsset, aaIndex) => {

package/cjs/claiming/uniswap.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types';
+import { Blockish, EthAddress, NetworkNumber } from '../types';
 import { UniswapAirdropClaimableToken } from '../types/claiming';
 export declare const fetchUniswapRewardsData: (walletAddress: EthAddress) => Promise<any>;
-export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, UniswapAirdropClaimableToken[]>>;
+export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[], blockNumber?: Blockish) => Promise<Record<string, UniswapAirdropClaimableToken[]>>;

package/cjs/claiming/uniswap.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniswapRewards = exports.fetchUniswapRewardsData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
+const viem_1 = require("../services/viem");
 const contracts_1 = require("../contracts");
 const claiming_1 = require("../types/claiming");
 const EMPTY_DATA = (walletAddress) => ({
@@ -35,13 +36,13 @@ const fetchUniswapRewardsData = (walletAddress) => __awaiter(void 0, void 0, voi
     }
 });
 exports.fetchUniswapRewardsData = fetchUniswapRewardsData;
-const getUniswapRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
+const getUniswapRewards = (provider_1, network_1, walletAddresses_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, walletAddresses_1, ...args_1], void 0, function* (provider, network, walletAddresses, blockNumber = 'latest') {
     // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
     const apiDataPromises = walletAddresses.map(address => (0, exports.fetchUniswapRewardsData)(address));
     const apiDataArray = yield Promise.all(apiDataPromises);
     // Batch all contract calls using multicall
     const contract = (0, contracts_1.UniswapTokenDistributorViem)(provider, network);
-    const cumulativePromises = apiDataArray.map(data => (data.index ? contract.read.isClaimed([data.index]) : Promise.resolve(false)));
+    const cumulativePromises = apiDataArray.map(data => (data.index ? contract.read.isClaimed([data.index], (0, viem_1.setViemBlockNumber)(blockNumber)) : Promise.resolve(false)));
     const cumulativeResults = yield Promise.all(cumulativePromises);
     // Process results
     const results = {};

package/cjs/compoundV2/index.d.ts

@@ -1,8 +1,8 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 import { CompoundV2AssetsData, CompoundV2MarketsData, CompoundV2PositionData } from '../types';
-export declare const _getCompoundV2MarketsData: (provider: Client, network: NetworkNumber) => Promise<CompoundV2MarketsData>;
-export declare const getCompoundV2MarketsData: (provider: EthereumProvider, network: NetworkNumber) => Promise<CompoundV2MarketsData>;
+export declare const _getCompoundV2MarketsData: (provider: Client, network: NetworkNumber, blockNumber?: Blockish) => Promise<CompoundV2MarketsData>;
+export declare const getCompoundV2MarketsData: (provider: EthereumProvider, network: NetworkNumber, blockNumber?: Blockish) => Promise<CompoundV2MarketsData>;
 export declare const EMPTY_COMPOUND_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -19,6 +19,6 @@ export declare const EMPTY_COMPOUND_DATA: {
 };
 export declare const _getCompoundV2AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, tokens?: EthAddress[]) => Promise<PositionBalances>;
 export declare const getCompoundV2AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const _getCompoundV2AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, assetsData: CompoundV2AssetsData) => Promise<CompoundV2PositionData>;
-export declare const getCompoundV2AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, assetsData: CompoundV2AssetsData) => Promise<CompoundV2PositionData>;
+export declare const _getCompoundV2AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, assetsData: CompoundV2AssetsData, blockNumber?: Blockish) => Promise<CompoundV2PositionData>;
+export declare const getCompoundV2AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, assetsData: CompoundV2AssetsData, blockNumber?: Blockish) => Promise<CompoundV2PositionData>;
 export declare const getCompoundV2FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress) => Promise<CompoundV2PositionData>;