envio 3.3.0-alpha.0 → 3.3.0-alpha.2

package/src/Config.res.mjs

@@ -111,9 +111,8 @@ let publicConfigChainSchema = S$RescriptSchema.schema(s => ({
 let svmEventDescriptorSchema = S$RescriptSchema.schema(s => ({
   discriminator: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   discriminatorByteLen: s.m(S$RescriptSchema.int),
-  includeTransaction: s.m(S$RescriptSchema.bool),
+  transactionFields: s.m(S$RescriptSchema.array(Internal.svmTransactionFieldSchema)),
   includeLogs: s.m(S$RescriptSchema.bool),
-  includeTokenBalances: s.m(S$RescriptSchema.bool),
   accountFilters: s.m(S$RescriptSchema.option(S$RescriptSchema.array(S$RescriptSchema.schema(s => ({
     position: s.m(S$RescriptSchema.int),
     values: s.m(S$RescriptSchema.array(S$RescriptSchema.string))
@@ -518,7 +517,7 @@ function fromPublic(publicConfigJson) {
               position: af.position,
               values: af.values
             })));
-            return EventConfigBuilder.buildSvmInstructionEventConfig(contractName, eventName, programId, svm.discriminator, svm.discriminatorByteLen, svm.includeTransaction, svm.includeLogs, svm.includeTokenBalances, accountFilters, svm.isInner, false, undefined, undefined, Stdlib_Option.getOr(svm.accounts, []), Stdlib_Option.getOr(svm.args, null), svmDefinedTypes, startBlock);
+            return EventConfigBuilder.buildSvmInstructionEventConfig(contractName, eventName, programId, svm.discriminator, svm.discriminatorByteLen, svm.includeLogs, svm.transactionFields, accountFilters, svm.isInner, false, undefined, undefined, Stdlib_Option.getOr(svm.accounts, []), Stdlib_Option.getOr(svm.args, null), svmDefinedTypes, startBlock);
         }
       });
     } else {

package/src/Core.res

@@ -9,6 +9,7 @@ type evmRpcClientCtor
 type evmDecoderCtor
 type svmHypersyncClientCtor
 type hyperfuelClientCtor
+type transactionStoreCtor
 
 type addon = {
   getConfigJson: (~configPath: Null.t<string>, ~directory: Null.t<string>) => string,
@@ -23,6 +24,12 @@ type addon = {
   svmHypersyncClient: svmHypersyncClientCtor,
   @as("HyperfuelClient")
   hyperfuelClient: hyperfuelClientCtor,
+  @as("TransactionStore")
+  transactionStore: transactionStoreCtor,
+  // Ordered transaction-field names exposed for the field-code contract test
+  // (the ReScript `transactionFields` arrays must match the Rust ordinals).
+  evmTransactionFieldNames: unit => array<string>,
+  svmTransactionFieldNames: unit => array<string>,
 }
 
 @module("node:module") external createRequire: string => {..} = "createRequire"

package/src/CrossChainState.res

@@ -11,10 +11,6 @@ type t = {
   // True once every chain has caught up to head/endBlock. Monotonic during a run.
   mutable isRealtime: bool,
   mutable isInReorgThreshold: bool,
-  // Indexer-wide caps on concurrent data-source queries, shared across all
-  // chains. The realtime budget applies once every chain is at head.
-  maxBackfillConcurrency: int,
-  maxRealtimeConcurrency: int,
   // Indexer-wide fetch buffer pool (item count), shared across all chains.
   targetBufferSize: int,
 }
@@ -26,18 +22,10 @@ let calculateTargetBufferSize = () =>
   | None => 100_000
   }
 
-// The concurrency budget in force for the current phase.
-let maxConcurrency = (crossChainState: t) =>
-  crossChainState.isRealtime
-    ? crossChainState.maxRealtimeConcurrency
-    : crossChainState.maxBackfillConcurrency
-
 let make = (
   ~chainStates,
   ~isInReorgThreshold,
   ~isRealtime,
-  ~maxBackfillConcurrency=Env.maxBackfillConcurrency,
-  ~maxRealtimeConcurrency=Env.maxRealtimeConcurrency,
   ~targetBufferSize=calculateTargetBufferSize(),
 ): t => {
   let crossChainState = {
@@ -45,11 +33,8 @@ let make = (
     chainIds: chainStates->Dict.valuesToArray->Array.map(cs => (cs->ChainState.chainConfig).id),
     isRealtime,
     isInReorgThreshold,
-    maxBackfillConcurrency,
-    maxRealtimeConcurrency,
     targetBufferSize,
   }
-  Prometheus.IndexingMaxConcurrency.set(~maxConcurrency=crossChainState->maxConcurrency)
   Prometheus.IndexingTargetBufferSize.set(~targetBufferSize)
   crossChainState
 }
@@ -65,17 +50,6 @@ let chainStates = (crossChainState: t) => crossChainState.chainStates
 let isRealtime = (crossChainState: t) => crossChainState.isRealtime
 let isInReorgThreshold = (crossChainState: t) => crossChainState.isInReorgThreshold
 
-// Partition queries in flight across every chain — the live draw against
-// maxConcurrency.
-let inFlight = (crossChainState: t) => {
-  let total = ref(0)
-  for i in 0 to crossChainState.chainIds->Array.length - 1 {
-    let cs = crossChainState->getChainState(crossChainState.chainIds->Array.getUnsafe(i))
-    total := total.contents + cs->ChainState.sourceManager->SourceManager.inFlightCount
-  }
-  total.contents
-}
-
 // Ready-to-process items across every chain — the live draw against
 // targetBufferSize, which is a budget of processable events (items stuck behind
 // a gap don't count toward the goal of keeping ~targetBufferSize ready).
@@ -83,7 +57,7 @@ let totalReadyCount = (crossChainState: t) => {
   let total = ref(0)
   for i in 0 to crossChainState.chainIds->Array.length - 1 {
     let cs = crossChainState->getChainState(crossChainState.chainIds->Array.getUnsafe(i))
-    total := total.contents + cs->ChainState.fetchState->FetchState.bufferReadyCount
+    total := total.contents + cs->ChainState.bufferReadyCount
   }
   total.contents
 }
@@ -91,9 +65,7 @@ let totalReadyCount = (crossChainState: t) => {
 // --- Derived (pure). ---
 
 let nextItemIsNone = (crossChainState: t): bool =>
-  !Batch.hasReadyItem(
-    crossChainState.chainStates->Dict.valuesToArray->Array.map(ChainState.fetchState),
-  )
+  !(crossChainState.chainStates->Dict.valuesToArray->Array.some(ChainState.hasReadyItem))
 
 let getSafeCheckpointId = (crossChainState: t) => {
   let result: ref<option<bigint>> = ref(None)
@@ -105,7 +77,7 @@ let getSafeCheckpointId = (crossChainState: t) => {
     | Some(safeCheckpointTracking) =>
       let safeCheckpointId =
         safeCheckpointTracking->SafeCheckpointTracking.getSafeCheckpointId(
-          ~sourceBlockNumber=(cs->ChainState.fetchState).knownHeight,
+          ~sourceBlockNumber=cs->ChainState.knownHeight,
         )
       switch result.contents {
       | None => result := Some(safeCheckpointId)
@@ -137,16 +109,9 @@ let createBatch = (
       // in an append-only ClickHouse insert.
       isRollback ? 1n : 0n,
     ),
-    ~chainsBeforeBatch=crossChainState.chainStates->Utils.Dict.mapValues((
-      cs
-    ): Batch.chainBeforeBatch => {
-      fetchState: cs->ChainState.fetchState,
-      progressBlockNumber: cs->ChainState.committedProgressBlockNumber,
-      totalEventsProcessed: cs->ChainState.numEventsProcessed,
-      sourceBlockNumber: (cs->ChainState.fetchState).knownHeight,
-      reorgDetection: cs->ChainState.reorgDetection,
-      chainConfig: cs->ChainState.chainConfig,
-    }),
+    ~chainsBeforeBatch=crossChainState.chainStates->Utils.Dict.mapValues(
+      ChainState.toChainBeforeBatch,
+    ),
     ~batchSizeTarget,
   )
 }
@@ -199,71 +164,114 @@ let applyBatchProgress = (crossChainState: t, ~batch: Batch.t) => {
     Prometheus.ProgressReady.setAllReady()
   }
 
-  let wasRealtime = crossChainState.isRealtime
   crossChainState.isRealtime = crossChainState.isRealtime || allChainsReady.contents
-  if !wasRealtime && crossChainState.isRealtime {
-    // The realtime budget takes over now that every chain is at head.
-    Prometheus.IndexingMaxConcurrency.set(~maxConcurrency=crossChainState->maxConcurrency)
-  }
 }
 
 // --- Fetch control. ---
 
-// Chains ordered furthest-behind first, so the shared concurrency and buffer
-// pools go to the chains with the most backfill work before the rest.
+// Chains ordered furthest-behind first, so the shared buffer pool goes to the
+// chains with the most backfill work before the rest.
 let priorityOrder = (crossChainState: t) =>
   crossChainState.chainStates
   ->Dict.valuesToArray
   ->Array.toSorted((a, b) =>
-    Float.compare(
-      a->ChainState.fetchState->FetchState.getProgressPercentage,
-      b->ChainState.fetchState->FetchState.getProgressPercentage,
-    )
+    Float.compare(a->ChainState.getProgressPercentage, b->ChainState.getProgressPercentage)
   )
 
-// Dispatch a fetch tick across every chain in priority order, drawing from the
-// shared concurrency and buffer pools. Chains are visited in turn; fetchChain
-// bumps the in-flight count synchronously before it suspends, so a later chain
-// sees the slots an earlier one already claimed and the budget is honored
-// indexer-wide.
-//
-// bufferLimit is each chain's slice of the shared pool: it may grow its buffer
-// into whatever the other chains leave free, so a lone backfilling chain can use
-// the whole pool while head-following chains stay shallow.
+// In-flight estimated items across every chain — the live draw against
+// targetBufferSize alongside totalReadyCount, so the pool isn't re-dispatched
+// while queries are still being fetched.
+let totalReservedSize = (crossChainState: t) => {
+  let total = ref(0.)
+  for i in 0 to crossChainState.chainIds->Array.length - 1 {
+    let cs = crossChainState->getChainState(crossChainState.chainIds->Array.getUnsafe(i))
+    total := total.contents +. cs->ChainState.pendingBudget
+  }
+  total.contents
+}
+
+// Furthest-behind first: order candidate queries by the chain progress % at
+// their fromBlock, so the most behind ranges across all chains are admitted
+// before the rest.
+let compareByProgress = (a: FetchState.query, b: FetchState.query) =>
+  Float.compare(a.progress, b.progress)
+
+// Dispatch a fetch tick across the whole indexer from one shared pool of
+// ~targetBufferSize ready events. Every chain proposes its candidate queries
+// (each carrying an estimated response size) against the full free budget; the
+// candidates are then pooled, ordered by chain progress (furthest-behind first),
+// and admitted until the budget is consumed. So the budget is split per query
+// across chains rather than per chain — a chain that can only use a little
+// leaves the rest for the others automatically.
 let checkAndFetch = async (
   crossChainState: t,
-  ~fetchChain: (
-    ~chain: ChainMap.Chain.t,
-    ~concurrencyLimit: int,
-    ~bufferLimit: int,
-  ) => promise<unit>,
+  ~dispatchChain: (~chain: ChainMap.Chain.t, ~action: FetchState.nextQuery) => promise<unit>,
 ) => {
-  let maxConcurrency = crossChainState->maxConcurrency
-  // Pool is a budget of ready-to-process items, but the cap fed to getNextQuery
-  // is still a buffer position (it tracks the sorted buffer, ready items first),
-  // so add this chain's own buffer size back rather than its ready count. A chain
-  // with a gap therefore gets extra headroom to fetch the not-ready overhang
-  // while still aiming for its share of ~targetBufferSize ready events.
-  let totalReady = crossChainState->totalReadyCount
-  // Track the in-flight total as a running counter (summed once up front, then
-  // adjusted by each chain's delta) instead of re-summing every chain — O(chains)
-  // per tick rather than O(chains^2). fetchChain bumps the chain's count
-  // synchronously, so the delta is observable right after the call.
-  let inFlight = ref(crossChainState->inFlight)
-  let priorityOrdered = crossChainState->priorityOrder
+  let remaining = Pervasives.max(
+    0,
+    crossChainState.targetBufferSize -
+    crossChainState->totalReadyCount -
+    crossChainState->totalReservedSize->Float.toInt,
+  )
+
+  let chainIds = crossChainState.chainIds
+  let actionByChain = Dict.make()
+  // Candidate queries from every chain. Each query carries its chain id and the
+  // chain progress % at its fromBlock (the admission sort key), set here so the
+  // pool can be ordered without a side tuple per query.
+  let candidates = []
+  for i in 0 to chainIds->Array.length - 1 {
+    let chainId = chainIds->Array.getUnsafe(i)
+    let cs = crossChainState->getChainState(chainId)
+    switch cs->ChainState.getNextQuery(~budget=remaining) {
+    | (WaitingForNewBlock | NothingToQuery) as action =>
+      actionByChain->Utils.Dict.setByInt(chainId, action)
+    | Ready(queries) =>
+      // Default to NothingToQuery; replaced below if any candidate is admitted.
+      actionByChain->Utils.Dict.setByInt(chainId, FetchState.NothingToQuery)
+      queries->Array.forEach(query => {
+        query.chainId = chainId
+        query.progress = cs->ChainState.getProgressPercentageAt(~blockNumber=query.fromBlock)
+        candidates->Array.push(query)
+      })
+    }
+  }
+
+  candidates->Array.sort(compareByProgress)
+
+  // Admit furthest-behind first until the budget runs out. The condition is
+  // checked before each query, so as long as there's any budget left we admit
+  // the next one even when its estimate alone exceeds the remainder — otherwise a
+  // chain whose only query is bigger than the budget would never make progress.
+  let admittedByChain = Dict.make()
+  let running = ref(0.)
+  let remainingF = remaining->Int.toFloat
+  let idx = ref(0)
+  while running.contents < remainingF && idx.contents < candidates->Array.length {
+    let query = candidates->Array.getUnsafe(idx.contents)
+    admittedByChain->Utils.Dict.push(query.chainId->Int.toString, query)
+    running := running.contents +. query.estResponseSize
+    idx := idx.contents + 1
+  }
+  admittedByChain->Dict.forEachWithKey((queries, chainId) => {
+    actionByChain->Dict.set(chainId, FetchState.Ready(queries))
+    // Mark the admitted queries in flight and reserve their size against the
+    // shared budget; released as each response lands in handleQueryResult.
+    crossChainState
+    ->getChainState(chainId->Int.fromString->Option.getUnsafe)
+    ->ChainState.startFetchingQueries(~queries)
+  })
+
   let promises = []
-  for i in 0 to priorityOrdered->Array.length - 1 {
-    let cs = priorityOrdered->Array.getUnsafe(i)
-    let chain = ChainMap.Chain.makeUnsafe(~chainId=(cs->ChainState.chainConfig).id)
-    let sourceManager = cs->ChainState.sourceManager
-    let concurrencyLimit = Pervasives.max(0, maxConcurrency - inFlight.contents)
-    let bufferLimit =
-      crossChainState.targetBufferSize -
-      (totalReady -
-      cs->ChainState.fetchState->FetchState.bufferSize)
-    let inFlightBefore = sourceManager->SourceManager.inFlightCount
-    promises->Array.push(fetchChain(~chain, ~concurrencyLimit, ~bufferLimit))
-    inFlight := inFlight.contents + (sourceManager->SourceManager.inFlightCount - inFlightBefore)
+  for i in 0 to chainIds->Array.length - 1 {
+    let chainId = chainIds->Array.getUnsafe(i)
+    switch actionByChain->Utils.Dict.dangerouslyGetByIntNonOption(chainId) {
+    | Some(NothingToQuery)
+    | None => ()
+    | Some(action) =>
+      let chain = ChainMap.Chain.makeUnsafe(~chainId)
+      promises->Array.push(dispatchChain(~chain, ~action))
+    }
   }
   let _ = await promises->Promise.all
 }

package/src/CrossChainState.res.mjs

@@ -6,10 +6,10 @@ import * as Utils from "./Utils.res.mjs";
 import * as Logging from "./Logging.res.mjs";
 import * as ChainMap from "./ChainMap.res.mjs";
 import * as ChainState from "./ChainState.res.mjs";
-import * as FetchState from "./FetchState.res.mjs";
 import * as Prometheus from "./Prometheus.res.mjs";
+import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
+import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
-import * as SourceManager from "./sources/SourceManager.res.mjs";
 import * as Primitive_float from "@rescript/runtime/lib/es6/Primitive_float.js";
 import * as SafeCheckpointTracking from "./SafeCheckpointTracking.res.mjs";
 
@@ -21,17 +21,7 @@ function calculateTargetBufferSize() {
   }
 }
 
-function maxConcurrency(crossChainState) {
-  if (crossChainState.isRealtime) {
-    return crossChainState.maxRealtimeConcurrency;
-  } else {
-    return crossChainState.maxBackfillConcurrency;
-  }
-}
-
-function make(chainStates, isInReorgThreshold, isRealtime, maxBackfillConcurrencyOpt, maxRealtimeConcurrencyOpt, targetBufferSizeOpt) {
-  let maxBackfillConcurrency = maxBackfillConcurrencyOpt !== undefined ? maxBackfillConcurrencyOpt : Env.maxBackfillConcurrency;
-  let maxRealtimeConcurrency = maxRealtimeConcurrencyOpt !== undefined ? maxRealtimeConcurrencyOpt : Env.maxRealtimeConcurrency;
+function make(chainStates, isInReorgThreshold, isRealtime, targetBufferSizeOpt) {
   let targetBufferSize = targetBufferSizeOpt !== undefined ? targetBufferSizeOpt : (
       Env.targetBufferSize !== undefined ? Env.targetBufferSize : 100000
     );
@@ -40,11 +30,8 @@ function make(chainStates, isInReorgThreshold, isRealtime, maxBackfillConcurrenc
     chainIds: Object.values(chainStates).map(cs => ChainState.chainConfig(cs).id),
     isRealtime: isRealtime,
     isInReorgThreshold: isInReorgThreshold,
-    maxBackfillConcurrency: maxBackfillConcurrency,
-    maxRealtimeConcurrency: maxRealtimeConcurrency,
     targetBufferSize: targetBufferSize
   };
-  Prometheus.IndexingMaxConcurrency.set(maxConcurrency(crossChainState));
   Prometheus.IndexingTargetBufferSize.set(targetBufferSize);
   return crossChainState;
 }
@@ -61,26 +48,17 @@ function isInReorgThreshold(crossChainState) {
   return crossChainState.isInReorgThreshold;
 }
 
-function inFlight(crossChainState) {
-  let total = 0;
-  for (let i = 0, i_finish = crossChainState.chainIds.length; i < i_finish; ++i) {
-    let cs = crossChainState.chainStates[crossChainState.chainIds[i]];
-    total = total + SourceManager.inFlightCount(ChainState.sourceManager(cs)) | 0;
-  }
-  return total;
-}
-
 function totalReadyCount(crossChainState) {
   let total = 0;
   for (let i = 0, i_finish = crossChainState.chainIds.length; i < i_finish; ++i) {
     let cs = crossChainState.chainStates[crossChainState.chainIds[i]];
-    total = total + FetchState.bufferReadyCount(ChainState.fetchState(cs)) | 0;
+    total = total + ChainState.bufferReadyCount(cs) | 0;
   }
   return total;
 }
 
 function nextItemIsNone(crossChainState) {
-  return !Batch.hasReadyItem(Object.values(crossChainState.chainStates).map(ChainState.fetchState));
+  return !Object.values(crossChainState.chainStates).some(ChainState.hasReadyItem);
 }
 
 function getSafeCheckpointId(crossChainState) {
@@ -89,7 +67,7 @@ function getSafeCheckpointId(crossChainState) {
     let cs = crossChainState.chainStates[crossChainState.chainIds[i]];
     let safeCheckpointTracking = ChainState.safeCheckpointTracking(cs);
     if (safeCheckpointTracking !== undefined) {
-      let safeCheckpointId = SafeCheckpointTracking.getSafeCheckpointId(safeCheckpointTracking, ChainState.fetchState(cs).knownHeight);
+      let safeCheckpointId = SafeCheckpointTracking.getSafeCheckpointId(safeCheckpointTracking, ChainState.knownHeight(cs));
       let current = result;
       if (!(current !== undefined && safeCheckpointId >= current)) {
         result = safeCheckpointId;
@@ -105,14 +83,7 @@ function getSafeCheckpointId(crossChainState) {
 function createBatch(crossChainState, processedCheckpointId, batchSizeTarget, isRollback) {
   return Batch.make(processedCheckpointId + (
     isRollback ? 1n : 0n
-  ), Utils.Dict.mapValues(crossChainState.chainStates, cs => ({
-    fetchState: ChainState.fetchState(cs),
-    reorgDetection: ChainState.reorgDetection(cs),
-    progressBlockNumber: ChainState.committedProgressBlockNumber(cs),
-    sourceBlockNumber: ChainState.fetchState(cs).knownHeight,
-    totalEventsProcessed: ChainState.numEventsProcessed(cs),
-    chainConfig: ChainState.chainConfig(cs)
-  })), batchSizeTarget, crossChainState.isInReorgThreshold);
+  ), Utils.Dict.mapValues(crossChainState.chainStates, ChainState.toChainBeforeBatch), batchSizeTarget, crossChainState.isInReorgThreshold);
 }
 
 function enterReorgThreshold(crossChainState) {
@@ -148,32 +119,78 @@ function applyBatchProgress(crossChainState, batch) {
   if (allChainsReady) {
     Prometheus.ProgressReady.setAllReady();
   }
-  let wasRealtime = crossChainState.isRealtime;
   crossChainState.isRealtime = crossChainState.isRealtime || allChainsReady;
-  if (!wasRealtime && crossChainState.isRealtime) {
-    return Prometheus.IndexingMaxConcurrency.set(maxConcurrency(crossChainState));
-  }
 }
 
 function priorityOrder(crossChainState) {
-  return Object.values(crossChainState.chainStates).toSorted((a, b) => Primitive_float.compare(FetchState.getProgressPercentage(ChainState.fetchState(a)), FetchState.getProgressPercentage(ChainState.fetchState(b))));
+  return Object.values(crossChainState.chainStates).toSorted((a, b) => Primitive_float.compare(ChainState.getProgressPercentage(a), ChainState.getProgressPercentage(b)));
+}
+
+function totalReservedSize(crossChainState) {
+  let total = 0;
+  for (let i = 0, i_finish = crossChainState.chainIds.length; i < i_finish; ++i) {
+    let cs = crossChainState.chainStates[crossChainState.chainIds[i]];
+    total = total + ChainState.pendingBudget(cs);
+  }
+  return total;
 }
 
-async function checkAndFetch(crossChainState, fetchChain) {
-  let maxConcurrency$1 = maxConcurrency(crossChainState);
-  let totalReady = totalReadyCount(crossChainState);
-  let inFlight$1 = inFlight(crossChainState);
-  let priorityOrdered = priorityOrder(crossChainState);
+function compareByProgress(a, b) {
+  return Primitive_float.compare(a.progress, b.progress);
+}
+
+async function checkAndFetch(crossChainState, dispatchChain) {
+  let remaining = Primitive_int.max(0, (crossChainState.targetBufferSize - totalReadyCount(crossChainState) | 0) - (totalReservedSize(crossChainState) | 0) | 0);
+  let chainIds = crossChainState.chainIds;
+  let actionByChain = {};
+  let candidates = [];
+  for (let i = 0, i_finish = chainIds.length; i < i_finish; ++i) {
+    let chainId = chainIds[i];
+    let cs = crossChainState.chainStates[chainId];
+    let action = ChainState.getNextQuery(cs, remaining);
+    if (typeof action !== "object") {
+      actionByChain[chainId] = action;
+    } else {
+      actionByChain[chainId] = "NothingToQuery";
+      action._0.forEach(query => {
+        query.chainId = chainId;
+        query.progress = ChainState.getProgressPercentageAt(cs, query.fromBlock);
+        candidates.push(query);
+      });
+    }
+  }
+  candidates.sort(compareByProgress);
+  let admittedByChain = {};
+  let running = 0;
+  let idx = 0;
+  while (running < remaining && idx < candidates.length) {
+    let query = candidates[idx];
+    Utils.Dict.push(admittedByChain, query.chainId.toString(), query);
+    running = running + query.estResponseSize;
+    idx = idx + 1 | 0;
+  };
+  Stdlib_Dict.forEachWithKey(admittedByChain, (queries, chainId) => {
+    actionByChain[chainId] = {
+      TAG: "Ready",
+      _0: queries
+    };
+    let chainId$1 = Stdlib_Int.fromString(chainId, undefined);
+    ChainState.startFetchingQueries(crossChainState.chainStates[chainId$1], queries);
+  });
   let promises = [];
-  for (let i = 0, i_finish = priorityOrdered.length; i < i_finish; ++i) {
-    let cs = priorityOrdered[i];
-    let chain = ChainMap.Chain.makeUnsafe(ChainState.chainConfig(cs).id);
-    let sourceManager = ChainState.sourceManager(cs);
-    let concurrencyLimit = Primitive_int.max(0, maxConcurrency$1 - inFlight$1 | 0);
-    let bufferLimit = crossChainState.targetBufferSize - (totalReady - FetchState.bufferSize(ChainState.fetchState(cs)) | 0) | 0;
-    let inFlightBefore = SourceManager.inFlightCount(sourceManager);
-    promises.push(fetchChain(chain, concurrencyLimit, bufferLimit));
-    inFlight$1 = inFlight$1 + (SourceManager.inFlightCount(sourceManager) - inFlightBefore | 0) | 0;
+  for (let i$1 = 0, i_finish$1 = chainIds.length; i$1 < i_finish$1; ++i$1) {
+    let chainId$1 = chainIds[i$1];
+    let action$1 = actionByChain[chainId$1];
+    if (action$1 !== undefined) {
+      let exit = 0;
+      if (typeof action$1 === "object" || action$1 === "WaitingForNewBlock") {
+        exit = 1;
+      }
+      if (exit === 1) {
+        let chain = ChainMap.Chain.makeUnsafe(chainId$1);
+        promises.push(dispatchChain(chain, action$1));
+      }
+    }
   }
   await Promise.all(promises);
 }
@@ -184,8 +201,6 @@ export {
   chainStates,
   isRealtime,
   isInReorgThreshold,
-  maxConcurrency,
-  inFlight,
   nextItemIsNone,
   getSafeCheckpointId,
   createBatch,

package/src/CrossChainState.resi

@@ -9,8 +9,6 @@ let make: (
   ~chainStates: dict<ChainState.t>,
   ~isInReorgThreshold: bool,
   ~isRealtime: bool,
-  ~maxBackfillConcurrency: int=?,
-  ~maxRealtimeConcurrency: int=?,
   ~targetBufferSize: int=?,
 ) => t
 
@@ -18,8 +16,6 @@ let make: (
 let chainStates: t => dict<ChainState.t>
 let isRealtime: t => bool
 let isInReorgThreshold: t => bool
-let maxConcurrency: t => int
-let inFlight: t => int
 
 // Derived (pure).
 let nextItemIsNone: t => bool
@@ -39,9 +35,5 @@ let applyBatchProgress: (t, ~batch: Batch.t) => unit
 let priorityOrder: t => array<ChainState.t>
 let checkAndFetch: (
   t,
-  ~fetchChain: (
-    ~chain: ChainMap.Chain.t,
-    ~concurrencyLimit: int,
-    ~bufferLimit: int,
-  ) => promise<unit>,
+  ~dispatchChain: (~chain: ChainMap.Chain.t, ~action: FetchState.nextQuery) => promise<unit>,
 ) => promise<unit>

package/src/Ecosystem.res

@@ -33,8 +33,13 @@ type t = {
       loggers (see `getItemLogger`). */
   logger: Pino.t,
   /** Materialise the user-facing event handed to handlers and contract
-      registration from an item's opaque payload. */
+      registration from an item's opaque payload. `event.transaction` is written
+      onto the payload at batch prep (HyperSync) or inline (RPC/simulate). */
   toEvent: Internal.eventItem => Internal.event,
+  /** Bitmask (as a float) of the transaction fields selected across the chain's
+      events — the set the store materialises at batch prep. `0.` when the
+      ecosystem carries transactions inline. */
+  transactionFieldMask: array<Internal.eventConfig> => float,
   /** Build the per-item child logger for an event item, with
       ecosystem-specific log fields (EVM/Fuel: contract/event/address; SVM:
       program/instruction/programId). Closes over the injected logger. */

package/src/Env.res

@@ -8,13 +8,6 @@ let updateSyncTimeOnRestart =
   envSafe->EnvSafe.get("UPDATE_SYNC_TIME_ON_RESTART", S.bool, ~fallback=true)
 let targetBufferSize = envSafe->EnvSafe.get("ENVIO_INDEXING_MAX_BUFFER_SIZE", S.option(S.int))
 let maxAddrInPartition = envSafe->EnvSafe.get("MAX_PARTITION_SIZE", S.int, ~fallback=5_000)
-// Global caps on concurrent data-source queries across the whole indexer (all
-// chains share the budget), not per chain. Realtime allows far more since head
-// queries are small and many chains follow the head at once.
-let maxBackfillConcurrency =
-  envSafe->EnvSafe.get("ENVIO_MAX_BACKFILL_CONCURRENCY", S.int, ~fallback=30)
-let maxRealtimeConcurrency =
-  envSafe->EnvSafe.get("ENVIO_MAX_REALTIME_CONCURRENCY", S.int, ~fallback=200)
 
 // Target number of in-memory objects (uncommitted entity/effect changes plus
 // unwritten batch items) the store holds before processing waits for the write

package/src/Env.res.mjs

@@ -19,10 +19,6 @@ let targetBufferSize = EnvSafe.get(envSafe, "ENVIO_INDEXING_MAX_BUFFER_SIZE", S$
 
 let maxAddrInPartition = EnvSafe.get(envSafe, "MAX_PARTITION_SIZE", S$RescriptSchema.int, undefined, 5000, undefined, undefined);
 
-let maxBackfillConcurrency = EnvSafe.get(envSafe, "ENVIO_MAX_BACKFILL_CONCURRENCY", S$RescriptSchema.int, undefined, 30, undefined, undefined);
-
-let maxRealtimeConcurrency = EnvSafe.get(envSafe, "ENVIO_MAX_REALTIME_CONCURRENCY", S$RescriptSchema.int, undefined, 200, undefined, undefined);
-
 let inMemoryObjectsTarget = EnvSafe.get(envSafe, "ENVIO_IN_MEMORY_OBJECTS_TARGET", S$RescriptSchema.int, undefined, 100000, undefined, undefined);
 
 let serverPort = EnvSafe.get(envSafe, "ENVIO_INDEXER_PORT", S$RescriptSchema.port(S$RescriptSchema.int, undefined), undefined, EnvSafe.get(envSafe, "METRICS_PORT", S$RescriptSchema.port(S$RescriptSchema.int, undefined), undefined, 9898, undefined, undefined), undefined, undefined);
@@ -224,8 +220,6 @@ export {
   updateSyncTimeOnRestart,
   targetBufferSize,
   maxAddrInPartition,
-  maxBackfillConcurrency,
-  maxRealtimeConcurrency,
   inMemoryObjectsTarget,
   serverPort,
   tuiEnvVar,

package/src/Envio.res

@@ -48,6 +48,7 @@ type svmTokenBalance = {
 }
 
 type svmTransaction = {
+  transactionIndex?: int,
   signatures: array<string>,
   feePayer?: SvmTypes.Pubkey.t,
   success?: bool,
@@ -104,8 +105,8 @@ type svmInstruction = {
   d8?: string,
   /** Borsh-decoded params view. See [[svmInstructionParams]]. */
   params?: svmInstructionParams,
-  /** Parent transaction. Absent when the per-instruction
-   `include_transaction` flag is `false`. */
+  /** Parent transaction. Carries only the fields selected via
+   `field_selection.transaction_fields`; absent when none are selected. */
   transaction?: svmTransaction,
   /** Program log entries scoped to this instruction. Absent when the
    per-instruction `include_logs` flag is `false`. */