envio 3.3.0-alpha.1 → 3.3.0-alpha.11

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
@@ -235,26 +236,22 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName,
-    ~indexingAddresses,
+    ~contractNameByAddress,
     ~knownHeight,
     ~partitionId as _,
     ~selection: FetchState.selection,
+    ~itemsTarget as _,
     ~retry,
     ~logger,
   ) => {
-    let totalTimeRef = Hrtime.makeTimer()
+    let totalTimeRef = Performance.now()
 
     let selectionConfig = getSelectionConfig(selection)
     let recieptsSelection = selectionConfig.getRecieptsSelection(~addressesByContractName)
 
-    let startFetchingBatchTimeRef = Hrtime.makeTimer()
+    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,
@@ -305,7 +302,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       )
     }
 
-    let pageFetchTime = startFetchingBatchTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let pageFetchTime = startFetchingBatchTimeRef->Performance.secondsSince
+    let requestStats = [{Source.method: "getLogs", seconds: pageFetchTime}]
 
     //set height and next from block
     let knownHeight = pageUnsafe.archiveHeight
@@ -315,7 +313,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     //In the query
     let heighestBlockQueried = pageUnsafe.nextBlock - 1
 
-    let parsingTimeRef = Hrtime.makeTimer()
+    let parsingTimeRef = Performance.now()
 
     let parsedQueueItems = pageUnsafe.items->Array.map(item => {
       let {contractId: contractAddress, receipt, block, receiptIndex} = item
@@ -330,11 +328,10 @@ 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,
-        ~indexingAddresses,
+        ~contractNameByAddress,
         ~contractAddress,
-        ~blockNumber=block.height,
       ) {
       | None => {
           let logger = Logging.createChildFrom(
@@ -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,12 +410,13 @@ 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).
+        transactionIndex: 0,
         payload: {
           contractName: eventConfig.contractName,
           eventName: eventConfig.name,
@@ -429,7 +432,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       })
     })
 
-    let parsingTimeElapsed = parsingTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let parsingTimeElapsed = parsingTimeRef->Performance.secondsSince
 
     // Fuel never rolls back on reorg, so block hashes here are purely informational
     // for detect-only logging via ReorgDetection.
@@ -445,7 +448,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     | _ => 0
     }
 
-    let totalTimeElapsed = totalTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let totalTimeElapsed = totalTimeRef->Performance.secondsSince
 
     let stats = {
       totalTimeElapsed,
@@ -456,11 +459,15 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     {
       latestFetchedBlockTimestamp,
       parsedQueueItems,
+      // Fuel keeps transaction and block on the payload; no store pages.
+      transactionStore: None,
+      blockStore: None,
       latestFetchedBlockNumber: heighestBlockQueried,
       stats,
       knownHeight,
       blockHashes,
       fromBlockQueried: fromBlock,
+      requestStats,
     }
   }
 
@@ -475,7 +482,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     pollingInterval: 100,
     poweredByHyperSync: true,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer()
+      let timerRef = Performance.now()
       let height = try await client->HyperFuelClient.getHeight catch {
       | JsExn(e) =>
         switch e->JsExn.message {
@@ -487,19 +494,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
         | _ => throw(JsExn(e))
         }
       }
-      let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
-      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
+      let seconds = timerRef->Performance.secondsSince
+      {height, requestStats: [{method: "getHeight", seconds}]}
     },
     getItemsOrThrow,
   }

package/src/sources/HyperFuelSource.res.mjs

@@ -1,11 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Hrtime from "../bindings/Hrtime.res.mjs";
 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";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.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`);
@@ -196,12 +196,11 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the HyperFuel client", exn);
   }
   let getSelectionConfig = memoGetSelectionConfig(chain);
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, param, selection, retry, logger) => {
-    let totalTimeRef = Hrtime.makeTimer();
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, param, selection, param$1, retry, logger) => {
+    let totalTimeRef = Performance.now();
     let selectionConfig = getSelectionConfig(selection);
     let recieptsSelection = selectionConfig.getRecieptsSelection(addressesByContractName);
-    let startFetchingBatchTimeRef = Hrtime.makeTimer();
-    Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
+    let startFetchingBatchTimeRef = Performance.now();
     let pageUnsafe;
     try {
       pageUnsafe = await HyperFuel.GetLogs.query(client, fromBlock, toBlock, recieptsSelection);
@@ -249,10 +248,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         Error: new Error()
       };
     }
-    let pageFetchTime = Hrtime.toSecondsFloat(Hrtime.timeSince(startFetchingBatchTimeRef));
+    let pageFetchTime = Performance.secondsSince(startFetchingBatchTimeRef);
+    let requestStats = [{
+        method: "getLogs",
+        seconds: pageFetchTime
+      }];
     let knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
-    let parsingTimeRef = Hrtime.makeTimer();
+    let parsingTimeRef = Performance.now();
     let parsedQueueItems = pageUnsafe.items.map(item => {
       let block = item.block;
       let receiptIndex = item.receiptIndex;
@@ -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, block.height, indexingAddresses);
-      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,15 +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,
@@ -369,7 +372,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         }
       };
     });
-    let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingTimeRef));
+    let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     let blockHashes = pageUnsafe.items.map(param => {
       let block = param.block;
       return {
@@ -385,7 +388,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     } else {
       latestFetchedBlockTimestamp = 0;
     }
-    let totalTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(totalTimeRef));
+    let totalTimeElapsed = Performance.secondsSince(totalTimeRef);
     let stats_parsing$unknowntime$unknown$lpars$rpar = parsingTimeElapsed;
     let stats_page$unknownfetch$unknowntime$unknown$lpars$rpar = pageFetchTime;
     let stats = {
@@ -397,22 +400,25 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       knownHeight: knownHeight$1,
       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,
     pollingInterval: 100,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer();
+      let timerRef = Performance.now();
       let height;
       try {
         height = await client.getHeight();
@@ -444,10 +450,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           throw e;
         }
       }
-      let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
-      Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
-      Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
-      return height;
+      let seconds = Performance.secondsSince(timerRef);
+      return {
+        height: height,
+        requestStats: [{
+            method: "getHeight",
+            seconds: seconds
+          }]
+      };
     },
     getItemsOrThrow: getItemsOrThrow
   };

package/src/sources/HyperSync.res

@@ -16,9 +16,15 @@ let reraisIfRateLimited = exn =>
 
 type logsQueryPage = {
   items: array<HyperSyncClient.EventItems.item>,
+  // 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 = {
@@ -55,21 +61,6 @@ module GetLogs = {
 
   exception Error(error)
 
-  let makeRequestBody = (
-    ~fromBlock,
-    ~toBlockInclusive,
-    ~addressesWithTopics,
-    ~fieldSelection,
-  ): HyperSyncClient.QueryTypes.query => {
-    fromBlock,
-    toBlockExclusive: ?switch toBlockInclusive {
-    | Some(toBlockInclusive) => Some(toBlockInclusive + 1)
-    | None => None
-    },
-    logs: addressesWithTopics,
-    fieldSelection,
-  }
-
   // Rust encodes structured failures as a JSON payload in the napi error's
   // message: `{"kind":"MissingFields","fields":["block.timestamp", ...]}`.
   // JSON.parse + shape check is the recovery protocol — no string-grepping
@@ -99,29 +90,19 @@ module GetLogs = {
     ~client: HyperSyncClient.t,
     ~fromBlock,
     ~toBlock,
-    ~logSelections: array<LogSelection.t>,
-    ~fieldSelection,
+    ~maxNumLogs,
+    ~registrationIndexes,
+    ~addressesByContractName,
   ): logsQueryPage => {
-    let addressesWithTopics = logSelections->Array.flatMap(({addresses, topicSelections}) =>
-      topicSelections->Array.map(({topic0, topic1, topic2, topic3}) => {
-        let topics = HyperSyncClient.QueryTypes.makeTopicSelection(
-          ~topic0,
-          ~topic1,
-          ~topic2,
-          ~topic3,
-        )
-        HyperSyncClient.QueryTypes.makeLogSelection(~address=addresses, ~topics)
-      })
-    )
-
-    let query = makeRequestBody(
-      ~fromBlock,
-      ~toBlockInclusive=toBlock,
-      ~addressesWithTopics,
-      ~fieldSelection,
-    )
+    let query: HyperSyncClient.EventItems.query = {
+      fromBlock,
+      toBlock,
+      maxNumLogs,
+      registrationIndexes,
+      addressesByContractName,
+    }
 
-    let res = switch await client.getEventItems(~query) {
+    let (res, transactionStore, blockStore) = switch await client.getEventItems(~query) {
     | res => res
     | exception exn =>
       reraisIfRateLimited(exn)
@@ -137,9 +118,12 @@ module GetLogs = {
 
     {
       items: res.items,
+      blocks: res.blocks,
       nextBlock: res.nextBlock,
       archiveHeight: res.archiveHeight->Option.getOr(0), //Archive Height is only None if height is 0
       rollbackGuard: res.rollbackGuard,
+      transactionStore,
+      blockStore,
     }
   }
 }
@@ -196,6 +180,7 @@ module BlockData = {
     ~sourceName,
     ~chainId,
     ~logger,
+    ~requestStats: array<Source.requestStat>,
   ): queryResponse<array<ReorgDetection.blockDataWithTimestamp>> => {
     let body = makeRequestBody(~fromBlock, ~toBlock)
 
@@ -208,7 +193,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)
@@ -216,6 +201,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 {
@@ -225,7 +213,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 {
@@ -238,6 +234,7 @@ module BlockData = {
             ~sourceName,
             ~chainId,
             ~logger,
+            ~requestStats,
           )
           restRes->Result.map(rest => datas->Array.concat(rest))
         }
@@ -252,8 +249,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)
@@ -281,6 +279,7 @@ module BlockData = {
           ~sourceName,
           ~chainId,
           ~logger,
+          ~requestStats,
         )
         let filtered = res->Result.map(datas => {
           datas->Array.filter(data => set->Utils.Set.delete(data.blockNumber))
@@ -295,10 +294,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,
@@ -306,5 +307,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