envio 3.5.0-alpha.1 → 3.5.0-alpha.2

package/src/EventConfigBuilder.res

@@ -292,61 +292,6 @@ let resolveFieldSelection = (
   )
 }
 
-// ============== Client-side address filter ==============
-
-let compileAddressFilter: string => (
-  Internal.eventPayload,
-  int,
-  dict<Internal.indexingContract>,
-) => bool = %raw(`function (body) {
-  return new Function("event", "blockNumber", "indexingAddresses", body);
-}`)
-
-// Body of the client-side address filter. Two analogous registered-at-or-before
-// checks, ANDed: (1) for non-wildcard events, the log's srcAddress must itself be
-// registered (ownership is resolved structurally by partition, but the temporal
-// `effectiveStartBlock` gate lives here now); (2) a DNF of address-filtered param
-// names (OR of AND-groups) for events that filter an indexed address param. The
-// DNF is fixed here, so it's unrolled into one boolean expression — no per-event
-// closure, loop, or array. `None` only for wildcard events without a param
-// filter. Exposed for snapshotting.
-// `srcAddressExpr` is the JS expression for the event's owning address: EVM and
-// Fuel events expose `event.srcAddress`; SVM instructions expose `event.programId`.
-let buildAddressFilterBody = (
-  groups: array<array<string>>,
-  ~isWildcard: bool,
-  ~srcAddressExpr: string="event.srcAddress",
-): option<string> => {
-  let paramLeaf = name =>
-    `(ic = indexingAddresses[p[${JSON.stringify(
-        JSON.String(name),
-      )}]]) !== undefined && ic.effectiveStartBlock <= blockNumber`
-  let paramDnf = switch groups {
-  | [] => None
-  | _ =>
-    Some(
-      groups
-      ->Array.map(group => "(" ++ group->Array.map(paramLeaf)->Array.join(" && ") ++ ")")
-      ->Array.join(" || "),
-    )
-  }
-  let srcLeaf = `(ic = indexingAddresses[${srcAddressExpr}]) !== undefined && ic.effectiveStartBlock <= blockNumber`
-  switch (isWildcard, paramDnf) {
-  | (true, None) => None
-  | (true, Some(dnf)) => Some("var p = event.params, ic; return " ++ dnf ++ ";")
-  | (false, None) => Some("var ic; return " ++ srcLeaf ++ ";")
-  | (false, Some(dnf)) =>
-    Some("var p = event.params, ic; return " ++ srcLeaf ++ " && (" ++ dnf ++ ");")
-  }
-}
-
-let buildAddressFilter = (
-  groups: array<array<string>>,
-  ~isWildcard: bool,
-  ~srcAddressExpr: string="event.srcAddress",
-): option<(Internal.eventPayload, int, dict<Internal.indexingContract>) => bool> =>
-  buildAddressFilterBody(groups, ~isWildcard, ~srcAddressExpr)->Option.map(compileAddressFilter)
-
 // ============== Build complete EVM event config ==============
 
 let buildEvmEventConfig = (
@@ -431,7 +376,7 @@ let buildEvmOnEventRegistration = (
     contractRegister,
     resolvedWhere,
     filterByAddresses,
-    clientAddressFilter: ?buildAddressFilter(addressFilterParamGroups, ~isWildcard),
+    addressFilterParamGroups,
     dependsOnAddresses: Internal.dependsOnAddresses(~isWildcard, ~filterByAddresses),
     startBlock: resolvedStartBlock,
   }
@@ -516,7 +461,6 @@ let buildSvmOnEventRegistration = (
   isWildcard,
   filterByAddresses: false,
   dependsOnAddresses: Internal.dependsOnAddresses(~isWildcard, ~filterByAddresses=false),
-  clientAddressFilter: ?buildAddressFilter([], ~isWildcard, ~srcAddressExpr="event.programId"),
   startBlock,
 }
 
@@ -594,6 +538,5 @@ let buildFuelOnEventRegistration = (
   isWildcard,
   filterByAddresses: false,
   dependsOnAddresses: Internal.dependsOnAddresses(~isWildcard, ~filterByAddresses=false),
-  clientAddressFilter: ?buildAddressFilter([], ~isWildcard),
   startBlock,
 }

package/src/EventConfigBuilder.res.mjs

@@ -243,33 +243,6 @@ function resolveFieldSelection(blockFields, transactionFields, globalBlockFields
   ];
 }
 
-let compileAddressFilter = (function (body) {
-  return new Function("event", "blockNumber", "indexingAddresses", body);
-});
-
-function buildAddressFilterBody(groups, isWildcard, srcAddressExprOpt) {
-  let srcAddressExpr = srcAddressExprOpt !== undefined ? srcAddressExprOpt : "event.srcAddress";
-  let paramLeaf = name => `(ic = indexingAddresses[p[` + JSON.stringify(name) + `]]) !== undefined && ic.effectiveStartBlock <= blockNumber`;
-  let paramDnf = groups.length !== 0 ? groups.map(group => "(" + group.map(paramLeaf).join(" && ") + ")").join(" || ") : undefined;
-  let srcLeaf = `(ic = indexingAddresses[` + srcAddressExpr + `]) !== undefined && ic.effectiveStartBlock <= blockNumber`;
-  if (isWildcard) {
-    if (paramDnf !== undefined) {
-      return "var p = event.params, ic; return " + paramDnf + ";";
-    } else {
-      return;
-    }
-  } else if (paramDnf !== undefined) {
-    return "var p = event.params, ic; return " + srcLeaf + " && (" + paramDnf + ");";
-  } else {
-    return "var ic; return " + srcLeaf + ";";
-  }
-}
-
-function buildAddressFilter(groups, isWildcard, srcAddressExprOpt) {
-  let srcAddressExpr = srcAddressExprOpt !== undefined ? srcAddressExprOpt : "event.srcAddress";
-  return Stdlib_Option.map(buildAddressFilterBody(groups, isWildcard, srcAddressExpr), compileAddressFilter);
-}
-
 function buildEvmEventConfig(contractName, eventName, sighash, params, blockFields, transactionFields, globalBlockFieldsSetOpt, globalTransactionFieldsSetOpt) {
   let globalBlockFieldsSet = globalBlockFieldsSetOpt !== undefined ? Primitive_option.valFromOption(globalBlockFieldsSetOpt) : new Set();
   let globalTransactionFieldsSet = globalTransactionFieldsSetOpt !== undefined ? Primitive_option.valFromOption(globalTransactionFieldsSetOpt) : new Set();
@@ -314,7 +287,7 @@ function buildEvmOnEventRegistration(eventConfig, isWildcard, handler, contractR
     isWildcard: isWildcard,
     filterByAddresses: filterByAddresses,
     dependsOnAddresses: Internal.dependsOnAddresses(isWildcard, filterByAddresses),
-    clientAddressFilter: buildAddressFilter(match.addressFilterParamGroups, isWildcard, undefined),
+    addressFilterParamGroups: match.addressFilterParamGroups,
     startBlock: resolvedStartBlock,
     resolvedWhere: resolvedWhere
   };
@@ -367,7 +340,6 @@ function buildSvmOnEventRegistration(eventConfig, isWildcard, handler, contractR
     isWildcard: isWildcard,
     filterByAddresses: false,
     dependsOnAddresses: Internal.dependsOnAddresses(isWildcard, false),
-    clientAddressFilter: buildAddressFilter([], isWildcard, "event.programId"),
     startBlock: startBlock
   };
 }
@@ -437,7 +409,6 @@ function buildFuelOnEventRegistration(eventConfig, isWildcard, handler, contract
     isWildcard: isWildcard,
     filterByAddresses: false,
     dependsOnAddresses: Internal.dependsOnAddresses(isWildcard, false),
-    clientAddressFilter: buildAddressFilter([], isWildcard, undefined),
     startBlock: startBlock
   };
 }
@@ -457,9 +428,6 @@ export {
   buildTopicGetter,
   alwaysIncludedBlockFields,
   resolveFieldSelection,
-  compileAddressFilter,
-  buildAddressFilterBody,
-  buildAddressFilter,
   buildEvmEventConfig,
   buildEvmOnEventRegistration,
   alwaysIncludedSvmBlockFields,