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

package/src/sources/SourceManager.res.mjs

@@ -1,11 +1,11 @@
 // 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 FetchState from "../FetchState.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
+import * as Performance from "../bindings/Performance.res.mjs";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -139,7 +139,7 @@ function make(sources, isRealtime, newBlockStallTimeoutOpt, newBlockStallTimeout
       disabled: false,
       lastFailedAt: undefined
     })),
-    statusStart: Hrtime.makeTimer(),
+    statusStart: Performance.now(),
     status: "Idle",
     newBlockStallTimeout: newBlockStallTimeout,
     newBlockStallTimeoutRealtime: newBlockStallTimeoutRealtime,
@@ -148,6 +148,7 @@ function make(sources, isRealtime, newBlockStallTimeoutOpt, newBlockStallTimeout
     getHeightRetryInterval: getHeightRetryInterval,
     activeSource: initialActiveSource,
     waitingForNewBlockStateId: undefined,
+    waitingLogged: false,
     fetchingPartitionsCount: 0,
     recoveryTimeout: recoveryTimeout,
     hasRealtime: hasRealtime,
@@ -172,8 +173,8 @@ function trackNewStatus(sourceManager, newStatus) {
       promCounter = Prometheus.IndexingQueryTime.counter;
       break;
   }
-  Prometheus.SafeCounter.handleFloat(promCounter, sourceManager.activeSource.chain, Hrtime.toSecondsFloat(Hrtime.timeSince(sourceManager.statusStart)));
-  sourceManager.statusStart = Hrtime.makeTimer();
+  Prometheus.SafeCounter.handleFloat(promCounter, sourceManager.activeSource.chain, Performance.secondsSince(sourceManager.statusStart));
+  sourceManager.statusStart = Performance.now();
   sourceManager.status = newStatus;
 }
 
@@ -408,10 +409,9 @@ async function waitForNewBlock(sourceManager, knownHeight, isRealtime, reducedPo
     chainId: sourceManager.activeSource.chain,
     knownHeight: knownHeight
   });
-  if (reducedPolling) {
-    Logging.childTrace(logger, `Waiting for new blocks with reduced polling (` + (sourceManager.reducedPollingInterval / 1000 | 0).toString() + `s). Chain is caught up, waiting for other chains to backfill.`);
-  } else {
-    Logging.childTrace(logger, "Initiating check for new blocks.");
+  if (!sourceManager.waitingLogged) {
+    Logging.childTrace(logger, reducedPolling ? `Waiting for new blocks with reduced polling (` + (sourceManager.reducedPollingInterval / 1000 | 0).toString() + `s). Chain is caught up, waiting for other chains to backfill.` : "Initiating check for new blocks.");
+    sourceManager.waitingLogged = true;
   }
   let mainSources = getNextSources(sourceManager, isRealtime, undefined);
   let status = {
@@ -453,6 +453,7 @@ async function waitForNewBlock(sourceManager, knownHeight, isRealtime, reducedPo
     source: source.name,
     newBlockHeight: newBlockHeight
   });
+  sourceManager.waitingLogged = false;
   status.contents = "Done";
   return newBlockHeight;
 }
@@ -499,13 +500,7 @@ async function executeQuery(sourceManager, query, knownHeight, isRealtime) {
       retry: retry
     });
     try {
-      let response = await source.getItemsOrThrow(query.fromBlock, toBlock, query.addressesByContractName, query.indexingAddresses, knownHeight, query.partitionId, query.selection, retry, logger$2);
-      Logging.childTrace(logger$2, {
-        msg: "Fetched block range from server",
-        toBlock: response.latestFetchedBlockNumber,
-        numEvents: response.parsedQueueItems.length,
-        stats: response.stats
-      });
+      let response = await source.getItemsOrThrow(query.fromBlock, toBlock, query.addressesByContractName, FetchState.deriveContractNameByAddress(query.addressesByContractName), knownHeight, query.partitionId, query.selection, retry, logger$2);
       sourceState.lastFailedAt = undefined;
       responseRef = response;
     } catch (raw_error) {

package/src/sources/Svm.res

@@ -20,16 +20,12 @@ let transactionFields = [
   "tokenBalances",
 ]
 
-// Field name → bit index (the code shared with the Rust store), built once.
-let transactionFieldCodes = TransactionStore.fieldCodes(transactionFields)
-
-let transactionFieldMask = (eventConfigs: array<Internal.eventConfig>): float =>
-  eventConfigs->TransactionStore.mask(~codes=transactionFieldCodes)
+// One instruction's selected transaction fields → store selection bitmask.
+// Computed per event at config build and cached on the event config.
+let eventTransactionFieldMask = TransactionStore.makeMaskFn(transactionFields)
 
 let make = (~logger: Pino.t): Ecosystem.t => {
   name: Svm,
-  blockFields: ["slot"],
-  transactionFields,
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "hash",
@@ -42,7 +38,6 @@ let make = (~logger: Pino.t): Ecosystem.t => {
   // parse. The schema is a no-op object that always surfaces `None`.
   onEventBlockFilterSchema: S.object(_ => None),
   logger,
-  transactionFieldMask,
   toEvent: eventItem => eventItem.payload->(Utils.magic: Internal.eventPayload => Internal.event),
   toEventLogger: eventItem => {
     let instruction =
@@ -94,9 +89,9 @@ let makeRPCSource = (~chain, ~rpc: string, ~sourceFor: Source.sourceFor=Sync): S
     getBlockHashes: (~blockNumbers as _, ~logger as _) =>
       JsError.throwWithMessage("Svm does not support getting block hashes"),
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer()
+      let timerRef = Performance.now()
       let height = await GetFinalizedSlot.route->Rest.fetch((), ~client)
-      let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+      let seconds = timerRef->Performance.secondsSince
       Prometheus.SourceRequestCount.increment(~sourceName=name, ~chainId, ~method="getSlot")
       Prometheus.SourceRequestCount.addSeconds(
         ~sourceName=name,
@@ -110,7 +105,7 @@ let makeRPCSource = (~chain, ~rpc: string, ~sourceFor: Source.sourceFor=Sync): S
       ~fromBlock as _,
       ~toBlock as _,
       ~addressesByContractName as _,
-      ~indexingAddresses as _,
+      ~contractNameByAddress as _,
       ~knownHeight as _,
       ~partitionId as _,
       ~selection as _,

package/src/sources/Svm.res.mjs

@@ -3,9 +3,9 @@
 import * as Rpc from "./Rpc.res.mjs";
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Utils from "../Utils.res.mjs";
-import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
+import * as Performance from "../bindings/Performance.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as TransactionStore from "./TransactionStore.res.mjs";
@@ -30,17 +30,11 @@ let transactionFields = [
   "tokenBalances"
 ];
 
-let transactionFieldCodes = TransactionStore.fieldCodes(transactionFields);
-
-function transactionFieldMask(eventConfigs) {
-  return TransactionStore.mask(eventConfigs, transactionFieldCodes);
-}
+let eventTransactionFieldMask = TransactionStore.makeMaskFn(transactionFields);
 
 function make(logger) {
   return {
     name: "svm",
-    blockFields: ["slot"],
-    transactionFields: transactionFields,
     blockNumberName: "height",
     blockTimestampName: "time",
     blockHashName: "hash",
@@ -50,7 +44,6 @@ function make(logger) {
     onEventBlockFilterSchema: S$RescriptSchema.object(param => {}),
     logger: logger,
     toEvent: eventItem => eventItem.payload,
-    transactionFieldMask: transactionFieldMask,
     toEventLogger: eventItem => {
       let instruction = eventItem.payload;
       return Logging.createChildFrom(logger, {
@@ -89,9 +82,9 @@ function makeRPCSource(chain, rpc, sourceForOpt) {
     pollingInterval: 10000,
     getBlockHashes: (param, param$1) => Stdlib_JsError.throwWithMessage("Svm does not support getting block hashes"),
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer();
+      let timerRef = Performance.now();
       let height = await Rest.fetch(route, undefined, client);
-      let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
+      let seconds = Performance.secondsSince(timerRef);
       Prometheus.SourceRequestCount.increment(name, chain, "getSlot");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "getSlot", seconds);
       return height;
@@ -103,10 +96,9 @@ function makeRPCSource(chain, rpc, sourceForOpt) {
 export {
   cleanUpRawEventFieldsInPlace,
   transactionFields,
-  transactionFieldCodes,
-  transactionFieldMask,
+  eventTransactionFieldMask,
   make,
   GetFinalizedSlot,
   makeRPCSource,
 }
-/* transactionFieldCodes Not a pure module */
+/* eventTransactionFieldMask Not a pure module */

package/src/sources/SvmHyperSyncSource.res

@@ -216,11 +216,11 @@ let probeRouter = (
   instr: SvmHyperSyncClient.ResponseTypes.instruction,
   byteLengthsDesc: array<int>,
   ~contractAddress,
-  ~indexingAddresses,
+  ~contractNameByAddress,
 ) => {
   let probe = (dN: option<string>) => {
     let tag = EventRouter.getSvmEventId(~programId, ~discriminator=dN)
-    router->EventRouter.get(~tag, ~contractAddress, ~blockNumber=instr.slot, ~indexingAddresses)
+    router->EventRouter.get(~tag, ~contractAddress, ~contractNameByAddress)
   }
 
   let result = byteLengthsDesc->Array.reduce(None, (acc, len) =>
@@ -319,26 +319,32 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
     )
     fields
   }
-  // Every selected field except `tokenBalances` (its own table) is read off a
-  // stored transaction record, so the transaction table must be fetched to
-  // populate the store — even when only `transactionIndex` (a key column) is
-  // selected.
-  let txFieldCount = selectedTxFields->Utils.Set.size
-  let needsTransactions = txFieldCount > 1 || (txFieldCount === 1 && !needsTokenBalances)
+  // The transaction table is fetched only when a selected field is actually read
+  // off a stored transaction record. `transactionIndex` materialises from the
+  // store key and `tokenBalances` lives in its own table, so neither requires it.
+  let needsTransactions =
+    selectedTxFields
+    ->Utils.Set.toArray
+    ->Array.some(field =>
+      switch field {
+      | Internal.TransactionIndex | Internal.TokenBalances => false
+      | _ => true
+      }
+    )
 
   let getItemsOrThrow = async (
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName as _,
-    ~indexingAddresses,
+    ~contractNameByAddress,
     ~knownHeight,
     ~partitionId as _,
     ~selection as _,
     ~retry,
     ~logger,
   ) => {
-    let totalTimeRef = Hrtime.makeTimer()
-    let pageFetchRef = Hrtime.makeTimer()
+    let totalTimeRef = Performance.now()
+    let pageFetchRef = Performance.now()
 
     let instructionSelections = buildInstructionSelections(eventConfigs)
     // Under the server's default merge mode, requesting a table's columns is
@@ -384,9 +390,9 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
         ),
       )
     }
-    let pageFetchTime = pageFetchRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let pageFetchTime = pageFetchRef->Performance.secondsSince
 
-    let parsingRef = Hrtime.makeTimer()
+    let parsingRef = Performance.now()
 
     // Per-slot unix timestamp lookup from the response's `blocks` table. Slots
     // without a block row (rare; usually skipped slots) fall back to `None`.
@@ -434,7 +440,7 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
         instr,
         byteLengths,
         ~contractAddress,
-        ~indexingAddresses,
+        ~contractNameByAddress,
       )
 
       switch maybeConfig {
@@ -492,7 +498,7 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
       let _ = logger
     })
 
-    let parsingTimeElapsed = parsingRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let parsingTimeElapsed = parsingRef->Performance.secondsSince
     let highestSlot = resp.nextSlot - 1
     let latestBlockTime =
       blockTimeBySlot
@@ -507,7 +513,7 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
       blockHash: b.blockhash,
     })
 
-    let totalTimeElapsed = totalTimeRef->Hrtime.timeSince->Hrtime.toSecondsFloat
+    let totalTimeElapsed = totalTimeRef->Performance.secondsSince
 
     {
       latestFetchedBlockTimestamp: latestBlockTime,
@@ -597,9 +603,9 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
     poweredByHyperSync: true,
     getBlockHashes,
     getHeightOrThrow: async () => {
-      let timer = Hrtime.makeTimer()
+      let timer = Performance.now()
       let h = await client.getHeight()
-      let seconds = timer->Hrtime.timeSince->Hrtime.toSecondsFloat
+      let seconds = timer->Performance.secondsSince
       Prometheus.SourceRequestCount.increment(~sourceName=name, ~chainId, ~method="getHeight")
       Prometheus.SourceRequestCount.addSeconds(
         ~sourceName=name,

package/src/sources/SvmHyperSyncSource.res.mjs

@@ -1,9 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Source from "./Source.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_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
@@ -185,10 +185,10 @@ function toSvmInstruction(instr, programName, instructionName, logs, block) {
   };
 }
 
-function probeRouter(router, programId, instr, byteLengthsDesc, contractAddress, indexingAddresses) {
+function probeRouter(router, programId, instr, byteLengthsDesc, contractAddress, contractNameByAddress) {
   let probe = dN => {
     let tag = EventRouter.getSvmEventId(programId, dN);
-    return EventRouter.get(router, tag, contractAddress, instr.slot, indexingAddresses);
+    return EventRouter.get(router, tag, contractAddress, contractNameByAddress);
   };
   let result = Stdlib_Array.reduce(byteLengthsDesc, undefined, (acc, len) => {
     if (acc !== undefined) {
@@ -279,11 +279,18 @@ function make(param) {
       return;
     }
   });
-  let txFieldCount = selectedTxFields.size;
-  let needsTransactions = txFieldCount > 1 || txFieldCount === 1 && !needsTokenBalances;
-  let getItemsOrThrow = async (fromBlock, toBlock, param, indexingAddresses, knownHeight, param$1, param$2, retry, logger) => {
-    let totalTimeRef = Hrtime.makeTimer();
-    let pageFetchRef = Hrtime.makeTimer();
+  let needsTransactions = Array.from(selectedTxFields).some(field => {
+    switch (field) {
+      case "transactionIndex" :
+      case "tokenBalances" :
+        return false;
+      default:
+        return true;
+    }
+  });
+  let getItemsOrThrow = async (fromBlock, toBlock, param, contractNameByAddress, knownHeight, param$1, param$2, retry, logger) => {
+    let totalTimeRef = Performance.now();
+    let pageFetchRef = Performance.now();
     let instructionSelections = buildInstructionSelections(eventConfigs);
     let fields_block = [
       "slot",
@@ -344,8 +351,8 @@ function make(param) {
       };
     }
     let resp = match[0];
-    let pageFetchTime = Hrtime.toSecondsFloat(Hrtime.timeSince(pageFetchRef));
-    let parsingRef = Hrtime.makeTimer();
+    let pageFetchTime = Performance.secondsSince(pageFetchRef);
+    let parsingRef = Performance.now();
     let blockTimeBySlot = {};
     resp.data.blocks.forEach(b => {
       let t = b.blockTime;
@@ -377,7 +384,7 @@ function make(param) {
       let programId = instr.programId;
       let byteLengths = Stdlib_Option.getOr(orderingByProgram[instr.programId], []);
       let contractAddress = instr.programId;
-      let maybeConfig = probeRouter(eventRouter, programId, instr, byteLengths, contractAddress, indexingAddresses);
+      let maybeConfig = probeRouter(eventRouter, programId, instr, byteLengths, contractAddress, contractNameByAddress);
       if (maybeConfig !== undefined) {
         let logKey = instr.slot.toString() + ":" + instr.transactionIndex.toString() + ":" + serializeInstructionAddress(instr.instructionAddress);
         let maybeLogs = Stdlib_Option.map(logsByKey[logKey], logs => logs.map(log => ({
@@ -404,14 +411,14 @@ function make(param) {
         });
       }
     });
-    let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingRef));
+    let parsingTimeElapsed = Performance.secondsSince(parsingRef);
     let highestSlot = resp.nextSlot - 1 | 0;
     let latestBlockTime = Stdlib_Option.getOr(blockTimeBySlot[highestSlot.toString()], 0);
     let blockHashes = resp.data.blocks.map(b => ({
       blockHash: b.blockhash,
       blockNumber: b.slot
     }));
-    let totalTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(totalTimeRef));
+    let totalTimeElapsed = Performance.secondsSince(totalTimeRef);
     return {
       knownHeight: knownHeight,
       blockHashes: blockHashes,
@@ -513,9 +520,9 @@ function make(param) {
     pollingInterval: 1000,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timer = Hrtime.makeTimer();
+      let timer = Performance.now();
       let h = await client.getHeight();
-      let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timer));
+      let seconds = Performance.secondsSince(timer);
       Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
       return h;

package/src/sources/TransactionStore.res

@@ -19,32 +19,45 @@ let fieldCodes = (fields: array<string>): dict<int> => {
 
 let pow2: int => float = %raw(`c => Math.pow(2, c)`)
 
-// Union of an ecosystem's selected transaction fields as a bitmask float (bit
-// `code` set ⇔ selected). Built arithmetically to dodge 32-bit JS bitwise ops.
-let mask = (eventConfigs: array<Internal.eventConfig>, ~codes: dict<int>): float => {
-  let selected = Utils.Set.make()
-  eventConfigs->Array.forEach(eventConfig =>
-    eventConfig.selectedTransactionFields->Utils.Set.forEach(name =>
-      switch codes->Utils.Dict.dangerouslyGetNonOption(name) {
-      | Some(code) => selected->Utils.Set.add(code)->ignore
-      | None => ()
-      }
-    )
+// One event's selected transaction fields as a bitmask float (bit `code` set ⇔
+// selected). Each field appears once, so summing `pow2(code)` sets distinct bits
+// with no overlap; the result stays exact in f64 (codes span 0..31, so a mask is
+// at most 2^32-1).
+let maskFromFields = (selectedTransactionFields: Utils.Set.t<string>, ~codes: dict<int>): float => {
+  let mask = ref(0.)
+  selectedTransactionFields->Utils.Set.forEach(name =>
+    switch codes->Utils.Dict.dangerouslyGetNonOption(name) {
+    | Some(code) => mask := mask.contents +. pow2(code)
+    | None => ()
+    }
   )
-  selected->Utils.Set.toArray->Array.reduce(0., (mask, code) => mask +. pow2(code))
+  mask.contents
+}
+
+// Build an ecosystem's per-event mask function from its ordered field-name
+// array. The field codes are derived once and closed over.
+let makeMaskFn = (fields: array<string>): (Utils.Set.t<string> => float) => {
+  let codes = fieldCodes(fields)
+  selectedTransactionFields => selectedTransactionFields->maskFromFields(~codes)
 }
 
+// Bitwise OR of two per-event masks. Masks fit in 32 bits (≤32 transaction
+// fields), so `>>> 0` recovers the unsigned value that a plain `|` renders
+// negative once bit 31 is set.
+let orMask: (float, float) => float = %raw(`(a, b) => (a | b) >>> 0`)
+
 // Drain another store (a fetch-response page) into this one.
 @send external merge: (t, t) => unit = "merge"
 
-// Bulk-materialise the fields selected by `mask` (one bit per field code) for
-// the given transactions, off the JS thread. Result is aligned with the input.
+// Bulk-materialise transactions off the JS thread, one row per
+// (blockNumbers[i], transactionIndices[i]) key, decoding only the fields set in
+// that row's own masks[i]. Result is aligned with the input.
 @send
 external materialize: (
   t,
   ~blockNumbers: array<int>,
   ~transactionIndices: array<int>,
-  ~mask: float,
+  ~masks: array<float>,
 ) => promise<array<Internal.eventTransaction>> = "materialize"
 
 // Drop transactions for blocks at or below the given block (already processed).
@@ -53,21 +66,28 @@ external materialize: (
 // Drop transactions for blocks above the given block (rolled back).
 @send external rollback: (t, int) => unit = "rollback"
 
-// Materialise the mask-selected fields for the store-backed items and write the
-// resulting transaction onto each item's payload. Items that already carry an
-// inline transaction (RPC/simulate/Fuel) are skipped. Store-backed items always
-// get a transaction object — the selected fields, or `{}` when the chain
-// selected none — so `event.transaction` is never `undefined` (matching the
-// inline sources). Deduped per (blockNumber, transactionIndex).
-let materializeItems = async (store: t, ~items: array<Internal.item>, ~mask: float) => {
+// Materialise each store-backed item's selected transaction fields and write the
+// resulting transaction onto its payload. Every event's mask comes from its own
+// `eventConfig.transactionFieldMask`, so a transaction decodes only the fields
+// the events on it selected — a large field (e.g. `input`) never materialises
+// for events that didn't ask for it. Items that already carry an inline
+// transaction (RPC/simulate/Fuel) are skipped. Store-backed items always get a
+// transaction object — the selected fields, or `{}` when nothing was selected —
+// so `event.transaction` is never `undefined` (matching the inline sources).
+// Deduped per (blockNumber, transactionIndex); each row's mask is the OR of the
+// masks of the events sharing that transaction.
+let materializeItems = async (store: t, ~items: array<Internal.item>) => {
   // Store-backed items arrive in (block, logIndex) order, and a transaction's
   // logs are contiguous within a block, so events sharing a (blockNumber,
-  // transactionIndex) are adjacent. Group them by extending the current run
-  // rather than hashing a string key per item. A key recurring non-adjacently
-  // just splits into two groups (one redundant decode) — never incorrect.
+  // transactionIndex) are adjacent regardless of event. Group them by extending
+  // the current run rather than hashing a string key per item. A key recurring
+  // non-adjacently just splits into two groups (one redundant decode) — never
+  // incorrect.
   let blockNumbers = []
   let transactionIndices = []
+  let masks = []
   let payloadGroups = []
+  let anySelected = ref(false)
 
   items->Array.forEach(item =>
     switch item {
@@ -77,6 +97,10 @@ let materializeItems = async (store: t, ~items: array<Internal.item>, ~mask: flo
       | Some(_) => () // RPC/simulate/Fuel carry the transaction inline.
       | None =>
         let {blockNumber, transactionIndex} = eventItem
+        let mask = eventItem.eventConfig.transactionFieldMask
+        if mask != 0. {
+          anySelected := true
+        }
         let last = payloadGroups->Array.length - 1
         if (
           last >= 0 &&
@@ -84,9 +108,11 @@ let materializeItems = async (store: t, ~items: array<Internal.item>, ~mask: flo
           transactionIndices->Array.getUnsafe(last) == transactionIndex
         ) {
           payloadGroups->Array.getUnsafe(last)->Array.push(eventItem.payload)
+          masks->Array.setUnsafe(last, orMask(masks->Array.getUnsafe(last), mask))
         } else {
           blockNumbers->Array.push(blockNumber)
           transactionIndices->Array.push(transactionIndex)
+          masks->Array.push(mask)
           payloadGroups->Array.push([eventItem.payload])
         }
       }
@@ -95,17 +121,18 @@ let materializeItems = async (store: t, ~items: array<Internal.item>, ~mask: flo
   )
 
   if payloadGroups->Utils.Array.notEmpty {
-    // A zero mask selects no fields, so there's nothing to decode — each
-    // store-backed item still gets an empty transaction object, so
-    // `event.transaction` is never undefined (matching the inline sources).
-    let txs = if mask == 0. {
-      payloadGroups->Array.map((_): Internal.eventTransaction => %raw(`{}`))
+    if anySelected.contents {
+      let txs = await store->materialize(~blockNumbers, ~transactionIndices, ~masks)
+      payloadGroups->Array.forEachWithIndex((payloads, i) => {
+        let tx = txs->Array.getUnsafe(i)
+        payloads->Array.forEach(payload => payload->Internal.setPayloadTransaction(tx))
+      })
     } else {
-      await store->materialize(~blockNumbers, ~transactionIndices, ~mask)
+      // No event selected any field: stamp an empty transaction object so
+      // `event.transaction` is never undefined, without a materialize call.
+      payloadGroups->Array.forEach(payloads =>
+        payloads->Array.forEach(payload => payload->Internal.setPayloadTransaction(%raw(`{}`)))
+      )
     }
-    payloadGroups->Array.forEachWithIndex((payloads, i) => {
-      let tx = txs->Array.getUnsafe(i)
-      payloads->Array.forEach(payload => payload->Internal.setPayloadTransaction(tx))
-    })
   }
 }

package/src/sources/TransactionStore.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Core from "../Core.res.mjs";
 import * as Utils from "../Utils.res.mjs";
-import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 
 function make() {
   return Core.getAddon().TransactionStore.new();
@@ -18,24 +17,35 @@ function fieldCodes(fields) {
 
 let pow2 = (c => Math.pow(2, c));
 
-function mask(eventConfigs, codes) {
-  let selected = new Set();
-  eventConfigs.forEach(eventConfig => {
-    eventConfig.selectedTransactionFields.forEach(name => {
-      let code = codes[name];
-      if (code !== undefined) {
-        selected.add(code);
-        return;
-      }
-    });
+function maskFromFields(selectedTransactionFields, codes) {
+  let mask = {
+    contents: 0
+  };
+  selectedTransactionFields.forEach(name => {
+    let code = codes[name];
+    if (code !== undefined) {
+      mask.contents = mask.contents + pow2(code);
+      return;
+    }
   });
-  return Stdlib_Array.reduce(Array.from(selected), 0, (mask, code) => mask + pow2(code));
+  return mask.contents;
+}
+
+function makeMaskFn(fields) {
+  let codes = fieldCodes(fields);
+  return selectedTransactionFields => maskFromFields(selectedTransactionFields, codes);
 }
 
-async function materializeItems(store, items, mask) {
+let orMask = ((a, b) => (a | b) >>> 0);
+
+async function materializeItems(store, items) {
   let blockNumbers = [];
   let transactionIndices = [];
+  let masks = [];
   let payloadGroups = [];
+  let anySelected = {
+    contents: false
+  };
   items.forEach(item => {
     if (item.kind !== 0) {
       return;
@@ -46,23 +56,37 @@ async function materializeItems(store, items, mask) {
     }
     let transactionIndex = item.transactionIndex;
     let blockNumber = item.blockNumber;
+    let mask = item.eventConfig.transactionFieldMask;
+    if (mask !== 0) {
+      anySelected.contents = true;
+    }
     let last = payloadGroups.length - 1 | 0;
     if (last >= 0 && blockNumbers[last] === blockNumber && transactionIndices[last] === transactionIndex) {
       payloadGroups[last].push(item.payload);
+      masks[last] = orMask(masks[last], mask);
     } else {
       blockNumbers.push(blockNumber);
       transactionIndices.push(transactionIndex);
+      masks.push(mask);
       payloadGroups.push([item.payload]);
     }
   });
   if (!Utils.$$Array.notEmpty(payloadGroups)) {
     return;
   }
-  let txs = mask === 0 ? payloadGroups.map(param => ({})) : await store.materialize(blockNumbers, transactionIndices, mask);
-  payloadGroups.forEach((payloads, i) => {
-    let tx = txs[i];
+  if (anySelected.contents) {
+    let txs = await store.materialize(blockNumbers, transactionIndices, masks);
+    payloadGroups.forEach((payloads, i) => {
+      let tx = txs[i];
+      payloads.forEach(payload => {
+        payload.transaction = tx;
+      });
+    });
+    return;
+  }
+  payloadGroups.forEach(payloads => {
     payloads.forEach(payload => {
-      payload.transaction = tx;
+      payload.transaction = {};
     });
   });
 }
@@ -71,7 +95,9 @@ export {
   make,
   fieldCodes,
   pow2,
-  mask,
+  maskFromFields,
+  makeMaskFn,
+  orMask,
   materializeItems,
 }
 /* Core Not a pure module */