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

package/src/FetchState.res.mjs

@@ -14,6 +14,14 @@ function deriveEffectiveStartBlock(registrationBlock, contractStartBlock) {
   return Primitive_int.max(Primitive_int.max(registrationBlock, 0), Stdlib_Option.getOr(contractStartBlock, 0));
 }
 
+function calculateEstResponseSize(p, fromBlock, toBlock, maxQueryBlockNumber) {
+  if (p.prevQueryRange <= 0) {
+    return 10000;
+  }
+  let density = p.prevRangeSize / p.prevQueryRange;
+  return ((Stdlib_Option.getOr(toBlock, maxQueryBlockNumber) - fromBlock | 0) + 1 | 0) * density;
+}
+
 function getMinHistoryRange(p) {
   let match = p.prevQueryRange;
   let match$1 = p.prevPrevQueryRange;
@@ -69,6 +77,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         mutPendingQueries: p1.mutPendingQueries,
         prevQueryRange: p1.prevQueryRange,
         prevPrevQueryRange: p1.prevPrevQueryRange,
+        prevRangeSize: p1.prevRangeSize,
         latestBlockRangeUpdateBlock: p1.latestBlockRangeUpdateBlock
       });
       completed.push({
@@ -81,6 +90,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         mutPendingQueries: p2.mutPendingQueries,
         prevQueryRange: p2.prevQueryRange,
         prevPrevQueryRange: p2.prevPrevQueryRange,
+        prevRangeSize: p2.prevRangeSize,
         latestBlockRangeUpdateBlock: p2.latestBlockRangeUpdateBlock
       });
       let newId = nextPartitionIndexRef.contents.toString();
@@ -102,6 +112,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         mutPendingQueries: [],
         prevQueryRange: minRange,
         prevPrevQueryRange: minRange,
+        prevRangeSize: 0,
         latestBlockRangeUpdateBlock: 0
       };
     } else {
@@ -115,6 +126,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         mutPendingQueries: p1.mutPendingQueries,
         prevQueryRange: p1.prevQueryRange,
         prevPrevQueryRange: p1.prevPrevQueryRange,
+        prevRangeSize: p1.prevRangeSize,
         latestBlockRangeUpdateBlock: p1.latestBlockRangeUpdateBlock
       });
       continuingBase = p2;
@@ -130,6 +142,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       mutPendingQueries: p2.mutPendingQueries,
       prevQueryRange: p2.prevQueryRange,
       prevPrevQueryRange: p2.prevPrevQueryRange,
+      prevRangeSize: p2.prevRangeSize,
       latestBlockRangeUpdateBlock: p2.latestBlockRangeUpdateBlock
     });
     continuingBase = p1;
@@ -153,6 +166,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       mutPendingQueries: continuingBase.mutPendingQueries,
       prevQueryRange: continuingBase.prevQueryRange,
       prevPrevQueryRange: continuingBase.prevPrevQueryRange,
+      prevRangeSize: continuingBase.prevRangeSize,
       latestBlockRangeUpdateBlock: continuingBase.latestBlockRangeUpdateBlock
     });
     let restId = nextPartitionIndexRef.contents.toString();
@@ -167,6 +181,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       mutPendingQueries: [],
       prevQueryRange: continuingBase.prevQueryRange,
       prevPrevQueryRange: continuingBase.prevPrevQueryRange,
+      prevRangeSize: continuingBase.prevRangeSize,
       latestBlockRangeUpdateBlock: continuingBase.latestBlockRangeUpdateBlock
     });
     return completed;
@@ -183,6 +198,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
     mutPendingQueries: continuingBase.mutPendingQueries,
     prevQueryRange: continuingBase.prevQueryRange,
     prevPrevQueryRange: continuingBase.prevPrevQueryRange,
+    prevRangeSize: continuingBase.prevRangeSize,
     latestBlockRangeUpdateBlock: continuingBase.latestBlockRangeUpdateBlock
   });
   return completed;
@@ -320,7 +336,7 @@ function getPendingQueryOrThrow(p, fromBlock) {
   }
 }
 
-function handleQueryResponse(optimizedPartitions, query, knownHeight, latestFetchedBlock) {
+function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount, latestFetchedBlock) {
   let partitionId = query.partitionId;
   let p = optimizedPartitions.entities[partitionId];
   let p$1 = p !== undefined ? p : Stdlib_JsError.throwWithMessage(`Unexpected case: Couldn't find partition ` + partitionId);
@@ -346,6 +362,7 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, latestFetc
   }
   let updatedPrevQueryRange = shouldUpdateBlockRange ? blockRange : p$1.prevQueryRange;
   let updatedPrevPrevQueryRange = shouldUpdateBlockRange ? p$1.prevQueryRange : p$1.prevPrevQueryRange;
+  let updatedPrevRangeSize = shouldUpdateBlockRange ? itemsCount : p$1.prevRangeSize;
   let mutPendingQueries = p$1.mutPendingQueries;
   let latestFetchedBlock$1 = p$1.latestFetchedBlock;
   while ((() => {
@@ -382,6 +399,7 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, latestFetc
       mutPendingQueries: updatedMainPartition_mutPendingQueries,
       prevQueryRange: updatedPrevQueryRange,
       prevPrevQueryRange: updatedPrevPrevQueryRange,
+      prevRangeSize: updatedPrevRangeSize,
       latestBlockRangeUpdateBlock: updatedMainPartition_latestBlockRangeUpdateBlock
     };
     mutEntities[p$1.id] = updatedMainPartition;
@@ -628,6 +646,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             mutPendingQueries: [],
             prevQueryRange: 0,
             prevPrevQueryRange: 0,
+            prevRangeSize: 0,
             latestBlockRangeUpdateBlock: 0
           });
           nextPartitionIndexRef = nextPartitionIndexRef + 1 | 0;
@@ -678,6 +697,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             mutPendingQueries: currentP.mutPendingQueries,
             prevQueryRange: currentP.prevQueryRange,
             prevPrevQueryRange: currentP.prevPrevQueryRange,
+            prevRangeSize: currentP.prevRangeSize,
             latestBlockRangeUpdateBlock: currentP.latestBlockRangeUpdateBlock
           });
           currentPRef = {
@@ -690,6 +710,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             mutPendingQueries: nextP.mutPendingQueries,
             prevQueryRange: nextP.prevQueryRange,
             prevPrevQueryRange: nextP.prevPrevQueryRange,
+            prevRangeSize: nextP.prevRangeSize,
             latestBlockRangeUpdateBlock: nextP.latestBlockRangeUpdateBlock
           };
         } else {
@@ -703,6 +724,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             mutPendingQueries: currentP.mutPendingQueries,
             prevQueryRange: currentP.prevQueryRange,
             prevPrevQueryRange: currentP.prevPrevQueryRange,
+            prevRangeSize: currentP.prevRangeSize,
             latestBlockRangeUpdateBlock: currentP.latestBlockRangeUpdateBlock
           };
         }
@@ -847,6 +869,7 @@ function registerDynamicContracts(fetchState, items) {
                   mutPendingQueries: p.mutPendingQueries,
                   prevQueryRange: p.prevQueryRange,
                   prevPrevQueryRange: p.prevPrevQueryRange,
+                  prevRangeSize: p.prevRangeSize,
                   latestBlockRangeUpdateBlock: p.latestBlockRangeUpdateBlock
                 };
                 let addressesByContractName = {};
@@ -861,6 +884,7 @@ function registerDynamicContracts(fetchState, items) {
                   mutPendingQueries: p.mutPendingQueries,
                   prevQueryRange: p.prevQueryRange,
                   prevPrevQueryRange: p.prevPrevQueryRange,
+                  prevRangeSize: p.prevRangeSize,
                   latestBlockRangeUpdateBlock: p.latestBlockRangeUpdateBlock
                 });
               }
@@ -875,6 +899,7 @@ function registerDynamicContracts(fetchState, items) {
                 mutPendingQueries: p.mutPendingQueries,
                 prevQueryRange: p.prevQueryRange,
                 prevPrevQueryRange: p.prevPrevQueryRange,
+                prevRangeSize: p.prevRangeSize,
                 latestBlockRangeUpdateBlock: p.latestBlockRangeUpdateBlock
               };
             }
@@ -908,7 +933,7 @@ function handleQueryResult(fetchState, query, latestFetchedBlock, newItems) {
       return true;
     }
   });
-  return updateInternal(fetchState, handleQueryResponse(fetchState.optimizedPartitions, query, fetchState.knownHeight, latestFetchedBlock), undefined, newItems$1.length !== 0 ? fetchState.buffer.concat(newItems$1) : undefined, undefined, undefined);
+  return updateInternal(fetchState, handleQueryResponse(fetchState.optimizedPartitions, query, fetchState.knownHeight, newItems$1.length, latestFetchedBlock), undefined, newItems$1.length !== 0 ? fetchState.buffer.concat(newItems$1) : undefined, undefined, undefined);
 }
 
 function startFetchingQueries(param, queries) {
@@ -922,6 +947,7 @@ function startFetchingQueries(param, queries) {
       fromBlock: q.fromBlock,
       toBlock: q.toBlock,
       isChunk: q.isChunk,
+      estResponseSize: q.estResponseSize,
       fetchedBlock: undefined
     };
     let inserted = false;
@@ -939,7 +965,7 @@ function startFetchingQueries(param, queries) {
   }
 }
 
-function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber, maybeChunkRange, selection, addressesByContractName, indexingAddresses) {
+function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber, maybeChunkRange, partition, selection, addressesByContractName, indexingAddresses) {
   if (rangeFromBlock > maxQueryBlockNumber) {
     return;
   }
@@ -967,6 +993,9 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
           fromBlock: chunkFromBlock,
           toBlock: chunkToBlock,
           isChunk: true,
+          estResponseSize: calculateEstResponseSize(partition, chunkFromBlock, chunkToBlock, maxQueryBlockNumber),
+          chainId: 0,
+          progress: 0,
           selection: selection,
           addressesByContractName: addressesByContractName,
           indexingAddresses: indexingAddresses
@@ -981,6 +1010,9 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
       fromBlock: rangeFromBlock,
       toBlock: rangeEndBlock,
       isChunk: rangeEndBlock !== undefined,
+      estResponseSize: calculateEstResponseSize(partition, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber),
+      chainId: 0,
+      progress: 0,
       selection: selection,
       addressesByContractName: addressesByContractName,
       indexingAddresses: indexingAddresses
@@ -992,13 +1024,16 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
     fromBlock: rangeFromBlock,
     toBlock: rangeEndBlock,
     isChunk: false,
+    estResponseSize: calculateEstResponseSize(partition, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber),
+    chainId: 0,
+    progress: 0,
     selection: selection,
     addressesByContractName: addressesByContractName,
     indexingAddresses: indexingAddresses
   });
 }
 
-function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
+function getNextQuery(fetchState, budget, chainPendingBudget) {
   let knownHeight = fetchState.knownHeight;
   let blockLag = fetchState.blockLag;
   let indexingAddresses = fetchState.indexingAddresses;
@@ -1007,10 +1042,7 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
   if (headBlockNumber <= 0) {
     return "WaitingForNewBlock";
   }
-  if (concurrencyLimit === 0) {
-    return "ReachedMaxConcurrency";
-  }
-  if (bufferLimit <= 0) {
+  if (budget <= 0) {
     return "NothingToQuery";
   }
   let isOnBlockBehindTheHead = fetchState.latestOnBlockBlockNumber < headBlockNumber;
@@ -1018,7 +1050,7 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
   let shouldWaitForNewBlock = (
     endBlock !== undefined ? headBlockNumber < endBlock : true
   ) && !isOnBlockBehindTheHead;
-  let item = fetchState.buffer[bufferLimit - 1 | 0];
+  let item = fetchState.buffer[(budget + (chainPendingBudget | 0) | 0) - 1 | 0];
   let maxQueryBlockNumber = item !== undefined ? Primitive_int.min(item.blockNumber, knownHeight) : knownHeight;
   let queries = [];
   let partitionsCount = optimizedPartitions.idsInAscOrder.length;
@@ -1080,6 +1112,9 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
                     fromBlock: chunkFromBlock,
                     toBlock: chunkToBlock,
                     isChunk: true,
+                    estResponseSize: calculateEstResponseSize(p, chunkFromBlock, chunkToBlock, maxQueryBlockNumber),
+                    chainId: 0,
+                    progress: 0,
                     selection: selection,
                     addressesByContractName: addressesByContractName,
                     indexingAddresses: indexingAddresses
@@ -1093,6 +1128,9 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
                   fromBlock: rangeFromBlock,
                   toBlock: rangeEndBlock,
                   isChunk: rangeEndBlock !== undefined,
+                  estResponseSize: calculateEstResponseSize(p, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber),
+                  chainId: 0,
+                  progress: 0,
                   selection: selection,
                   addressesByContractName: addressesByContractName,
                   indexingAddresses: indexingAddresses
@@ -1104,6 +1142,9 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
                 fromBlock: rangeFromBlock,
                 toBlock: rangeEndBlock,
                 isChunk: false,
+                estResponseSize: calculateEstResponseSize(p, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber),
+                chainId: 0,
+                progress: 0,
                 selection: selection,
                 addressesByContractName: addressesByContractName,
                 indexingAddresses: indexingAddresses
@@ -1157,6 +1198,9 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
                   fromBlock: chunkFromBlock$1,
                   toBlock: chunkToBlock$1,
                   isChunk: true,
+                  estResponseSize: calculateEstResponseSize(p, chunkFromBlock$1, chunkToBlock$1, maxQueryBlockNumber),
+                  chainId: 0,
+                  progress: 0,
                   selection: selection$1,
                   addressesByContractName: addressesByContractName$1,
                   indexingAddresses: indexingAddresses
@@ -1170,6 +1214,9 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
                 fromBlock: rangeFromBlock$1,
                 toBlock: queryEndBlock$2,
                 isChunk: queryEndBlock$2 !== undefined,
+                estResponseSize: calculateEstResponseSize(p, rangeFromBlock$1, queryEndBlock$2, maxQueryBlockNumber),
+                chainId: 0,
+                progress: 0,
                 selection: selection$1,
                 addressesByContractName: addressesByContractName$1,
                 indexingAddresses: indexingAddresses
@@ -1181,6 +1228,9 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
               fromBlock: rangeFromBlock$1,
               toBlock: queryEndBlock$2,
               isChunk: false,
+              estResponseSize: calculateEstResponseSize(p, rangeFromBlock$1, queryEndBlock$2, maxQueryBlockNumber),
+              chainId: 0,
+              progress: 0,
               selection: selection$1,
               addressesByContractName: addressesByContractName$1,
               indexingAddresses: indexingAddresses
@@ -1202,12 +1252,12 @@ function getNextQuery(fetchState, concurrencyLimit, bufferLimit) {
     } else {
       return "NothingToQuery";
     }
+  } else {
+    return {
+      TAG: "Ready",
+      _0: queries
+    };
   }
-  let queries$1 = queries.length > concurrencyLimit ? (queries.sort((a, b) => Primitive_int.compare(a.fromBlock, b.fromBlock)), queries.slice(0, concurrencyLimit)) : queries;
-  return {
-    TAG: "Ready",
-    _0: queries$1
-  };
 }
 
 function hasReadyItem(fetchState) {
@@ -1295,6 +1345,7 @@ function make$1(startBlock, endBlock, eventConfigs, addresses, maxAddrInPartitio
       mutPendingQueries: [],
       prevQueryRange: 0,
       prevPrevQueryRange: 0,
+      prevRangeSize: 0,
       latestBlockRangeUpdateBlock: 0
     });
   }
@@ -1402,6 +1453,7 @@ function rollbackPendingQueries(mutPendingQueries, targetBlockNumber) {
             fromBlock: pq.fromBlock,
             toBlock: pq.toBlock,
             isChunk: pq.isChunk,
+            estResponseSize: pq.estResponseSize,
             fetchedBlock: {
               blockNumber: targetBlockNumber,
               blockTimestamp: 0
@@ -1469,6 +1521,7 @@ function rollback(fetchState, targetBlockNumber) {
             mutPendingQueries: rollbackPendingQueries(p.mutPendingQueries, targetBlockNumber),
             prevQueryRange: p.prevQueryRange,
             prevPrevQueryRange: p.prevPrevQueryRange,
+            prevRangeSize: p.prevRangeSize,
             latestBlockRangeUpdateBlock: p.latestBlockRangeUpdateBlock
           });
         }
@@ -1489,6 +1542,7 @@ function rollback(fetchState, targetBlockNumber) {
         mutPendingQueries: rollbackPendingQueries(p.mutPendingQueries, targetBlockNumber),
         prevQueryRange: p.prevQueryRange,
         prevPrevQueryRange: p.prevPrevQueryRange,
+        prevRangeSize: p.prevRangeSize,
         latestBlockRangeUpdateBlock: p.latestBlockRangeUpdateBlock
       });
     }
@@ -1533,6 +1587,7 @@ function resetPendingQueries(fetchState) {
         mutPendingQueries: kept,
         prevQueryRange: partition.prevQueryRange,
         prevPrevQueryRange: partition.prevPrevQueryRange,
+        prevRangeSize: partition.prevRangeSize,
         latestBlockRangeUpdateBlock: partition.latestBlockRangeUpdateBlock
       };
     }
@@ -1619,6 +1674,19 @@ function getProgressPercentage(fetchState) {
   return progress / totalRange;
 }
 
+function getProgressPercentageAt(fetchState, blockNumber) {
+  let firstEventBlock = fetchState.firstEventBlock;
+  if (firstEventBlock === undefined) {
+    return 0;
+  }
+  let totalRange = fetchState.knownHeight - firstEventBlock | 0;
+  if (totalRange <= 0) {
+    return 0;
+  } else {
+    return (blockNumber - firstEventBlock | 0) / totalRange;
+  }
+}
+
 function hasFullBatch(fetchState, batchSizeTarget) {
   let item = fetchState.buffer[batchSizeTarget - 1 | 0];
   if (item !== undefined) {
@@ -1672,12 +1740,16 @@ function updateKnownHeight(fetchState, knownHeight) {
   }
 }
 
+let defaultEstResponseSize = 10000;
+
 let blockItemLogIndex = 16777216;
 
 let maxPendingChunksPerPartition = 10;
 
 export {
   deriveEffectiveStartBlock,
+  defaultEstResponseSize,
+  calculateEstResponseSize,
   getMinHistoryRange,
   getMinQueryRange,
   OptimizedPartitions,
@@ -1710,6 +1782,7 @@ export {
   isFetchingAtHead,
   isReadyToEnterReorgThreshold,
   getProgressPercentage,
+  getProgressPercentageAt,
   sortForBatch,
   getProgressBlockNumberAt,
   updateKnownHeight,

package/src/IndexerLoop.res

@@ -19,12 +19,11 @@ let start = (state: IndexerState.t) => {
     launch(state, () =>
       state
       ->IndexerState.crossChainState
-      ->CrossChainState.checkAndFetch(~fetchChain=(~chain, ~concurrencyLimit, ~bufferLimit) =>
+      ->CrossChainState.checkAndFetch(~dispatchChain=(~chain, ~action) =>
         ChainFetching.fetchChain(
           state,
           chain,
-          ~concurrencyLimit,
-          ~bufferLimit,
+          ~action,
           ~stateId=state->IndexerState.epoch,
           ~scheduleFetch,
           ~scheduleProcessing,

package/src/IndexerLoop.res.mjs

@@ -15,7 +15,7 @@ function launch(state, work) {
 
 function start(state) {
   let scheduleFetch = () => {
-    let work = () => CrossChainState.checkAndFetch(IndexerState.crossChainState(state), (chain, concurrencyLimit, bufferLimit) => ChainFetching.fetchChain(state, chain, concurrencyLimit, bufferLimit, IndexerState.epoch(state), scheduleFetch, scheduleProcessing, scheduleRollback));
+    let work = () => CrossChainState.checkAndFetch(IndexerState.crossChainState(state), (chain, action) => ChainFetching.fetchChain(state, chain, action, IndexerState.epoch(state), scheduleFetch, scheduleProcessing, scheduleRollback));
     if (!IndexerState.isStopped(state)) {
       work();
       return;

package/src/IndexerState.res

@@ -116,8 +116,6 @@ let make = (
   ~chainStates: dict<ChainState.t>,
   ~isInReorgThreshold: bool,
   ~isRealtime: bool,
-  ~maxBackfillConcurrency=Env.maxBackfillConcurrency,
-  ~maxRealtimeConcurrency=Env.maxRealtimeConcurrency,
   ~targetBufferSize=CrossChainState.calculateTargetBufferSize(),
   ~committedCheckpointId=Internal.initialCheckpointId,
   ~isDevelopmentMode=false,
@@ -160,8 +158,6 @@ let make = (
       ~chainStates,
       ~isInReorgThreshold,
       ~isRealtime,
-      ~maxBackfillConcurrency,
-      ~maxRealtimeConcurrency,
       ~targetBufferSize,
     ),
     indexerStartTime: Date.make(),
@@ -194,8 +190,6 @@ let makeFromDbState = (
   ~shouldUseTui=false,
   ~exitAfterFirstEventBlock=false,
   ~reducedPollingInterval=?,
-  ~maxBackfillConcurrency=Env.maxBackfillConcurrency,
-  ~maxRealtimeConcurrency=Env.maxRealtimeConcurrency,
   ~targetBufferSize=CrossChainState.calculateTargetBufferSize(),
   ~onError,
 ) => {
@@ -269,8 +263,6 @@ let makeFromDbState = (
     ~chainStates,
     ~isInReorgThreshold,
     ~isRealtime,
-    ~maxBackfillConcurrency,
-    ~maxRealtimeConcurrency,
     ~targetBufferSize,
     ~committedCheckpointId=initialState.checkpointId,
     ~isDevelopmentMode,

package/src/IndexerState.res.mjs

@@ -53,9 +53,7 @@ function get(self, entityName) {
   }
 }
 
-function make$2(config, persistence, chainStates, isInReorgThreshold, isRealtime, maxBackfillConcurrencyOpt, maxRealtimeConcurrencyOpt, targetBufferSizeOpt, committedCheckpointIdOpt, isDevelopmentModeOpt, shouldUseTuiOpt, exitAfterFirstEventBlockOpt, onError) {
-  let maxBackfillConcurrency = maxBackfillConcurrencyOpt !== undefined ? maxBackfillConcurrencyOpt : Env.maxBackfillConcurrency;
-  let maxRealtimeConcurrency = maxRealtimeConcurrencyOpt !== undefined ? maxRealtimeConcurrencyOpt : Env.maxRealtimeConcurrency;
+function make$2(config, persistence, chainStates, isInReorgThreshold, isRealtime, targetBufferSizeOpt, committedCheckpointIdOpt, isDevelopmentModeOpt, shouldUseTuiOpt, exitAfterFirstEventBlockOpt, onError) {
   let targetBufferSize = targetBufferSizeOpt !== undefined ? targetBufferSizeOpt : CrossChainState.calculateTargetBufferSize();
   let committedCheckpointId = committedCheckpointIdOpt !== undefined ? committedCheckpointIdOpt : Internal.initialCheckpointId;
   let isDevelopmentMode = isDevelopmentModeOpt !== undefined ? isDevelopmentModeOpt : false;
@@ -84,7 +82,7 @@ function make$2(config, persistence, chainStates, isInReorgThreshold, isRealtime
     chainMetaDirty: false,
     chainMetaThrottler: chainMetaThrottler,
     isProcessing: false,
-    crossChainState: CrossChainState.make(chainStates, isInReorgThreshold, isRealtime, maxBackfillConcurrency, maxRealtimeConcurrency, targetBufferSize),
+    crossChainState: CrossChainState.make(chainStates, isInReorgThreshold, isRealtime, targetBufferSize),
     rollbackState: "NoRollback",
     indexerStartTime: new Date(),
     writeThrottlers: make(),
@@ -97,12 +95,10 @@ function make$2(config, persistence, chainStates, isInReorgThreshold, isRealtime
   };
 }
 
-function makeFromDbState(config, persistence, initialState, registrations, isDevelopmentModeOpt, shouldUseTuiOpt, exitAfterFirstEventBlockOpt, reducedPollingInterval, maxBackfillConcurrencyOpt, maxRealtimeConcurrencyOpt, targetBufferSizeOpt, onError) {
+function makeFromDbState(config, persistence, initialState, registrations, isDevelopmentModeOpt, shouldUseTuiOpt, exitAfterFirstEventBlockOpt, reducedPollingInterval, targetBufferSizeOpt, onError) {
   let isDevelopmentMode = isDevelopmentModeOpt !== undefined ? isDevelopmentModeOpt : false;
   let shouldUseTui = shouldUseTuiOpt !== undefined ? shouldUseTuiOpt : false;
   let exitAfterFirstEventBlock = exitAfterFirstEventBlockOpt !== undefined ? exitAfterFirstEventBlockOpt : false;
-  let maxBackfillConcurrency = maxBackfillConcurrencyOpt !== undefined ? maxBackfillConcurrencyOpt : Env.maxBackfillConcurrency;
-  let maxRealtimeConcurrency = maxRealtimeConcurrencyOpt !== undefined ? maxRealtimeConcurrencyOpt : Env.maxRealtimeConcurrency;
   let targetBufferSize = targetBufferSizeOpt !== undefined ? targetBufferSizeOpt : CrossChainState.calculateTargetBufferSize();
   let isInReorgThreshold = initialState.cleanRun ? false : initialState.chains.some(chain => {
       let progressBlockNumber = chain.progressBlockNumber;
@@ -144,7 +140,7 @@ function makeFromDbState(config, persistence, initialState, registrations, isDev
   if (allChainsReady.contents) {
     Prometheus.ProgressReady.setAllReady();
   }
-  return make$2(config, persistence, chainStates, isInReorgThreshold, isRealtime, maxBackfillConcurrency, maxRealtimeConcurrency, targetBufferSize, initialState.checkpointId, isDevelopmentMode, shouldUseTui, exitAfterFirstEventBlock, onError);
+  return make$2(config, persistence, chainStates, isInReorgThreshold, isRealtime, targetBufferSize, initialState.checkpointId, isDevelopmentMode, shouldUseTui, exitAfterFirstEventBlock, onError);
 }
 
 function isStale(state, stateId) {

package/src/IndexerState.resi

@@ -32,8 +32,6 @@ let make: (
   ~chainStates: dict<ChainState.t>,
   ~isInReorgThreshold: bool,
   ~isRealtime: bool,
-  ~maxBackfillConcurrency: int=?,
-  ~maxRealtimeConcurrency: int=?,
   ~targetBufferSize: int=?,
   ~committedCheckpointId: Internal.checkpointId=?,
   ~isDevelopmentMode: bool=?,
@@ -51,8 +49,6 @@ let makeFromDbState: (
   ~shouldUseTui: bool=?,
   ~exitAfterFirstEventBlock: bool=?,
   ~reducedPollingInterval: int=?,
-  ~maxBackfillConcurrency: int=?,
-  ~maxRealtimeConcurrency: int=?,
   ~targetBufferSize: int=?,
   ~onError: ErrorHandling.t => unit,
 ) => t

package/src/Internal.res

@@ -136,6 +136,36 @@ let allEvmTransactionFields: array<evmTransactionField> = [
 ]
 let evmTransactionFieldSchema = S.enum(allEvmTransactionFields)
 
+// SVM transaction fields. Order mirrors the Rust `SvmTxField` ordinals (the bit
+// position in the selection mask) and `Svm.res` `transactionFields`.
+type svmTransactionField =
+  | @as("transactionIndex") TransactionIndex
+  | @as("signatures") Signatures
+  | @as("feePayer") FeePayer
+  | @as("success") Success
+  | @as("err") Err
+  | @as("fee") Fee
+  | @as("computeUnitsConsumed") ComputeUnitsConsumed
+  | @as("accountKeys") AccountKeys
+  | @as("recentBlockhash") RecentBlockhash
+  | @as("version") Version
+  | @as("tokenBalances") TokenBalances
+
+let allSvmTransactionFields: array<svmTransactionField> = [
+  TransactionIndex,
+  Signatures,
+  FeePayer,
+  Success,
+  Err,
+  Fee,
+  ComputeUnitsConsumed,
+  AccountKeys,
+  RecentBlockhash,
+  Version,
+  TokenBalances,
+]
+let svmTransactionFieldSchema = S.enum(allSvmTransactionFields)
+
 // Static sets of nullable field names — used by RpcSource and HyperSyncSource to wrap schemas with S.nullable
 let evmNullableBlockFields = Utils.Set.fromArray(
   (
@@ -277,7 +307,10 @@ type event
 // modules, not here, and are distinct per ecosystem.
 type eventPayload
 
-external payloadToEvent: eventPayload => event = "%identity"
+// Generic access to the payload's `transaction`, written at batch prep for
+// store-backed ecosystems (HyperSync) and present inline otherwise.
+@get external getPayloadTransaction: eventPayload => Nullable.t<eventTransaction> = "transaction"
+@set external setPayloadTransaction: (eventPayload, eventTransaction) => unit = "transaction"
 
 type genericLoaderArgs<'event, 'context> = {
   event: 'event,
@@ -382,6 +415,11 @@ type eventConfig = private {
   paramsRawEventSchema: S.schema<eventParams>,
   simulateParamsSchema: S.schema<eventParams>,
   startBlock: option<int>,
+  // Field names selected for the chain's transaction-store materialisation
+  // (camelCase, matching the ecosystem's `transactionFields`). Stored as a
+  // string set so the shared mask logic is ecosystem-agnostic; sources recover
+  // the typed view where they need it.
+  selectedTransactionFields: Utils.Set.t<string>,
 }
 
 type fuelEventKind =
@@ -419,7 +457,6 @@ type evmEventConfig = {
   ...eventConfig,
   getEventFiltersOrThrow: ChainMap.Chain.t => eventFilters,
   selectedBlockFields: Utils.Set.t<evmBlockField>,
-  selectedTransactionFields: Utils.Set.t<evmTransactionField>,
   sighash: string,
   topicCount: int,
   paramsMetadata: array<paramMeta>,
@@ -456,9 +493,7 @@ type svmInstructionEventConfig = {
    `dN` selector at query time and the dispatch-key precomputation in the
    router. */
   discriminatorByteLen: int,
-  includeTransaction: bool,
   includeLogs: bool,
-  includeTokenBalances: bool,
   /** Disjunctive normal form: outer array is OR of AND-groups, inner array is
    AND across positions. Empty outer array means "no account filter". */
   accountFilters: array<svmAccountFilterGroup>,
@@ -502,6 +537,9 @@ type eventItem = private {
   blockNumber: int,
   blockHash: string,
   logIndex: int,
+  // Within-block transaction index — the key into the per-chain transaction
+  // store. Unused (0) for ecosystems that carry the transaction inline (Fuel).
+  transactionIndex: int,
   payload: eventPayload,
 }
 
@@ -554,6 +592,7 @@ type item =
       blockNumber: int,
       blockHash: string,
       logIndex: int,
+      transactionIndex: int,
       payload: eventPayload,
     })
   | @as(1) Block({onBlockConfig: onBlockConfig, blockNumber: int, logIndex: int})

package/src/Internal.res.mjs

@@ -74,6 +74,22 @@ let allEvmTransactionFields = [
 
 let evmTransactionFieldSchema = S$RescriptSchema.$$enum(allEvmTransactionFields);
 
+let allSvmTransactionFields = [
+  "transactionIndex",
+  "signatures",
+  "feePayer",
+  "success",
+  "err",
+  "fee",
+  "computeUnitsConsumed",
+  "accountKeys",
+  "recentBlockhash",
+  "version",
+  "tokenBalances"
+];
+
+let svmTransactionFieldSchema = S$RescriptSchema.$$enum(allSvmTransactionFields);
+
 let evmNullableBlockFields = new Set([
   "nonce",
   "difficulty",
@@ -160,6 +176,8 @@ export {
   evmBlockFieldSchema,
   allEvmTransactionFields,
   evmTransactionFieldSchema,
+  allSvmTransactionFields,
+  svmTransactionFieldSchema,
   evmNullableBlockFields,
   evmNullableTransactionFields,
   dependsOnAddresses,