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

package/cjs/services/merkl.js

@@ -9,31 +9,154 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchAllMerklOpportunities = void 0;
+exports.fetchMerklOpportunities = exports.fetchMerklOpportunitiesAt = exports.fetchMerklOpportunityAprAt = exports.fetchMerklOpportunitiesByIds = exports.fetchAllMerklCampaigns = exports.fetchAllMerklOpportunities = void 0;
+const types_1 = require("../types");
 const utils_1 = require("./utils");
-const MERKL_OPPORTUNITIES_URL = 'https://fe.defisaver.com/api/merkl/opportunities';
+const MERKL_API_URL = 'https://fe.defisaver.com/api/merkl';
+const MERKL_OPPORTUNITIES_URL = `${MERKL_API_URL}/opportunities`;
+const MERKL_CAMPAIGNS_URL = `${MERKL_API_URL}/campaigns`;
+// Merkl caps list pages at 100 items; opportunity ids are batched below that so a single page
+// covers every id in the batch.
+const MERKL_MAX_PAGE_ITEMS = 100;
+const OPPORTUNITY_ID_BATCH_SIZE = 50;
+// APR history is fetched per opportunity, so historical lookups are throttled to keep a block with
+// many live campaigns from firing every request at once.
+const APR_RECORDS_CONCURRENCY = 10;
+const SECONDS_PER_DAY = 24 * 60 * 60;
+const merklGet = (url, query, label) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`${url}?${new URLSearchParams(query)}`, { signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT) });
+    if (!res.ok)
+        throw new Error(`Failed to fetch Merkl ${label}`);
+    return res.json();
+});
 /**
- * Fetches every page 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.
+ * Fetches every page matching the query, advancing `page` until an empty page comes back. When
+ * `items` is omitted, Merkl's default page size applies and no client-side maximum is imposed.
  */
-const fetchAllMerklOpportunities = (query) => __awaiter(void 0, void 0, void 0, function* () {
-    const opportunities = [];
+const fetchAllMerklPages = (url, query, label, items) => __awaiter(void 0, void 0, void 0, function* () {
+    const results = [];
     let page = 0;
-    let pageOpportunities;
+    let pageResults;
     do {
-        const searchParams = new URLSearchParams(Object.assign(Object.assign({}, query), { page: page.toString() }));
-        const res = yield fetch(`${MERKL_OPPORTUNITIES_URL}?${searchParams}`, {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
-        });
-        if (!res.ok)
-            throw new Error(`Failed to fetch Merkl opportunities page ${page}`);
-        const data = yield res.json(); // eslint-disable-line no-await-in-loop
+        const pageQuery = Object.assign(Object.assign(Object.assign({}, query), { page: page.toString() }), (items ? { items: items.toString() } : {}));
+        const data = yield merklGet(url, pageQuery, `${label} page ${page}`); // eslint-disable-line no-await-in-loop
         if (!Array.isArray(data))
-            throw new Error(`Invalid Merkl opportunities response on page ${page}`);
-        pageOpportunities = data;
-        opportunities.push(...pageOpportunities);
+            throw new Error(`Invalid Merkl ${label} response on page ${page}`);
+        pageResults = data;
+        results.push(...pageResults);
         page += 1;
-    } while (pageOpportunities.length > 0);
-    return opportunities;
+    } while (pageResults.length > 0);
+    return results;
+});
+/**
+ * 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.
+ */
+const fetchAllMerklOpportunities = (query) => __awaiter(void 0, void 0, void 0, function* () {
+    return (fetchAllMerklPages(MERKL_OPPORTUNITIES_URL, query, 'opportunities'));
 });
 exports.fetchAllMerklOpportunities = fetchAllMerklOpportunities;
+/** Fetches every campaign matching the query, e.g. `{ mainProtocolId: 'aave', status: 'LIVE,PAST' }`. */
+const fetchAllMerklCampaigns = (query) => __awaiter(void 0, void 0, void 0, function* () {
+    return (fetchAllMerklPages(MERKL_CAMPAIGNS_URL, query, 'campaigns', MERKL_MAX_PAGE_ITEMS));
+});
+exports.fetchAllMerklCampaigns = fetchAllMerklCampaigns;
+/**
+ * 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.
+ */
+const fetchMerklOpportunitiesByIds = (ids) => __awaiter(void 0, void 0, void 0, function* () {
+    const batches = [];
+    for (let i = 0; i < ids.length; i += OPPORTUNITY_ID_BATCH_SIZE)
+        batches.push(ids.slice(i, i + OPPORTUNITY_ID_BATCH_SIZE));
+    const results = yield Promise.all(batches.map((batch) => merklGet(MERKL_OPPORTUNITIES_URL, { id: batch.join(','), items: MERKL_MAX_PAGE_ITEMS.toString() }, 'opportunities by id')));
+    return results.flatMap((data) => {
+        if (!Array.isArray(data))
+            throw new Error('Invalid Merkl opportunities by id response');
+        return data;
+    });
+});
+exports.fetchMerklOpportunitiesByIds = fetchMerklOpportunitiesByIds;
+/**
+ * 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.
+ */
+const fetchMerklOpportunityAprAt = (opportunityId, timestamp) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const records = yield merklGet(`${MERKL_OPPORTUNITIES_URL}/${opportunityId}/apr-records`, {
+        grain: 'HOUR',
+        from: (timestamp - SECONDS_PER_DAY).toString(),
+        to: timestamp.toString(),
+        items: '1',
+    }, `APR records for opportunity ${opportunityId}`);
+    if (!Array.isArray(records))
+        throw new Error(`Invalid Merkl APR records response for opportunity ${opportunityId}`);
+    return (_a = records[0]) === null || _a === void 0 ? void 0 : _a.apr;
+});
+exports.fetchMerklOpportunityAprAt = fetchMerklOpportunityAprAt;
+const mapWithConcurrency = (items, concurrency, fn) => __awaiter(void 0, void 0, void 0, function* () {
+    const results = [];
+    for (let i = 0; i < items.length; i += concurrency) {
+        results.push(...yield Promise.all(items.slice(i, i + concurrency).map(fn))); // eslint-disable-line no-await-in-loop
+    }
+    return results;
+});
+/**
+ * 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.
+ */
+const fetchMerklOpportunitiesAt = (query, timestamp) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const campaignQuery = { status: 'LIVE,PAST', endTimestamp: timestamp.toString() };
+    if (query.mainProtocolId)
+        campaignQuery.mainProtocolId = query.mainProtocolId;
+    if (query.chainId)
+        campaignQuery.chainId = query.chainId;
+    // `endTimestamp` only narrows the listing upstream — the exact window check happens here
+    const campaigns = (yield (0, exports.fetchAllMerklCampaigns)(campaignQuery))
+        .filter((c) => { var _a, _b; return c.opportunityId && +((_a = c.startTimestamp) !== null && _a !== void 0 ? _a : 0) <= timestamp && timestamp <= +((_b = c.endTimestamp) !== null && _b !== void 0 ? _b : 0); });
+    const campaignsByOpportunity = {};
+    campaigns.forEach((c) => {
+        if (!campaignsByOpportunity[c.opportunityId])
+            campaignsByOpportunity[c.opportunityId] = [];
+        campaignsByOpportunity[c.opportunityId].push(c);
+    });
+    const opportunityIds = Object.keys(campaignsByOpportunity);
+    if (!opportunityIds.length)
+        return [];
+    const types = (_a = query.type) === null || _a === void 0 ? void 0 : _a.split(',').filter(Boolean);
+    const opportunities = (yield (0, exports.fetchMerklOpportunitiesByIds)(opportunityIds))
+        .filter((o) => !(types === null || types === void 0 ? void 0 : types.length) || types.includes(o.type));
+    const aprs = yield mapWithConcurrency(opportunities, APR_RECORDS_CONCURRENCY, (o) => (0, exports.fetchMerklOpportunityAprAt)(o.id, timestamp));
+    return opportunities.flatMap((o, i) => {
+        var _a, _b, _c;
+        const apr = aprs[i];
+        if (apr === undefined)
+            return [];
+        const coveringCampaigns = campaignsByOpportunity[o.id];
+        const rewardToken = (_a = coveringCampaigns.find((c) => c.rewardToken)) === null || _a === void 0 ? void 0 : _a.rewardToken;
+        const hasBreakdown = !!((_c = (_b = o.rewardsRecord) === null || _b === void 0 ? void 0 : _b.breakdowns) === null || _c === void 0 ? void 0 : _c.length);
+        return [Object.assign(Object.assign({}, o), { status: types_1.OpportunityStatus.LIVE, apr, campaigns: coveringCampaigns, rewardsRecord: hasBreakdown || !rewardToken ? o.rewardsRecord : Object.assign(Object.assign({}, o.rewardsRecord), { breakdowns: [{ token: rewardToken, campaignId: coveringCampaigns[0].campaignId }] }) })];
+    });
+});
+exports.fetchMerklOpportunitiesAt = fetchMerklOpportunitiesAt;
+/**
+ * Live opportunities when no timestamp is given, otherwise the opportunities as they were at that
+ * unix timestamp (seconds) — see `fetchMerklOpportunitiesAt`.
+ */
+const fetchMerklOpportunities = (query, asOfTimestamp) => __awaiter(void 0, void 0, void 0, function* () {
+    return (asOfTimestamp === undefined ? (0, exports.fetchAllMerklOpportunities)(query) : (0, exports.fetchMerklOpportunitiesAt)(query, asOfTimestamp));
+});
+exports.fetchMerklOpportunities = fetchMerklOpportunities;

package/cjs/services/priceService.d.ts

@@ -1,14 +1,14 @@
 import Dec from 'decimal.js';
 import { Client, PublicClient } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getEthPrice: (client: Client) => Promise<string>;
-export declare const getUSDCPrice: (client: Client) => Promise<string>;
-export declare const getCompPrice: (client: Client) => Promise<string>;
-export declare const getWstETHPrice: (client: Client, network?: NetworkNumber) => Promise<string>;
-export declare const getWeETHPrice: (client: Client, network?: NetworkNumber) => Promise<string>;
-export declare const getWsrETHPrice: (client: Client, network?: NetworkNumber) => Promise<string>;
-export declare const getSyrupUSDTPrice: (client: Client, network?: NetworkNumber) => Promise<string>;
-export declare const getWstUSRPrice: (client: Client, network?: NetworkNumber) => Promise<string>;
+import { Blockish, EthAddress, NetworkNumber } from '../types/common';
+export declare const getEthPrice: (client: Client, block?: Blockish) => Promise<string>;
+export declare const getUSDCPrice: (client: Client, block?: Blockish) => Promise<string>;
+export declare const getCompPrice: (client: Client, block?: Blockish) => Promise<string>;
+export declare const getWstETHPrice: (client: Client, network?: NetworkNumber, block?: Blockish) => Promise<string>;
+export declare const getWeETHPrice: (client: Client, network?: NetworkNumber, block?: Blockish) => Promise<string>;
+export declare const getWsrETHPrice: (client: Client, network?: NetworkNumber, block?: Blockish) => Promise<string>;
+export declare const getSyrupUSDTPrice: (client: Client, network?: NetworkNumber, block?: Blockish) => Promise<string>;
+export declare const getWstUSRPrice: (client: Client, network?: NetworkNumber, block?: Blockish) => Promise<string>;
 export declare const getWstETHChainLinkPriceCalls: (client: PublicClient, network: NetworkNumber) => ({
     address: `0x${string}`;
     abi: readonly [{
@@ -1821,7 +1821,7 @@ export declare const parseWeETHPriceCalls: (_ethPrice: string, weETHrateAnswer:
     ethPrice: Dec;
     weETHRate: string;
 };
-export declare const getWstETHPriceFluid: (client: PublicClient, network: NetworkNumber) => Promise<string>;
-export declare const getBTCPriceForFluid: (client: PublicClient, network: NetworkNumber) => Promise<string>;
-export declare const getEthPriceForFluid: (client: PublicClient, network: NetworkNumber) => Promise<string>;
+export declare const getWstETHPriceFluid: (client: PublicClient, network: NetworkNumber, block?: Blockish) => Promise<string>;
+export declare const getBTCPriceForFluid: (client: PublicClient, network: NetworkNumber, block?: Blockish) => Promise<string>;
+export declare const getEthPriceForFluid: (client: PublicClient, network: NetworkNumber, block?: Blockish) => Promise<string>;
 export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => EthAddress;

package/cjs/services/priceService.js

@@ -18,78 +18,79 @@ const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const utils_1 = require("./utils");
+const viem_1 = require("./viem");
 const constants_1 = require("../constants");
-const getEthPrice = (client) => __awaiter(void 0, void 0, void 0, function* () {
+const getEthPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, block = 'latest') {
     const contract = (0, contracts_1.ETHPriceFeedContractViem)(client, common_1.NetworkNumber.Eth);
-    const price = yield contract.read.latestAnswer();
+    const price = yield contract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block));
     return new decimal_js_1.default(price.toString()).div(1e8).toString();
 });
 exports.getEthPrice = getEthPrice;
-const getUSDCPrice = (client) => __awaiter(void 0, void 0, void 0, function* () {
+const getUSDCPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, block = 'latest') {
     const contract = (0, contracts_1.USDCPriceFeedContractViem)(client, common_1.NetworkNumber.Eth);
-    const price = yield contract.read.latestAnswer();
+    const price = yield contract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block));
     return new decimal_js_1.default(price.toString()).div(1e8).toString();
 });
 exports.getUSDCPrice = getUSDCPrice;
-const getCompPrice = (client) => __awaiter(void 0, void 0, void 0, function* () {
+const getCompPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, block = 'latest') {
     const contract = (0, contracts_1.COMPPriceFeedContractViem)(client, common_1.NetworkNumber.Eth);
-    const price = yield contract.read.latestAnswer();
+    const price = yield contract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block));
     return new decimal_js_1.default(price.toString()).div(1e8).toString();
 });
 exports.getCompPrice = getCompPrice;
-const getWstETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+const getWstETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth, block = 'latest') {
     const wstETHFeedContract = (0, contracts_1.WstETHPriceFeedContractViem)(client, network);
     const ethFeedContract = (0, contracts_1.ETHPriceFeedContractViem)(client, network);
     const [ethPriceWei, wstETHRateWei, decimals] = yield Promise.all([
-        ethFeedContract.read.latestAnswer(),
-        wstETHFeedContract.read.latestRoundData(),
-        wstETHFeedContract.read.decimals(),
+        ethFeedContract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block)),
+        wstETHFeedContract.read.latestRoundData((0, viem_1.setViemBlockNumber)(block)),
+        wstETHFeedContract.read.decimals((0, viem_1.setViemBlockNumber)(block)),
     ]);
     const ethPrice = new decimal_js_1.default(ethPriceWei.toString()).div(1e8);
     const wstETHRate = (0, utils_1.getEthAmountForDecimals)(wstETHRateWei[1].toString(), decimals);
     return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
 });
 exports.getWstETHPrice = getWstETHPrice;
-const getWeETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+const getWeETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth, block = 'latest') {
     const weETHFeedContract = (0, contracts_1.WeETHPriceFeedContractViem)(client, network);
     const ethFeedContract = (0, contracts_1.ETHPriceFeedContractViem)(client, network);
     const [ethPriceWei, weETHRateWei, decimals] = yield Promise.all([
-        ethFeedContract.read.latestAnswer(),
-        weETHFeedContract.read.latestRoundData(),
-        weETHFeedContract.read.decimals(),
+        ethFeedContract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block)),
+        weETHFeedContract.read.latestRoundData((0, viem_1.setViemBlockNumber)(block)),
+        weETHFeedContract.read.decimals((0, viem_1.setViemBlockNumber)(block)),
     ]);
     const ethPrice = new decimal_js_1.default(ethPriceWei.toString()).div(1e8);
     const weETHRate = (0, utils_1.getEthAmountForDecimals)(weETHRateWei[1].toString(), decimals);
     return new decimal_js_1.default(ethPrice).mul(weETHRate).toString();
 });
 exports.getWeETHPrice = getWeETHPrice;
-const getWsrETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+const getWsrETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth, block = 'latest') {
     const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
     const [ethPriceWei, wrsETHRateWei] = yield Promise.all([
-        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('WETH', network).address, constants_1.USD_QUOTE]),
-        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('wrsETH', network).address, (0, tokens_1.getAssetInfo)('WETH', network).address]),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('WETH', network).address, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(block)),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('wrsETH', network).address, (0, tokens_1.getAssetInfo)('WETH', network).address], (0, viem_1.setViemBlockNumber)(block)),
     ]);
     const ethPrice = new decimal_js_1.default(ethPriceWei[1].toString()).div(1e8);
     const wrsETHRate = (0, utils_1.getEthAmountForDecimals)(wrsETHRateWei[1].toString(), 18);
     return new decimal_js_1.default(ethPrice).mul(wrsETHRate).toString();
 });
 exports.getWsrETHPrice = getWsrETHPrice;
-const getSyrupUSDTPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+const getSyrupUSDTPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth, block = 'latest') {
     const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
     const [usdtPriceWei, syrupUSDTRateWei] = yield Promise.all([
-        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('USDT', network).address, constants_1.USD_QUOTE]),
-        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('syrupUSDT', network).address, (0, tokens_1.getAssetInfo)('USDT', network).address]),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('USDT', network).address, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(block)),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('syrupUSDT', network).address, (0, tokens_1.getAssetInfo)('USDT', network).address], (0, viem_1.setViemBlockNumber)(block)),
     ]);
     const usdtPrice = new decimal_js_1.default(usdtPriceWei[1].toString()).div(1e8);
     const syrupUSDTPrice = (0, utils_1.getEthAmountForDecimals)(syrupUSDTRateWei[1].toString(), 18);
     return new decimal_js_1.default(usdtPrice).mul(syrupUSDTPrice).toString();
 });
 exports.getSyrupUSDTPrice = getSyrupUSDTPrice;
-const getWstUSRPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+const getWstUSRPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth, block = 'latest') {
     const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
     const [usrPriceWei, wstUSRRateWei] = yield Promise.all([
-        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('USR', network).address, constants_1.USD_QUOTE]),
-        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('wstUSR', network).address, (0, tokens_1.getAssetInfo)('USR', network).address]),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('USR', network).address, constants_1.USD_QUOTE], (0, viem_1.setViemBlockNumber)(block)),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('wstUSR', network).address, (0, tokens_1.getAssetInfo)('USR', network).address], (0, viem_1.setViemBlockNumber)(block)),
     ]);
     const usrPrice = new decimal_js_1.default(usrPriceWei[1].toString()).div(1e8);
     const wstUSRPrice = (0, utils_1.getEthAmountForDecimals)(wstUSRRateWei[1].toString(), 18);
@@ -236,23 +237,23 @@ const parseWeETHPriceCalls = (_ethPrice, weETHrateAnswer, decimals) => {
 };
 exports.parseWeETHPriceCalls = parseWeETHPriceCalls;
 // this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
-const getWstETHPriceFluid = (client, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getWstETHPriceFluid = (client_1, network_1, ...args_1) => __awaiter(void 0, [client_1, network_1, ...args_1], void 0, function* (client, network, block = 'latest') {
     const calls = (0, exports.getWstETHChainLinkPriceCalls)(client, network);
-    const results = yield client.multicall({ contracts: calls });
+    const results = yield client.multicall(Object.assign({ contracts: calls }, (0, viem_1.setViemBlockNumber)(block)));
     // @ts-ignore
     const { ethPrice, wstETHRate } = (0, exports.parseWstETHPriceCalls)(results[0].result.toString(), results[1].result[1].toString(), results[2].result.toString());
     return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
 });
 exports.getWstETHPriceFluid = getWstETHPriceFluid;
-const getBTCPriceForFluid = (client, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getBTCPriceForFluid = (client_1, network_1, ...args_1) => __awaiter(void 0, [client_1, network_1, ...args_1], void 0, function* (client, network, block = 'latest') {
     const contract = (0, contracts_1.BTCPriceFeedContractViem)(client, network);
-    const price = yield contract.read.latestAnswer();
+    const price = yield contract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block));
     return new decimal_js_1.default(price).div(1e8).toString();
 });
 exports.getBTCPriceForFluid = getBTCPriceForFluid;
-const getEthPriceForFluid = (client, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getEthPriceForFluid = (client_1, network_1, ...args_1) => __awaiter(void 0, [client_1, network_1, ...args_1], void 0, function* (client, network, block = 'latest') {
     const contract = (0, contracts_1.ETHPriceFeedContractViem)(client, network);
-    const price = yield contract.read.latestAnswer();
+    const price = yield contract.read.latestAnswer((0, viem_1.setViemBlockNumber)(block));
     return new decimal_js_1.default(price).div(1e8).toString();
 });
 exports.getEthPriceForFluid = getEthPriceForFluid;

package/cjs/services/viem.d.ts

@@ -1,4 +1,4 @@
-import { type Abi } from 'viem';
+import { type Abi, type Client } from 'viem';
 import { Blockish, EthereumProvider, NetworkNumber } from '../types/common';
 export declare const getViemChain: (network: NetworkNumber) => {
     blockExplorers: {
@@ -4401,8 +4401,16 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         transport?: undefined;
         type?: undefined;
         uid?: undefined;
-    } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").Transport, undefined, undefined>, "getBlockNumber" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, import("viem").PublicActions<import("viem").Transport, undefined>>) => client) => import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, { [K in keyof client]: client[K]; } & import("viem").PublicActions<import("viem").Transport, undefined>>;
+    } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").Transport, undefined, undefined>, "getBlockNumber" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, import("viem").PublicActions<import("viem").Transport, undefined>>) => client) => Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, { [K in keyof client]: client[K]; } & import("viem").PublicActions<import("viem").Transport, undefined>>;
 };
+/**
+ * Unix timestamp (seconds) of the block, for data sources keyed by time rather than block (Merkl
+ * reward history). `'latest'` resolves to `undefined` without an RPC call, since live sources need
+ * no timestamp. A numeric block costs one `eth_getBlockByNumber` unless the caller already knows
+ * its timestamp and passes it — flows that fetch many markets at one block resolve it once and
+ * hand it down.
+ */
+export declare const getBlockTimestamp: (client: Client, block: Blockish, blockTimestamp?: number) => Promise<number | undefined>;
 export declare const setViemBlockNumber: (block: Blockish) => {
     blockNumber?: undefined;
 } | {

package/cjs/services/viem.js

@@ -1,8 +1,18 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setViemBlockNumber = exports.getViemProvider = exports.getViemChain = void 0;
+exports.setViemBlockNumber = exports.getBlockTimestamp = exports.getViemProvider = exports.getViemChain = void 0;
 exports.encodeCalldata = encodeCalldata;
 const viem_1 = require("viem");
+const actions_1 = require("viem/actions");
 const chains_1 = require("viem/chains");
 const common_1 = require("../types/common");
 const getViemChain = (network) => {
@@ -26,6 +36,22 @@ const getViemChain = (network) => {
 exports.getViemChain = getViemChain;
 const getViemProvider = (provider, network, options) => (0, viem_1.createPublicClient)(Object.assign({ transport: (0, viem_1.custom)(provider), chain: (0, exports.getViemChain)(network) }, options));
 exports.getViemProvider = getViemProvider;
+/**
+ * Unix timestamp (seconds) of the block, for data sources keyed by time rather than block (Merkl
+ * reward history). `'latest'` resolves to `undefined` without an RPC call, since live sources need
+ * no timestamp. A numeric block costs one `eth_getBlockByNumber` unless the caller already knows
+ * its timestamp and passes it — flows that fetch many markets at one block resolve it once and
+ * hand it down.
+ */
+const getBlockTimestamp = (client, block, blockTimestamp) => __awaiter(void 0, void 0, void 0, function* () {
+    if (block === 'latest')
+        return undefined;
+    if (blockTimestamp !== undefined)
+        return blockTimestamp;
+    const { timestamp } = yield (0, actions_1.getBlock)(client, { blockNumber: BigInt(block) });
+    return Number(timestamp);
+});
+exports.getBlockTimestamp = getBlockTimestamp;
 const setViemBlockNumber = (block) => {
     if (block === 'latest')
         return {};

package/cjs/spark/index.d.ts

@@ -6,8 +6,8 @@ export declare const sparkEmodeCategoriesMapping: (extractedState: {
 }, usedAssets: SparkUsedAssets) => {
     [key: number]: SparkEModeCategoryDataMapping;
 };
-export declare const _getSparkMarketsData: (provider: Client, network: NetworkNumber, selectedMarket: SparkMarketData) => Promise<SparkMarketsData>;
-export declare const getSparkMarketsData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: SparkMarketData) => Promise<SparkMarketsData>;
+export declare const _getSparkMarketsData: (provider: Client, network: NetworkNumber, selectedMarket: SparkMarketData, blockNumber?: Blockish) => Promise<SparkMarketsData>;
+export declare const getSparkMarketsData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: SparkMarketData, blockNumber?: Blockish) => Promise<SparkMarketsData>;
 export declare const EMPTY_SPARK_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -34,10 +34,10 @@ export declare const _getSparkAccountData: (provider: Client, network: NetworkNu
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
     eModeCategoriesData: EModeCategoriesData;
-}) => Promise<SparkPositionData>;
+}, blockNumber?: Blockish) => Promise<SparkPositionData>;
 export declare const getSparkAccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
     eModeCategoriesData: EModeCategoriesData;
-}) => Promise<SparkPositionData>;
+}, blockNumber?: Blockish) => Promise<SparkPositionData>;
 export declare const getSparkFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: SparkMarketData) => Promise<SparkPositionData>;

package/cjs/spark/index.js

@@ -50,14 +50,14 @@ const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     return categoriesMapping;
 };
 exports.sparkEmodeCategoriesMapping = sparkEmodeCategoriesMapping;
-const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const _getSparkMarketsData = (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 marketAddress = selectedMarket.providerAddress;
     const loanInfoContract = (0, contracts_1.SparkViewContractViem)(provider, network);
     const sparkIncentivesContract = (0, contracts_1.SparkIncentiveDataProviderContractViem)(provider, network);
     // eslint-disable-next-line prefer-const
     let [loanInfo, rewardInfo] = yield Promise.all([
-        loanInfoContract.read.getFullTokensInfo([marketAddress, selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address)]),
-        sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]),
+        loanInfoContract.read.getFullTokensInfo([marketAddress, selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        sparkIncentivesContract.read.getReservesIncentivesData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     rewardInfo = rewardInfo.reduce((all, market) => {
         // eslint-disable-next-line no-param-reassign
@@ -215,7 +215,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
     return { assetsData: filteredAssetsData, eModeCategoriesData };
 });
 exports._getSparkMarketsData = _getSparkMarketsData;
-const getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getSparkMarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
+const getSparkMarketsData = (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._getSparkMarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, blockNumber); });
 exports.getSparkMarketsData = getSparkMarketsData;
 exports.EMPTY_SPARK_DATA = {
     usedAssets: {},
@@ -244,7 +244,7 @@ const _getSparkAccountBalances = (provider, network, block, addressMapping, addr
 exports._getSparkAccountBalances = _getSparkAccountBalances;
 const getSparkAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getSparkAccountBalances)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, block, addressMapping, address); });
 exports.getSparkAccountBalances = getSparkAccountBalances;
-const _getSparkAccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
+const _getSparkAccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') {
     const { selectedMarket: market, assetsData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_SPARK_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -260,9 +260,9 @@ const _getSparkAccountData = (provider, network, address, extractedState) => __a
     const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
     const [userEMode, tokenBalances1, tokenBalances2] = yield Promise.all([
-        lendingPoolContract.read.getUserEMode([address]),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)]),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)]),
+        lendingPoolContract.read.getUserEMode([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], (0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     const loanInfo = [...tokenBalances1, ...tokenBalances2];
     const usedAssets = {};
@@ -321,7 +321,7 @@ const _getSparkAccountData = (provider, network, address, extractedState) => __a
     return payload;
 });
 exports._getSparkAccountData = _getSparkAccountData;
-const getSparkAccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getSparkAccountData)((0, viem_1.getViemProvider)(provider, network), network, address, extractedState); });
+const getSparkAccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') { return (0, exports._getSparkAccountData)((0, viem_1.getViemProvider)(provider, network), network, address, extractedState, blockNumber); });
 exports.getSparkAccountData = getSparkAccountData;
 const getSparkFullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getSparkMarketsData)(provider, network, market);

package/cjs/types/merkl.d.ts

@@ -126,6 +126,24 @@ export type MerklOpportunity = {
         }[];
     };
 };
+/** One entry of Merkl's campaign listing: a campaign plus the opportunity it rewards. */
+export type MerklCampaignListItem = MerklCampaign & {
+    opportunityId: string;
+    type: string;
+    rewardToken?: MerklOpportunity['rewardsRecord']['breakdowns'][number]['token'];
+};
+/** One bucket of an opportunity's APR history (`apr` is the last value recorded in the bucket). */
+export type MerklAprRecord = {
+    timestamp: string;
+    date: string;
+    apr: number;
+    open: number;
+    min: number;
+    max: number;
+    avg: number;
+    samples: number;
+    hasUntrustedContribution: boolean;
+};
 export type MerkleRewardInfo = {
     apy: string;
     rewardTokenSymbol: string;

package/cjs/types/portfolio.d.ts

@@ -87,6 +87,8 @@ export interface CustomDeFiDataOptions {
     isSim?: boolean;
     /** viem multicall calldata cap in bytes; defaults to 250k (2k when isSim). */
     batchSize?: number;
+    /** Every read is made at this block; defaults to latest. */
+    blockNumber?: number;
 }
 export interface CustomDeFiData {
     positions: PortfolioPositionsData;

package/cjs/umbrella/index.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getUmbrellaData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+import { Blockish, EthAddress, NetworkNumber } from '../types/common';
+export declare const getUmbrellaData: (provider: Client, network: NetworkNumber, address: EthAddress, blockNumber?: Blockish) => Promise<{
     [k: string]: any;
 }>;

package/cjs/umbrella/index.js

@@ -12,16 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUmbrellaData = void 0;
 const contracts_1 = require("../contracts");
 const utils_1 = require("../services/utils");
+const viem_1 = require("../services/viem");
 const umbrellaUtils_1 = require("./umbrellaUtils");
 const umbrella = '0xD400fc38ED4732893174325693a63C30ee3881a8';
 const aaveOracle = '0x54586bE62E3c3580375aE3723C145253060Ca0C2';
-const getUmbrellaData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+const getUmbrellaData = (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 umbrellaView = (0, contracts_1.AaveUmbrellaViewViem)(provider, network);
     const aaveV3View = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
     const [tokensAggregatedData, additionalUmbrellaStakingData, userAggregatedData] = yield Promise.all([
-        umbrellaView.read.getTokensAggregatedData([umbrella, aaveOracle]),
-        aaveV3View.read.getAdditionalUmbrellaStakingData([umbrella, address]),
-        umbrellaView.read.getUserAggregatedData([umbrella, address]),
+        umbrellaView.read.getTokensAggregatedData([umbrella, aaveOracle], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        aaveV3View.read.getAdditionalUmbrellaStakingData([umbrella, address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        umbrellaView.read.getUserAggregatedData([umbrella, address], (0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     return Object.fromEntries(umbrellaUtils_1.tokenEntries.map(([symbol, tokenAddr]) => {
         // @ts-ignore

package/esm/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>;