envio 3.3.0-alpha.8 → 3.3.0-alpha.9

package/src/sources/HyperSyncSource.res.mjs

@@ -16,17 +16,17 @@ import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as HyperSyncHeightStream from "./HyperSyncHeightStream.res.mjs";
 
-function getSelectionConfig(selection, chain) {
+function getSelectionConfig(selection) {
   let capitalizedBlockFields = new Set();
   let capitalizedTransactionFields = new Set();
-  let staticTopicSelectionsByContract = {};
-  let dynamicEventFiltersByContract = {};
-  let dynamicWildcardEventFiltersByContract = {};
+  let topicSelectionsByContract = {};
+  let wildcardTopicSelectionsByContract = {};
   let noAddressesTopicSelections = [];
   let contractNames = new Set();
   selection.onEventRegistrations.forEach(reg => {
     let eventConfig = reg.eventConfig;
     let contractName = eventConfig.contractName;
+    let resolvedWhere = reg.resolvedWhere;
     Array.from(eventConfig.selectedBlockFields).forEach(name => {
       capitalizedBlockFields.add(Utils.$$String.capitalize(name));
     });
@@ -36,18 +36,13 @@ function getSelectionConfig(selection, chain) {
         return;
       }
     });
-    let eventFilters = reg.getEventFiltersOrThrow(chain);
     if (reg.dependsOnAddresses) {
       contractNames.add(contractName);
-      if (eventFilters.TAG === "Static") {
-        return Utils.Dict.pushMany(staticTopicSelectionsByContract, contractName, eventFilters._0);
-      } else {
-        return Utils.Dict.push(reg.isWildcard ? dynamicWildcardEventFiltersByContract : dynamicEventFiltersByContract, contractName, eventFilters._0);
-      }
+      return Utils.Dict.pushMany(reg.isWildcard ? wildcardTopicSelectionsByContract : topicSelectionsByContract, contractName, resolvedWhere.topicSelections);
+    } else {
+      noAddressesTopicSelections.push(...LogSelection.materializeTopicSelections(resolvedWhere.topicSelections, []));
+      return;
     }
-    let tmp;
-    tmp = eventFilters.TAG === "Static" ? eventFilters._0 : eventFilters._0([]);
-    noAddressesTopicSelections.push(...tmp);
   });
   let fieldSelection_block = Array.from(capitalizedBlockFields);
   let fieldSelection_transaction = Array.from(capitalizedTransactionFields);
@@ -79,17 +74,13 @@ function getSelectionConfig(selection, chain) {
       if (addresses.length === 0) {
         return;
       }
-      let topicSelections = staticTopicSelectionsByContract[contractName];
+      let topicSelections = topicSelectionsByContract[contractName];
       if (topicSelections !== undefined) {
-        logSelections.push(LogSelection.make(addresses, topicSelections));
-      }
-      let fns = dynamicEventFiltersByContract[contractName];
-      if (fns !== undefined) {
-        logSelections.push(LogSelection.make(addresses, fns.flatMap(fn => fn(addresses))));
+        logSelections.push(LogSelection.make(addresses, LogSelection.materializeTopicSelections(topicSelections, addresses)));
       }
-      let fns$1 = dynamicWildcardEventFiltersByContract[contractName];
-      if (fns$1 !== undefined) {
-        logSelections.push(LogSelection.make([], fns$1.flatMap(fn => fn(addresses))));
+      let topicSelections$1 = wildcardTopicSelectionsByContract[contractName];
+      if (topicSelections$1 !== undefined) {
+        logSelections.push(LogSelection.make([], LogSelection.materializeTopicSelections(topicSelections$1, addresses)));
         return;
       }
     });
@@ -101,8 +92,8 @@ function getSelectionConfig(selection, chain) {
   };
 }
 
-function memoGetSelectionConfig(chain) {
-  return Utils.$$WeakMap.memoize(selection => getSelectionConfig(selection, chain));
+function memoGetSelectionConfig() {
+  return Utils.$$WeakMap.memoize(getSelectionConfig);
 }
 
 function isUnauthorizedError(message) {
@@ -115,7 +106,7 @@ function make(param) {
   let endpointUrl = param.endpointUrl;
   let chain = param.chain;
   let name = "HyperSync";
-  let getSelectionConfig = memoGetSelectionConfig(chain);
+  let getSelectionConfig$1 = Utils.$$WeakMap.memoize(getSelectionConfig);
   let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperSync as a data-source.
 Set the ENVIO_API_TOKEN environment variable in your .env file.
 Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
@@ -148,7 +139,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
   };
   let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, param, selection, itemsTarget, retry, logger) => {
     let totalTimeRef = Performance.now();
-    let selectionConfig = getSelectionConfig(selection);
+    let selectionConfig = getSelectionConfig$1(selection);
     let logSelections;
     try {
       logSelections = selectionConfig.getLogSelectionOrThrow(addressesByContractName);

package/src/sources/RpcSource.res

@@ -412,7 +412,7 @@ type selectionConfig = {
   ) => array<logSelection>,
 }
 
-let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
+let getSelectionConfig = (selection: FetchState.selection) => {
   let evmOnEventRegistrations =
     selection.onEventRegistrations->(
       Utils.magic: array<Internal.onEventRegistration> => array<Internal.evmOnEventRegistration>
@@ -436,33 +436,23 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
   // re-applies it). Pure-wildcard events carry no address constraint, so they're
   // pooled and resolved once.
   let noAddressTopicSelections = []
-  let staticByContract = Dict.make()
-  let dynamicByContract = Dict.make()
-  let dynamicWildcardByContract = Dict.make()
+  let byContract = Dict.make()
+  let wildcardByContract = Dict.make()
   let contractNames = Utils.Set.make()
 
   evmOnEventRegistrations->Array.forEach(reg => {
     let contractName = reg.eventConfig.contractName
-    let {isWildcard, dependsOnAddresses, getEventFiltersOrThrow} = reg
-    let eventFilters = getEventFiltersOrThrow(chain)
+    let {isWildcard, dependsOnAddresses, resolvedWhere} = reg
     if dependsOnAddresses {
       contractNames->Utils.Set.add(contractName)->ignore
-      switch eventFilters {
-      | Internal.Static(topicSelections) =>
-        staticByContract->Utils.Dict.pushMany(contractName, topicSelections)
-      | Dynamic(fn) =>
-        (isWildcard ? dynamicWildcardByContract : dynamicByContract)->Utils.Dict.push(
-          contractName,
-          fn,
-        )
-      }
+      (isWildcard ? wildcardByContract : byContract)->Utils.Dict.pushMany(
+        contractName,
+        resolvedWhere.topicSelections,
+      )
     } else {
       noAddressTopicSelections
       ->Array.pushMany(
-        switch eventFilters {
-        | Static(s) => s
-        | Dynamic(fn) => fn([])
-        },
+        resolvedWhere.topicSelections->LogSelection.materializeTopicSelections(~addresses=[]),
       )
       ->ignore
     }
@@ -491,30 +481,30 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
         | None
         | Some([]) => ()
         | Some(addresses) =>
-          // Static + dynamic non-wildcard filters, scoped to this contract's addresses.
-          let addressedTopicSelections = []
-          switch staticByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-          | Some(s) => addressedTopicSelections->Array.pushMany(s)->ignore
-          | None => ()
-          }
-          switch dynamicByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-          | Some(fns) =>
-            fns->Array.forEach(fn =>
-              addressedTopicSelections->Array.pushMany(fn(addresses))->ignore
+          // Non-wildcard filters, scoped to this contract's addresses.
+          switch byContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
+          | Some(topicSelections) =>
+            logSelections
+            ->Array.pushMany(
+              toLogSelections(
+                ~addresses=Some(addresses),
+                topicSelections->LogSelection.materializeTopicSelections(~addresses),
+              ),
             )
+            ->ignore
           | None => ()
           }
-          logSelections
-          ->Array.pushMany(toLogSelections(~addresses=Some(addresses), addressedTopicSelections))
-          ->ignore
 
-          // Dynamic wildcard-by-address filters fold the address into the topics,
+          // Wildcard-by-address filters fold the address into the topics,
           // so they still match any address.
-          switch dynamicWildcardByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-          | Some(fns) =>
+          switch wildcardByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
+          | Some(topicSelections) =>
             logSelections
             ->Array.pushMany(
-              toLogSelections(~addresses=None, fns->Array.flatMap(fn => fn(addresses))),
+              toLogSelections(
+                ~addresses=None,
+                topicSelections->LogSelection.materializeTopicSelections(~addresses),
+              ),
             )
             ->ignore
           | None => ()
@@ -530,8 +520,7 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
   }
 }
 
-let memoGetSelectionConfig = (~chain) =>
-  Utils.WeakMap.memoize(selection => selection->getSelectionConfig(~chain))
+let memoGetSelectionConfig = () => Utils.WeakMap.memoize(getSelectionConfig)
 
 // Type-erase a schema for storage in the field registry
 external toFieldSchema: S.t<'a> => S.t<JSON.t> = "%identity"
@@ -1021,7 +1010,7 @@ let make = (
   }
   let name = `RPC (${urlHost})`
 
-  let getSelectionConfig = memoGetSelectionConfig(~chain)
+  let getSelectionConfig = memoGetSelectionConfig()
 
   // Per-partition adaptive block interval (AIMD), keyed by partitionId. The
   // `max` key holds a source-wide ceiling that only ever tightens, set by

package/src/sources/RpcSource.res.mjs

@@ -356,7 +356,7 @@ function getNextPage(fromBlock, toBlock, logSelections, loadBlock, sc, rpcClient
   });
 }
 
-function getSelectionConfig(selection, chain) {
+function getSelectionConfig(selection) {
   let evmOnEventRegistrations = selection.onEventRegistrations;
   if (Utils.$$Array.isEmpty(evmOnEventRegistrations)) {
     throw {
@@ -369,24 +369,19 @@ function getSelectionConfig(selection, chain) {
     };
   }
   let noAddressTopicSelections = [];
-  let staticByContract = {};
-  let dynamicByContract = {};
-  let dynamicWildcardByContract = {};
+  let byContract = {};
+  let wildcardByContract = {};
   let contractNames = new Set();
   evmOnEventRegistrations.forEach(reg => {
     let contractName = reg.eventConfig.contractName;
-    let eventFilters = reg.getEventFiltersOrThrow(chain);
+    let resolvedWhere = reg.resolvedWhere;
     if (reg.dependsOnAddresses) {
       contractNames.add(contractName);
-      if (eventFilters.TAG === "Static") {
-        return Utils.Dict.pushMany(staticByContract, contractName, eventFilters._0);
-      } else {
-        return Utils.Dict.push(reg.isWildcard ? dynamicWildcardByContract : dynamicByContract, contractName, eventFilters._0);
-      }
+      return Utils.Dict.pushMany(reg.isWildcard ? wildcardByContract : byContract, contractName, resolvedWhere.topicSelections);
+    } else {
+      noAddressTopicSelections.push(...LogSelection.materializeTopicSelections(resolvedWhere.topicSelections, []));
+      return;
     }
-    let tmp;
-    tmp = eventFilters.TAG === "Static" ? eventFilters._0 : eventFilters._0([]);
-    noAddressTopicSelections.push(...tmp);
   });
   let toLogSelections = (addresses, topicSelections) => LogSelection.compressTopicSelections(topicSelections).map(topicSelection => ({
     addresses: addresses,
@@ -403,21 +398,13 @@ function getSelectionConfig(selection, chain) {
         if (addresses.length === 0) {
           return;
         }
-        let addressedTopicSelections = [];
-        let s = staticByContract[contractName];
-        if (s !== undefined) {
-          addressedTopicSelections.push(...s);
-        }
-        let fns = dynamicByContract[contractName];
-        if (fns !== undefined) {
-          fns.forEach(fn => {
-            addressedTopicSelections.push(...fn(addresses));
-          });
+        let topicSelections = byContract[contractName];
+        if (topicSelections !== undefined) {
+          logSelections.push(...toLogSelections(addresses, LogSelection.materializeTopicSelections(topicSelections, addresses)));
         }
-        logSelections.push(...toLogSelections(addresses, addressedTopicSelections));
-        let fns$1 = dynamicWildcardByContract[contractName];
-        if (fns$1 !== undefined) {
-          logSelections.push(...toLogSelections(undefined, fns$1.flatMap(fn => fn(addresses))));
+        let topicSelections$1 = wildcardByContract[contractName];
+        if (topicSelections$1 !== undefined) {
+          logSelections.push(...toLogSelections(undefined, LogSelection.materializeTopicSelections(topicSelections$1, addresses)));
           return;
         }
       });
@@ -428,8 +415,8 @@ function getSelectionConfig(selection, chain) {
   };
 }
 
-function memoGetSelectionConfig(chain) {
-  return Utils.$$WeakMap.memoize(selection => getSelectionConfig(selection, chain));
+function memoGetSelectionConfig() {
+  return Utils.$$WeakMap.memoize(getSelectionConfig);
 }
 
 let lowercaseAddressSchema = S$RescriptSchema.transform(S$RescriptSchema.string, param => ({
@@ -973,7 +960,7 @@ function make(param) {
   let host = Utils.Url.getHostFromUrl(url);
   let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
-  let getSelectionConfig = memoGetSelectionConfig(chain);
+  let getSelectionConfig$1 = Utils.$$WeakMap.memoize(getSelectionConfig);
   let mutSuggestedBlockIntervals = {};
   let client = Rpc.makeClient(url, headers);
   let rpcClient = EvmRpcClient.make(url, !lowercaseAddresses, undefined, headers, param.allEventParams);
@@ -1069,7 +1056,7 @@ function make(param) {
     let toBlock$1 = toBlock !== undefined ? Primitive_int.min(toBlock, knownHeight) : knownHeight;
     let suggestedToBlock = Primitive_int.max(Primitive_int.min((fromBlock + suggestedBlockInterval | 0) - 1 | 0, toBlock$1), fromBlock);
     let firstBlockParentPromise = fromBlock > 0 ? LazyLoader.get(blockLoader.contents, fromBlock - 1 | 0).then(json => parseBlockInfo(json)) : Promise.resolve(undefined);
-    let match = getSelectionConfig(selection);
+    let match = getSelectionConfig$1(selection);
     let logSelections = match.getLogSelectionsOrThrow(addressesByContractName);
     let match$1 = await getNextPage(fromBlock, suggestedToBlock, logSelections, blockNumber => LazyLoader.get(blockLoader.contents, blockNumber).then(parseBlockInfo), syncConfig, rpcClient, mutSuggestedBlockIntervals, partitionId, recordRequest);
     let latestFetchedBlockInfo = match$1.latestFetchedBlockInfo;

package/src/sources/SourceManager.res

@@ -734,13 +734,7 @@ let executeQuery = async (
         ~partitionId=query.partitionId,
         ~knownHeight,
         ~selection=query.selection,
-        // Ceil (not truncate) so a sub-1 target from a sparse partition over a
-        // small range doesn't round down to 0 and ask the backend to cap the
-        // response at nothing — 0 items is indistinguishable from "no signal".
-        ~itemsTarget={
-          let target = query.itemsTarget->Math.ceil->Float.toInt
-          target > 0 ? target : FetchState.minItemsTarget->Float.toInt
-        },
+        ~itemsTarget=query.itemsTarget,
         ~retry,
         ~logger,
       )

package/src/sources/SourceManager.res.mjs

@@ -543,8 +543,7 @@ async function executeQuery(sourceManager, query, knownHeight, isRealtime) {
       retry: retry
     });
     try {
-      let target = Math.ceil(query.itemsTarget) | 0;
-      let response = await source.getItemsOrThrow(query.fromBlock, toBlock, query.addressesByContractName, FetchState.deriveContractNameByAddress(query.addressesByContractName), knownHeight, query.partitionId, query.selection, target > 0 ? target : FetchState.minItemsTarget | 0, retry, logger$2);
+      let response = await source.getItemsOrThrow(query.fromBlock, toBlock, query.addressesByContractName, FetchState.deriveContractNameByAddress(query.addressesByContractName), knownHeight, query.partitionId, query.selection, query.itemsTarget, retry, logger$2);
       recordRequestStats(sourceState, response.requestStats);
       sourceState.lastFailedAt = undefined;
       responseRef = response;