envio 3.3.0-alpha.9 → 3.3.0-rc.0

package/src/sources/SimulateSource.res

@@ -1,8 +1,5 @@
 let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain.t): Source.t => {
-  // getItemsOrThrow might be called multiple times with different partition ids.
-  // Return all items on the first call and empty on subsequent calls to prevent
-  // duplicate event processing.
-  let delivered = ref(false)
+  let reportedHeight = max(endBlock, 1)
 
   {
     name: "SimulateSource",
@@ -16,38 +13,59 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
     },
     getHeightOrThrow: () => {
       // Report at least height 1 so the engine doesn't treat 0 as "no blocks available"
-      Promise.resolve({Source.height: max(endBlock, 1), requestStats: []})
+      Promise.resolve({Source.height: reportedHeight, requestStats: []})
     },
     getItemsOrThrow: (
-      ~fromBlock as _,
-      ~toBlock as _,
+      ~fromBlock,
+      ~toBlock,
       ~addressesByContractName as _,
-      ~contractNameByAddress as _,
+      ~contractNameByAddress,
       ~knownHeight as _,
       ~partitionId as _,
-      ~selection as _,
+      ~selection: FetchState.selection,
       ~itemsTarget as _,
       ~retry as _,
       ~logger as _,
     ) => {
-      // Return all items on the first call, empty on subsequent.
-      let result = if delivered.contents {
-        []
-      } else {
-        delivered := true
-        items
+      // Mirror a real backend: return only the items this query would match —
+      // in the block range, part of the selection, and (for non-wildcard events)
+      // emitted by an address the partition is querying. Wildcard events are
+      // over-fetched regardless of srcAddress, leaving the client-side address
+      // filter to gate them exactly as it does for a HyperSync response. Overlapping
+      // queries may return the same item more than once; the buffer dedups it.
+      let toBlockQueried = switch toBlock {
+      | Some(toBlock) => toBlock
+      | None => reportedHeight
       }
+      let selectionEventIds = Utils.Set.make()
+      selection.onEventRegistrations->Array.forEach(reg =>
+        selectionEventIds->Utils.Set.add(reg.eventConfig.id)->ignore
+      )
+
+      let parsedQueueItems = items->Array.filter(item => {
+        let eventItem = item->Internal.castUnsafeEventItem
+        let {blockNumber, onEventRegistration} = eventItem
+        if blockNumber < fromBlock || blockNumber > toBlockQueried {
+          false
+        } else if !(selectionEventIds->Utils.Set.has(onEventRegistration.eventConfig.id)) {
+          false
+        } else if onEventRegistration.isWildcard {
+          true
+        } else {
+          let sa = eventItem.payload->Internal.getPayloadSrcAddress->Address.toString
+          contractNameByAddress->Utils.Dict.dangerouslyGetNonOption(sa)->Option.isSome
+        }
+      })
 
-      let reportedHeight = max(endBlock, 1)
       Promise.resolve({
         Source.knownHeight: reportedHeight,
         blockHashes: [],
-        parsedQueueItems: result,
+        parsedQueueItems,
         // Simulate keeps the transaction and block inline on the payload; no store pages.
         transactionStore: None,
         blockStore: None,
-        fromBlockQueried: 0,
-        latestFetchedBlockNumber: reportedHeight,
+        fromBlockQueried: fromBlock,
+        latestFetchedBlockNumber: toBlockQueried,
         latestFetchedBlockTimestamp: 0,
         stats: {
           totalTimeElapsed: 0.,

package/src/sources/SimulateSource.res.mjs

@@ -1,11 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 
 function make(items, endBlock, chain) {
-  let delivered = {
-    contents: false
-  };
+  let reportedHeight = Primitive_int.max(endBlock, 1);
   return {
     name: "SimulateSource",
     sourceFor: "Sync",
@@ -20,20 +19,38 @@ function make(items, endBlock, chain) {
       requestStats: []
     }),
     getHeightOrThrow: () => Promise.resolve({
-      height: Primitive_int.max(endBlock, 1),
+      height: reportedHeight,
       requestStats: []
     }),
-    getItemsOrThrow: (param, param$1, param$2, param$3, param$4, param$5, param$6, param$7, param$8, param$9) => {
-      let result = delivered.contents ? [] : (delivered.contents = true, items);
-      let reportedHeight = Primitive_int.max(endBlock, 1);
+    getItemsOrThrow: (fromBlock, toBlock, param, contractNameByAddress, param$1, param$2, selection, param$3, param$4, param$5) => {
+      let toBlockQueried = toBlock !== undefined ? toBlock : reportedHeight;
+      let selectionEventIds = new Set();
+      selection.onEventRegistrations.forEach(reg => {
+        selectionEventIds.add(reg.eventConfig.id);
+      });
+      let parsedQueueItems = items.filter(item => {
+        let blockNumber = item.blockNumber;
+        if (blockNumber < fromBlock || blockNumber > toBlockQueried) {
+          return false;
+        }
+        let onEventRegistration = item.onEventRegistration;
+        if (!selectionEventIds.has(onEventRegistration.eventConfig.id)) {
+          return false;
+        }
+        if (onEventRegistration.isWildcard) {
+          return true;
+        }
+        let sa = item.payload.srcAddress;
+        return Stdlib_Option.isSome(contractNameByAddress[sa]);
+      });
       return Promise.resolve({
         knownHeight: reportedHeight,
         blockHashes: [],
-        parsedQueueItems: result,
+        parsedQueueItems: parsedQueueItems,
         transactionStore: undefined,
         blockStore: undefined,
-        fromBlockQueried: 0,
-        latestFetchedBlockNumber: reportedHeight,
+        fromBlockQueried: fromBlock,
+        latestFetchedBlockNumber: toBlockQueried,
         latestFetchedBlockTimestamp: 0,
         stats: {
           "total time elapsed (s)": 0

package/src/sources/SourceManager.res

@@ -1,4 +1,4 @@
-type sourceManagerStatus = Idle | WaitingForNewBlock | Querieng
+type sourceManagerStatus = Idle | WaitingForNewBlock | Querying
 
 // Cumulative per-method request count/time for a source, aggregated from the
 // requestStat arrays returned by its methods. Rendered into
@@ -92,10 +92,6 @@ let getRequestStatSamples = (sourceManager: t): array<requestStatSample> => {
   samples
 }
 
-// Partition queries currently in flight on this chain's sources. Summed across
-// chains by CrossChainState to enforce the indexer-wide concurrency budget.
-let inFlightCount = sourceManager => sourceManager.fetchingPartitionsCount
-
 let getRateLimitTimeMs = sourceManager =>
   sourceManager.committedRateLimitTimeMs +.
   switch sourceManager.activeRateLimitStartMs {
@@ -259,7 +255,7 @@ let trackNewStatus = (sourceManager: t, ~newStatus) => {
   let promCounter = switch sourceManager.status {
   | Idle => Prometheus.IndexingIdleTime.counter
   | WaitingForNewBlock => Prometheus.IndexingSourceWaitingTime.counter
-  | Querieng => Prometheus.IndexingQueryTime.counter
+  | Querying => Prometheus.IndexingQueryTime.counter
   }
   promCounter->Prometheus.SafeCounter.handleFloat(
     ~labels=sourceManager.activeSource.chain->ChainMap.Chain.toChainId,
@@ -311,7 +307,7 @@ let dispatch = async (
         ~concurrency=sourceManager.fetchingPartitionsCount,
         ~chainId=sourceManager.activeSource.chain->ChainMap.Chain.toChainId,
       )
-      sourceManager->trackNewStatus(~newStatus=Querieng)
+      sourceManager->trackNewStatus(~newStatus=Querying)
       let _ = await queries
       ->Array.map(q => {
         let promise = q->executeQuery

package/src/sources/SourceManager.res.mjs

@@ -52,10 +52,6 @@ function getRequestStatSamples(sourceManager) {
   return samples;
 }
 
-function inFlightCount(sourceManager) {
-  return sourceManager.fetchingPartitionsCount;
-}
-
 function getRateLimitTimeMs(sourceManager) {
   let startMs = sourceManager.activeRateLimitStartMs;
   return sourceManager.committedRateLimitTimeMs + (
@@ -204,7 +200,7 @@ function trackNewStatus(sourceManager, newStatus) {
     case "WaitingForNewBlock" :
       promCounter = Prometheus.IndexingSourceWaitingTime.counter;
       break;
-    case "Querieng" :
+    case "Querying" :
       promCounter = Prometheus.IndexingQueryTime.counter;
       break;
   }
@@ -237,7 +233,7 @@ async function dispatch(sourceManager, fetchState, executeQuery, waitForNewBlock
     let queries = action._0;
     sourceManager.fetchingPartitionsCount = sourceManager.fetchingPartitionsCount + queries.length | 0;
     Prometheus.IndexingConcurrency.set(sourceManager.fetchingPartitionsCount, sourceManager.activeSource.chain);
-    trackNewStatus(sourceManager, "Querieng");
+    trackNewStatus(sourceManager, "Querying");
     await Promise.all(queries.map(q => {
       let promise = executeQuery(q);
       promise.then(param => {
@@ -719,7 +715,6 @@ export {
   make,
   getActiveSource,
   getRequestStatSamples,
-  inFlightCount,
   onReorg,
   dispatch,
   waitForNewBlock,

package/src/sources/SourceManager.resi

@@ -31,8 +31,6 @@ type requestStatSample = {
 
 let getRequestStatSamples: t => array<requestStatSample>
 
-let inFlightCount: t => int
-
 let onReorg: (t, ~rollbackTargetBlock: int) => unit
 
 let dispatch: (

package/src/sources/SvmHyperSyncSource.res

@@ -285,8 +285,8 @@ let make = (
 ): t => {
   let name = "SvmHyperSync"
 
-  // Definitions drive query/decode building; the registrations drive routing
-  // (they carry `isWildcard` and become each decoded item's `onEventRegistration`).
+  // Definitions drive query/decode building; registrations drive routing and
+  // are attached directly to decoded runtime items.
   let eventConfigs =
     onEventRegistrations->Array.map(reg =>
       reg.eventConfig->(Utils.magic: Internal.eventConfig => Internal.svmInstructionEventConfig)
@@ -488,6 +488,16 @@ let make = (
 
       switch maybeConfig {
       | None => ()
+      // Exclude instructions from failed transactions. HyperSync has no
+      // server-side predicate to filter instructions by parent-transaction
+      // success (`InstructionSelection` only exposes `is_inner`, and
+      // instruction/transaction selections union at block level rather than
+      // joining), so we filter client-side on the `isCommitted` flag HyperSync
+      // already delivers on every instruction row (a required column, zero extra
+      // bandwidth). When HyperSync adds a server-side `is_committed` predicate the
+      // query can push this down and the client-side check becomes a redundant
+      // safety net.
+      | Some(_) if !instr.isCommitted => ()
       | Some(onEventRegistration) =>
         let eventConfig =
           onEventRegistration.eventConfig->(
@@ -521,7 +531,7 @@ let make = (
         parsedQueueItems
         ->Array.push(
           Internal.Event({
-            onEventRegistration,
+            onEventRegistration: (onEventRegistration :> Internal.onEventRegistration),
             chain,
             blockNumber: instr.slot,
             logIndex: synthLogIndex(instr),

package/src/sources/SvmHyperSyncSource.res.mjs

@@ -415,7 +415,7 @@ function make(param) {
       let byteLengths = Stdlib_Option.getOr(orderingByProgram[instr.programId], []);
       let contractAddress = instr.programId;
       let maybeConfig = probeRouter(eventRouter, programId, instr, byteLengths, contractAddress, contractNameByAddress);
-      if (maybeConfig !== undefined) {
+      if (maybeConfig !== undefined && instr.isCommitted) {
         let eventConfig = maybeConfig.eventConfig;
         let logKey = instr.slot.toString() + ":" + instr.transactionIndex.toString() + ":" + serializeInstructionAddress(instr.instructionAddress);
         let maybeLogs = Stdlib_Option.map(logsByKey[logKey], logs => logs.map(log => ({