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

package/esm/morphoBlue/index.js

@@ -16,7 +16,7 @@ import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
 import { isMainnetNetwork, wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate, } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
-import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getBlockTimestamp, getViemProvider, setViemBlockNumber } from '../services/viem';
 import { addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities } from './merkl';
 export { MorphoBlueMerklOpportunityType, addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities, addMorphoBlueMerklRewardsToMarketInfo, } from './merkl';
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
@@ -33,8 +33,8 @@ export const addMorphoBlueRewardsToMarketInfo = (marketInfo, rewards) => (Object
                 ...marketInfo.assetsData[marketInfo.loanToken].borrowIncentives.filter(({ token }) => token !== 'MORPHO'),
                 ...getMorphoRewardIncentives(rewards.borrowApy),
             ] }) }) }));
-function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getMorphoBlueMarketDataInternal(provider_1, network_1, selectedMarket_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
         const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
@@ -48,8 +48,8 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
         if (isMainnet) {
             const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
             const [_loanTokenPrice, _marketInfo] = yield Promise.all([
-                isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]),
-                morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)]),
+                isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+                morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)], setViemBlockNumber(blockNumber)),
             ]);
             marketInfo = _marketInfo;
             loanTokenPrice = _loanTokenPrice;
@@ -59,8 +59,8 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
             const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
             const [loanTokenPriceRound, _marketInfo] = yield Promise.all([
                 isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) // Normalize to match the expected object structure
-                    : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]),
-                morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)]),
+                    : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+                morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)], setViemBlockNumber(blockNumber)),
             ]);
             marketInfo = _marketInfo;
             loanTokenPrice = loanTokenPriceRound[1].toString();
@@ -119,29 +119,31 @@ function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
         };
     });
 }
-export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function _getMorphoBlueMarketData(provider_1, network_1, selectedMarket_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
         const [marketInfo, rewards, merklOpportunities] = yield Promise.all([
-            getMorphoBlueMarketDataInternal(provider, network, selectedMarket),
+            getMorphoBlueMarketDataInternal(provider, network, selectedMarket, blockNumber),
             getRewardsForMarket(selectedMarket.marketId, network).catch((error) => {
                 console.error(error);
                 return { supplyApy: '0', borrowApy: '0' };
             }),
-            getMorphoBlueMerklOpportunities(),
+            // Merkl rewards are keyed by time: a historical block resolves to its timestamp first (one RPC
+            // call, none for 'latest') so the rewards in force at that moment are attached.
+            getBlockTimestamp(provider, blockNumber).then((asOfTimestamp) => getMorphoBlueMerklOpportunities(asOfTimestamp, network)),
         ]);
         return addMorphoBlueMerklOpportunitiesToMarketInfo(addMorphoBlueRewardsToMarketInfo(marketInfo, rewards), selectedMarket, network, merklOpportunities);
     });
 }
-export function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
-    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+export function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket, blockNumber = 'latest') {
+    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket, blockNumber);
 }
-export function getMorphoBlueMarketData(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket);
+export function getMorphoBlueMarketData(provider_1, network_1, selectedMarket_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
+        return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
     });
 }
-export function getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
-    return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket);
+export function getMorphoBluePortfolioMarketData(provider, network, selectedMarket, blockNumber = 'latest') {
+    return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
 }
 export const getMorphoBluePositionDataWithMarketInfo = (data, marketInfo) => (Object.assign(Object.assign({}, data), getMorphoBlueAggregatedPositionData({
     usedAssets: data.usedAssets,
@@ -195,8 +197,8 @@ export const _getMorphoBlueAccountBalances = (provider, network, block, addressM
     return balances;
 });
 export const getMorphoBlueAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return _getMorphoBlueAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, selectedMarket); });
-export function _getMorphoBlueAccountData(provider, network, account, selectedMarket, marketInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function _getMorphoBlueAccountData(provider_1, network_1, account_1, selectedMarket_1, marketInfo_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, account, selectedMarket, marketInfo, blockNumber = 'latest') {
         const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
         const viewContract = MorphoBlueViewContractViem(provider, network);
@@ -205,7 +207,7 @@ export function _getMorphoBlueAccountData(provider, network, account, selectedMa
                 loanToken, collateralToken, oracle, irm, lltv: BigInt(lltvInWei),
             },
             account
-        ]));
+        ], setViemBlockNumber(blockNumber)));
         const usedAssets = {};
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
         const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
@@ -235,13 +237,13 @@ export function _getMorphoBlueAccountData(provider, network, account, selectedMa
         return Object.assign({ supplyShares: loanInfo.supplyShares.toString(), borrowShares: loanInfo.borrowShares.toString(), usedAssets }, getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }));
     });
 }
-export function getMorphoBlueAccountData(provider, network, account, selectedMarket, marketInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
+export function getMorphoBlueAccountData(provider_1, network_1, account_1, selectedMarket_1, marketInfo_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, account, selectedMarket, marketInfo, blockNumber = 'latest') {
+        return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo, blockNumber);
     });
 }
-export function getMorphoEarn(provider, network, account, selectedMarket, marketInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function getMorphoEarn(provider_1, network_1, account_1, selectedMarket_1, marketInfo_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, account, selectedMarket, marketInfo, blockNumber = 'latest') {
         const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
         const viewContract = MorphoBlueViewContractViem(provider, network);
@@ -250,7 +252,7 @@ export function getMorphoEarn(provider, network, account, selectedMarket, market
                 loanToken, collateralToken, oracle, irm, lltv: BigInt(lltvInWei),
             },
             account
-        ]));
+        ], setViemBlockNumber(blockNumber)));
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
         const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenSuppliedUsd = new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString();

package/esm/morphoBlue/merkl.d.ts

@@ -24,10 +24,12 @@ export declare enum MorphoBlueMerklOpportunityType {
  */
 export declare const addMorphoBlueMerklOpportunitiesToMarketInfo: (marketInfo: MorphoBlueMarketInfo, selectedMarket: MorphoBlueMarketData, chainId: NetworkNumber, opportunities: MerklOpportunity[]) => MorphoBlueMarketInfo;
 /**
- * Fetches live market-scoped Morpho Blue campaigns for all chains. Never throws — on any failure
- * it returns an empty list, so Merkl being down can't break market data.
+ * Fetches live market-scoped Morpho Blue campaigns for all chains (or one, when `chainId` is given).
+ * With `asOfTimestamp` (unix seconds) the campaigns and APRs are the ones Merkl had at that moment
+ * instead. Never throws — on any failure it returns an empty list, so Merkl being down can't break
+ * market data.
  */
-export declare const getMorphoBlueMerklOpportunities: () => Promise<MerklOpportunity[]>;
+export declare const getMorphoBlueMerklOpportunities: (asOfTimestamp?: number, chainId?: NetworkNumber) => Promise<MerklOpportunity[]>;
 /**
  * Fetches live Merkl campaigns and appends the ones for the market to its `assetsData` incentive
  * arrays. Never throws — on any failure the market info is returned unchanged.

package/esm/morphoBlue/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { fetchAllMerklOpportunities } from '../services/merkl';
+import { fetchMerklOpportunities } from '../services/merkl';
 import { IncentiveKind, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Morpho Blue market-level reward campaigns via the opportunity `type` field:
@@ -73,16 +73,14 @@ export const addMorphoBlueMerklOpportunitiesToMarketInfo = (marketInfo, selected
     return Object.assign(Object.assign({}, marketInfo), { assetsData: Object.assign(Object.assign({}, marketInfo.assetsData), { [marketInfo.collateralToken]: Object.assign(Object.assign({}, collateralAsset), { supplyIncentives: [...withoutMerklIncentives(collateralAsset.supplyIncentives), ...collateralSupply] }), [marketInfo.loanToken]: Object.assign(Object.assign({}, loanAsset), { supplyIncentives: [...withoutMerklIncentives(loanAsset.supplyIncentives), ...loanSupply], borrowIncentives: [...withoutMerklIncentives(loanAsset.borrowIncentives), ...loanBorrow] }) }) });
 };
 /**
- * Fetches live market-scoped Morpho Blue campaigns for all chains. Never throws — on any failure
- * it returns an empty list, so Merkl being down can't break market data.
+ * Fetches live market-scoped Morpho Blue campaigns for all chains (or one, when `chainId` is given).
+ * With `asOfTimestamp` (unix seconds) the campaigns and APRs are the ones Merkl had at that moment
+ * instead. Never throws — on any failure it returns an empty list, so Merkl being down can't break
+ * market data.
  */
-export const getMorphoBlueMerklOpportunities = () => __awaiter(void 0, void 0, void 0, function* () {
+export const getMorphoBlueMerklOpportunities = (asOfTimestamp, chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        return yield fetchAllMerklOpportunities({
-            mainProtocolId: 'morpho',
-            type: Object.values(MorphoBlueMerklOpportunityType).join(','),
-            status: OpportunityStatus.LIVE,
-        });
+        return yield fetchMerklOpportunities(Object.assign({ mainProtocolId: 'morpho', type: Object.values(MorphoBlueMerklOpportunityType).join(','), status: OpportunityStatus.LIVE }, (chainId ? { chainId: chainId.toString() } : {})), asOfTimestamp);
     }
     catch (e) {
         console.error('Failed to fetch Morpho Blue Merkl campaigns', e);

package/esm/morphoMidnight/index.d.ts

@@ -1,13 +1,13 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 import { MorphoMidnightMarketData, MorphoMidnightMarketInfo, MorphoMidnightPositionData } from '../types';
-export declare function _getMorphoMidnightMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo>;
-export declare function getMorphoMidnightMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo>;
-export declare function _getMorphoMidnightAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData>;
-export declare function getMorphoMidnightAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData>;
+export declare function _getMorphoMidnightMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData, blockNumber?: Blockish): Promise<MorphoMidnightMarketInfo>;
+export declare function getMorphoMidnightMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData, blockNumber?: Blockish): Promise<MorphoMidnightMarketInfo>;
+export declare function _getMorphoMidnightAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo, blockNumber?: Blockish): Promise<MorphoMidnightPositionData>;
+export declare function getMorphoMidnightAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo, blockNumber?: Blockish): Promise<MorphoMidnightPositionData>;
 export declare const _getMorphoMidnightAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData, includeCredit?: boolean) => Promise<PositionBalances>;
 export declare const getMorphoMidnightAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData) => Promise<PositionBalances>;
-export declare function getMorphoMidnightEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<{
+export declare function getMorphoMidnightEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo, blockNumber?: Blockish): Promise<{
     apy: string;
     amount: string;
     amountUsd: string;

package/esm/morphoMidnight/index.js

@@ -20,8 +20,8 @@ import { getChainlinkAssetAddress } from '../services/priceService';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
 const nowInSeconds = () => Math.floor(Date.now() / 1000);
-export function _getMorphoMidnightMarketData(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function _getMorphoMidnightMarketData(provider_1, network_1, selectedMarket_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
         const { loanToken, collaterals, marketId } = selectedMarket;
         const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
         const loanSym = wethToEth(loanTokenInfo.symbol);
@@ -33,8 +33,8 @@ export function _getMorphoMidnightMarketData(provider, network, selectedMarket)
         if (isMainnetNetwork(network)) {
             const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
             const [_loanTokenPrice, _marketInfo] = yield Promise.all([
-                isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]),
-                viewContract.read.getMarketInfo([marketId]),
+                isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+                viewContract.read.getMarketInfo([marketId], setViemBlockNumber(blockNumber)),
             ]);
             marketInfo = _marketInfo;
             loanTokenPrice = _loanTokenPrice;
@@ -43,8 +43,8 @@ export function _getMorphoMidnightMarketData(provider, network, selectedMarket)
             // Currently only Base is supported
             const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
             const [loanTokenPriceRound, _marketInfo] = yield Promise.all([
-                isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]),
-                viewContract.read.getMarketInfo([marketId]),
+                isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE], setViemBlockNumber(blockNumber)),
+                viewContract.read.getMarketInfo([marketId], setViemBlockNumber(blockNumber)),
             ]);
             marketInfo = _marketInfo;
             loanTokenPrice = loanTokenPriceRound[1].toString();
@@ -114,16 +114,16 @@ export function _getMorphoMidnightMarketData(provider, network, selectedMarket)
         };
     });
 }
-export function getMorphoMidnightMarketData(provider, network, selectedMarket) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getMorphoMidnightMarketData(getViemProvider(provider, network), network, selectedMarket);
+export function getMorphoMidnightMarketData(provider_1, network_1, selectedMarket_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
+        return _getMorphoMidnightMarketData(getViemProvider(provider, network), network, selectedMarket, blockNumber);
     });
 }
-export function _getMorphoMidnightAccountData(provider, network, account, selectedMarket, marketInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function _getMorphoMidnightAccountData(provider_1, network_1, account_1, selectedMarket_1, marketInfo_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, account, selectedMarket, marketInfo, blockNumber = 'latest') {
         const { marketId, collaterals } = selectedMarket;
         const viewContract = MorphoMidnightViewContractViem(provider, network);
-        const positionInfo = yield viewContract.read.getPositionInfo([marketId, account]);
+        const positionInfo = yield viewContract.read.getPositionInfo([marketId, account], setViemBlockNumber(blockNumber));
         const usedAssets = {};
         const loanTokenData = marketInfo.assetsData[marketInfo.loanToken];
         const credit = assetAmountInEth(positionInfo.credit.toString(), marketInfo.loanToken);
@@ -205,9 +205,9 @@ export function _getMorphoMidnightAccountData(provider, network, account, select
             borrowInfoStatus, maturity: marketInfo.maturity, isMatured: marketInfo.isMatured }, getMorphoMidnightAggregatedPositionData({ usedAssets, assetsData: assetsDataForApy, marketInfo }));
     });
 }
-export function getMorphoMidnightAccountData(provider, network, account, selectedMarket, marketInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getMorphoMidnightAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
+export function getMorphoMidnightAccountData(provider_1, network_1, account_1, selectedMarket_1, marketInfo_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, account, selectedMarket, marketInfo, blockNumber = 'latest') {
+        return _getMorphoMidnightAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo, blockNumber);
     });
 }
 export const _getMorphoMidnightAccountBalances = (provider_1, network_1, block_1, addressMapping_1, address_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, block_1, addressMapping_1, address_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, block, addressMapping, address, selectedMarket, includeCredit = false) {
@@ -240,11 +240,11 @@ export const _getMorphoMidnightAccountBalances = (provider_1, network_1, block_1
 export const getMorphoMidnightAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return _getMorphoMidnightAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, selectedMarket); });
 // Lender-side (credit-only) supply position, mirroring getMorphoEarn. `amount` is the credit face value
 // redeemable at maturity; `apy` is '0' in MVP because the fixed yield is orderbook-derived, not on-chain.
-export function getMorphoMidnightEarn(provider, network, account, selectedMarket, marketInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function getMorphoMidnightEarn(provider_1, network_1, account_1, selectedMarket_1, marketInfo_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, account, selectedMarket, marketInfo, blockNumber = 'latest') {
         const { marketId } = selectedMarket;
         const viewContract = MorphoMidnightViewContractViem(provider, network);
-        const positionInfo = yield viewContract.read.getPositionInfo([marketId, account]);
+        const positionInfo = yield viewContract.read.getPositionInfo([marketId, account], setViemBlockNumber(blockNumber));
         const loanTokenData = marketInfo.assetsData[marketInfo.loanToken];
         const credit = assetAmountInEth(positionInfo.credit.toString(), marketInfo.loanToken);
         const creditUsd = new Dec(credit).mul(loanTokenData.price).toString();

package/esm/portfolio/customDeFiData.js

@@ -8,10 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { NetworkNumber } from '../types/common';
+import { NetworkNumber, } from '../types/common';
 import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MakerActiveIlks, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
 import { AaveVersions, CompoundVersions, PortfolioProtocol, } from '../types';
-import { getViemProvider } from '../services/viem';
+import { getBlockTimestamp, getViemProvider } from '../services/viem';
 import { ZERO_ADDRESS } from '../constants';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
@@ -38,7 +38,7 @@ const positive = (value) => new Dec(value || '0').gt(0);
 const supported = (list, network) => (Object.values(list).filter((m) => m.chainIds.includes(network)));
 export function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addresses_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, options = {}) {
-        var _a;
+        var _a, _b;
         const { protocols = Object.values(PortfolioProtocol), fetchStaking = false, fetchRewards = false, returnEmptyEModePositions = false, fetchFluidMarkets = false, isSim = false, } = options;
         // JSON-RPC body ends up ~4x the calldata cap; 250k keeps it under the ~2.5MB provider limit.
         const batchSize = (_a = options.batchSize) !== null && _a !== void 0 ? _a : (isSim ? 2000 : 250000);
@@ -47,6 +47,11 @@ export function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addr
         const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
         const client = getViemProvider(provider, network, { batch: { multicall: { batchSize } } });
         const defaultClient = getViemProvider(defaultProvider, network, { batch: { multicall: { batchSize } } });
+        // Every fetch below takes the block explicitly and passes it to each of its contract reads.
+        // Time-keyed sources (Merkl rewards) need the block's timestamp instead, resolved once here (no
+        // RPC call for 'latest') and handed to the market fetches so they don't each look it up.
+        const blockNumber = (_b = options.blockNumber) !== null && _b !== void 0 ? _b : 'latest';
+        const blockTimestamp = yield getBlockTimestamp(client, blockNumber);
         const aaveV3Markets = has(PortfolioProtocol.AaveV3)
             ? [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((v) => AaveMarkets(network)[v]).filter((m) => m.chainIds.includes(network))
             : [];
@@ -138,22 +143,22 @@ export function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addr
             }
         }))();
         yield Promise.allSettled([
-            ...morphoMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.morphoMarketsData[m.value] = yield _getMorphoBluePortfolioMarketData(client, network, m); })),
-            ...morphoMidnightMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.morphoMidnightMarketsData[m.value] = yield _getMorphoMidnightMarketData(client, network, m); })),
-            ...compoundV3Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.compoundV3MarketsData[m.value] = yield _getCompoundV3MarketsData(client, network, m, defaultClient); })),
-            ...sparkMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.sparkMarketsData[m.value] = yield _getSparkMarketsData(client, network, m); })),
-            ...aaveV3Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.aaveV3MarketsData[m.value] = yield _getAaveV3MarketData(client, network, m); })),
-            ...aaveV4Spokes.map((s) => __awaiter(this, void 0, void 0, function* () { markets.aaveV4SpokesData[s.value] = yield _getAaveV4SpokeData(client, network, s); })),
-            ...aaveV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.aaveV2MarketsData[m.value] = yield _getAaveV2MarketsData(client, network, m); })),
-            ...compoundV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.compoundV2MarketsData[m.value] = yield _getCompoundV2MarketsData(client, network); })),
-            ...crvUsdMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.crvUsdMarketsData[m.value] = yield _getCurveUsdGlobalData(client, network, m); })),
-            ...llamaLendMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.llamaLendMarketsData[m.value] = yield _getLlamaLendGlobalData(client, network, m); })),
-            ...liquityV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.liquityV2MarketsData[m.value] = yield _getLiquityV2MarketData(client, network, m); })),
+            ...morphoMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.morphoMarketsData[m.value] = yield _getMorphoBluePortfolioMarketData(client, network, m, blockNumber); })),
+            ...morphoMidnightMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.morphoMidnightMarketsData[m.value] = yield _getMorphoMidnightMarketData(client, network, m, blockNumber); })),
+            ...compoundV3Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.compoundV3MarketsData[m.value] = yield _getCompoundV3MarketsData(client, network, m, defaultClient, blockNumber, blockTimestamp); })),
+            ...sparkMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.sparkMarketsData[m.value] = yield _getSparkMarketsData(client, network, m, blockNumber); })),
+            ...aaveV3Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.aaveV3MarketsData[m.value] = yield _getAaveV3MarketData(client, network, m, blockNumber, blockTimestamp); })),
+            ...aaveV4Spokes.map((s) => __awaiter(this, void 0, void 0, function* () { markets.aaveV4SpokesData[s.value] = yield _getAaveV4SpokeData(client, network, s, blockNumber, blockTimestamp); })),
+            ...aaveV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.aaveV2MarketsData[m.value] = yield _getAaveV2MarketsData(client, network, m, blockNumber); })),
+            ...compoundV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.compoundV2MarketsData[m.value] = yield _getCompoundV2MarketsData(client, network, blockNumber); })),
+            ...crvUsdMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.crvUsdMarketsData[m.value] = yield _getCurveUsdGlobalData(client, network, m, blockNumber); })),
+            ...llamaLendMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.llamaLendMarketsData[m.value] = yield _getLlamaLendGlobalData(client, network, m, blockNumber); })),
+            ...liquityV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.liquityV2MarketsData[m.value] = yield _getLiquityV2MarketData(client, network, m, blockNumber); })),
             (() => __awaiter(this, void 0, void 0, function* () {
                 if (!fetchFluid || !fetchFluidMarkets)
                     return;
                 try {
-                    markets.fluidMarketsData = yield _getAllFluidMarketDataPortfolio(client, network);
+                    markets.fluidMarketsData = yield _getAllFluidMarketDataPortfolio(client, network, blockNumber, blockTimestamp);
                 }
                 catch (error) {
                     console.error('Error fetching Fluid markets data:', error);
@@ -163,7 +168,7 @@ export function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addr
                 if (!fetchMaker)
                     return;
                 try {
-                    markets.makerMarketsData = yield _getMakerIlksData(client, network, MakerActiveIlks);
+                    markets.makerMarketsData = yield _getMakerIlksData(client, network, MakerActiveIlks, blockNumber);
                 }
                 catch (error) {
                     console.error('Error fetching Maker ilks data:', error);
@@ -172,78 +177,78 @@ export function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addr
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 if (!fetchMaker)
                     return;
-                makerCdps[lower(address)] = yield _getUserCdps(client, network, address);
+                makerCdps[lower(address)] = yield _getUserCdps(client, network, address, blockNumber);
             })),
-            ...addresses.map((address) => fetchFluid && run(`Fluid positions for address ${address}`, () => _getUserPositionsPortfolio(client, network, address), (userPositions) => {
+            ...addresses.map((address) => fetchFluid && run(`Fluid positions for address ${address}`, () => _getUserPositionsPortfolio(client, network, address, blockNumber), (userPositions) => {
                 for (const position of userPositions) {
                     if (position.userData && positive(position.userData.suppliedUsd))
                         positions[lower(address)].fluid.data[position.userData.nftId] = position.userData;
                 }
             }, (err) => { positions[lower(address)].fluid = { error: err.error, data: {} }; })),
             ...(fetchStaking ? [
-                ...addresses.map((address) => fetchFluid && run(`Fluid lend data for address ${address}`, () => _getAllUserEarnPositionsWithFTokens(client, network, address), (data) => { stakingPositions[lower(address)].fluid = data; }, (err) => { stakingPositions[lower(address)].fluid = err; })),
-                ...addresses.map((address) => fetchLiquity && run(`Liquity staking data for address ${address}`, () => getLiquityStakingData(client, network, address), (data) => { stakingPositions[lower(address)].liquity = data; }, (err) => { stakingPositions[lower(address)].liquity = err; })),
-                ...addresses.map((address) => has(PortfolioProtocol.AaveV3) && isMainnet && run(`Aave V3 staking data for address ${address}`, () => getStakeAaveData(client, network, address), (data) => { stakingPositions[lower(address)].aaveV3 = data; }, (err) => { stakingPositions[lower(address)].aaveV3 = err; })),
-                ...addresses.map((address) => has(PortfolioProtocol.AaveV3) && isMainnet && run(`Umbrella staking data for address ${address}`, () => getUmbrellaData(client, network, address), (data) => { stakingPositions[lower(address)].umbrella = data; }, (err) => { stakingPositions[lower(address)].umbrella = err; })),
-                ...perAddress(liquityV2StakingMarkets, (market, address) => run(`Liquity V2 staking data for address ${address}, market ${market.value}`, () => getLiquityV2Staking(client, network, market.value, address), (data) => { stakingPositions[lower(address)].liquityV2[market.value] = { error: '', data }; }, (err) => { stakingPositions[lower(address)].liquityV2[market.value] = err; })),
+                ...addresses.map((address) => fetchFluid && run(`Fluid lend data for address ${address}`, () => _getAllUserEarnPositionsWithFTokens(client, network, address, blockNumber), (data) => { stakingPositions[lower(address)].fluid = data; }, (err) => { stakingPositions[lower(address)].fluid = err; })),
+                ...addresses.map((address) => fetchLiquity && run(`Liquity staking data for address ${address}`, () => getLiquityStakingData(client, network, address, blockNumber), (data) => { stakingPositions[lower(address)].liquity = data; }, (err) => { stakingPositions[lower(address)].liquity = err; })),
+                ...addresses.map((address) => has(PortfolioProtocol.AaveV3) && isMainnet && run(`Aave V3 staking data for address ${address}`, () => getStakeAaveData(client, network, address, blockNumber), (data) => { stakingPositions[lower(address)].aaveV3 = data; }, (err) => { stakingPositions[lower(address)].aaveV3 = err; })),
+                ...addresses.map((address) => has(PortfolioProtocol.AaveV3) && isMainnet && run(`Umbrella staking data for address ${address}`, () => getUmbrellaData(client, network, address, blockNumber), (data) => { stakingPositions[lower(address)].umbrella = data; }, (err) => { stakingPositions[lower(address)].umbrella = err; })),
+                ...perAddress(liquityV2StakingMarkets, (market, address) => run(`Liquity V2 staking data for address ${address}, market ${market.value}`, () => getLiquityV2Staking(client, network, market.value, address, blockNumber), (data) => { stakingPositions[lower(address)].liquityV2[market.value] = { error: '', data }; }, (err) => { stakingPositions[lower(address)].liquityV2[market.value] = err; })),
             ] : []),
             ...(fetchRewards ? [
-                batchRewards('king', 'King rewards data', () => getKingRewards(client, network, addresses), isMainnet),
-                batchRewards('uniswap', 'Uniswap rewards data', () => getUniswapRewards(client, network, addresses), isMainnet),
-                batchRewards('spk', 'Spark Airdrop rewards data', () => fetchSparkAirdropRewards(client, network, addresses), isMainnet && has(PortfolioProtocol.Spark)),
+                batchRewards('king', 'King rewards data', () => getKingRewards(client, network, addresses, blockNumber), isMainnet),
+                batchRewards('uniswap', 'Uniswap rewards data', () => getUniswapRewards(client, network, addresses, blockNumber), isMainnet),
+                batchRewards('spk', 'Spark Airdrop rewards data', () => fetchSparkAirdropRewards(client, network, addresses, blockNumber), isMainnet && has(PortfolioProtocol.Spark)),
                 batchRewards('ethena', 'Ethena Airdrop rewards data', () => fetchEthenaAirdropRewards(addresses), isMainnet),
                 ...addresses.map((address) => run(`Merkl rewards data for address ${address}`, () => getMerklUnclaimedRewards(address, network), (data) => { rewardsData[lower(address)].merkl = { error: '', data }; }, (err) => { rewardsData[lower(address)].merkl = err; })),
-                ...perAddress(aaveV3Markets, (market, address) => run(`Aave V3 rewards data for address ${address}, market ${market.value}`, () => getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress), (data) => { rewardsData[lower(address)].aaveV3[market.value] = { error: '', data }; }, (err) => { rewardsData[lower(address)].aaveV3[market.value] = err; })),
+                ...perAddress(aaveV3Markets, (market, address) => run(`Aave V3 rewards data for address ${address}, market ${market.value}`, () => getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress, blockNumber), (data) => { rewardsData[lower(address)].aaveV3[market.value] = { error: '', data }; }, (err) => { rewardsData[lower(address)].aaveV3[market.value] = err; })),
                 ...perAddress(sparkMarkets, (market, address) => {
                     if (!isMainnet) {
                         rewardsData[lower(address)].spark[market.value] = { error: '', data: [] };
                         return Promise.resolve();
                     }
-                    return run(`Spark rewards data for address ${address}, market ${market.value}`, () => fetchSparkRewards(client, network, address, market.providerAddress), (data) => { rewardsData[lower(address)].spark[market.value] = { error: '', data }; }, (err) => { rewardsData[lower(address)].spark[market.value] = err; });
+                    return run(`Spark rewards data for address ${address}, market ${market.value}`, () => fetchSparkRewards(client, network, address, market.providerAddress, blockNumber), (data) => { rewardsData[lower(address)].spark[market.value] = { error: '', data }; }, (err) => { rewardsData[lower(address)].spark[market.value] = err; });
                 }),
             ] : []),
         ]);
         yield Promise.all([
-            ...perAddress(aaveV3Markets, (market, address) => run(`AaveV3 account data for address ${address} on market ${market.value}`, () => _getAaveV3AccountData(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value])), (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd))
+            ...perAddress(aaveV3Markets, (market, address) => run(`AaveV3 account data for address ${address} on market ${market.value}`, () => _getAaveV3AccountData(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]), blockNumber), (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd))
                 positions[lower(address)].aaveV3[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].aaveV3[market.value] = err; })),
-            ...perAddress(sparkMarkets, (market, address) => run(`Spark account data for address ${address} on market ${market.value}`, () => _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData }), (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd))
+            ...perAddress(sparkMarkets, (market, address) => run(`Spark account data for address ${address} on market ${market.value}`, () => _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData }, blockNumber), (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd))
                 positions[lower(address)].spark[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].spark[market.value] = err; })),
-            ...perAddress(aaveV4Spokes, (spoke, address) => run(`AaveV4 account data for address ${address} on spoke ${spoke.value}`, () => _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address), (data) => { if (positive(data.suppliedUsd))
+            ...perAddress(aaveV4Spokes, (spoke, address) => run(`AaveV4 account data for address ${address} on spoke ${spoke.value}`, () => _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address, blockNumber), (data) => { if (positive(data.suppliedUsd))
                 positions[lower(address)].aaveV4[spoke.value] = { error: '', data }; }, (err) => { positions[lower(address)].aaveV4[spoke.value] = err; })),
-            ...perAddress(morphoMarkets, (market, address) => run(`MorphoBlue account data for address ${address} on market ${market.value}`, () => _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value]), (data) => { if (positive(data.suppliedUsd))
+            ...perAddress(morphoMarkets, (market, address) => run(`MorphoBlue account data for address ${address} on market ${market.value}`, () => _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value], blockNumber), (data) => { if (positive(data.suppliedUsd))
                 positions[lower(address)].morphoBlue[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].morphoBlue[market.value] = err; })),
-            ...(fetchStaking ? perAddress(morphoMarkets, (market, address) => run(`MorphoBlue earn data for address ${address} on market ${market.value}`, () => getMorphoEarn(client, network, address, market, markets.morphoMarketsData[market.value]), (data) => { if (data && positive(data.amount))
+            ...(fetchStaking ? perAddress(morphoMarkets, (market, address) => run(`MorphoBlue earn data for address ${address} on market ${market.value}`, () => getMorphoEarn(client, network, address, market, markets.morphoMarketsData[market.value], blockNumber), (data) => { if (data && positive(data.amount))
                 stakingPositions[lower(address)].morphoBlue[market.value] = { error: '', data }; }, (err) => { stakingPositions[lower(address)].morphoBlue[market.value] = err; })) : []),
             ...perAddress(morphoMidnightMarkets, (market, address) => {
                 var _a;
                 if (!((_a = markets.morphoMidnightMarketsData[market.value]) === null || _a === void 0 ? void 0 : _a.isCreated))
                     return Promise.resolve();
-                return run(`MorphoMidnight account data for address ${address} on market ${market.value}`, () => _getMorphoMidnightAccountData(client, network, address, market, markets.morphoMidnightMarketsData[market.value]), (data) => { if (positive(data.suppliedUsd))
+                return run(`MorphoMidnight account data for address ${address} on market ${market.value}`, () => _getMorphoMidnightAccountData(client, network, address, market, markets.morphoMidnightMarketsData[market.value], blockNumber), (data) => { if (positive(data.suppliedUsd))
                     positions[lower(address)].morphoMidnight[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].morphoMidnight[market.value] = err; });
             }),
-            ...perAddress(compoundV3Markets, (market, address) => run(`CompoundV3 account data for address ${address} on market ${market.value}`, () => _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData }), (data) => { if (positive(data.suppliedUsd))
+            ...perAddress(compoundV3Markets, (market, address) => run(`CompoundV3 account data for address ${address} on market ${market.value}`, () => _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData }, blockNumber), (data) => { if (positive(data.suppliedUsd))
                 positions[lower(address)].compoundV3[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].compoundV3[market.value] = err; })),
-            ...perAddress(compoundV2Markets, (market, address) => run(`CompoundV2 account data for address ${address}`, () => _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData), (data) => { if (positive(data.suppliedUsd))
+            ...perAddress(compoundV2Markets, (market, address) => run(`CompoundV2 account data for address ${address}`, () => _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData, blockNumber), (data) => { if (positive(data.suppliedUsd))
                 positions[lower(address)].compoundV2[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].compoundV2[market.value] = err; })),
-            ...perAddress(aaveV2Markets, (market, address) => run(`AaveV2 account data for address ${address}`, () => _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market), (data) => { if (positive(data.suppliedUsd))
+            ...perAddress(aaveV2Markets, (market, address) => run(`AaveV2 account data for address ${address}`, () => _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market, blockNumber), (data) => { if (positive(data.suppliedUsd))
                 positions[lower(address)].aaveV2[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].aaveV2[market.value] = err; })),
-            ...perAddress(crvUsdMarkets, (market, address) => run(`Curve USD account data for address ${address} on market ${market.value}`, () => _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate), (data) => { if (positive(data.suppliedUsd) || positive(data.borrowedUsd))
+            ...perAddress(crvUsdMarkets, (market, address) => run(`Curve USD account data for address ${address} on market ${market.value}`, () => _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate, blockNumber), (data) => { if (positive(data.suppliedUsd) || positive(data.borrowedUsd))
                 positions[lower(address)].crvUsd[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].crvUsd[market.value] = err; })),
-            ...perAddress(llamaLendMarkets, (market, address) => run(`LlamaLend account data for address ${address} on market ${market.value}`, () => _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value]), (data) => {
+            ...perAddress(llamaLendMarkets, (market, address) => run(`LlamaLend account data for address ${address} on market ${market.value}`, () => _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value], blockNumber), (data) => {
                 if (positive(data.suppliedUsd) || positive(data.borrowedUsd)) {
                     positions[lower(address)].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, data), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
                 }
             }, (err) => { positions[lower(address)].llamaLend[market.value] = err; })),
-            ...addresses.map((address) => (makerCdps[lower(address)] || []).map((cdpInfo) => run(`Maker CDP data for address ${address} with ID ${cdpInfo.id}`, () => _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]), (data) => { if (data)
+            ...addresses.map((address) => (makerCdps[lower(address)] || []).map((cdpInfo) => run(`Maker CDP data for address ${address} with ID ${cdpInfo.id}`, () => _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel], blockNumber), (data) => { if (data)
                 positions[lower(address)].maker[cdpInfo.id] = { error: '', data }; }, (err) => { positions[lower(address)].maker[cdpInfo.id] = err; }))).flat(),
-            ...addresses.map((address) => fetchLiquity && run(`Liquity trove info for address ${address}`, () => _getLiquityTroveInfo(client, network, address), (data) => { if (positive(data.collateral))
+            ...addresses.map((address) => fetchLiquity && run(`Liquity trove info for address ${address}`, () => _getLiquityTroveInfo(client, network, address, blockNumber), (data) => { if (positive(data.collateral))
                 positions[lower(address)].liquity = { error: '', data }; }, (err) => { positions[lower(address)].liquity = err; })),
             ...(fetchStaking && has(PortfolioProtocol.LiquityV2) ? addresses.map((address) => {
                 if (!isMainnet) {
                     stakingPositions[lower(address)].liquityV2SBoldYBold = { error: '', data: null };
                     return Promise.resolve();
                 }
-                return run(`sBold/yBold data for address ${address}`, () => getLiquitySAndYBold(client, network, stakingPositions[lower(address)].liquityV2, address), (data) => { stakingPositions[lower(address)].liquityV2SBoldYBold = { error: '', data }; }, (err) => { stakingPositions[lower(address)].liquityV2SBoldYBold = err; });
+                return run(`sBold/yBold data for address ${address}`, () => getLiquitySAndYBold(client, network, stakingPositions[lower(address)].liquityV2, address, blockNumber), (data) => { stakingPositions[lower(address)].liquityV2SBoldYBold = { error: '', data }; }, (err) => { stakingPositions[lower(address)].liquityV2SBoldYBold = err; });
             }) : []),
         ]);
         return {

package/esm/services/merkl.d.ts

@@ -1,6 +1,40 @@
-import { MerklOpportunity } from '../types';
+import { MerklCampaignListItem, MerklOpportunity } from '../types';
 /**
- * Fetches every page matching the query. Merkl returns 20 opportunities by default, so omitting
+ * Fetches every opportunity matching the query. Merkl returns 20 opportunities by default, so omitting
  * `items` and advancing `page` avoids imposing a client-side maximum on the result set.
  */
 export declare const fetchAllMerklOpportunities: (query: Record<string, string>) => Promise<MerklOpportunity[]>;
+/** Fetches every campaign matching the query, e.g. `{ mainProtocolId: 'aave', status: 'LIVE,PAST' }`. */
+export declare const fetchAllMerklCampaigns: (query: Record<string, string>) => Promise<MerklCampaignListItem[]>;
+/**
+ * Fetches the opportunities with the given Merkl-internal ids, regardless of their current status.
+ * Ids Merkl no longer serves (hidden or test campaigns) are simply absent from the result.
+ */
+export declare const fetchMerklOpportunitiesByIds: (ids: string[]) => Promise<MerklOpportunity[]>;
+/**
+ * Returns the reward APR Merkl recorded for the opportunity at the given unix timestamp (seconds),
+ * or `undefined` when no campaign was computing for it then. Records are hourly buckets keyed by
+ * their start, newest first, so the first bucket at or before the timestamp carries the value in
+ * force at that moment; the window is a day wide to tolerate computation gaps.
+ */
+export declare const fetchMerklOpportunityAprAt: (opportunityId: string, timestamp: number) => Promise<number | undefined>;
+/**
+ * Reconstructs the opportunities that were live at `timestamp` (unix seconds), shaped like the
+ * live listing so the per-protocol reward mappers can consume either without knowing which they got:
+ *   1. campaigns for the protocol (and chain, when the query names one) whose [start, end] covers
+ *      the timestamp identify the opportunities that were rewarded then — the live listing can't,
+ *      since campaigns live then are mostly PAST now and ones live now didn't exist then;
+ *   2. those opportunities are loaded by id (works for PAST ones too) and narrowed to `query.type`;
+ *   3. each one's `apr` is replaced with the value Merkl recorded at the timestamp, and ones with no
+ *      record then are dropped, since nothing was being computed for them.
+ * `status` is forced to LIVE so status filters downstream keep working, `campaigns` carries the
+ * covering campaigns, and a reward token breakdown is synthesized from the campaign's reward token
+ * when Merkl no longer serves one for the opportunity (it drops them once an opportunity is PAST).
+ * `query.status` is ignored: it describes the present, not the requested moment.
+ */
+export declare const fetchMerklOpportunitiesAt: (query: Record<string, string>, timestamp: number) => Promise<MerklOpportunity[]>;
+/**
+ * Live opportunities when no timestamp is given, otherwise the opportunities as they were at that
+ * unix timestamp (seconds) — see `fetchMerklOpportunitiesAt`.
+ */
+export declare const fetchMerklOpportunities: (query: Record<string, string>, asOfTimestamp?: number) => Promise<MerklOpportunity[]>;