envio 3.3.0-alpha.10 → 3.3.0-alpha.11

package/src/sources/HyperSyncSource.res.mjs

@@ -1,12 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Utils from "../Utils.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperSync from "./HyperSync.res.mjs";
-import * as EventRouter from "./EventRouter.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
-import * as LogSelection from "../LogSelection.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -16,109 +13,27 @@ 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) {
-  let capitalizedBlockFields = new Set();
-  let capitalizedTransactionFields = new Set();
-  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));
-    });
-    Array.from(eventConfig.selectedTransactionFields).forEach(name => {
-      if (name !== "transactionIndex") {
-        capitalizedTransactionFields.add(Utils.$$String.capitalize(name));
-        return;
-      }
-    });
-    if (reg.dependsOnAddresses) {
-      contractNames.add(contractName);
-      return Utils.Dict.pushMany(reg.isWildcard ? wildcardTopicSelectionsByContract : topicSelectionsByContract, contractName, resolvedWhere.topicSelections);
-    } else {
-      noAddressesTopicSelections.push(...LogSelection.materializeTopicSelections(resolvedWhere.topicSelections, []));
-      return;
-    }
-  });
-  let fieldSelection_block = Array.from(capitalizedBlockFields);
-  let fieldSelection_transaction = Array.from(capitalizedTransactionFields);
-  let fieldSelection_log = [
-    "Address",
-    "Data",
-    "LogIndex",
-    "Topic0",
-    "Topic1",
-    "Topic2",
-    "Topic3"
-  ];
-  let fieldSelection = {
-    block: fieldSelection_block,
-    transaction: fieldSelection_transaction,
-    log: fieldSelection_log
-  };
-  let noAddressesLogSelection = LogSelection.make([], noAddressesTopicSelections);
-  let getLogSelectionOrThrow = addressesByContractName => {
-    let logSelections = [];
-    if (!Utils.$$Array.isEmpty(noAddressesLogSelection.topicSelections)) {
-      logSelections.push(noAddressesLogSelection);
-    }
-    contractNames.forEach(contractName => {
-      let addresses = addressesByContractName[contractName];
-      if (addresses === undefined) {
-        return;
-      }
-      if (addresses.length === 0) {
-        return;
-      }
-      let topicSelections = topicSelectionsByContract[contractName];
-      if (topicSelections !== undefined) {
-        logSelections.push(LogSelection.make(addresses, LogSelection.materializeTopicSelections(topicSelections, addresses)));
-      }
-      let topicSelections$1 = wildcardTopicSelectionsByContract[contractName];
-      if (topicSelections$1 !== undefined) {
-        logSelections.push(LogSelection.make([], LogSelection.materializeTopicSelections(topicSelections$1, addresses)));
-        return;
-      }
-    });
-    return logSelections;
-  };
-  return {
-    getLogSelectionOrThrow: getLogSelectionOrThrow,
-    fieldSelection: fieldSelection
-  };
-}
-
-function memoGetSelectionConfig() {
-  return Utils.$$WeakMap.memoize(getSelectionConfig);
-}
-
 function isUnauthorizedError(message) {
   return message.includes("401 Unauthorized");
 }
 
 function make(param) {
   let apiToken = param.apiToken;
-  let eventRouter = param.eventRouter;
+  let onEventRegistrations = param.onEventRegistrations;
   let endpointUrl = param.endpointUrl;
   let chain = param.chain;
   let name = "HyperSync";
-  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`);
   let client;
   try {
-    client = HyperSyncClient.make(endpointUrl, apiToken$1, param.clientTimeoutMillis, param.allEventParams, !param.lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined, param.logLevel);
+    client = HyperSyncClient.make(endpointUrl, apiToken$1, param.clientTimeoutMillis, HyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), !param.lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined, param.logLevel);
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
     client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the hypersync client, please double check your ABI", exn);
   }
-  let UndefinedValue = /* @__PURE__ */Primitive_exceptions.create("UndefinedValue");
-  let makeEventBatchQueueItem = (item, params, onEventRegistration) => {
+  let makeEventBatchQueueItem = (item, onEventRegistration) => {
     let logIndex = item.logIndex;
     return {
       kind: 0,
@@ -130,27 +45,19 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       payload: {
         contractName: onEventRegistration.eventConfig.contractName,
         eventName: onEventRegistration.eventConfig.name,
-        params: params,
+        params: item.params,
         chainId: chain,
         srcAddress: item.srcAddress,
         logIndex: logIndex
       }
     };
   };
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, param, selection, itemsTarget, retry, logger) => {
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, param, knownHeight, param$1, selection, itemsTarget, retry, param$2) => {
     let totalTimeRef = Performance.now();
-    let selectionConfig = getSelectionConfig$1(selection);
-    let logSelections;
-    try {
-      logSelections = selectionConfig.getLogSelectionOrThrow(addressesByContractName);
-    } catch (raw_exn) {
-      let exn = Primitive_exceptions.internalToException(raw_exn);
-      logSelections = ErrorHandling.mkLogAndRaise(logger, "Failed getting log selection for the query", exn);
-    }
     let startFetchingBatchTimeRef = Performance.now();
     let pageUnsafe;
     try {
-      pageUnsafe = await HyperSync.GetLogs.query(client, fromBlock, toBlock, logSelections, selectionConfig.fieldSelection, itemsTarget);
+      pageUnsafe = await HyperSync.GetLogs.query(client, fromBlock, toBlock, itemsTarget, selection.onEventRegistrations.map(reg => reg.index), addressesByContractName);
     } catch (raw_error) {
       let error = Primitive_exceptions.internalToException(raw_error);
       if (error.RE_EXN_ID === HyperSync.GetLogs.$$Error) {
@@ -212,32 +119,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       blocksByNumber.set(block.number, block);
     });
     pageUnsafe.items.forEach(item => {
-      let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, contractNameByAddress);
-      if (maybeEventConfig === undefined) {
-        return;
-      }
-      let params = Stdlib_Option.flatMap(Primitive_option.fromNullable(item.params), __x => __x[maybeEventConfig.eventConfig.contractName]);
-      if (params !== undefined) {
-        parsedQueueItems.push(makeEventBatchQueueItem(item, Primitive_option.valFromOption(params), maybeEventConfig));
-        return;
-      } else {
-        let logIndex = item.logIndex;
-        let blockNumber = item.blockNumber;
-        let exn = {
-          RE_EXN_ID: UndefinedValue
-        };
-        if (maybeEventConfig.isWildcard) {
-          return;
-        }
-        let msg = `Event ` + maybeEventConfig.eventConfig.name + ` was unexpectedly parsed as undefined`;
-        let logger$1 = Logging.createChildFrom(logger, {
-          chainId: chain,
-          blockNumber: blockNumber,
-          logIndex: logIndex,
-          decoder: "hypersync-client"
-        });
-        return ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
-      }
+      let onEventRegistration = onEventRegistrations[item.onEventRegistrationIndex];
+      parsedQueueItems.push(makeEventBatchQueueItem(item, onEventRegistration));
     });
     let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     let blockHashes = [];
@@ -346,9 +229,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
 }
 
 export {
-  getSelectionConfig,
-  memoGetSelectionConfig,
   isUnauthorizedError,
   make,
 }
-/* Utils Not a pure module */
+/* Logging Not a pure module */

package/src/sources/Rpc.res

@@ -82,38 +82,6 @@ let decimalFloatSchema: S.schema<float> = S.string->S.transform(s => {
 })
 
 module GetLogs = {
-  @unboxed
-  type topicFilter = Single(hex) | Multiple(array<hex>) | @as(null) Null
-  type topicQuery = array<topicFilter>
-
-  let makeTopicQuery = (~topic0=[], ~topic1=[], ~topic2=[], ~topic3=[]) => {
-    let topics = [topic0, topic1, topic2, topic3]
-
-    let isLastTopicEmpty = () =>
-      switch topics->Utils.Array.last {
-      | Some([]) => true
-      | _ => false
-      }
-
-    //Remove all empty topics from the end of the array
-    while isLastTopicEmpty() {
-      topics->Array.pop->ignore
-    }
-
-    let toTopicFilter = topic => {
-      switch topic {
-      | [] => Null
-      | [single] => Single(single->EvmTypes.Hex.toString)
-      | multiple => Multiple(multiple->EvmTypes.Hex.toStrings)
-      }
-    }
-
-    topics->Array.map(toTopicFilter)
-  }
-
-  let mapTopicQuery = ({topic0, topic1, topic2, topic3}: Internal.topicSelection): topicQuery =>
-    makeTopicQuery(~topic0, ~topic1, ~topic2, ~topic3)
-
   type log = {
     address: Address.t,
     topics: array<hex>,

package/src/sources/Rpc.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Viem from "viem";
-import * as Utils from "../Utils.res.mjs";
 import * as Address from "../Address.res.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_BigInt from "@rescript/runtime/lib/es6/Stdlib_BigInt.js";
@@ -95,51 +94,7 @@ let decimalFloatSchema = S$RescriptSchema.transform(S$RescriptSchema.string, s =
   }
 }));
 
-function makeTopicQuery(topic0Opt, topic1Opt, topic2Opt, topic3Opt) {
-  let topic0 = topic0Opt !== undefined ? topic0Opt : [];
-  let topic1 = topic1Opt !== undefined ? topic1Opt : [];
-  let topic2 = topic2Opt !== undefined ? topic2Opt : [];
-  let topic3 = topic3Opt !== undefined ? topic3Opt : [];
-  let topics = [
-    topic0,
-    topic1,
-    topic2,
-    topic3
-  ];
-  let isLastTopicEmpty = () => {
-    let match = Utils.$$Array.last(topics);
-    if (match !== undefined) {
-      return match.length === 0;
-    } else {
-      return false;
-    }
-  };
-  while (isLastTopicEmpty()) {
-    topics.pop();
-  };
-  let toTopicFilter = topic => {
-    let len = topic.length;
-    if (len !== 1) {
-      if (len !== 0) {
-        return topic;
-      } else {
-        return null;
-      }
-    }
-    let single = topic[0];
-    return single;
-  };
-  return topics.map(toTopicFilter);
-}
-
-function mapTopicQuery(param) {
-  return makeTopicQuery(param.topic0, param.topic1, param.topic2, param.topic3);
-}
-
-let GetLogs = {
-  makeTopicQuery: makeTopicQuery,
-  mapTopicQuery: mapTopicQuery
-};
+let GetLogs = {};
 
 let blockSchema = S$RescriptSchema.object(s => ({
   difficulty: s.f("difficulty", S$RescriptSchema.$$null(hexBigintSchema)),

package/src/sources/RpcSource.res

@@ -97,10 +97,6 @@ let getErrorMessage = (exn: exn): option<string> =>
   | _ => None
   }
 
-type logSelection = {
-  addresses: option<array<Address.t>>,
-  topicQuery: Rpc.GetLogs.topicQuery,
-}
 
 // `EvmRpcClient.getNextPage` throws a napi error whose message is a JSON
 // payload describing the retry decision:
@@ -161,122 +157,6 @@ let parseGetNextPageRetryError = (exn: exn): option<(
   | _ => None
   }
 
-type selectionConfig = {
-  getLogSelectionsOrThrow: (
-    ~addressesByContractName: dict<array<Address.t>>,
-  ) => array<logSelection>,
-}
-
-let getSelectionConfig = (selection: FetchState.selection) => {
-  let evmOnEventRegistrations =
-    selection.onEventRegistrations->(
-      Utils.magic: array<Internal.onEventRegistration> => array<Internal.evmOnEventRegistration>
-    )
-
-  if evmOnEventRegistrations->Utils.Array.isEmpty {
-    throw(
-      Source.GetItemsError(
-        UnsupportedSelection({
-          message: "Invalid events configuration for the partition. Nothing to fetch. Please, report to the Envio team.",
-        }),
-      ),
-    )
-  }
-
-  // eth_getLogs takes one address list and one topic selection per request, so
-  // fan out to one request per selection. Each address-bound event is grouped by
-  // its contract and later scoped to that contract's own addresses — pooling all
-  // contracts' addresses would let one contract's query fetch a sibling's logs,
-  // which route back by address and bypass the sibling's filter (routing never
-  // re-applies it). Pure-wildcard events carry no address constraint, so they're
-  // pooled and resolved once.
-  let noAddressTopicSelections = []
-  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, resolvedWhere} = reg
-    if dependsOnAddresses {
-      contractNames->Utils.Set.add(contractName)->ignore
-      (isWildcard ? wildcardByContract : byContract)->Utils.Dict.pushMany(
-        contractName,
-        resolvedWhere.topicSelections,
-      )
-    } else {
-      noAddressTopicSelections
-      ->Array.pushMany(
-        resolvedWhere.topicSelections->LogSelection.materializeTopicSelections(~addresses=[]),
-      )
-      ->ignore
-    }
-  })
-
-  // `compressTopicSelections` folds the filter-less events into a single topic0
-  // OR-set, keeping the common case at one request.
-  let toLogSelections = (~addresses, topicSelections): array<logSelection> =>
-    topicSelections
-    ->LogSelection.compressTopicSelections
-    ->Array.map(topicSelection => {
-      addresses,
-      topicQuery: topicSelection->Rpc.GetLogs.mapTopicQuery,
-    })
-
-  // Address-independent, so resolve once (the wildcard partition reuses this).
-  let noAddressLogSelections = toLogSelections(~addresses=None, noAddressTopicSelections)
-
-  let getLogSelectionsOrThrow = if contractNames->Utils.Set.size === 0 {
-    (~addressesByContractName as _) => noAddressLogSelections
-  } else {
-    (~addressesByContractName): array<logSelection> => {
-      let logSelections = noAddressLogSelections->Array.copy
-      contractNames->Utils.Set.forEach(contractName => {
-        switch addressesByContractName->Utils.Dict.dangerouslyGetNonOption(contractName) {
-        | None
-        | Some([]) => ()
-        | Some(addresses) =>
-          // 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 => ()
-          }
-
-          // Wildcard-by-address filters fold the address into the topics,
-          // so they still match any address.
-          switch wildcardByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-          | Some(topicSelections) =>
-            logSelections
-            ->Array.pushMany(
-              toLogSelections(
-                ~addresses=None,
-                topicSelections->LogSelection.materializeTopicSelections(~addresses),
-              ),
-            )
-            ->ignore
-          | None => ()
-          }
-        }
-      })
-      logSelections
-    }
-  }
-
-  {
-    getLogSelectionsOrThrow: getLogSelectionsOrThrow,
-  }
-}
-
-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"
 
@@ -735,8 +615,8 @@ type options = {
   syncConfig: Config.sourceSync,
   url: string,
   chain: ChainMap.Chain.t,
-  eventRouter: EventRouter.t<Internal.evmOnEventRegistration>,
-  allEventParams: array<HyperSyncClient.Decoder.eventParamsInput>,
+  // The chain's registrations, indexed by their sequential `index`.
+  onEventRegistrations: array<Internal.evmOnEventRegistration>,
   lowercaseAddresses: bool,
   ws?: string,
   headers?: dict<string>,
@@ -748,8 +628,7 @@ let make = (
     syncConfig,
     url,
     chain,
-    eventRouter,
-    allEventParams,
+    onEventRegistrations,
     lowercaseAddresses,
     ?ws,
     ?headers,
@@ -765,12 +644,12 @@ let make = (
   }
   let name = `RPC (${urlHost})`
 
-  let getSelectionConfig = memoGetSelectionConfig()
-
   let client = Rpc.makeClient(url, ~headers?)
   let rpcClient = EvmRpcClient.make(
     ~url,
-    ~allEventParams,
+    ~eventRegistrations=HyperSyncClient.Registration.fromOnEventRegistrations(
+      onEventRegistrations,
+    ),
     ~checksumAddresses=!lowercaseAddresses,
     ~syncConfig,
     ~headers?,
@@ -921,7 +800,7 @@ let make = (
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName,
-    ~contractNameByAddress,
+    ~contractNameByAddress as _,
     ~knownHeight,
     ~partitionId,
     ~selection: FetchState.selection,
@@ -944,26 +823,22 @@ let make = (
           ->Promise.thenResolve(json => Some(parseBlockInfo(json)))
         : Promise.resolve(None)
 
-    let {getLogSelectionsOrThrow} = getSelectionConfig(selection)
-    let logSelections = getLogSelectionsOrThrow(~addressesByContractName)
+    if selection.onEventRegistrations->Utils.Array.isEmpty {
+      throw(
+        Source.GetItemsError(
+          UnsupportedSelection({
+            message: "Invalid events configuration for the partition. Nothing to fetch. Please, report to the Envio team.",
+          }),
+        ),
+      )
+    }
 
     let {items, toBlock: queriedToBlock, requestStats} = try await rpcClient.getNextPage({
       fromBlock,
       toBlockCeiling: toBlock,
-      logSelections: logSelections->Array.map(({
-        addresses,
-        topicQuery,
-      }): EvmRpcClient.logSelectionInput => {
-        ?addresses,
-        topics: topicQuery->Array.map(filter =>
-          switch filter {
-          | Rpc.GetLogs.Null => Nullable.null
-          | Single(topic) => Nullable.make([topic])
-          | Multiple(topics) => Nullable.make(topics)
-          }
-        ),
-      }),
       partitionId,
+      registrationIndexes: selection.onEventRegistrations->Array.map(reg => reg.index),
+      addressesByContractName,
     }) catch {
     | exn =>
       switch exn->parseGetNextPageRetryError {
@@ -997,32 +872,15 @@ let make = (
     ->Promise.thenResolve(parseBlockInfo)
 
     let parsedQueueItems = await items
-    ->Array.filterMap(({log, params: maybeDecodedEvent}: EvmRpcClient.rpcEventItem) => {
-      let topic0 = log.topics[0]->Option.getOr("0x0")
-      let routedAddress = if lowercaseAddresses {
-        log.address->Address.Evm.fromAddressLowercaseOrThrow
-      } else {
-        log.address->Address.Evm.fromAddressOrThrow
-      }
-
-      switch eventRouter->EventRouter.get(
-        ~tag=EventRouter.getEvmEventId(~sighash=topic0, ~topicCount=log.topics->Array.length),
-        ~contractNameByAddress,
-        ~contractAddress=routedAddress,
-      ) {
-      | None => None
-      | Some(onEventRegistration) =>
-        let eventConfig =
-          onEventRegistration.eventConfig->(
-            Utils.magic: Internal.eventConfig => Internal.evmEventConfig
-          )
-        switch maybeDecodedEvent
-        ->Nullable.toOption
-        ->Option.flatMap(Dict.get(_, eventConfig.contractName)) {
-        | Some(decoded) =>
-          Some(
-            (
-              async () => {
+    ->Array.map(({log, onEventRegistrationIndex, params: decoded}: EvmRpcClient.rpcEventItem) => {
+      // `log.address` comes back already normalized to the client's casing.
+      let onEventRegistration = onEventRegistrations->Array.getUnsafe(onEventRegistrationIndex)
+      let eventConfig =
+        onEventRegistration.eventConfig->(
+          Utils.magic: Internal.eventConfig => Internal.evmEventConfig
+        )
+      (
+        async () => {
                 let (block, transaction) = try await Promise.all2((
                   log->getEventBlockOrThrow(~selectedBlockFields=eventConfig.selectedBlockFields),
                   log->getEventTransactionOrThrow(
@@ -1074,16 +932,12 @@ let make = (
                     params: decoded,
                     block,
                     transaction,
-                    srcAddress: routedAddress,
+                    srcAddress: log.address,
                     logIndex: log.logIndex,
                   }->Evm.fromPayload,
                 })
-              }
-            )(),
-          )
-        | None => None
         }
-      }
+      )()
     })
     ->Promise.all