envio 3.3.0-alpha.2 → 3.3.0-alpha.4

package/src/sources/HyperSync.resi

@@ -1,5 +1,6 @@
 type logsQueryPage = {
   items: array<HyperSyncClient.EventItems.item>,
+  blocks: array<HyperSyncClient.ResponseTypes.block>,
   nextBlock: int,
   archiveHeight: int,
   rollbackGuard: option<HyperSyncClient.ResponseTypes.rollbackGuard>,

package/src/sources/HyperSyncClient.res

@@ -280,7 +280,9 @@ module EventItems = {
     srcAddress: Address.t,
     topic0: EvmTypes.Hex.t,
     topicCount: int,
-    block: ResponseTypes.block,
+    // Number of the block this log belongs to; the block itself is resolved from
+    // `response.blocks`, deduplicated across items sharing a block.
+    blockNumber: int,
     // Key (with the block number) into the transaction store; the transaction
     // is resolved from the store on demand.
     transactionIndex: int,
@@ -290,6 +292,8 @@ module EventItems = {
   type response = {
     archiveHeight: option<int>,
     nextBlock: int,
+    // One entry per block number referenced by `items`.
+    blocks: array<ResponseTypes.block>,
     items: array<item>,
     rollbackGuard: option<ResponseTypes.rollbackGuard>,
   }

package/src/sources/HyperSyncSource.res

@@ -36,11 +36,15 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
     )
     selectedTransactionFields
     ->Utils.Set.toArray
-    ->Array.forEach(name =>
-      capitalizedTransactionFields
-      ->Utils.Set.add((name :> string)->Utils.String.capitalize)
-      ->ignore
-    )
+    ->Array.forEach(name => {
+      // transactionIndex is read off the log (the store key), so it never needs
+      // to be requested as a transaction column — and requesting it alone would
+      // pull the whole transaction table for nothing.
+      let fieldName = (name :> string)
+      if fieldName != "transactionIndex" {
+        capitalizedTransactionFields->Utils.Set.add(fieldName->Utils.String.capitalize)->ignore
+      }
+    })
 
     let eventFilters = getEventFiltersOrThrow(chain)
     if dependsOnAddresses {
@@ -193,17 +197,18 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
 
   let makeEventBatchQueueItem = (
     item: HyperSyncClient.EventItems.item,
+    ~block: HyperSyncClient.ResponseTypes.block,
     ~params: Internal.eventParams,
     ~eventConfig: Internal.evmEventConfig,
   ): Internal.item => {
-    let {block, transactionIndex, logIndex, srcAddress} = item
+    let {transactionIndex, logIndex, srcAddress} = item
     let chainId = chain->ChainMap.Chain.toChainId
 
     Internal.Event({
       eventConfig: (eventConfig :> Internal.eventConfig),
       timestamp: block.timestamp->Option.getUnsafe,
       chain,
-      blockNumber: block.number->Option.getUnsafe,
+      blockNumber: item.blockNumber,
       blockHash: block.hash->Option.getUnsafe,
       logIndex,
       transactionIndex,
@@ -223,14 +228,14 @@ 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,
     ~retry,
     ~logger,
   ) => {
-    let totalTimeRef = Hrtime.makeTimer()
+    let totalTimeRef = Performance.now()
 
     let selectionConfig = selection->getSelectionConfig
 
@@ -239,7 +244,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       exn->ErrorHandling.mkLogAndRaise(~logger, ~msg="Failed getting log selection for the query")
     }
 
-    let startFetchingBatchTimeRef = Hrtime.makeTimer()
+    let startFetchingBatchTimeRef = Performance.now()
 
     //fetch batch
     Prometheus.SourceRequestCount.increment(
@@ -299,7 +304,7 @@ 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
 
     //set height and next from block
     let knownHeight = pageUnsafe.archiveHeight
@@ -309,11 +314,21 @@ 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()
 
     //Parse page items into queue items
     let parsedQueueItems = []
 
+    // Blocks are returned once per number; items reference them by blockNumber.
+    let blocksByNumber = Utils.Map.make()
+    pageUnsafe.blocks->Array.forEach(block => {
+      switch block.number {
+      | Some(number) => blocksByNumber->Utils.Map.set(number, block)->ignore
+      | None => ()
+      }
+    })
+    let getBlock = blockNumber => blocksByNumber->Utils.Map.unsafeGet(blockNumber)
+
     let handleDecodeFailure = (
       ~eventConfig: Internal.evmEventConfig,
       ~logIndex,
@@ -347,9 +362,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
             ~sighash=item.topic0->EvmTypes.Hex.toString,
             ~topicCount=item.topicCount,
           ),
-          ~indexingAddresses,
+          ~contractNameByAddress,
           ~contractAddress=item.srcAddress,
-          ~blockNumber=item.block.number->Option.getUnsafe,
         )
 
       switch maybeEventConfig {
@@ -359,12 +373,16 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
         ->Nullable.toOption
         ->Option.flatMap(Dict.get(_, eventConfig.contractName)) {
         | Some(params) =>
-          parsedQueueItems->Array.push(makeEventBatchQueueItem(item, ~params, ~eventConfig))->ignore
+          parsedQueueItems
+          ->Array.push(
+            makeEventBatchQueueItem(item, ~block=getBlock(item.blockNumber), ~params, ~eventConfig),
+          )
+          ->ignore
         | None =>
           handleDecodeFailure(
             ~eventConfig,
             ~logIndex=item.logIndex,
-            ~blockNumber=item.block.number->Option.getUnsafe,
+            ~blockNumber=item.blockNumber,
             ~chainId,
             ~exn=UndefinedValue,
           )
@@ -372,14 +390,14 @@ 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
 
     // Collect (blockNumber, blockHash) pairs we already have from the response —
-    // one per item's block plus, when present, the rollbackGuard's head block
+    // one per returned block plus, when present, the rollbackGuard's head block
     // and the parent of the range's first block. Duplicates are allowed; reorg
     // detection notices same-block-number-different-hash collisions itself.
     let blockHashes = []
-    pageUnsafe.items->Array.forEach(({block}) => {
+    pageUnsafe.blocks->Array.forEach(block => {
       switch (block.number, block.hash) {
       | (Some(blockNumber), Some(blockHash)) =>
         blockHashes->Array.push({ReorgDetection.blockNumber, blockHash})->ignore
@@ -407,13 +425,13 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     | Some({timestamp}) => timestamp
     | None =>
       switch pageUnsafe.items->Array.get(pageUnsafe.items->Array.length - 1) {
-      | Some({block}) if block.number->Option.getUnsafe == heighestBlockQueried =>
-        block.timestamp->Option.getUnsafe
+      | Some(item) if item.blockNumber == heighestBlockQueried =>
+        getBlock(item.blockNumber).timestamp->Option.getUnsafe
       | _ => 0
       }
     }
 
-    let totalTimeElapsed = totalTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let totalTimeElapsed = totalTimeRef->Performance.secondsSince
 
     let stats = {
       totalTimeElapsed,
@@ -450,7 +468,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     poweredByHyperSync: true,
     getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer()
+      let timerRef = Performance.now()
       let result = try {
         await client.getHeight()
       } catch {
@@ -464,7 +482,7 @@ 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
+      let seconds = timerRef->Performance.secondsSince
       Prometheus.SourceRequestCount.increment(
         ~sourceName=name,
         ~chainId=chain->ChainMap.Chain.toChainId,

package/src/sources/HyperSyncSource.res.mjs

@@ -1,12 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Utils from "../Utils.res.mjs";
-import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperSync from "./HyperSync.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 LogSelection from "../LogSelection.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
@@ -31,7 +31,10 @@ function getSelectionConfig(selection, chain) {
       capitalizedBlockFields.add(Utils.$$String.capitalize(name));
     });
     Array.from(param.selectedTransactionFields).forEach(name => {
-      capitalizedTransactionFields.add(Utils.$$String.capitalize(name));
+      if (name !== "transactionIndex") {
+        capitalizedTransactionFields.add(Utils.$$String.capitalize(name));
+        return;
+      }
     });
     let eventFilters = param.getEventFiltersOrThrow(chain);
     if (param.dependsOnAddresses) {
@@ -124,15 +127,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the hypersync client, please double check your ABI", exn);
   }
   let UndefinedValue = /* @__PURE__ */Primitive_exceptions.create("UndefinedValue");
-  let makeEventBatchQueueItem = (item, params, eventConfig) => {
-    let block = item.block;
+  let makeEventBatchQueueItem = (item, block, params, eventConfig) => {
     let logIndex = item.logIndex;
     return {
       kind: 0,
       eventConfig: eventConfig,
       timestamp: block.timestamp,
       chain: chain,
-      blockNumber: block.number,
+      blockNumber: item.blockNumber,
       blockHash: block.hash,
       logIndex: logIndex,
       transactionIndex: item.transactionIndex,
@@ -147,8 +149,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       }
     };
   };
-  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, retry, logger) => {
+    let totalTimeRef = Performance.now();
     let selectionConfig = getSelectionConfig(selection);
     let logSelections;
     try {
@@ -157,7 +159,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       let exn = Primitive_exceptions.internalToException(raw_exn);
       logSelections = ErrorHandling.mkLogAndRaise(logger, "Failed getting log selection for the query", exn);
     }
-    let startFetchingBatchTimeRef = Hrtime.makeTimer();
+    let startFetchingBatchTimeRef = Performance.now();
     Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
     let pageUnsafe;
     try {
@@ -209,23 +211,31 @@ 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 knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
-    let parsingTimeRef = Hrtime.makeTimer();
+    let parsingTimeRef = Performance.now();
     let parsedQueueItems = [];
+    let blocksByNumber = new Map();
+    pageUnsafe.blocks.forEach(block => {
+      let number = block.number;
+      if (number !== undefined) {
+        blocksByNumber.set(number, block);
+        return;
+      }
+    });
     pageUnsafe.items.forEach(item => {
-      let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, item.block.number, indexingAddresses);
+      let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, contractNameByAddress);
       if (maybeEventConfig === undefined) {
         return;
       }
       let params = Stdlib_Option.flatMap(Primitive_option.fromNullable(item.params), __x => __x[maybeEventConfig.contractName]);
       if (params !== undefined) {
-        parsedQueueItems.push(makeEventBatchQueueItem(item, Primitive_option.valFromOption(params), maybeEventConfig));
+        parsedQueueItems.push(makeEventBatchQueueItem(item, blocksByNumber.get(item.blockNumber), Primitive_option.valFromOption(params), maybeEventConfig));
         return;
       } else {
         let logIndex = item.logIndex;
-        let blockNumber = item.block.number;
+        let blockNumber = item.blockNumber;
         let exn = {
           RE_EXN_ID: UndefinedValue
         };
@@ -242,10 +252,9 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         return ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
       }
     });
-    let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingTimeRef));
+    let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     let blockHashes = [];
-    pageUnsafe.items.forEach(param => {
-      let block = param.block;
+    pageUnsafe.blocks.forEach(block => {
       let match = block.number;
       let match$1 = block.hash;
       if (match !== undefined && match$1 !== undefined) {
@@ -272,15 +281,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     if (match$1 !== undefined) {
       latestFetchedBlockTimestamp = match$1.timestamp;
     } else {
-      let match$2 = pageUnsafe.items[pageUnsafe.items.length - 1 | 0];
-      if (match$2 !== undefined) {
-        let block = match$2.block;
-        latestFetchedBlockTimestamp = block.number === heighestBlockQueried ? block.timestamp : 0;
-      } else {
-        latestFetchedBlockTimestamp = 0;
-      }
+      let item = pageUnsafe.items[pageUnsafe.items.length - 1 | 0];
+      latestFetchedBlockTimestamp = item !== undefined && item.blockNumber === heighestBlockQueried ? blocksByNumber.get(item.blockNumber).timestamp : 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 = {
@@ -308,7 +312,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     pollingInterval: 100,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer();
+      let timerRef = Performance.now();
       let result;
       try {
         result = await client.getHeight();
@@ -340,7 +344,7 @@ 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));
+      let seconds = Performance.secondsSince(timerRef);
       Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
       return result;

package/src/sources/RpcSource.res

@@ -1034,14 +1034,14 @@ let make = (
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName,
-    ~indexingAddresses,
+    ~contractNameByAddress,
     ~knownHeight,
     ~partitionId,
     ~selection: FetchState.selection,
     ~retry,
     ~logger as _,
   ) => {
-    let startFetchingBatchTimeRef = Hrtime.makeTimer()
+    let startFetchingBatchTimeRef = Performance.now()
 
     let suggestedBlockInterval = switch mutSuggestedBlockIntervals->Utils.Dict.dangerouslyGetNonOption(
       maxSuggestedBlockIntervalKey,
@@ -1144,9 +1144,8 @@ let make = (
 
       switch eventRouter->EventRouter.get(
         ~tag=EventRouter.getEvmEventId(~sighash=topic0, ~topicCount=log.topics->Array.length),
-        ~indexingAddresses,
+        ~contractNameByAddress,
         ~contractAddress=routedAddress,
-        ~blockNumber=log.blockNumber,
       ) {
       | None => None
       | Some(eventConfig) =>
@@ -1225,7 +1224,7 @@ let make = (
 
     let optFirstBlockParent = await firstBlockParentPromise
 
-    let totalTimeElapsed = startFetchingBatchTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let totalTimeElapsed = startFetchingBatchTimeRef->Performance.secondsSince
 
     // Every fetched block carries `hash` and `parentHash`, so each one yields
     // two confirmed (number, hash) pairs for reorg detection at no extra cost.
@@ -1308,12 +1307,12 @@ let make = (
     getBlockHashes,
     onReorg,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer()
+      let timerRef = Performance.now()
       let height = try {
         await rpcClient.getHeight()
       } catch {
       | exn =>
-        let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+        let seconds = timerRef->Performance.secondsSince
         Prometheus.SourceRequestCount.increment(
           ~sourceName=name,
           ~chainId=chain->ChainMap.Chain.toChainId,
@@ -1327,7 +1326,7 @@ let make = (
         )
         exn->throw
       }
-      let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+      let seconds = timerRef->Performance.secondsSince
       Prometheus.SourceRequestCount.increment(
         ~sourceName=name,
         ~chainId=chain->ChainMap.Chain.toChainId,

package/src/sources/RpcSource.res.mjs

@@ -4,7 +4,6 @@ import * as Rpc from "./Rpc.res.mjs";
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Time from "../Time.res.mjs";
 import * as Utils from "../Utils.res.mjs";
-import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Address from "../Address.res.mjs";
 import * as Logging from "../Logging.res.mjs";
@@ -14,6 +13,7 @@ import * as LazyLoader from "../LazyLoader.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as EventRouter from "./EventRouter.res.mjs";
+import * as Performance from "../bindings/Performance.res.mjs";
 import * as EvmRpcClient from "./EvmRpcClient.res.mjs";
 import * as LogSelection from "../LogSelection.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
@@ -1035,8 +1035,8 @@ function make(param) {
     hscDecoder.contents = decoder$1;
     return decoder$1;
   };
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, partitionId, selection, retry, param) => {
-    let startFetchingBatchTimeRef = Hrtime.makeTimer();
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, partitionId, selection, retry, param) => {
+    let startFetchingBatchTimeRef = Performance.now();
     let maxSuggestedBlockInterval = mutSuggestedBlockIntervals[maxSuggestedBlockIntervalKey];
     let suggestedBlockInterval = maxSuggestedBlockInterval !== undefined ? maxSuggestedBlockInterval : Stdlib_Option.getOr(mutSuggestedBlockIntervals[partitionId], syncConfig.initialBlockInterval);
     let toBlock$1 = toBlock !== undefined ? Primitive_int.min(toBlock, knownHeight) : knownHeight;
@@ -1075,7 +1075,7 @@ function make(param) {
       let log = param[0];
       let topic0 = Stdlib_Option.getOr(log.topics[0], "0x0");
       let routedAddress = lowercaseAddresses ? Address.Evm.fromAddressLowercaseOrThrow(log.address) : Address.Evm.fromAddressOrThrow(log.address);
-      let eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, log.blockNumber, indexingAddresses);
+      let eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, contractNameByAddress);
       if (eventConfig === undefined) {
         return;
       }
@@ -1146,7 +1146,7 @@ function make(param) {
       })();
     }));
     let optFirstBlockParent = await firstBlockParentPromise;
-    let totalTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(startFetchingBatchTimeRef));
+    let totalTimeElapsed = Performance.secondsSince(startFetchingBatchTimeRef);
     let blockHashes = [];
     let pushBlockInfo = b => {
       blockHashes.push({
@@ -1212,17 +1212,17 @@ function make(param) {
     pollingInterval: syncConfig.pollingInterval,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer();
+      let timerRef = Performance.now();
       let height;
       try {
         height = await rpcClient.getHeight();
       } catch (exn) {
-        let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
+        let seconds = Performance.secondsSince(timerRef);
         Prometheus.SourceRequestCount.increment(name, chain, "eth_blockNumber");
         Prometheus.SourceRequestCount.addSeconds(name, chain, "eth_blockNumber", seconds);
         throw exn;
       }
-      let seconds$1 = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
+      let seconds$1 = Performance.secondsSince(timerRef);
       Prometheus.SourceRequestCount.increment(name, chain, "eth_blockNumber");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "eth_blockNumber", seconds$1);
       return height;

package/src/sources/SimulateSource.res

@@ -21,7 +21,7 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
       ~fromBlock as _,
       ~toBlock as _,
       ~addressesByContractName as _,
-      ~indexingAddresses as _,
+      ~contractNameByAddress as _,
       ~knownHeight as _,
       ~partitionId as _,
       ~selection as _,

package/src/sources/Source.res

@@ -60,7 +60,7 @@ type t = {
     ~fromBlock: int,
     ~toBlock: option<int>,
     ~addressesByContractName: dict<array<Address.t>>,
-    ~indexingAddresses: dict<FetchState.indexingAddress>,
+    ~contractNameByAddress: dict<string>,
     ~knownHeight: int,
     ~partitionId: string,
     ~selection: FetchState.selection,

package/src/sources/SourceManager.res

@@ -15,7 +15,7 @@ type sourceState = {
 // with a mutable state for easier reasoning and testing.
 type t = {
   sourcesState: array<sourceState>,
-  mutable statusStart: Hrtime.timeRef,
+  mutable statusStart: Performance.timeRef,
   mutable status: sourceManagerStatus,
   newBlockStallTimeout: int,
   newBlockStallTimeoutRealtime: int,
@@ -24,6 +24,10 @@ type t = {
   getHeightRetryInterval: (~retry: int) => int,
   mutable activeSource: Source.t,
   mutable waitingForNewBlockStateId: option<int>,
+  // Dedupes the "waiting for new blocks" trace so it fires once per contiguous
+  // wait period instead of on every epoch that re-enters the wait before any
+  // new block is found. Reset when blocks are found.
+  mutable waitingLogged: bool,
   // Should take into consideration partitions fetching for previous states (before rollback)
   mutable fetchingPartitionsCount: int,
   recoveryTimeout: float,
@@ -186,6 +190,7 @@ let make = (
     }),
     activeSource: initialActiveSource,
     waitingForNewBlockStateId: None,
+    waitingLogged: false,
     fetchingPartitionsCount: 0,
     newBlockStallTimeout,
     newBlockStallTimeoutRealtime,
@@ -193,7 +198,7 @@ let make = (
     reducedPollingInterval,
     getHeightRetryInterval,
     recoveryTimeout,
-    statusStart: Hrtime.makeTimer(),
+    statusStart: Performance.now(),
     status: Idle,
     hasRealtime,
     committedRateLimitTimeMs: 0.0,
@@ -211,9 +216,9 @@ let trackNewStatus = (sourceManager: t, ~newStatus) => {
   }
   promCounter->Prometheus.SafeCounter.handleFloat(
     ~labels=sourceManager.activeSource.chain->ChainMap.Chain.toChainId,
-    ~value=sourceManager.statusStart->Hrtime.timeSince->Hrtime.toSecondsFloat,
+    ~value=sourceManager.statusStart->Performance.secondsSince,
   )
-  sourceManager.statusStart = Hrtime.makeTimer()
+  sourceManager.statusStart = Performance.now()
   sourceManager.status = newStatus
 }
 
@@ -496,13 +501,14 @@ let waitForNewBlock = async (sourceManager: t, ~knownHeight, ~isRealtime, ~reduc
       "knownHeight": knownHeight,
     },
   )
-  if reducedPolling {
+  if !sourceManager.waitingLogged {
     logger->Logging.childTrace(
-      `Waiting for new blocks with reduced polling (${(sourceManager.reducedPollingInterval / 1000)
-          ->Int.toString}s). Chain is caught up, waiting for other chains to backfill.`,
+      reducedPolling
+        ? `Waiting for new blocks with reduced polling (${(sourceManager.reducedPollingInterval / 1000)
+              ->Int.toString}s). Chain is caught up, waiting for other chains to backfill.`
+        : "Initiating check for new blocks.",
     )
-  } else {
-    logger->Logging.childTrace("Initiating check for new blocks.")
+    sourceManager.waitingLogged = true
   }
 
   let mainSources = sourceManager->getNextSources(~isRealtime)
@@ -600,6 +606,7 @@ let waitForNewBlock = async (sourceManager: t, ~knownHeight, ~isRealtime, ~reduc
     "source": source.name,
     "newBlockHeight": newBlockHeight,
   })
+  sourceManager.waitingLogged = false
 
   status := Done
 
@@ -669,19 +676,13 @@ let executeQuery = async (
         ~fromBlock=query.fromBlock,
         ~toBlock,
         ~addressesByContractName=query.addressesByContractName,
-        ~indexingAddresses=query.indexingAddresses,
+        ~contractNameByAddress=query.addressesByContractName->FetchState.deriveContractNameByAddress,
         ~partitionId=query.partitionId,
         ~knownHeight,
         ~selection=query.selection,
         ~retry,
         ~logger,
       )
-      logger->Logging.childTrace({
-        "msg": "Fetched block range from server",
-        "toBlock": response.latestFetchedBlockNumber,
-        "numEvents": response.parsedQueueItems->Array.length,
-        "stats": response.stats,
-      })
       sourceState.lastFailedAt = None
       responseRef := Some(response)
     } catch {