envio 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/FetchState.res.mjs

@@ -14,6 +14,16 @@ function deriveEffectiveStartBlock(registrationBlock, contractStartBlock) {
   return Primitive_int.max(Primitive_int.max(registrationBlock, 0), Stdlib_Option.getOr(contractStartBlock, 0));
 }
 
+function deriveContractNameByAddress(addressesByContractName) {
+  let result = {};
+  Utils.Dict.forEachWithKey(addressesByContractName, (addresses, contractName) => {
+    for (let i = 0, i_finish = addresses.length; i < i_finish; ++i) {
+      result[addresses[i]] = contractName;
+    }
+  });
+  return result;
+}
+
 function calculateEstResponseSize(p, fromBlock, toBlock, maxQueryBlockNumber) {
   if (p.prevQueryRange <= 0) {
     return 10000;
@@ -72,6 +82,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         latestFetchedBlock: p1.latestFetchedBlock,
         selection: p1.selection,
         addressesByContractName: p1.addressesByContractName,
+        contractNameByAddress: p1.contractNameByAddress,
         mergeBlock: potentialMergeBlock,
         dynamicContract: p1.dynamicContract,
         mutPendingQueries: p1.mutPendingQueries,
@@ -85,6 +96,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         latestFetchedBlock: p2.latestFetchedBlock,
         selection: p2.selection,
         addressesByContractName: p2.addressesByContractName,
+        contractNameByAddress: p2.contractNameByAddress,
         mergeBlock: potentialMergeBlock,
         dynamicContract: p2.dynamicContract,
         mutPendingQueries: p2.mutPendingQueries,
@@ -107,6 +119,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         },
         selection: p1.selection,
         addressesByContractName: {},
+        contractNameByAddress: {},
         mergeBlock: undefined,
         dynamicContract: contractName,
         mutPendingQueries: [],
@@ -121,6 +134,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         latestFetchedBlock: p1.latestFetchedBlock,
         selection: p1.selection,
         addressesByContractName: p1.addressesByContractName,
+        contractNameByAddress: p1.contractNameByAddress,
         mergeBlock: potentialMergeBlock,
         dynamicContract: p1.dynamicContract,
         mutPendingQueries: p1.mutPendingQueries,
@@ -137,6 +151,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       latestFetchedBlock: p2.latestFetchedBlock,
       selection: p2.selection,
       addressesByContractName: p2.addressesByContractName,
+      contractNameByAddress: p2.contractNameByAddress,
       mergeBlock: potentialMergeBlock,
       dynamicContract: p2.dynamicContract,
       mutPendingQueries: p2.mutPendingQueries,
@@ -161,6 +176,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       latestFetchedBlock: continuingBase.latestFetchedBlock,
       selection: continuingBase.selection,
       addressesByContractName: abcFull,
+      contractNameByAddress: continuingBase.contractNameByAddress,
       mergeBlock: continuingBase.mergeBlock,
       dynamicContract: continuingBase.dynamicContract,
       mutPendingQueries: continuingBase.mutPendingQueries,
@@ -176,6 +192,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
       latestFetchedBlock: continuingBase.latestFetchedBlock,
       selection: continuingBase.selection,
       addressesByContractName: abcRest,
+      contractNameByAddress: continuingBase.contractNameByAddress,
       mergeBlock: continuingBase.mergeBlock,
       dynamicContract: continuingBase.dynamicContract,
       mutPendingQueries: [],
@@ -193,6 +210,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
     latestFetchedBlock: continuingBase.latestFetchedBlock,
     selection: continuingBase.selection,
     addressesByContractName: abc,
+    contractNameByAddress: continuingBase.contractNameByAddress,
     mergeBlock: continuingBase.mergeBlock,
     dynamicContract: continuingBase.dynamicContract,
     mutPendingQueries: continuingBase.mutPendingQueries,
@@ -291,7 +309,20 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
   for (let idx$2 = 0; idx$2 < partitionsCount; ++idx$2) {
     let p$1 = newPartitions[idx$2];
     idsInAscOrder[idx$2] = p$1.id;
-    entities[p$1.id] = p$1;
+    entities[p$1.id] = {
+      id: p$1.id,
+      latestFetchedBlock: p$1.latestFetchedBlock,
+      selection: p$1.selection,
+      addressesByContractName: p$1.addressesByContractName,
+      contractNameByAddress: deriveContractNameByAddress(p$1.addressesByContractName),
+      mergeBlock: p$1.mergeBlock,
+      dynamicContract: p$1.dynamicContract,
+      mutPendingQueries: p$1.mutPendingQueries,
+      prevQueryRange: p$1.prevQueryRange,
+      prevPrevQueryRange: p$1.prevPrevQueryRange,
+      prevRangeSize: p$1.prevRangeSize,
+      latestBlockRangeUpdateBlock: p$1.latestBlockRangeUpdateBlock
+    };
   }
   return {
     idsInAscOrder: idsInAscOrder,
@@ -385,6 +416,7 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
     let updatedMainPartition_id = p$1.id;
     let updatedMainPartition_selection = p$1.selection;
     let updatedMainPartition_addressesByContractName = p$1.addressesByContractName;
+    let updatedMainPartition_contractNameByAddress = p$1.contractNameByAddress;
     let updatedMainPartition_mergeBlock = p$1.mergeBlock;
     let updatedMainPartition_dynamicContract = p$1.dynamicContract;
     let updatedMainPartition_mutPendingQueries = p$1.mutPendingQueries;
@@ -394,6 +426,7 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
       latestFetchedBlock: updatedLatestFetchedBlock,
       selection: updatedMainPartition_selection,
       addressesByContractName: updatedMainPartition_addressesByContractName,
+      contractNameByAddress: updatedMainPartition_contractNameByAddress,
       mergeBlock: updatedMainPartition_mergeBlock,
       dynamicContract: updatedMainPartition_dynamicContract,
       mutPendingQueries: updatedMainPartition_mutPendingQueries,
@@ -641,6 +674,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: latestFetchedBlock,
             selection: normalSelection,
             addressesByContractName: addressesByContractName,
+            contractNameByAddress: {},
             mergeBlock: undefined,
             dynamicContract: isDynamic ? contractName : undefined,
             mutPendingQueries: [],
@@ -692,6 +726,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: currentP.latestFetchedBlock,
             selection: currentP.selection,
             addressesByContractName: currentP.addressesByContractName,
+            contractNameByAddress: currentP.contractNameByAddress,
             mergeBlock: currentPBlock < nextPBlock ? nextPBlock : undefined,
             dynamicContract: currentP.dynamicContract,
             mutPendingQueries: currentP.mutPendingQueries,
@@ -705,6 +740,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: nextP.latestFetchedBlock,
             selection: nextP.selection,
             addressesByContractName: mergedAddresses,
+            contractNameByAddress: nextP.contractNameByAddress,
             mergeBlock: nextP.mergeBlock,
             dynamicContract: nextP.dynamicContract,
             mutPendingQueries: nextP.mutPendingQueries,
@@ -719,6 +755,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             latestFetchedBlock: currentP.latestFetchedBlock,
             selection: currentP.selection,
             addressesByContractName: mergedAddresses,
+            contractNameByAddress: currentP.contractNameByAddress,
             mergeBlock: currentP.mergeBlock,
             dynamicContract: currentP.dynamicContract,
             mutPendingQueries: currentP.mutPendingQueries,
@@ -864,6 +901,7 @@ function registerDynamicContracts(fetchState, items) {
                   latestFetchedBlock: p.latestFetchedBlock,
                   selection: p.selection,
                   addressesByContractName: restAddressesByContractName,
+                  contractNameByAddress: p.contractNameByAddress,
                   mergeBlock: p.mergeBlock,
                   dynamicContract: p.dynamicContract,
                   mutPendingQueries: p.mutPendingQueries,
@@ -879,6 +917,7 @@ function registerDynamicContracts(fetchState, items) {
                   latestFetchedBlock: p.latestFetchedBlock,
                   selection: fetchState.normalSelection,
                   addressesByContractName: addressesByContractName,
+                  contractNameByAddress: {},
                   mergeBlock: undefined,
                   dynamicContract: contractName,
                   mutPendingQueries: p.mutPendingQueries,
@@ -894,6 +933,7 @@ function registerDynamicContracts(fetchState, items) {
                 latestFetchedBlock: p.latestFetchedBlock,
                 selection: p.selection,
                 addressesByContractName: p.addressesByContractName,
+                contractNameByAddress: p.contractNameByAddress,
                 mergeBlock: p.mergeBlock,
                 dynamicContract: contractName,
                 mutPendingQueries: p.mutPendingQueries,
@@ -965,8 +1005,8 @@ function startFetchingQueries(param, queries) {
   }
 }
 
-function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber, maybeChunkRange, partition, selection, addressesByContractName, indexingAddresses) {
-  if (rangeFromBlock > maxQueryBlockNumber) {
+function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock, maxQueryBlockNumber, maybeChunkRange, maxChunks, partition, selection, addressesByContractName) {
+  if (!(rangeFromBlock <= maxQueryBlockNumber && maxChunks > 0)) {
     return;
   }
   if (rangeEndBlock !== undefined && rangeFromBlock > rangeEndBlock) {
@@ -975,19 +1015,11 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
   if (maybeChunkRange !== undefined) {
     let maxBlock = rangeEndBlock !== undefined ? rangeEndBlock : maxQueryBlockNumber;
     let chunkSize = Js_math.ceil_int(maybeChunkRange * 1.8);
-    let probeSize = Js_math.ceil_int(maybeChunkRange * 0.9);
-    let getChunkSize = chunkIdx => {
-      if (chunkIdx < 2) {
-        return probeSize;
-      } else {
-        return chunkSize;
-      }
-    };
-    if ((((rangeFromBlock + probeSize | 0) + probeSize | 0) - 1 | 0) <= maxBlock) {
+    if (((rangeFromBlock + (chunkSize << 1) | 0) - 1 | 0) <= maxBlock) {
       let chunkFromBlock = rangeFromBlock;
       let chunkIdx = 0;
-      while (chunkIdx < 5 && ((chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0) <= maxBlock) {
-        let chunkToBlock = (chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0;
+      while (chunkIdx < maxChunks && ((chunkFromBlock + chunkSize | 0) - 1 | 0) <= maxBlock) {
+        let chunkToBlock = (chunkFromBlock + chunkSize | 0) - 1 | 0;
         queries.push({
           partitionId: partitionId,
           fromBlock: chunkFromBlock,
@@ -998,7 +1030,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
           progress: 0,
           selection: selection,
           addressesByContractName: addressesByContractName,
-          indexingAddresses: indexingAddresses
+          contractNameByAddress: partition.contractNameByAddress
         });
         chunkFromBlock = chunkToBlock + 1 | 0;
         chunkIdx = chunkIdx + 1 | 0;
@@ -1015,7 +1047,7 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
       progress: 0,
       selection: selection,
       addressesByContractName: addressesByContractName,
-      indexingAddresses: indexingAddresses
+      contractNameByAddress: partition.contractNameByAddress
     });
     return;
   }
@@ -1029,14 +1061,13 @@ function pushQueriesForRange(queries, partitionId, rangeFromBlock, rangeEndBlock
     progress: 0,
     selection: selection,
     addressesByContractName: addressesByContractName,
-    indexingAddresses: indexingAddresses
+    contractNameByAddress: partition.contractNameByAddress
   });
 }
 
 function getNextQuery(fetchState, budget, chainPendingBudget) {
   let knownHeight = fetchState.knownHeight;
   let blockLag = fetchState.blockLag;
-  let indexingAddresses = fetchState.indexingAddresses;
   let optimizedPartitions = fetchState.optimizedPartitions;
   let headBlockNumber = knownHeight - blockLag | 0;
   if (headBlockNumber <= 0) {
@@ -1083,9 +1114,10 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
       if (pq.fromBlock > cursor) {
         let addressesByContractName = p.addressesByContractName;
         let selection = p.selection;
+        let maxChunks = (10 - pendingCount | 0) - (queries.length - partitionQueriesStart | 0) | 0;
         let rangeEndBlock = Utils.$$Math.minOptInt(pq.fromBlock - 1 | 0, queryEndBlock$2);
         let rangeFromBlock = cursor;
-        if (rangeFromBlock <= maxQueryBlockNumber) {
+        if (rangeFromBlock <= maxQueryBlockNumber && maxChunks > 0) {
           let exit = 0;
           if (!(rangeEndBlock !== undefined && rangeFromBlock > rangeEndBlock)) {
             exit = 1;
@@ -1094,19 +1126,11 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
             if (maybeChunkRange !== undefined) {
               let maxBlock = rangeEndBlock !== undefined ? rangeEndBlock : maxQueryBlockNumber;
               let chunkSize = Js_math.ceil_int(maybeChunkRange * 1.8);
-              let probeSize = Js_math.ceil_int(maybeChunkRange * 0.9);
-              let getChunkSize = chunkIdx => {
-                if (chunkIdx < 2) {
-                  return probeSize;
-                } else {
-                  return chunkSize;
-                }
-              };
-              if ((((rangeFromBlock + getChunkSize(0) | 0) + getChunkSize(1) | 0) - 1 | 0) <= maxBlock) {
+              if (((rangeFromBlock + (chunkSize << 1) | 0) - 1 | 0) <= maxBlock) {
                 let chunkFromBlock = rangeFromBlock;
                 let chunkIdx = 0;
-                while (chunkIdx < 5 && ((chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0) <= maxBlock) {
-                  let chunkToBlock = (chunkFromBlock + getChunkSize(chunkIdx) | 0) - 1 | 0;
+                while (chunkIdx < maxChunks && ((chunkFromBlock + chunkSize | 0) - 1 | 0) <= maxBlock) {
+                  let chunkToBlock = (chunkFromBlock + chunkSize | 0) - 1 | 0;
                   queries.push({
                     partitionId: partitionId,
                     fromBlock: chunkFromBlock,
@@ -1117,7 +1141,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                     progress: 0,
                     selection: selection,
                     addressesByContractName: addressesByContractName,
-                    indexingAddresses: indexingAddresses
+                    contractNameByAddress: p.contractNameByAddress
                   });
                   chunkFromBlock = chunkToBlock + 1 | 0;
                   chunkIdx = chunkIdx + 1 | 0;
@@ -1133,7 +1157,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                   progress: 0,
                   selection: selection,
                   addressesByContractName: addressesByContractName,
-                  indexingAddresses: indexingAddresses
+                  contractNameByAddress: p.contractNameByAddress
                 });
               }
             } else {
@@ -1147,7 +1171,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                 progress: 0,
                 selection: selection,
                 addressesByContractName: addressesByContractName,
-                indexingAddresses: indexingAddresses
+                contractNameByAddress: p.contractNameByAddress
               });
             }
           }
@@ -1170,8 +1194,9 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
     if (canContinue) {
       let addressesByContractName$1 = p.addressesByContractName;
       let selection$1 = p.selection;
+      let maxChunks$1 = (10 - pendingCount | 0) - (queries.length - partitionQueriesStart | 0) | 0;
       let rangeFromBlock$1 = cursor;
-      if (rangeFromBlock$1 <= maxQueryBlockNumber) {
+      if (rangeFromBlock$1 <= maxQueryBlockNumber && maxChunks$1 > 0) {
         let exit$1 = 0;
         if (!(queryEndBlock$2 !== undefined && rangeFromBlock$1 > queryEndBlock$2)) {
           exit$1 = 1;
@@ -1180,19 +1205,11 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
           if (maybeChunkRange !== undefined) {
             let maxBlock$1 = queryEndBlock$2 !== undefined ? queryEndBlock$2 : maxQueryBlockNumber;
             let chunkSize$1 = Js_math.ceil_int(maybeChunkRange * 1.8);
-            let probeSize$1 = Js_math.ceil_int(maybeChunkRange * 0.9);
-            let getChunkSize$1 = chunkIdx => {
-              if (chunkIdx < 2) {
-                return probeSize$1;
-              } else {
-                return chunkSize$1;
-              }
-            };
-            if ((((rangeFromBlock$1 + getChunkSize$1(0) | 0) + getChunkSize$1(1) | 0) - 1 | 0) <= maxBlock$1) {
+            if (((rangeFromBlock$1 + (chunkSize$1 << 1) | 0) - 1 | 0) <= maxBlock$1) {
               let chunkFromBlock$1 = rangeFromBlock$1;
               let chunkIdx$1 = 0;
-              while (chunkIdx$1 < 5 && ((chunkFromBlock$1 + getChunkSize$1(chunkIdx$1) | 0) - 1 | 0) <= maxBlock$1) {
-                let chunkToBlock$1 = (chunkFromBlock$1 + getChunkSize$1(chunkIdx$1) | 0) - 1 | 0;
+              while (chunkIdx$1 < maxChunks$1 && ((chunkFromBlock$1 + chunkSize$1 | 0) - 1 | 0) <= maxBlock$1) {
+                let chunkToBlock$1 = (chunkFromBlock$1 + chunkSize$1 | 0) - 1 | 0;
                 queries.push({
                   partitionId: partitionId,
                   fromBlock: chunkFromBlock$1,
@@ -1203,7 +1220,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                   progress: 0,
                   selection: selection$1,
                   addressesByContractName: addressesByContractName$1,
-                  indexingAddresses: indexingAddresses
+                  contractNameByAddress: p.contractNameByAddress
                 });
                 chunkFromBlock$1 = chunkToBlock$1 + 1 | 0;
                 chunkIdx$1 = chunkIdx$1 + 1 | 0;
@@ -1219,7 +1236,7 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
                 progress: 0,
                 selection: selection$1,
                 addressesByContractName: addressesByContractName$1,
-                indexingAddresses: indexingAddresses
+                contractNameByAddress: p.contractNameByAddress
               });
             }
           } else {
@@ -1233,17 +1250,12 @@ function getNextQuery(fetchState, budget, chainPendingBudget) {
               progress: 0,
               selection: selection$1,
               addressesByContractName: addressesByContractName$1,
-              indexingAddresses: indexingAddresses
+              contractNameByAddress: p.contractNameByAddress
             });
           }
         }
       }
     }
-    let maxNewChunks = Primitive_int.max(0, 10 - pendingCount | 0);
-    let generatedCount = queries.length - partitionQueriesStart | 0;
-    if (generatedCount > maxNewChunks) {
-      queries.splice(partitionQueriesStart + maxNewChunks | 0, generatedCount - maxNewChunks | 0);
-    }
     idxRef = idxRef + 1 | 0;
   };
   if (Utils.$$Array.isEmpty(queries)) {
@@ -1340,6 +1352,7 @@ function make$1(startBlock, endBlock, eventConfigs, addresses, maxAddrInPartitio
         dependsOnAddresses: false
       },
       addressesByContractName: {},
+      contractNameByAddress: {},
       mergeBlock: undefined,
       dynamicContract: undefined,
       mutPendingQueries: [],
@@ -1516,6 +1529,7 @@ function rollback(fetchState, targetBlockNumber) {
             latestFetchedBlock: p.latestFetchedBlock,
             selection: p.selection,
             addressesByContractName: rollbackedAddressesByContractName,
+            contractNameByAddress: p.contractNameByAddress,
             mergeBlock: mergeBlock$1,
             dynamicContract: p.dynamicContract,
             mutPendingQueries: rollbackPendingQueries(p.mutPendingQueries, targetBlockNumber),
@@ -1537,6 +1551,7 @@ function rollback(fetchState, targetBlockNumber) {
           }) : p.latestFetchedBlock,
         selection: p.selection,
         addressesByContractName: p.addressesByContractName,
+        contractNameByAddress: p.contractNameByAddress,
         mergeBlock: p.mergeBlock,
         dynamicContract: p.dynamicContract,
         mutPendingQueries: rollbackPendingQueries(p.mutPendingQueries, targetBlockNumber),
@@ -1582,6 +1597,7 @@ function resetPendingQueries(fetchState) {
         latestFetchedBlock: partition.latestFetchedBlock,
         selection: partition.selection,
         addressesByContractName: partition.addressesByContractName,
+        contractNameByAddress: partition.contractNameByAddress,
         mergeBlock: partition.mergeBlock,
         dynamicContract: partition.dynamicContract,
         mutPendingQueries: kept,
@@ -1748,6 +1764,7 @@ let maxPendingChunksPerPartition = 10;
 
 export {
   deriveEffectiveStartBlock,
+  deriveContractNameByAddress,
   defaultEstResponseSize,
   calculateEstResponseSize,
   getMinHistoryRange,
@@ -1767,8 +1784,8 @@ export {
   registerDynamicContracts,
   handleQueryResult,
   startFetchingQueries,
-  pushQueriesForRange,
   maxPendingChunksPerPartition,
+  pushQueriesForRange,
   getNextQuery,
   hasReadyItem,
   getReadyItemsCount,

package/src/HandlerLoader.res

@@ -103,6 +103,7 @@ let applyRegistrations = (~config: Config.t): Config.t => {
               isWildcard,
               handler,
               contractRegister,
+              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter([], ~isWildcard),
               dependsOnAddresses: Internal.dependsOnAddresses(
                 ~isWildcard,
                 ~filterByAddresses=false,
@@ -144,7 +145,10 @@ let applyRegistrations = (~config: Config.t): Config.t => {
               contractRegister,
               getEventFiltersOrThrow,
               filterByAddresses,
-              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter(addressFilterParamGroups),
+              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter(
+                addressFilterParamGroups,
+                ~isWildcard,
+              ),
               dependsOnAddresses: Internal.dependsOnAddresses(~isWildcard, ~filterByAddresses),
             } :> Internal.eventConfig)
           | Svm =>
@@ -155,6 +159,11 @@ let applyRegistrations = (~config: Config.t): Config.t => {
               isWildcard,
               handler,
               contractRegister,
+              clientAddressFilter: ?EventConfigBuilder.buildAddressFilter(
+                [],
+                ~isWildcard,
+                ~srcAddressExpr="event.programId",
+              ),
               dependsOnAddresses: Internal.dependsOnAddresses(
                 ~isWildcard,
                 ~filterByAddresses=false,

package/src/HandlerLoader.res.mjs

@@ -79,21 +79,28 @@ function applyRegistrations(config) {
             newrecord.getEventFiltersOrThrow = match$1.getEventFiltersOrThrow;
             newrecord.contractRegister = contractRegister;
             newrecord.handler = handler;
-            newrecord.clientAddressFilter = EventConfigBuilder.buildAddressFilter(match$1.addressFilterParamGroups);
+            newrecord.clientAddressFilter = EventConfigBuilder.buildAddressFilter(match$1.addressFilterParamGroups, isWildcard, undefined);
             newrecord.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, filterByAddresses);
             newrecord.filterByAddresses = filterByAddresses;
             newrecord.isWildcard = isWildcard;
             return newrecord;
           case "fuel" :
+            let newrecord$1 = {...ev};
+            newrecord$1.contractRegister = contractRegister;
+            newrecord$1.handler = handler;
+            newrecord$1.clientAddressFilter = EventConfigBuilder.buildAddressFilter([], isWildcard, undefined);
+            newrecord$1.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, false);
+            newrecord$1.isWildcard = isWildcard;
+            return newrecord$1;
           case "svm" :
-            break;
+            let newrecord$2 = {...ev};
+            newrecord$2.contractRegister = contractRegister;
+            newrecord$2.handler = handler;
+            newrecord$2.clientAddressFilter = EventConfigBuilder.buildAddressFilter([], isWildcard, "event.programId");
+            newrecord$2.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, false);
+            newrecord$2.isWildcard = isWildcard;
+            return newrecord$2;
         }
-        let newrecord$1 = {...ev};
-        newrecord$1.contractRegister = contractRegister;
-        newrecord$1.handler = handler;
-        newrecord$1.dependsOnAddresses = Internal.dependsOnAddresses(isWildcard, false);
-        newrecord$1.isWildcard = isWildcard;
-        return newrecord$1;
       });
       return {
         name: contract.name,

package/src/Internal.res

@@ -58,7 +58,6 @@ type evmTransactionField =
   | @as("root") Root
   | @as("status") Status
   | @as("yParity") YParity
-  | @as("accessList") AccessList
   | @as("maxFeePerBlobGas") MaxFeePerBlobGas
   | @as("blobVersionedHashes") BlobVersionedHashes
   | @as("type") Type
@@ -67,6 +66,7 @@ type evmTransactionField =
   | @as("l1GasUsed") L1GasUsed
   | @as("l1FeeScalar") L1FeeScalar
   | @as("gasUsedForL1") GasUsedForL1
+  | @as("accessList") AccessList
   | @as("authorizationList") AuthorizationList
 
 let allEvmBlockFields: array<evmBlockField> = [
@@ -123,7 +123,6 @@ let allEvmTransactionFields: array<evmTransactionField> = [
   Root,
   Status,
   YParity,
-  AccessList,
   MaxFeePerBlobGas,
   BlobVersionedHashes,
   Type,
@@ -132,10 +131,41 @@ let allEvmTransactionFields: array<evmTransactionField> = [
   L1GasUsed,
   L1FeeScalar,
   GasUsedForL1,
+  AccessList,
   AuthorizationList,
 ]
 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})
@@ -653,7 +692,7 @@ type effect = {
   input: S.t<effectInput>,
   // The number of functions that are currently running.
   mutable activeCallsCount: int,
-  mutable prevCallStartTimerRef: Hrtime.timeRef,
+  mutable prevCallStartTimerRef: Performance.timeRef,
   rateLimit: option<rateLimitState>,
 }
 let cacheTablePrefix = "envio_effect_"

package/src/Internal.res.mjs

@@ -60,7 +60,6 @@ let allEvmTransactionFields = [
   "root",
   "status",
   "yParity",
-  "accessList",
   "maxFeePerBlobGas",
   "blobVersionedHashes",
   "type",
@@ -69,11 +68,28 @@ let allEvmTransactionFields = [
   "l1GasUsed",
   "l1FeeScalar",
   "gasUsedForL1",
+  "accessList",
   "authorizationList"
 ];
 
 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,