envio 3.4.0 → 3.5.0-alpha.1

package/src/FetchState.res.mjs

@@ -1,5 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Env from "./Env.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Js_math from "@rescript/runtime/lib/es6/Js_math.js";
 import * as Logging from "./Logging.res.mjs";
@@ -223,7 +224,7 @@ function ascSortFn(a, b) {
   return Primitive_int.compare(a.latestFetchedBlock.blockNumber, b.latestFetchedBlock.blockNumber);
 }
 
-function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContracts) {
+function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContracts, clientFilteredContracts) {
   let newPartitions = [];
   let mergingPartitions = {};
   let nextPartitionIndexRef = {
@@ -313,7 +314,8 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
     entities: entities,
     maxAddrInPartition: maxAddrInPartition,
     nextPartitionIndex: nextPartitionIndexRef.contents,
-    dynamicContracts: dynamicContracts
+    dynamicContracts: dynamicContracts,
+    clientFilteredContracts: clientFilteredContracts
   };
 }
 
@@ -359,26 +361,24 @@ function getPendingQueryOrThrow(p, fromBlock) {
   }
 }
 
-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);
+function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHeight, itemsCount, latestFetchedBlock) {
   let mutEntities = Utils.Dict.shallowCopy(optimizedPartitions.entities);
-  let pendingQuery = getPendingQueryOrThrow(p$1, query.fromBlock);
+  let pendingQuery = getPendingQueryOrThrow(p, query.fromBlock);
   pendingQuery.fetchedBlock = latestFetchedBlock;
   let blockRange = (latestFetchedBlock.blockNumber - query.fromBlock | 0) + 1 | 0;
   let observedEventDensity = itemsCount / blockRange;
-  let eventDensity = p$1.eventDensity;
+  let eventDensity = p.eventDensity;
   let updatedEventDensity = eventDensity !== undefined ? (eventDensity + observedEventDensity) / 2 : observedEventDensity;
   let shouldUpdateSourceRangeCapacity = false;
-  if (latestFetchedBlock.blockNumber > p$1.latestSourceRangeCapacityUpdateBlock) {
+  if (latestFetchedBlock.blockNumber > p.latestSourceRangeCapacityUpdateBlock) {
     let queryToBlock = query.toBlock;
     let tmp;
     if (queryToBlock !== undefined) {
       if (latestFetchedBlock.blockNumber < queryToBlock) {
-        tmp = itemsCount < query.itemsTarget;
+        let itemsTarget = query.itemsTarget;
+        tmp = itemsTarget !== undefined ? itemsCount < itemsTarget : true;
       } else {
-        let minHistoryRange = getMinHistoryRange(p$1);
+        let minHistoryRange = getMinHistoryRange(p);
         tmp = minHistoryRange !== undefined ? ((queryToBlock - query.fromBlock | 0) + 1 | 0) >= minHistoryRange : false;
       }
     } else {
@@ -386,10 +386,10 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
     }
     shouldUpdateSourceRangeCapacity = tmp;
   }
-  let updatedSourceRangeCapacity = shouldUpdateSourceRangeCapacity ? blockRange : p$1.sourceRangeCapacity;
-  let updatedPrevSourceRangeCapacity = shouldUpdateSourceRangeCapacity ? p$1.sourceRangeCapacity : p$1.prevSourceRangeCapacity;
-  let mutPendingQueries = p$1.mutPendingQueries;
-  let latestFetchedBlock$1 = p$1.latestFetchedBlock;
+  let updatedSourceRangeCapacity = shouldUpdateSourceRangeCapacity ? blockRange : p.sourceRangeCapacity;
+  let updatedPrevSourceRangeCapacity = shouldUpdateSourceRangeCapacity ? p.sourceRangeCapacity : p.prevSourceRangeCapacity;
+  let mutPendingQueries = p.mutPendingQueries;
+  let latestFetchedBlock$1 = p.latestFetchedBlock;
   let consumedCount = 0;
   let canContinue = true;
   while (canContinue) {
@@ -410,19 +410,19 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
     mutPendingQueries.splice(0, consumedCount);
   }
   let updatedLatestFetchedBlock = latestFetchedBlock$1;
-  let mergeBlock = p$1.mergeBlock;
+  let mergeBlock = p.mergeBlock;
   let partitionReachedMergeBlock = mergeBlock !== undefined ? updatedLatestFetchedBlock.blockNumber >= mergeBlock : false;
   if (partitionReachedMergeBlock) {
-    Utils.Dict.deleteInPlace(mutEntities, p$1.id);
-    return make(Object.values(mutEntities), optimizedPartitions.maxAddrInPartition, optimizedPartitions.nextPartitionIndex, optimizedPartitions.dynamicContracts);
+    Utils.Dict.deleteInPlace(mutEntities, p.id);
+    return make(Object.values(mutEntities), optimizedPartitions.maxAddrInPartition, optimizedPartitions.nextPartitionIndex, optimizedPartitions.dynamicContracts, optimizedPartitions.clientFilteredContracts);
   }
-  let updatedMainPartition_id = p$1.id;
-  let updatedMainPartition_selection = p$1.selection;
-  let updatedMainPartition_addressesByContractName = p$1.addressesByContractName;
-  let updatedMainPartition_mergeBlock = p$1.mergeBlock;
-  let updatedMainPartition_dynamicContract = p$1.dynamicContract;
-  let updatedMainPartition_mutPendingQueries = p$1.mutPendingQueries;
-  let updatedMainPartition_latestSourceRangeCapacityUpdateBlock = shouldUpdateSourceRangeCapacity ? latestFetchedBlock.blockNumber : p$1.latestSourceRangeCapacityUpdateBlock;
+  let updatedMainPartition_id = p.id;
+  let updatedMainPartition_selection = p.selection;
+  let updatedMainPartition_addressesByContractName = p.addressesByContractName;
+  let updatedMainPartition_mergeBlock = p.mergeBlock;
+  let updatedMainPartition_dynamicContract = p.dynamicContract;
+  let updatedMainPartition_mutPendingQueries = p.mutPendingQueries;
+  let updatedMainPartition_latestSourceRangeCapacityUpdateBlock = shouldUpdateSourceRangeCapacity ? latestFetchedBlock.blockNumber : p.latestSourceRangeCapacityUpdateBlock;
   let updatedMainPartition = {
     id: updatedMainPartition_id,
     latestFetchedBlock: updatedLatestFetchedBlock,
@@ -436,13 +436,13 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
     eventDensity: updatedEventDensity,
     latestSourceRangeCapacityUpdateBlock: updatedMainPartition_latestSourceRangeCapacityUpdateBlock
   };
-  mutEntities[p$1.id] = updatedMainPartition;
+  mutEntities[p.id] = updatedMainPartition;
   if (optimizedPartitions.dynamicContracts.size !== 0) {
-    return make(Object.values(mutEntities), optimizedPartitions.maxAddrInPartition, optimizedPartitions.nextPartitionIndex, optimizedPartitions.dynamicContracts);
+    return make(Object.values(mutEntities), optimizedPartitions.maxAddrInPartition, optimizedPartitions.nextPartitionIndex, optimizedPartitions.dynamicContracts, optimizedPartitions.clientFilteredContracts);
   }
   let ids = optimizedPartitions.idsInAscOrder;
   let count = ids.length;
-  let idx = ids.indexOf(p$1.id);
+  let idx = ids.indexOf(p.id);
   let isAfter = jdx => {
     if (jdx < count) {
       return mutEntities[ids[jdx]].latestFetchedBlock.blockNumber < updatedLatestFetchedBlock.blockNumber;
@@ -456,7 +456,8 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
       entities: mutEntities,
       maxAddrInPartition: optimizedPartitions.maxAddrInPartition,
       nextPartitionIndex: optimizedPartitions.nextPartitionIndex,
-      dynamicContracts: optimizedPartitions.dynamicContracts
+      dynamicContracts: optimizedPartitions.dynamicContracts,
+      clientFilteredContracts: optimizedPartitions.clientFilteredContracts
     };
   }
   let reordered = ids.slice();
@@ -465,16 +466,26 @@ function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount
     reordered[jdx] = ids[jdx + 1 | 0];
     jdx = jdx + 1 | 0;
   };
-  reordered[jdx] = p$1.id;
+  reordered[jdx] = p.id;
   return {
     idsInAscOrder: reordered,
     entities: mutEntities,
     maxAddrInPartition: optimizedPartitions.maxAddrInPartition,
     nextPartitionIndex: optimizedPartitions.nextPartitionIndex,
-    dynamicContracts: optimizedPartitions.dynamicContracts
+    dynamicContracts: optimizedPartitions.dynamicContracts,
+    clientFilteredContracts: optimizedPartitions.clientFilteredContracts
   };
 }
 
+function handleQueryResponse(optimizedPartitions, query, knownHeight, itemsCount, latestFetchedBlock) {
+  let p = optimizedPartitions.entities[query.partitionId];
+  if (p !== undefined) {
+    return handleQueryResponseForPartition(optimizedPartitions, p, query, knownHeight, itemsCount, latestFetchedBlock);
+  } else {
+    return optimizedPartitions;
+  }
+}
+
 function getLatestFullyFetchedBlock(optimizedPartitions) {
   let id = optimizedPartitions.idsInAscOrder[0];
   if (id !== undefined) {
@@ -492,6 +503,7 @@ let OptimizedPartitions = {
   consumeFetchedQueries: consumeFetchedQueries,
   getPendingQueryOrThrow: getPendingQueryOrThrow,
   handleQueryResponse: handleQueryResponse,
+  handleQueryResponseForPartition: handleQueryResponseForPartition,
   getLatestFullyFetchedBlock: getLatestFullyFetchedBlock
 };
 
@@ -691,7 +703,8 @@ function updateInternal(fetchState, optimizedPartitionsOpt, mutItems, mutItemsSo
     maxOnBlockBufferSize: fetchState.maxOnBlockBufferSize,
     onBlockRegistrations: fetchState.onBlockRegistrations,
     knownHeight: knownHeight,
-    firstEventBlock: fetchState.firstEventBlock
+    firstEventBlock: fetchState.firstEventBlock,
+    clientFilterAddressThreshold: fetchState.clientFilterAddressThreshold
   };
 }
 
@@ -725,8 +738,178 @@ function addressesByContractNameGetAll(addressesByContractName) {
   return all;
 }
 
-function createPartitionsFromIndexingAddresses(registeringContractsByContract, dynamicContracts, normalSelection, maxAddrInPartition, nextPartitionIndex, existingPartitions, progressBlockNumber) {
-  let nextPartitionIndexRef = nextPartitionIndex;
+function addClientFilteredContract(clientFilteredContracts, contractName, chainId, addressCount, threshold) {
+  clientFilteredContracts.add(contractName);
+  Logging.childTrace(Logging.createChild({
+    chainId: chainId,
+    contractName: contractName,
+    addressCount: addressCount,
+    threshold: threshold
+  }), "Switching contract to client-side address filtering: registered address count crossed the server-side threshold.");
+}
+
+function collapseClientFilteredContracts(partitions, clientFilteredContracts, normalSelection, nextPartitionIndexRef) {
+  if (clientFilteredContracts.size === 0) {
+    return partitions;
+  }
+  let kept = [];
+  let standingRef = {
+    contents: undefined
+  };
+  let backfills = [];
+  let absorbedPartitions = [];
+  let strippedFrontiers = [];
+  partitions.forEach(p => {
+    if (!p.selection.dependsOnAddresses) {
+      if (p.mergeBlock !== undefined) {
+        backfills.push(p);
+      } else if (Stdlib_Option.isNone(standingRef.contents)) {
+        standingRef.contents = p;
+      } else {
+        absorbedPartitions.push(p);
+      }
+      return;
+    }
+    let contractNames = Object.keys(p.addressesByContractName);
+    let clientFilteredNames = contractNames.filter(c => clientFilteredContracts.has(c));
+    if (Utils.$$Array.isEmpty(clientFilteredNames)) {
+      kept.push(p);
+      return;
+    }
+    if (clientFilteredNames.length === contractNames.length) {
+      absorbedPartitions.push(p);
+      return;
+    }
+    let stripped = Utils.Dict.shallowCopy(p.addressesByContractName);
+    clientFilteredNames.forEach(c => Utils.Dict.deleteInPlace(stripped, c));
+    strippedFrontiers.push(p.latestFetchedBlock);
+    kept.push({
+      id: p.id,
+      latestFetchedBlock: p.latestFetchedBlock,
+      selection: p.selection,
+      addressesByContractName: stripped,
+      mergeBlock: p.mergeBlock,
+      dynamicContract: p.dynamicContract,
+      mutPendingQueries: p.mutPendingQueries,
+      sourceRangeCapacity: p.sourceRangeCapacity,
+      prevSourceRangeCapacity: p.prevSourceRangeCapacity,
+      eventDensity: p.eventDensity,
+      latestSourceRangeCapacityUpdateBlock: p.latestSourceRangeCapacityUpdateBlock
+    });
+  });
+  let standing = standingRef.contents;
+  let selectionChanged = standing !== undefined ? Stdlib_Option.mapOr(standing.selection.clientFilteredContracts, 0, prim => prim.length) !== clientFilteredContracts.size : true;
+  if (Utils.$$Array.isEmpty(absorbedPartitions) && Utils.$$Array.isEmpty(strippedFrontiers) && !selectionChanged) {
+    return partitions;
+  }
+  let minFrontierRef = {
+    contents: undefined
+  };
+  let considerFrontier = b => {
+    let m = minFrontierRef.contents;
+    if (m !== undefined && m.blockNumber <= b.blockNumber) {
+      return;
+    } else {
+      minFrontierRef.contents = b;
+      return;
+    }
+  };
+  absorbedPartitions.forEach(p => considerFrontier(p.latestFetchedBlock));
+  backfills.forEach(p => considerFrontier(p.latestFetchedBlock));
+  strippedFrontiers.forEach(considerFrontier);
+  let regByIndex = {};
+  let addRegs = regs => {
+    regs.forEach(reg => {
+      regByIndex[reg.index.toString()] = reg;
+    });
+  };
+  let standing$1 = standingRef.contents;
+  if (standing$1 !== undefined) {
+    addRegs(standing$1.selection.onEventRegistrations);
+  }
+  absorbedPartitions.forEach(p => {
+    if (!p.selection.dependsOnAddresses) {
+      return addRegs(p.selection.onEventRegistrations);
+    }
+  });
+  addRegs(normalSelection.onEventRegistrations.filter(reg => clientFilteredContracts.has(reg.eventConfig.contractName)));
+  let newSelection_onEventRegistrations = Object.values(regByIndex);
+  let newSelection_clientFilteredContracts = Array.from(clientFilteredContracts);
+  let newSelection = {
+    onEventRegistrations: newSelection_onEventRegistrations,
+    dependsOnAddresses: false,
+    clientFilteredContracts: newSelection_clientFilteredContracts
+  };
+  let standing$2 = standingRef.contents;
+  if (standing$2 !== undefined) {
+    let standingOut;
+    if (selectionChanged) {
+      let id = nextPartitionIndexRef.contents.toString();
+      nextPartitionIndexRef.contents = nextPartitionIndexRef.contents + 1 | 0;
+      standingOut = {
+        id: id,
+        latestFetchedBlock: standing$2.latestFetchedBlock,
+        selection: newSelection,
+        addressesByContractName: standing$2.addressesByContractName,
+        mergeBlock: standing$2.mergeBlock,
+        dynamicContract: standing$2.dynamicContract,
+        mutPendingQueries: [],
+        sourceRangeCapacity: standing$2.sourceRangeCapacity,
+        prevSourceRangeCapacity: standing$2.prevSourceRangeCapacity,
+        eventDensity: standing$2.eventDensity,
+        latestSourceRangeCapacityUpdateBlock: standing$2.latestSourceRangeCapacityUpdateBlock
+      };
+    } else {
+      standingOut = standing$2;
+    }
+    kept.push(standingOut);
+    let minFrontier = minFrontierRef.contents;
+    if (minFrontier !== undefined && minFrontier.blockNumber < standing$2.latestFetchedBlock.blockNumber) {
+      let id$1 = nextPartitionIndexRef.contents.toString();
+      nextPartitionIndexRef.contents = nextPartitionIndexRef.contents + 1 | 0;
+      kept.push({
+        id: id$1,
+        latestFetchedBlock: minFrontier,
+        selection: newSelection,
+        addressesByContractName: {},
+        mergeBlock: standing$2.latestFetchedBlock.blockNumber,
+        dynamicContract: undefined,
+        mutPendingQueries: [],
+        sourceRangeCapacity: standing$2.sourceRangeCapacity,
+        prevSourceRangeCapacity: standing$2.prevSourceRangeCapacity,
+        eventDensity: standing$2.eventDensity,
+        latestSourceRangeCapacityUpdateBlock: 0
+      });
+    }
+    return kept;
+  }
+  let minFrontier$1 = minFrontierRef.contents;
+  if (minFrontier$1 === undefined) {
+    return kept;
+  }
+  let minRange = getMinQueryRange(absorbedPartitions);
+  let id$2 = nextPartitionIndexRef.contents.toString();
+  nextPartitionIndexRef.contents = nextPartitionIndexRef.contents + 1 | 0;
+  kept.push({
+    id: id$2,
+    latestFetchedBlock: minFrontier$1,
+    selection: newSelection,
+    addressesByContractName: {},
+    mergeBlock: undefined,
+    dynamicContract: undefined,
+    mutPendingQueries: [],
+    sourceRangeCapacity: minRange,
+    prevSourceRangeCapacity: minRange,
+    eventDensity: undefined,
+    latestSourceRangeCapacityUpdateBlock: 0
+  });
+  return kept;
+}
+
+function createPartitionsFromIndexingAddresses(registeringContractsByContract, dynamicContracts, clientFilteredContracts, normalSelection, maxAddrInPartition, nextPartitionIndex, existingPartitions, progressBlockNumber) {
+  let nextPartitionIndexRef = {
+    contents: nextPartitionIndex
+  };
   let dynamicPartitions = [];
   let nonDynamicPartitions = [];
   let contractNames = Object.keys(registeringContractsByContract);
@@ -773,7 +956,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
           let addressesByContractName = {};
           addressesByContractName[contractName] = pAddresses;
           partitions.push({
-            id: nextPartitionIndexRef.toString(),
+            id: nextPartitionIndexRef.contents.toString(),
             latestFetchedBlock: latestFetchedBlock,
             selection: normalSelection,
             addressesByContractName: addressesByContractName,
@@ -785,7 +968,7 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
             eventDensity: undefined,
             latestSourceRangeCapacityUpdateBlock: 0
           });
-          nextPartitionIndexRef = nextPartitionIndexRef + 1 | 0;
+          nextPartitionIndexRef.contents = nextPartitionIndexRef.contents + 1 | 0;
         };
         if (maybeNextStartBlockKey !== undefined) {
           startBlockRef = Stdlib_Int.fromString(maybeNextStartBlockKey, undefined);
@@ -870,7 +1053,8 @@ function createPartitionsFromIndexingAddresses(registeringContractsByContract, d
     mergedNonDynamic.push(currentPRef);
   }
   let mergedPartitions = mergedNonDynamic.concat(dynamicPartitions);
-  return make(existingPartitions.concat(mergedPartitions), maxAddrInPartition, nextPartitionIndexRef, dynamicContracts);
+  let allPartitions = collapseClientFilteredContracts(existingPartitions.concat(mergedPartitions), clientFilteredContracts, normalSelection, nextPartitionIndexRef);
+  return make(allPartitions, maxAddrInPartition, nextPartitionIndexRef.contents, dynamicContracts, clientFilteredContracts);
 }
 
 function registerDynamicContracts(fetchState, indexingAddresses, items) {
@@ -1051,7 +1235,21 @@ function registerDynamicContracts(fetchState, indexingAddresses, items) {
     IndexingAddresses.register(indexingAddresses, registeringContracts);
   }
   IndexingAddresses.register(indexingAddresses, noEventsAddresses);
-  let optimizedPartitions = createPartitionsFromIndexingAddresses(registeringContractsByContract, dynamicContractsRef, fetchState.normalSelection, fetchState.optimizedPartitions.maxAddrInPartition, fetchState.optimizedPartitions.nextPartitionIndex + newPartitions.length | 0, mutExistingPartitions.concat(newPartitions), 0);
+  let threshold = fetchState.clientFilterAddressThreshold;
+  let clientFilteredContracts;
+  if (threshold !== undefined) {
+    let clientFilteredContracts$1 = new Set(Array.from(fetchState.optimizedPartitions.clientFilteredContracts));
+    Array.from(dynamicContractsRef).forEach(contractName => {
+      let addressCount = IndexingAddresses.contractCount(indexingAddresses, contractName);
+      if (!clientFilteredContracts$1.has(contractName) && addressCount > threshold) {
+        return addClientFilteredContract(clientFilteredContracts$1, contractName, fetchState.chainId, addressCount, threshold);
+      }
+    });
+    clientFilteredContracts = clientFilteredContracts$1;
+  } else {
+    clientFilteredContracts = fetchState.optimizedPartitions.clientFilteredContracts;
+  }
+  let optimizedPartitions = createPartitionsFromIndexingAddresses(registeringContractsByContract, dynamicContractsRef, clientFilteredContracts, fetchState.normalSelection, fetchState.optimizedPartitions.maxAddrInPartition, fetchState.optimizedPartitions.nextPartitionIndex + newPartitions.length | 0, mutExistingPartitions.concat(newPartitions), 0);
   return updateInternal(fetchState, optimizedPartitions, undefined, undefined, undefined, undefined);
 }
 
@@ -1060,9 +1258,10 @@ function filterByClientAddress(items, indexingAddresses) {
     if (item.kind !== 0) {
       return true;
     }
-    let filter = item.onEventRegistration.clientAddressFilter;
+    let reg = item.onEventRegistration;
+    let filter = reg.clientAddressFilter;
     if (filter !== undefined) {
-      return filter(item.payload, item.blockNumber, IndexingAddresses.rawForFilter(indexingAddresses));
+      return filter(item.payload, item.blockNumber, IndexingAddresses.forContract(indexingAddresses, reg.eventConfig.contractName));
     } else {
       return true;
     }
@@ -1103,15 +1302,14 @@ function startFetchingQueries(param, queries) {
   }
 }
 
-function pushDensityPricedQuery(queries, partitionId, fromBlock, toBlock, isChunk, density, chunkItemsMultiplier, chainTargetBlock, itemsTargetFloor, selection, addressesByContractName) {
+function pushDensityPricedQuery(queries, partitionId, fromBlock, toBlock, isChunk, density, chainTargetBlock, selection, addressesByContractName) {
   let itemsEst = densityItemsTarget(density, fromBlock, toBlock, chainTargetBlock);
-  let itemsTarget = densityItemsTarget(density * chunkItemsMultiplier, fromBlock, toBlock, chainTargetBlock);
   queries.push({
     partitionId: partitionId,
     fromBlock: fromBlock,
     toBlock: toBlock,
     isChunk: isChunk,
-    itemsTarget: toBlock !== undefined ? Primitive_int.max(itemsTarget, itemsTargetFloor) : itemsTarget,
+    itemsTarget: toBlock !== undefined ? undefined : itemsEst,
     itemsEst: itemsEst,
     selection: selection,
     addressesByContractName: addressesByContractName
@@ -1119,7 +1317,7 @@ function pushDensityPricedQuery(queries, partitionId, fromBlock, toBlock, isChun
   return itemsEst;
 }
 
-function pushGapFillQueries(queries, partitionId, rangeFromBlock, rangeEndBlock, headBlockNumber, chainTargetBlock, maybeChunkRange, maxChunks, partition, partitionBudget, chunkItemsMultiplier, itemsTargetFloor, selection, addressesByContractName) {
+function pushGapFillQueries(queries, partitionId, rangeFromBlock, rangeEndBlock, headBlockNumber, chainTargetBlock, maybeChunkRange, maxChunks, partition, partitionBudget, selection, addressesByContractName) {
   if (!(rangeFromBlock <= Primitive_int.min(headBlockNumber, chainTargetBlock) && maxChunks > 0)) {
     return;
   }
@@ -1135,7 +1333,7 @@ function pushGapFillQueries(queries, partitionId, rangeFromBlock, rangeEndBlock,
   if (exit === 1) {
     let maxBlock = rangeEndBlock !== undefined ? rangeEndBlock : chainTargetBlock;
     let pushSingleQuery = (density, isChunk) => {
-      pushDensityPricedQuery(queries, partitionId, rangeFromBlock, rangeEndBlock, isChunk, density, chunkItemsMultiplier, chainTargetBlock, itemsTargetFloor, selection, addressesByContractName);
+      pushDensityPricedQuery(queries, partitionId, rangeFromBlock, rangeEndBlock, isChunk, density, chainTargetBlock, selection, addressesByContractName);
     };
     let match = partition.eventDensity;
     let exit$1 = 0;
@@ -1150,7 +1348,7 @@ function pushGapFillQueries(queries, partitionId, rangeFromBlock, rangeEndBlock,
           let chunkIdx = 0;
           while (chunkIdx < maxChunks && ((chunkFromBlock + chunkSize | 0) - 1 | 0) <= maxBlock) {
             let chunkToBlock = (chunkFromBlock + chunkSize | 0) - 1 | 0;
-            pushDensityPricedQuery(queries, partitionId, chunkFromBlock, chunkToBlock, true, match, chunkItemsMultiplier, chainTargetBlock, itemsTargetFloor, selection, addressesByContractName);
+            pushDensityPricedQuery(queries, partitionId, chunkFromBlock, chunkToBlock, true, match, chainTargetBlock, selection, addressesByContractName);
             chunkFromBlock = chunkToBlock + 1 | 0;
             chunkIdx = chunkIdx + 1 | 0;
           };
@@ -1173,7 +1371,7 @@ function pushGapFillQueries(queries, partitionId, rangeFromBlock, rangeEndBlock,
   }
 }
 
-function walkPartitionPending(p, partitionId, inFlightCount, candidates, headBlockNumber, chainTargetBlock, chunkItemsMultiplier, itemsTargetFloor, partitionBudget, queryEndBlock) {
+function walkPartitionPending(p, partitionId, inFlightCount, candidates, headBlockNumber, chainTargetBlock, partitionBudget, queryEndBlock) {
   let maybeChunkRange = getMinHistoryRange(p);
   let pendingCount = p.mutPendingQueries.length;
   let cursor = p.latestFetchedBlock.blockNumber + 1 | 0;
@@ -1184,7 +1382,7 @@ function walkPartitionPending(p, partitionId, inFlightCount, candidates, headBlo
     let pq = p.mutPendingQueries[pqIdx];
     if (pq.fromBlock > cursor) {
       let beforeLen = candidates.length;
-      pushGapFillQueries(candidates, partitionId, cursor, Utils.$$Math.minOptInt(pq.fromBlock - 1 | 0, queryEndBlock), headBlockNumber, chainTargetBlock, maybeChunkRange, (12 - inFlightCount | 0) - chunksUsedThisCall | 0, p, partitionBudget, chunkItemsMultiplier, itemsTargetFloor, p.selection, p.addressesByContractName);
+      pushGapFillQueries(candidates, partitionId, cursor, Utils.$$Math.minOptInt(pq.fromBlock - 1 | 0, queryEndBlock), headBlockNumber, chainTargetBlock, maybeChunkRange, (12 - inFlightCount | 0) - chunksUsedThisCall | 0, p, partitionBudget, p.selection, p.addressesByContractName);
       chunksUsedThisCall = chunksUsedThisCall + (candidates.length - beforeLen | 0) | 0;
     }
     let toBlock = pq.toBlock;
@@ -1214,7 +1412,7 @@ function walkPartitionPending(p, partitionId, inFlightCount, candidates, headBlo
   }
 }
 
-function pushForwardCandidates(candidates, inRangeStates, inRangeCount, chainTargetBlock, freshBudget, chunkItemsMultiplier, itemsTargetFloor) {
+function pushForwardCandidates(candidates, inRangeStates, inRangeCount, chainTargetBlock, freshBudget) {
   let probeShare = inRangeCount === 0 ? 0 : freshBudget / inRangeCount;
   let frontierCursor = Stdlib_Array.reduce(inRangeStates, chainTargetBlock, (min, fs) => {
     if (fs.cursor < min) {
@@ -1240,21 +1438,21 @@ function pushForwardCandidates(candidates, inRangeStates, inRangeCount, chainTar
       let generatedItems = 0;
       while (created < maxChunksRemaining && chunkFromBlock <= chunkStartCeiling && generatedItems <= freshBudget) {
         let chunkToBlock = Primitive_int.min((chunkFromBlock + chunkSize | 0) - 1 | 0, maxBlock);
-        let itemsEst = pushDensityPricedQuery(candidates, fs.partitionId, chunkFromBlock, chunkToBlock, true, match$1, chunkItemsMultiplier, chainTargetBlock, itemsTargetFloor, p.selection, p.addressesByContractName);
+        let itemsEst = pushDensityPricedQuery(candidates, fs.partitionId, chunkFromBlock, chunkToBlock, true, match$1, chainTargetBlock, p.selection, p.addressesByContractName);
         generatedItems = generatedItems + itemsEst;
         chunkFromBlock = chunkToBlock + 1 | 0;
         created = created + 1 | 0;
       };
       return;
     }
-    let itemsTarget = rangeToTarget > 0 ? Primitive_int.max(1, Math.round(rangeTargetDensity * ((chainTargetBlock - fs.cursor | 0) + 1 | 0) / inRangeCount) | 0) : Primitive_int.max(1, Math.round(probeShare) | 0);
+    let itemsEst$1 = rangeToTarget > 0 ? Primitive_int.max(1, Math.round(rangeTargetDensity * ((chainTargetBlock - fs.cursor | 0) + 1 | 0) / inRangeCount) | 0) : Primitive_int.max(1, Math.round(probeShare) | 0);
     candidates.push({
       partitionId: fs.partitionId,
       fromBlock: fs.cursor,
       toBlock: fs.queryEndBlock,
       isChunk: false,
-      itemsTarget: itemsTarget,
-      itemsEst: itemsTarget,
+      itemsTarget: itemsEst$1,
+      itemsEst: itemsEst$1,
       selection: p.selection,
       addressesByContractName: p.addressesByContractName
     });
@@ -1300,7 +1498,7 @@ function acceptCandidates(candidates, reservations, chainTargetItems, partitionI
   let remainingBudget = chainTargetItems;
   let acceptIdx = 0;
   let usedConcurrency = reservations.length;
-  while (remainingBudget > 0 && acceptIdx < streamCount && usedConcurrency < 100) {
+  while (remainingBudget > 0 && acceptIdx < streamCount && usedConcurrency < Env.maxChainConcurrency) {
     let match = acceptanceStream[acceptIdx];
     let maybeQuery = match[2];
     if (maybeQuery !== undefined) {
@@ -1313,12 +1511,10 @@ function acceptCandidates(candidates, reservations, chainTargetItems, partitionI
   };
 }
 
-function getNextQuery(param, chainTargetBlock, chainTargetItems, $staropt$star, $staropt$star$1) {
+function getNextQuery(param, chainTargetBlock, chainTargetItems) {
   let blockLag = param.blockLag;
   let endBlock = param.endBlock;
   let optimizedPartitions = param.optimizedPartitions;
-  let chunkItemsMultiplier = $staropt$star !== undefined ? $staropt$star : 1;
-  let itemsTargetFloor = $staropt$star$1 !== undefined ? $staropt$star$1 : 0;
   let headBlockNumber = param.knownHeight - blockLag | 0;
   if (headBlockNumber <= 0) {
     return "WaitingForNewBlock";
@@ -1353,7 +1549,7 @@ function getNextQuery(param, chainTargetBlock, chainTargetItems, $staropt$star,
       shouldWaitForNewBlock = false;
     }
   }
-  let availableConcurrency = 100 - reservations.length | 0;
+  let availableConcurrency = Env.maxChainConcurrency - reservations.length | 0;
   let partitionsCount$1 = chainTargetItems <= 0 || shouldWaitForNewBlock || availableConcurrency <= 0 ? 0 : partitionsCount;
   let queriesByPartitionIndex = Stdlib_Array.fromInitializer(partitionsCount$1, param => []);
   let computeQueryEndBlock = p => {
@@ -1370,7 +1566,7 @@ function getNextQuery(param, chainTargetBlock, chainTargetItems, $staropt$star,
   for (let idx$1 = 0; idx$1 < partitionsCount$1; ++idx$1) {
     let partitionId$1 = optimizedPartitions.idsInAscOrder[idx$1];
     let p$1 = optimizedPartitions.entities[partitionId$1];
-    let fillState = walkPartitionPending(p$1, partitionId$1, inFlightCounts[idx$1], candidates, headBlockNumber, chainTargetBlock, chunkItemsMultiplier, itemsTargetFloor, partitionBudget, computeQueryEndBlock(p$1));
+    let fillState = walkPartitionPending(p$1, partitionId$1, inFlightCounts[idx$1], candidates, headBlockNumber, chainTargetBlock, partitionBudget, computeQueryEndBlock(p$1));
     if (fillState !== undefined) {
       fillStates.push(fillState);
     }
@@ -1391,7 +1587,7 @@ function getNextQuery(param, chainTargetBlock, chainTargetItems, $staropt$star,
   let inRangeStates = fillStates.filter(isInRange);
   let inRangeCount = inRangeStates.length;
   let inRangeStates$1 = inRangeCount > availableConcurrency ? (inRangeStates.sort((a, b) => Primitive_int.compare(a.cursor, b.cursor)), inRangeStates.slice(0, availableConcurrency)) : inRangeStates;
-  pushForwardCandidates(candidates, inRangeStates$1, inRangeCount, chainTargetBlock, freshBudget, chunkItemsMultiplier, itemsTargetFloor);
+  pushForwardCandidates(candidates, inRangeStates$1, inRangeCount, chainTargetBlock, freshBudget);
   acceptCandidates(candidates, reservations, chainTargetItems, partitionIndexById, queriesByPartitionIndex);
   let queries = queriesByPartitionIndex.flat();
   if (Utils.$$Array.isEmpty(queries)) {
@@ -1440,11 +1636,12 @@ function getReadyItemsCount(fetchState, targetSize, fromItem) {
   return acc;
 }
 
-function make$1(startBlock, endBlock, onEventRegistrations, contractConfigs, addresses, maxAddrInPartition, chainId, maxOnBlockBufferSize, knownHeight, progressBlockNumberOpt, onBlockRegistrationsOpt, blockLagOpt, firstEventBlockOpt) {
+function make$1(startBlock, endBlock, onEventRegistrations, contractConfigs, addresses, maxAddrInPartition, chainId, maxOnBlockBufferSize, knownHeight, progressBlockNumberOpt, onBlockRegistrationsOpt, blockLagOpt, firstEventBlockOpt, clientFilterAddressThresholdOpt) {
   let progressBlockNumber = progressBlockNumberOpt !== undefined ? progressBlockNumberOpt : startBlock - 1 | 0;
   let onBlockRegistrations = onBlockRegistrationsOpt !== undefined ? onBlockRegistrationsOpt : [];
   let blockLag = blockLagOpt !== undefined ? blockLagOpt : 0;
   let firstEventBlock = firstEventBlockOpt !== undefined ? Primitive_option.valFromOption(firstEventBlockOpt) : undefined;
+  let clientFilterAddressThreshold = clientFilterAddressThresholdOpt !== undefined ? Primitive_option.valFromOption(clientFilterAddressThresholdOpt) : undefined;
   let latestFetchedBlock = {
     blockNumber: progressBlockNumber,
     blockTimestamp: 0
@@ -1485,6 +1682,7 @@ function make$1(startBlock, endBlock, onEventRegistrations, contractConfigs, add
   };
   let registeringContractsByContract = {};
   let dynamicContracts = new Set();
+  let clientFilteredContracts = new Set();
   addresses.forEach(contract => {
     let contractName = contract.contractName;
     if (contractNamesWithNormalEvents.has(contractName)) {
@@ -1497,7 +1695,15 @@ function make$1(startBlock, endBlock, onEventRegistrations, contractConfigs, add
       }
     }
   });
-  let optimizedPartitions = createPartitionsFromIndexingAddresses(registeringContractsByContract, dynamicContracts, normalSelection, maxAddrInPartition, partitions.length, partitions, progressBlockNumber);
+  if (clientFilterAddressThreshold !== undefined) {
+    Utils.Dict.forEachWithKey(registeringContractsByContract, (addrs, contractName) => {
+      let addressCount = Utils.Dict.size(addrs);
+      if (addressCount > clientFilterAddressThreshold) {
+        return addClientFilteredContract(clientFilteredContracts, contractName, chainId, addressCount, clientFilterAddressThreshold);
+      }
+    });
+  }
+  let optimizedPartitions = createPartitionsFromIndexingAddresses(registeringContractsByContract, dynamicContracts, clientFilteredContracts, normalSelection, maxAddrInPartition, partitions.length, partitions, progressBlockNumber);
   if (optimizedPartitions.idsInAscOrder.length === 0 && Utils.$$Array.isEmpty(onBlockRegistrations)) {
     Stdlib_JsError.throwWithMessage(`Invalid configuration: Nothing to fetch on chain ` + chainId.toString() + `. ` + (`addresses=` + addresses.length.toString() + `, `) + (`onEventRegistrations=` + onEventRegistrations.length.toString() + `, `) + (`normalRegistrations=` + normalRegistrations.length.toString() + `. `) + `Make sure that you provided at least one contract address to index, or have events with Wildcard mode enabled, or have onBlock handlers.`);
   }
@@ -1524,7 +1730,8 @@ function make$1(startBlock, endBlock, onEventRegistrations, contractConfigs, add
     maxOnBlockBufferSize: maxOnBlockBufferSize,
     onBlockRegistrations: onBlockRegistrations,
     knownHeight: knownHeight,
-    firstEventBlock: firstEventBlock
+    firstEventBlock: firstEventBlock,
+    clientFilterAddressThreshold: clientFilterAddressThreshold
   };
 }
 
@@ -1636,7 +1843,7 @@ function rollback(fetchState, indexingAddresses, targetBlockNumber) {
       });
     }
   }
-  let optimizedPartitions = createPartitionsFromIndexingAddresses(registeringContractsByContract, fetchState.optimizedPartitions.dynamicContracts, fetchState.normalSelection, fetchState.optimizedPartitions.maxAddrInPartition, nextKeptIdRef, keptPartitions, targetBlockNumber);
+  let optimizedPartitions = createPartitionsFromIndexingAddresses(registeringContractsByContract, fetchState.optimizedPartitions.dynamicContracts, fetchState.optimizedPartitions.clientFilteredContracts, fetchState.normalSelection, fetchState.optimizedPartitions.maxAddrInPartition, nextKeptIdRef, keptPartitions, targetBlockNumber);
   return updateInternal({
     optimizedPartitions: fetchState.optimizedPartitions,
     startBlock: fetchState.startBlock,
@@ -1650,7 +1857,8 @@ function rollback(fetchState, indexingAddresses, targetBlockNumber) {
     maxOnBlockBufferSize: fetchState.maxOnBlockBufferSize,
     onBlockRegistrations: fetchState.onBlockRegistrations,
     knownHeight: fetchState.knownHeight,
-    firstEventBlock: fetchState.firstEventBlock
+    firstEventBlock: fetchState.firstEventBlock,
+    clientFilterAddressThreshold: fetchState.clientFilterAddressThreshold
   }, optimizedPartitions, fetchState.buffer.filter(item => {
     let tmp;
     tmp = item.kind === 0 ? item.blockNumber : item.blockNumber;
@@ -1687,7 +1895,8 @@ function resetPendingQueries(fetchState) {
       entities: newEntities,
       maxAddrInPartition: init.maxAddrInPartition,
       nextPartitionIndex: init.nextPartitionIndex,
-      dynamicContracts: init.dynamicContracts
+      dynamicContracts: init.dynamicContracts,
+      clientFilteredContracts: init.clientFilteredContracts
     },
     startBlock: fetchState.startBlock,
     endBlock: fetchState.endBlock,
@@ -1700,7 +1909,8 @@ function resetPendingQueries(fetchState) {
     maxOnBlockBufferSize: fetchState.maxOnBlockBufferSize,
     onBlockRegistrations: fetchState.onBlockRegistrations,
     knownHeight: fetchState.knownHeight,
-    firstEventBlock: fetchState.firstEventBlock
+    firstEventBlock: fetchState.firstEventBlock,
+    clientFilterAddressThreshold: fetchState.clientFilterAddressThreshold
   };
 }
 
@@ -1817,7 +2027,7 @@ let blockItemLogIndex = 16777216;
 
 let maxInFlightChunksPerPartition = 12;
 
-let maxChainConcurrency = 100;
+let maxChainConcurrency = Env.maxChainConcurrency;
 
 let chunkRangeGrowthFactor = 1.8;
 
@@ -1840,6 +2050,8 @@ export {
   warnDifferentContractType,
   addressesByContractNameCount,
   addressesByContractNameGetAll,
+  addClientFilteredContract,
+  collapseClientFilteredContracts,
   createPartitionsFromIndexingAddresses,
   registerDynamicContracts,
   filterByClientAddress,