envio 3.3.0-alpha.7 → 3.3.0-alpha.9

package/src/sources/HyperFuelSource.res

@@ -13,7 +13,7 @@ type selectionConfig = {
   getRecieptsSelection: (
     ~addressesByContractName: dict<array<Address.t>>,
   ) => array<HyperFuelClient.QueryTypes.receiptSelection>,
-  eventRouter: EventRouter.t<Internal.fuelEventConfig>,
+  eventRouter: EventRouter.t<Internal.fuelOnEventRegistration>,
 }
 
 let logDataReceiptTypeSelection: array<FuelSDK.receiptType> = [LogData]
@@ -127,39 +127,40 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
 
   let contractNames = Utils.Set.make()
 
-  selection.eventConfigs
-  ->(Utils.magic: array<Internal.eventConfig> => array<Internal.fuelEventConfig>)
-  ->Array.forEach(eventConfig => {
+  selection.onEventRegistrations->Array.forEach(reg => {
+    let eventConfig =
+      reg.eventConfig->(Utils.magic: Internal.eventConfig => Internal.fuelEventConfig)
     let contractName = eventConfig.contractName
-    if !eventConfig.isWildcard {
+    let isWildcard = reg.isWildcard
+    if !isWildcard {
       let _ = contractNames->Utils.Set.add(contractName)
     }
     eventRouter->EventRouter.addOrThrow(
       eventConfig.id,
-      eventConfig,
+      reg,
       ~contractName,
       ~eventName=eventConfig.name,
       ~chain,
-      ~isWildcard=eventConfig.isWildcard,
+      ~isWildcard,
     )
 
-    switch eventConfig {
-    | {kind: Mint, isWildcard: true} => addNonLogDataWildcardReceiptTypes(Mint)
-    | {kind: Mint} => addNonLogDataReceiptType(contractName, Mint)
-    | {kind: Burn, isWildcard: true} => addNonLogDataWildcardReceiptTypes(Burn)
-    | {kind: Burn} => addNonLogDataReceiptType(contractName, Burn)
-    | {kind: Transfer, isWildcard: true} => {
+    switch (eventConfig.kind, isWildcard) {
+    | (Mint, true) => addNonLogDataWildcardReceiptTypes(Mint)
+    | (Mint, false) => addNonLogDataReceiptType(contractName, Mint)
+    | (Burn, true) => addNonLogDataWildcardReceiptTypes(Burn)
+    | (Burn, false) => addNonLogDataReceiptType(contractName, Burn)
+    | (Transfer, true) => {
         addNonLogDataWildcardReceiptTypes(Transfer)
         addNonLogDataWildcardReceiptTypes(TransferOut)
       }
-    | {kind: Transfer} => {
+    | (Transfer, false) => {
         addNonLogDataReceiptType(contractName, Transfer)
         addNonLogDataReceiptType(contractName, TransferOut)
       }
-    | {kind: Call, isWildcard: true} => addNonLogDataWildcardReceiptTypes(Call)
-    | {kind: Call} =>
+    | (Call, true) => addNonLogDataWildcardReceiptTypes(Call)
+    | (Call, false) =>
       JsError.throwWithMessage("Call receipt indexing currently supported only in wildcard mode")
-    | {kind: LogData({logId}), isWildcard} => {
+    | (LogData({logId}), _) => {
         let rb = logId->BigInt.fromStringOrThrow
         if isWildcard {
           wildcardLogDataRbs->Array.push(rb)->ignore
@@ -251,11 +252,6 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     let startFetchingBatchTimeRef = Performance.now()
 
     //fetch batch
-    Prometheus.SourceRequestCount.increment(
-      ~sourceName=name,
-      ~chainId=chain->ChainMap.Chain.toChainId,
-      ~method="getLogs",
-    )
     let pageUnsafe = try await HyperFuel.GetLogs.query(
       ~client,
       ~fromBlock,
@@ -307,6 +303,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     }
 
     let pageFetchTime = startFetchingBatchTimeRef->Performance.secondsSince
+    let requestStats = [{Source.method: "getLogs", seconds: pageFetchTime}]
 
     //set height and next from block
     let knownHeight = pageUnsafe.archiveHeight
@@ -331,7 +328,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       | Call(_) => callEventTag
       }
 
-      let eventConfig = switch selectionConfig.eventRouter->EventRouter.get(
+      let onEventRegistration = switch selectionConfig.eventRouter->EventRouter.get(
         ~tag=eventId,
         ~contractNameByAddress,
         ~contractAddress,
@@ -352,9 +349,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
             ~logger,
           )
         }
-      | Some(eventConfig) => eventConfig
+      | Some(onEventRegistration) => onEventRegistration
       }
 
+      let eventConfig =
+        onEventRegistration.eventConfig->(
+          Utils.magic: Internal.eventConfig => Internal.fuelEventConfig
+        )
+
       let params = switch (eventConfig, receipt) {
       | ({kind: LogData({decode})}, LogData({data})) =>
         try decode(data) catch {
@@ -408,11 +410,9 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       }
 
       Internal.Event({
-        eventConfig: (eventConfig :> Internal.eventConfig),
-        timestamp: block.time,
+        onEventRegistration: (onEventRegistration :> Internal.onEventRegistration),
         chain,
         blockNumber: block.height,
-        blockHash: block.id,
         logIndex: receiptIndex,
         // Fuel carries the transaction inline on the payload; the store key is
         // unused (Fuel identifies transactions by hash, kept on the payload).
@@ -459,13 +459,15 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     {
       latestFetchedBlockTimestamp,
       parsedQueueItems,
-      // Fuel keeps transaction on the payload; no store page.
+      // Fuel keeps transaction and block on the payload; no store pages.
       transactionStore: None,
+      blockStore: None,
       latestFetchedBlockNumber: heighestBlockQueried,
       stats,
       knownHeight,
       blockHashes,
       fromBlockQueried: fromBlock,
+      requestStats,
     }
   }
 
@@ -493,18 +495,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
         }
       }
       let seconds = timerRef->Performance.secondsSince
-      Prometheus.SourceRequestCount.increment(
-        ~sourceName=name,
-        ~chainId=chain->ChainMap.Chain.toChainId,
-        ~method="getHeight",
-      )
-      Prometheus.SourceRequestCount.addSeconds(
-        ~sourceName=name,
-        ~chainId=chain->ChainMap.Chain.toChainId,
-        ~method="getHeight",
-        ~seconds,
-      )
-      height
+      {height, requestStats: [{method: "getHeight", seconds}]}
     },
     getItemsOrThrow,
   }

package/src/sources/HyperFuelSource.res.mjs

@@ -3,7 +3,6 @@
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperFuel from "./HyperFuel.res.mjs";
-import * as Prometheus from "../Prometheus.res.mjs";
 import * as EventRouter from "./EventRouter.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
@@ -101,41 +100,43 @@ function getSelectionConfig(selection, chain) {
     }
   };
   let contractNames = new Set();
-  selection.eventConfigs.forEach(eventConfig => {
+  selection.onEventRegistrations.forEach(reg => {
+    let eventConfig = reg.eventConfig;
     let contractName = eventConfig.contractName;
-    if (!eventConfig.isWildcard) {
+    let isWildcard = reg.isWildcard;
+    if (!isWildcard) {
       contractNames.add(contractName);
     }
-    EventRouter.addOrThrow(eventRouter, eventConfig.id, eventConfig, contractName, eventConfig.isWildcard, eventConfig.name, chain);
-    let isWildcard = eventConfig.isWildcard;
-    if (isWildcard) {
-      let tmp = eventConfig.kind;
-      if (typeof tmp !== "object") {
-        switch (tmp) {
-          case "Mint" :
-            return addNonLogDataWildcardReceiptTypes(11);
-          case "Burn" :
-            return addNonLogDataWildcardReceiptTypes(12);
-          case "Transfer" :
-            addNonLogDataWildcardReceiptTypes(7);
-            return addNonLogDataWildcardReceiptTypes(8);
-          case "Call" :
-            return addNonLogDataWildcardReceiptTypes(0);
-        }
-      }
-    }
+    EventRouter.addOrThrow(eventRouter, eventConfig.id, reg, contractName, isWildcard, eventConfig.name, chain);
     let match = eventConfig.kind;
     if (typeof match !== "object") {
       switch (match) {
         case "Mint" :
-          return addNonLogDataReceiptType(contractName, 11);
+          if (isWildcard) {
+            return addNonLogDataWildcardReceiptTypes(11);
+          } else {
+            return addNonLogDataReceiptType(contractName, 11);
+          }
         case "Burn" :
-          return addNonLogDataReceiptType(contractName, 12);
+          if (isWildcard) {
+            return addNonLogDataWildcardReceiptTypes(12);
+          } else {
+            return addNonLogDataReceiptType(contractName, 12);
+          }
         case "Transfer" :
-          addNonLogDataReceiptType(contractName, 7);
-          return addNonLogDataReceiptType(contractName, 8);
+          if (isWildcard) {
+            addNonLogDataWildcardReceiptTypes(7);
+            return addNonLogDataWildcardReceiptTypes(8);
+          } else {
+            addNonLogDataReceiptType(contractName, 7);
+            return addNonLogDataReceiptType(contractName, 8);
+          }
         case "Call" :
-          return Stdlib_JsError.throwWithMessage("Call receipt indexing currently supported only in wildcard mode");
+          if (isWildcard) {
+            return addNonLogDataWildcardReceiptTypes(0);
+          } else {
+            return Stdlib_JsError.throwWithMessage("Call receipt indexing currently supported only in wildcard mode");
+          }
       }
     } else {
       let rb = BigInt(match.logId);
@@ -181,7 +182,6 @@ function memoGetSelectionConfig(chain) {
 function make(param) {
   let apiToken = param.apiToken;
   let chain = param.chain;
-  let name = "HyperFuel";
   let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperFuel as a data-source.
 Set the ENVIO_API_TOKEN environment variable in your .env file.
 Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
@@ -201,7 +201,6 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     let selectionConfig = getSelectionConfig(selection);
     let recieptsSelection = selectionConfig.getRecieptsSelection(addressesByContractName);
     let startFetchingBatchTimeRef = Performance.now();
-    Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
     let pageUnsafe;
     try {
       pageUnsafe = await HyperFuel.GetLogs.query(client, fromBlock, toBlock, recieptsSelection);
@@ -250,6 +249,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       };
     }
     let pageFetchTime = Performance.secondsSince(startFetchingBatchTimeRef);
+    let requestStats = [{
+        method: "getLogs",
+        seconds: pageFetchTime
+      }];
     let knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
     let parsingTimeRef = Performance.now();
@@ -277,10 +280,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           eventId = burnEventTag;
           break;
       }
-      let eventConfig = EventRouter.get(selectionConfig.eventRouter, eventId, contractAddress, contractNameByAddress);
-      let eventConfig$1;
-      if (eventConfig !== undefined) {
-        eventConfig$1 = eventConfig;
+      let onEventRegistration = EventRouter.get(selectionConfig.eventRouter, eventId, contractAddress, contractNameByAddress);
+      let onEventRegistration$1;
+      if (onEventRegistration !== undefined) {
+        onEventRegistration$1 = onEventRegistration;
       } else {
         let logger$1 = Logging.createChildFrom(logger, {
           chainId: chain,
@@ -289,11 +292,12 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           contractAddress: contractAddress,
           eventId: eventId
         });
-        eventConfig$1 = ErrorHandling.mkLogAndRaise(logger$1, "Failed to route registered event", {
+        onEventRegistration$1 = ErrorHandling.mkLogAndRaise(logger$1, "Failed to route registered event", {
           RE_EXN_ID: EventRoutingFailed
         });
       }
-      let match = eventConfig$1.kind;
+      let eventConfig = onEventRegistration$1.eventConfig;
+      let match = eventConfig.kind;
       let params;
       let exit = 0;
       if (typeof match !== "object" || receipt.receiptType !== 6) {
@@ -349,16 +353,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       }
       return {
         kind: 0,
-        eventConfig: eventConfig$1,
-        timestamp: block.time,
+        onEventRegistration: onEventRegistration$1,
         chain: chain,
         blockNumber: block.height,
-        blockHash: block.id,
         logIndex: receiptIndex,
         transactionIndex: 0,
         payload: {
-          contractName: eventConfig$1.contractName,
-          eventName: eventConfig$1.name,
+          contractName: eventConfig.contractName,
+          eventName: eventConfig.name,
           params: params,
           chainId: chain,
           srcAddress: contractAddress,
@@ -399,15 +401,17 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       blockHashes: blockHashes,
       parsedQueueItems: parsedQueueItems,
       transactionStore: undefined,
+      blockStore: undefined,
       fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: heighestBlockQueried,
       latestFetchedBlockTimestamp: latestFetchedBlockTimestamp,
-      stats: stats
+      stats: stats,
+      requestStats: requestStats
     };
   };
   let getBlockHashes = (param, param$1) => Stdlib_JsError.throwWithMessage("HyperFuel does not support getting block hashes");
   return {
-    name: name,
+    name: "HyperFuel",
     sourceFor: "Sync",
     chain: chain,
     poweredByHyperSync: true,
@@ -447,9 +451,13 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         }
       }
       let seconds = Performance.secondsSince(timerRef);
-      Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
-      Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
-      return height;
+      return {
+        height: height,
+        requestStats: [{
+            method: "getHeight",
+            seconds: seconds
+          }]
+      };
     },
     getItemsOrThrow: getItemsOrThrow
   };

package/src/sources/HyperSync.res

@@ -16,13 +16,15 @@ let reraisIfRateLimited = exn =>
 
 type logsQueryPage = {
   items: array<HyperSyncClient.EventItems.item>,
-  // Blocks referenced by `items`, deduplicated by block number.
-  blocks: array<HyperSyncClient.ResponseTypes.block>,
+  // Block headers referenced by `items`, deduplicated by block number.
+  blocks: array<HyperSyncClient.EventItems.blockHeader>,
   nextBlock: int,
   archiveHeight: int,
   rollbackGuard: option<HyperSyncClient.ResponseTypes.rollbackGuard>,
   // Page store owning this page's raw transactions.
   transactionStore: TransactionStore.t,
+  // Page store owning this page's raw blocks.
+  blockStore: BlockStore.t,
 }
 
 type missingParams = {
@@ -129,7 +131,7 @@ module GetLogs = {
       ~maxNumLogs,
     )
 
-    let (res, transactionStore) = switch await client.getEventItems(~query) {
+    let (res, transactionStore, blockStore) = switch await client.getEventItems(~query) {
     | res => res
     | exception exn =>
       reraisIfRateLimited(exn)
@@ -150,6 +152,7 @@ module GetLogs = {
       archiveHeight: res.archiveHeight->Option.getOr(0), //Archive Height is only None if height is 0
       rollbackGuard: res.rollbackGuard,
       transactionStore,
+      blockStore,
     }
   }
 }
@@ -206,6 +209,7 @@ module BlockData = {
     ~sourceName,
     ~chainId,
     ~logger,
+    ~requestStats: array<Source.requestStat>,
   ): queryResponse<array<ReorgDetection.blockDataWithTimestamp>> => {
     let body = makeRequestBody(~fromBlock, ~toBlock)
 
@@ -218,7 +222,7 @@ module BlockData = {
       },
     )
 
-    Prometheus.SourceRequestCount.increment(~sourceName, ~chainId, ~method="getBlockHashes")
+    let timerRef = Performance.now()
     let maybeSuccessfulRes = switch await client.get(~query=body) {
     | exception exn =>
       reraisIfRateLimited(exn)
@@ -226,6 +230,9 @@ module BlockData = {
     | res if res.nextBlock <= fromBlock => None
     | res => Some(res)
     }
+    requestStats
+    ->Array.push({Source.method: "getBlockHashes", seconds: timerRef->Performance.secondsSince})
+    ->ignore
 
     // If the block is not found, retry the query. This can occur since replicas of hypersync might not have caught up yet
     switch maybeSuccessfulRes {
@@ -235,7 +242,15 @@ module BlockData = {
           `Block #${fromBlock->Int.toString} not found in HyperSync. HyperSync has multiple instances and it's possible that they drift independently slightly from the head. Indexing should continue correctly after retrying the query in ${delayMilliseconds->Int.toString}ms.`,
         )
         await Time.resolvePromiseAfterDelay(~delayMilliseconds)
-        await queryBlockData(~client, ~fromBlock, ~toBlock, ~sourceName, ~chainId, ~logger)
+        await queryBlockData(
+          ~client,
+          ~fromBlock,
+          ~toBlock,
+          ~sourceName,
+          ~chainId,
+          ~logger,
+          ~requestStats,
+        )
       }
     | Some(res) =>
       switch res->convertResponse {
@@ -248,6 +263,7 @@ module BlockData = {
             ~sourceName,
             ~chainId,
             ~logger,
+            ~requestStats,
           )
           restRes->Result.map(rest => datas->Array.concat(rest))
         }
@@ -262,8 +278,9 @@ module BlockData = {
     ~sourceName,
     ~chainId,
     ~logger,
-  ) => {
-    switch blockNumbers->Array.get(0) {
+  ): (queryResponse<array<ReorgDetection.blockDataWithTimestamp>>, array<Source.requestStat>) => {
+    let requestStats = []
+    let result = switch blockNumbers->Array.get(0) {
     | None => Ok([])
     | Some(firstBlock) => {
         let fromBlock = ref(firstBlock)
@@ -291,6 +308,7 @@ module BlockData = {
           ~sourceName,
           ~chainId,
           ~logger,
+          ~requestStats,
         )
         let filtered = res->Result.map(datas => {
           datas->Array.filter(data => set->Utils.Set.delete(data.blockNumber))
@@ -305,10 +323,12 @@ module BlockData = {
         filtered
       }
     }
+    (result, requestStats)
   }
 }
 
-let queryBlockData = (~client, ~blockNumber, ~sourceName, ~chainId, ~logger) =>
+let queryBlockData = (~client, ~blockNumber, ~sourceName, ~chainId, ~logger) => {
+  let requestStats = []
   BlockData.queryBlockData(
     ~client,
     ~fromBlock=blockNumber,
@@ -316,5 +336,7 @@ let queryBlockData = (~client, ~blockNumber, ~sourceName, ~chainId, ~logger) =>
     ~sourceName,
     ~chainId,
     ~logger,
-  )->Promise.thenResolve(res => res->Result.map(res => res->Array.get(0)))
+    ~requestStats,
+  )->Promise.thenResolve(res => (res->Result.map(res => res->Array.get(0)), requestStats))
+}
 let queryBlockDataMulti = BlockData.queryBlockDataMulti

package/src/sources/HyperSync.res.mjs

@@ -4,8 +4,8 @@ import * as Time from "../Time.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
-import * as Prometheus from "../Prometheus.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
+import * as Performance from "../bindings/Performance.res.mjs";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
@@ -135,7 +135,8 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection,
     nextBlock: res.nextBlock,
     archiveHeight: Stdlib_Option.getOr(res.archiveHeight, 0),
     rollbackGuard: res.rollbackGuard,
-    transactionStore: match[1]
+    transactionStore: match[1],
+    blockStore: match[2]
   };
 }
 
@@ -191,14 +192,14 @@ function convertResponse(res) {
   }));
 }
 
-async function queryBlockData(client, fromBlock, toBlock, sourceName, chainId, logger) {
+async function queryBlockData(client, fromBlock, toBlock, sourceName, chainId, logger, requestStats) {
   let body = makeRequestBody$1(fromBlock, toBlock);
   let logger$1 = Logging.createChildFrom(logger, {
     logType: "HyperSync get block hash query",
     fromBlock: fromBlock,
     toBlock: toBlock
   });
-  Prometheus.SourceRequestCount.increment(sourceName, chainId, "getBlockHashes");
+  let timerRef = Performance.now();
   let maybeSuccessfulRes;
   let exit = 0;
   let res;
@@ -213,6 +214,10 @@ async function queryBlockData(client, fromBlock, toBlock, sourceName, chainId, l
   if (exit === 1) {
     maybeSuccessfulRes = res.nextBlock <= fromBlock ? undefined : res;
   }
+  requestStats.push({
+    method: "getBlockHashes",
+    seconds: Performance.secondsSince(timerRef)
+  });
   if (maybeSuccessfulRes !== undefined) {
     let err = convertResponse(maybeSuccessfulRes);
     if (err.TAG !== "Ok") {
@@ -222,48 +227,59 @@ async function queryBlockData(client, fromBlock, toBlock, sourceName, chainId, l
       return err;
     }
     let datas = err._0;
-    let restRes = await queryBlockData(client, maybeSuccessfulRes.nextBlock, toBlock, sourceName, chainId, logger$1);
+    let restRes = await queryBlockData(client, maybeSuccessfulRes.nextBlock, toBlock, sourceName, chainId, logger$1, requestStats);
     return Stdlib_Result.map(restRes, rest => datas.concat(rest));
   }
   Logging.childInfo(logger$1, `Block #` + fromBlock.toString() + ` not found in HyperSync. HyperSync has multiple instances and it's possible that they drift independently slightly from the head. Indexing should continue correctly after retrying the query in ` + (100).toString() + `ms.`);
   await Time.resolvePromiseAfterDelay(100);
-  return await queryBlockData(client, fromBlock, toBlock, sourceName, chainId, logger$1);
+  return await queryBlockData(client, fromBlock, toBlock, sourceName, chainId, logger$1, requestStats);
 }
 
 async function queryBlockDataMulti(client, blockNumbers, sourceName, chainId, logger) {
+  let requestStats = [];
   let firstBlock = blockNumbers[0];
-  if (firstBlock === undefined) {
-    return {
+  let result;
+  if (firstBlock !== undefined) {
+    let fromBlock = firstBlock;
+    let toBlock = firstBlock;
+    let set = new Set();
+    for (let idx = 0, idx_finish = blockNumbers.length; idx < idx_finish; ++idx) {
+      let blockNumber = blockNumbers[idx];
+      if (blockNumber < fromBlock) {
+        fromBlock = blockNumber;
+      }
+      if (blockNumber > toBlock) {
+        toBlock = blockNumber;
+      }
+      set.add(blockNumber);
+    }
+    if ((toBlock - fromBlock | 0) > 1000) {
+      Stdlib_JsError.throwWithMessage(`Invalid block data request. Range of block numbers is too large. Max range is 1000. Requested range: ` + fromBlock.toString() + `-` + toBlock.toString());
+    }
+    let res = await queryBlockData(client, fromBlock, toBlock, sourceName, chainId, logger, requestStats);
+    let filtered = Stdlib_Result.map(res, datas => datas.filter(data => set.delete(data.blockNumber)));
+    if (set.size > 0) {
+      Stdlib_JsError.throwWithMessage(`Invalid response. Failed to get block data for block numbers: ` + Array.from(set).join(", "));
+    }
+    result = filtered;
+  } else {
+    result = {
       TAG: "Ok",
       _0: []
     };
   }
-  let fromBlock = firstBlock;
-  let toBlock = firstBlock;
-  let set = new Set();
-  for (let idx = 0, idx_finish = blockNumbers.length; idx < idx_finish; ++idx) {
-    let blockNumber = blockNumbers[idx];
-    if (blockNumber < fromBlock) {
-      fromBlock = blockNumber;
-    }
-    if (blockNumber > toBlock) {
-      toBlock = blockNumber;
-    }
-    set.add(blockNumber);
-  }
-  if ((toBlock - fromBlock | 0) > 1000) {
-    Stdlib_JsError.throwWithMessage(`Invalid block data request. Range of block numbers is too large. Max range is 1000. Requested range: ` + fromBlock.toString() + `-` + toBlock.toString());
-  }
-  let res = await queryBlockData(client, fromBlock, toBlock, sourceName, chainId, logger);
-  let filtered = Stdlib_Result.map(res, datas => datas.filter(data => set.delete(data.blockNumber)));
-  if (set.size > 0) {
-    Stdlib_JsError.throwWithMessage(`Invalid response. Failed to get block data for block numbers: ` + Array.from(set).join(", "));
-  }
-  return filtered;
+  return [
+    result,
+    requestStats
+  ];
 }
 
 function queryBlockData$1(client, blockNumber, sourceName, chainId, logger) {
-  return queryBlockData(client, blockNumber, blockNumber, sourceName, chainId, logger).then(res => Stdlib_Result.map(res, res => res[0]));
+  let requestStats = [];
+  return queryBlockData(client, blockNumber, blockNumber, sourceName, chainId, logger, requestStats).then(res => [
+    Stdlib_Result.map(res, res => res[0]),
+    requestStats
+  ]);
 }
 
 let GetLogs = {

package/src/sources/HyperSync.resi

@@ -1,10 +1,11 @@
 type logsQueryPage = {
   items: array<HyperSyncClient.EventItems.item>,
-  blocks: array<HyperSyncClient.ResponseTypes.block>,
+  blocks: array<HyperSyncClient.EventItems.blockHeader>,
   nextBlock: int,
   archiveHeight: int,
   rollbackGuard: option<HyperSyncClient.ResponseTypes.rollbackGuard>,
   transactionStore: TransactionStore.t,
+  blockStore: BlockStore.t,
 }
 
 type missingParams = {
@@ -43,7 +44,10 @@ let queryBlockData: (
   ~sourceName: string,
   ~chainId: int,
   ~logger: Pino.t,
-) => promise<queryResponse<option<ReorgDetection.blockDataWithTimestamp>>>
+) => promise<(
+  queryResponse<option<ReorgDetection.blockDataWithTimestamp>>,
+  array<Source.requestStat>,
+)>
 
 let queryBlockDataMulti: (
   ~client: HyperSyncClient.t,
@@ -51,6 +55,9 @@ let queryBlockDataMulti: (
   ~sourceName: string,
   ~chainId: int,
   ~logger: Pino.t,
-) => promise<queryResponse<array<ReorgDetection.blockDataWithTimestamp>>>
+) => promise<(
+  queryResponse<array<ReorgDetection.blockDataWithTimestamp>>,
+  array<Source.requestStat>,
+)>
 
 let mapExn: queryResponse<'a> => result<'a, exn>

package/src/sources/HyperSyncClient.res

@@ -254,11 +254,19 @@ module EventItems = {
     params: Nullable.t<dict<Internal.eventParams>>,
   }
 
+  // The always-needed block fields, one per block number. The block's remaining
+  // fields live raw in the block store and are materialised on demand.
+  type blockHeader = {
+    number: int,
+    timestamp: int,
+    hash: string,
+  }
+
   type response = {
     archiveHeight: option<int>,
     nextBlock: int,
-    // One entry per block number referenced by `items`.
-    blocks: array<ResponseTypes.block>,
+    // One header per block number referenced by `items`.
+    blocks: array<blockHeader>,
     items: array<item>,
     rollbackGuard: option<ResponseTypes.rollbackGuard>,
   }
@@ -266,8 +274,11 @@ module EventItems = {
 
 type t = {
   get: (~query: query) => promise<queryResponse>,
-  // Returns the response plus a page store owning this page's raw transactions.
-  getEventItems: (~query: query) => promise<(EventItems.response, TransactionStore.t)>,
+  // Returns the response plus page stores owning this page's raw transactions
+  // and blocks.
+  getEventItems: (
+    ~query: query,
+  ) => promise<(EventItems.response, TransactionStore.t, BlockStore.t)>,
   getHeight: unit => promise<int>,
 }