envio 3.0.0-alpha.21 → 3.0.0-alpha.22

package/src/sources/EventRouter.res

@@ -1,5 +1,3 @@
-open Belt
-
 exception EventDuplicate
 exception WildcardCollision
 
@@ -11,21 +9,21 @@ module Group = {
 
   let empty = () => {
     wildcard: None,
-    byContractName: Js.Dict.empty(),
+    byContractName: Dict.make(),
   }
 
   let addOrThrow = (group: t<'a>, event, ~contractName, ~isWildcard) => {
     let {byContractName, wildcard} = group
     switch byContractName->Utils.Dict.dangerouslyGetNonOption(contractName) {
-    | Some(_) => raise(EventDuplicate)
+    | Some(_) => throw(EventDuplicate)
     | None =>
       if isWildcard && wildcard->Option.isSome {
-        raise(WildcardCollision)
+        throw(WildcardCollision)
       } else {
         if isWildcard {
           group.wildcard = Some(event)
         }
-        byContractName->Js.Dict.set(contractName, event)
+        byContractName->Dict.set(contractName, event)
       }
     }
   }
@@ -34,16 +32,23 @@ module Group = {
     group: t<'a>,
     ~contractAddress,
     ~blockNumber,
-    ~indexingContracts: dict<Internal.indexingContract>,
+    ~indexingAddresses: dict<FetchState.indexingAddress>,
   ) =>
     switch group {
     | {wildcard, byContractName} =>
-      switch indexingContracts->Utils.Dict.dangerouslyGetNonOption(
+      switch indexingAddresses->Utils.Dict.dangerouslyGetNonOption(
         contractAddress->Address.toString,
       ) {
       | Some(indexingContract) =>
-        if indexingContract.startBlock <= blockNumber {
-          byContractName->Utils.Dict.dangerouslyGetNonOption(indexingContract.contractName)
+        if indexingContract.effectiveStartBlock <= blockNumber {
+          switch byContractName->Utils.Dict.dangerouslyGetNonOption(indexingContract.contractName) {
+          // Fall back to the wildcard handler when the indexed contract has no
+          // matching event for this tag. This covers addresses registered for
+          // contracts without events (persisted for future config changes) as
+          // well as addresses whose contract has other events but not this one.
+          | None => wildcard
+          | Some(_) as event => event
+          }
         } else {
           None
         }
@@ -54,7 +59,7 @@ module Group = {
 
 type t<'a> = dict<Group.t<'a>>
 
-let empty = () => Js.Dict.empty()
+let empty = () => Dict.make()
 
 let addOrThrow = (
   router: t<'a>,
@@ -68,26 +73,26 @@ let addOrThrow = (
   let group = switch router->Utils.Dict.dangerouslyGetNonOption(eventId) {
   | None =>
     let group = Group.empty()
-    router->Js.Dict.set(eventId, group)
+    router->Dict.set(eventId, group)
     group
   | Some(group) => group
   }
   try group->Group.addOrThrow(event, ~contractName, ~isWildcard) catch {
   | EventDuplicate =>
-    Js.Exn.raiseError(
+    JsError.throwWithMessage(
       `Duplicate event detected: ${eventName} for contract ${contractName} on chain ${chain->ChainMap.Chain.toString}`,
     )
   | WildcardCollision =>
-    Js.Exn.raiseError(
+    JsError.throwWithMessage(
       `Another event is already registered with the same signature that would interfer with wildcard filtering: ${eventName} for contract ${contractName} on chain ${chain->ChainMap.Chain.toString}`,
     )
   }
 }
 
-let get = (router: t<'a>, ~tag, ~contractAddress, ~blockNumber, ~indexingContracts) => {
+let get = (router: t<'a>, ~tag, ~contractAddress, ~blockNumber, ~indexingAddresses) => {
   switch router->Utils.Dict.dangerouslyGetNonOption(tag) {
   | None => None
-  | Some(group) => group->Group.get(~contractAddress, ~blockNumber, ~indexingContracts)
+  | Some(group) => group->Group.get(~contractAddress, ~blockNumber, ~indexingAddresses)
   }
 }
 

package/src/sources/EventRouter.res.mjs

@@ -1,61 +1,63 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Js_exn from "rescript/lib/es6/js_exn.js";
 import * as ChainMap from "../ChainMap.res.mjs";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
-import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js";
+import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
-var EventDuplicate = /* @__PURE__ */Caml_exceptions.create("EventRouter.EventDuplicate");
+let EventDuplicate = /* @__PURE__ */Primitive_exceptions.create("EventRouter.EventDuplicate");
 
-var WildcardCollision = /* @__PURE__ */Caml_exceptions.create("EventRouter.WildcardCollision");
+let WildcardCollision = /* @__PURE__ */Primitive_exceptions.create("EventRouter.WildcardCollision");
 
 function empty() {
   return {
-          wildcard: undefined,
-          byContractName: {}
-        };
+    wildcard: undefined,
+    byContractName: {}
+  };
 }
 
-function addOrThrow(group, $$event, contractName, isWildcard) {
-  var wildcard = group.wildcard;
-  var byContractName = group.byContractName;
-  var match = byContractName[contractName];
+function addOrThrow(group, event, contractName, isWildcard) {
+  let wildcard = group.wildcard;
+  let byContractName = group.byContractName;
+  let match = byContractName[contractName];
   if (match !== undefined) {
     throw {
-          RE_EXN_ID: EventDuplicate,
-          Error: new Error()
-        };
+      RE_EXN_ID: EventDuplicate,
+      Error: new Error()
+    };
   }
-  if (isWildcard && Belt_Option.isSome(wildcard)) {
+  if (isWildcard && Stdlib_Option.isSome(wildcard)) {
     throw {
-          RE_EXN_ID: WildcardCollision,
-          Error: new Error()
-        };
+      RE_EXN_ID: WildcardCollision,
+      Error: new Error()
+    };
   }
   if (isWildcard) {
-    group.wildcard = Caml_option.some($$event);
+    group.wildcard = Primitive_option.some(event);
   }
-  byContractName[contractName] = $$event;
+  byContractName[contractName] = event;
 }
 
-function get(group, contractAddress, blockNumber, indexingContracts) {
-  var wildcard = group.wildcard;
-  var indexingContract = indexingContracts[contractAddress];
-  if (indexingContract !== undefined) {
-    if (indexingContract.startBlock <= blockNumber) {
-      return group.byContractName[indexingContract.contractName];
-    } else {
-      return ;
-    }
+function get(group, contractAddress, blockNumber, indexingAddresses) {
+  let wildcard = group.wildcard;
+  let indexingContract = indexingAddresses[contractAddress];
+  if (indexingContract === undefined) {
+    return wildcard;
+  }
+  if (indexingContract.effectiveStartBlock > blockNumber) {
+    return;
+  }
+  let event = group.byContractName[indexingContract.contractName];
+  if (event !== undefined) {
+    return event;
   } else {
     return wildcard;
   }
 }
 
-var Group = {
+let Group = {
   empty: empty,
   addOrThrow: addOrThrow,
   get: get
@@ -65,13 +67,13 @@ function empty$1() {
   return {};
 }
 
-function addOrThrow$1(router, eventId, $$event, contractName, isWildcard, eventName, chain) {
-  var group = router[eventId];
-  var group$1;
+function addOrThrow$1(router, eventId, event, contractName, isWildcard, eventName, chain) {
+  let group = router[eventId];
+  let group$1;
   if (group !== undefined) {
     group$1 = group;
   } else {
-    var group$2 = {
+    let group$2 = {
       wildcard: undefined,
       byContractName: {}
     };
@@ -79,26 +81,24 @@ function addOrThrow$1(router, eventId, $$event, contractName, isWildcard, eventN
     group$1 = group$2;
   }
   try {
-    return addOrThrow(group$1, $$event, contractName, isWildcard);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+    return addOrThrow(group$1, event, contractName, isWildcard);
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
     if (exn.RE_EXN_ID === EventDuplicate) {
-      return Js_exn.raiseError("Duplicate event detected: " + eventName + " for contract " + contractName + " on chain " + ChainMap.Chain.toString(chain));
+      return Stdlib_JsError.throwWithMessage(`Duplicate event detected: ` + eventName + ` for contract ` + contractName + ` on chain ` + ChainMap.Chain.toString(chain));
     }
     if (exn.RE_EXN_ID === WildcardCollision) {
-      return Js_exn.raiseError("Another event is already registered with the same signature that would interfer with wildcard filtering: " + eventName + " for contract " + contractName + " on chain " + ChainMap.Chain.toString(chain));
+      return Stdlib_JsError.throwWithMessage(`Another event is already registered with the same signature that would interfer with wildcard filtering: ` + eventName + ` for contract ` + contractName + ` on chain ` + ChainMap.Chain.toString(chain));
     }
     throw exn;
   }
 }
 
-function get$1(router, tag, contractAddress, blockNumber, indexingContracts) {
-  var group = router[tag];
+function get$1(router, tag, contractAddress, blockNumber, indexingAddresses) {
+  let group = router[tag];
   if (group !== undefined) {
-    return get(group, contractAddress, blockNumber, indexingContracts);
+    return get(group, contractAddress, blockNumber, indexingAddresses);
   }
-  
 }
 
 function getEvmEventId(sighash, topicCount) {
@@ -106,21 +106,19 @@ function getEvmEventId(sighash, topicCount) {
 }
 
 function fromEvmEventModsOrThrow(events, chain) {
-  var router = {};
-  Belt_Array.forEach(events, (function (config) {
-          addOrThrow$1(router, config.id, config, config.contractName, config.isWildcard, config.name, chain);
-        }));
+  let router = {};
+  Belt_Array.forEach(events, config => addOrThrow$1(router, config.id, config, config.contractName, config.isWildcard, config.name, chain));
   return router;
 }
 
 export {
-  EventDuplicate ,
-  WildcardCollision ,
-  Group ,
+  EventDuplicate,
+  WildcardCollision,
+  Group,
   empty$1 as empty,
   addOrThrow$1 as addOrThrow,
   get$1 as get,
-  getEvmEventId ,
-  fromEvmEventModsOrThrow ,
+  getEvmEventId,
+  fromEvmEventModsOrThrow,
 }
 /* ChainMap Not a pure module */

package/src/sources/Evm.res

@@ -2,7 +2,7 @@
 @get external getTimestamp: Internal.eventBlock => int = "timestamp"
 @get external getId: Internal.eventBlock => string = "hash"
 
-let cleanUpRawEventFieldsInPlace: Js.Json.t => unit = %raw(`fields => {
+let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.hash
     delete fields.number
     delete fields.timestamp
@@ -81,4 +81,20 @@ let ecosystem: Ecosystem.t = {
   getTimestamp,
   getId,
   cleanUpRawEventFieldsInPlace,
+  onBlockMethodName: "onBlock",
+  // EVM filter shape: `{block: {number: {_gte?, _lte?, _every?}}}`.
+  // The inner range chunk is returned as raw `S.unknown` and parsed a
+  // second time in `Main.res` by the shared `blockRangeSchema`.
+  onBlockFilterSchema: S.object(s =>
+    s.field("block", S.option(S.object(s2 => s2.field("number", S.unknown))))
+  ),
+  // EVM event filter shape: `{block: {number: {_gte?}}, params?, ...}`.
+  // Only the `block.number` wrapper is unwrapped here; sibling fields
+  // like `params` are left for `LogSelection` to consume. The inner
+  // range chunk is validated by `eventBlockRangeSchema` in
+  // `LogSelection.res` which rejects `_lte`/`_every` (use `onBlock` for
+  // stride- and endBlock-based block handlers).
+  onEventBlockFilterSchema: S.object(s =>
+    s.field("block", S.option(S.object(s2 => s2.field("number", S.unknown))))
+  ),
 }

package/src/sources/Evm.res.mjs

@@ -1,13 +1,14 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-var cleanUpRawEventFieldsInPlace = (fields => {
+let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.hash
     delete fields.number
     delete fields.timestamp
   });
 
-var ecosystem_blockFields = [
+let ecosystem_blockFields = [
   "number",
   "timestamp",
   "hash",
@@ -37,7 +38,7 @@ var ecosystem_blockFields = [
   "mixHash"
 ];
 
-var ecosystem_transactionFields = [
+let ecosystem_transactionFields = [
   "transactionIndex",
   "hash",
   "from",
@@ -85,7 +86,11 @@ function ecosystem_getId(prim) {
   return prim.hash;
 }
 
-var ecosystem = {
+let ecosystem_onBlockFilterSchema = S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("number", S$RescriptSchema.unknown)))));
+
+let ecosystem_onEventBlockFilterSchema = S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("number", S$RescriptSchema.unknown)))));
+
+let ecosystem = {
   name: "evm",
   blockFields: ecosystem_blockFields,
   transactionFields: ecosystem_transactionFields,
@@ -95,11 +100,14 @@ var ecosystem = {
   getNumber: ecosystem_getNumber,
   getTimestamp: ecosystem_getTimestamp,
   getId: ecosystem_getId,
-  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace
+  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
+  onBlockMethodName: "onBlock",
+  onBlockFilterSchema: ecosystem_onBlockFilterSchema,
+  onEventBlockFilterSchema: ecosystem_onEventBlockFilterSchema
 };
 
 export {
-  cleanUpRawEventFieldsInPlace ,
-  ecosystem ,
+  cleanUpRawEventFieldsInPlace,
+  ecosystem,
 }
-/* No side effect */
+/* ecosystem Not a pure module */

package/src/sources/EvmChain.res

@@ -1,5 +1,3 @@
-open Belt
-
 type rpc = {
   url: string,
   sourceFor: Source.sourceFor,
@@ -19,30 +17,30 @@ let getSyncConfig = (
     ?pollingInterval,
   }: Config.sourceSyncOptions,
 ): Config.sourceSync => {
-  let queryTimeoutMillis = queryTimeoutMillis->Option.getWithDefault(20_000)
+  let queryTimeoutMillis = queryTimeoutMillis->Option.getOr(20_000)
   {
-    initialBlockInterval: Env.Configurable.SyncConfig.initialBlockInterval->Option.getWithDefault(
-      initialBlockInterval->Option.getWithDefault(10_000),
+    initialBlockInterval: Env.Configurable.SyncConfig.initialBlockInterval->Option.getOr(
+      initialBlockInterval->Option.getOr(10_000),
     ),
     // After an RPC error, how much to scale back the number of blocks requested at once
-    backoffMultiplicative: Env.Configurable.SyncConfig.backoffMultiplicative->Option.getWithDefault(
-      backoffMultiplicative->Option.getWithDefault(0.8),
+    backoffMultiplicative: Env.Configurable.SyncConfig.backoffMultiplicative->Option.getOr(
+      backoffMultiplicative->Option.getOr(0.8),
     ),
     // Without RPC errors or timeouts, how much to increase the number of blocks requested by for the next batch
-    accelerationAdditive: Env.Configurable.SyncConfig.accelerationAdditive->Option.getWithDefault(
-      accelerationAdditive->Option.getWithDefault(500),
+    accelerationAdditive: Env.Configurable.SyncConfig.accelerationAdditive->Option.getOr(
+      accelerationAdditive->Option.getOr(500),
     ),
     // Do not further increase the block interval past this limit
-    intervalCeiling: Env.Configurable.SyncConfig.intervalCeiling->Option.getWithDefault(
-      intervalCeiling->Option.getWithDefault(10_000),
+    intervalCeiling: Env.Configurable.SyncConfig.intervalCeiling->Option.getOr(
+      intervalCeiling->Option.getOr(10_000),
     ),
     // After an error, how long to wait before retrying
-    backoffMillis: backoffMillis->Option.getWithDefault(5000),
+    backoffMillis: backoffMillis->Option.getOr(5000),
     // How long to wait before cancelling an RPC request
     queryTimeoutMillis,
-    fallbackStallTimeout: fallbackStallTimeout->Option.getWithDefault(queryTimeoutMillis / 2),
+    fallbackStallTimeout: fallbackStallTimeout->Option.getOr(queryTimeoutMillis / 2),
     // How frequently to check for new blocks in realtime (default: 1000ms)
-    pollingInterval: pollingInterval->Option.getWithDefault(1000),
+    pollingInterval: pollingInterval->Option.getOr(1000),
   }
 }
 
@@ -76,18 +74,18 @@ let makeSources = (
     ]
   | _ => []
   }
-  rpcs->Js.Array2.forEach(({?syncConfig, url, sourceFor, ?ws}) => {
+  rpcs->Array.forEach(({?syncConfig, url, sourceFor, ?ws}) => {
     let source = RpcSource.make({
       chain,
       sourceFor,
-      syncConfig: getSyncConfig(syncConfig->Option.getWithDefault({})),
+      syncConfig: getSyncConfig(syncConfig->Option.getOr({})),
       url,
       eventRouter,
       allEventSignatures,
       lowercaseAddresses,
       ?ws,
     })
-    let _ = sources->Js.Array2.push(source)
+    let _ = sources->Array.push(source)
   })
 
   sources

package/src/sources/EvmChain.res.mjs

@@ -2,59 +2,57 @@
 
 import * as Env from "../Env.res.mjs";
 import * as RpcSource from "./RpcSource.res.mjs";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
+import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as EventRouter from "./EventRouter.res.mjs";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as HyperSyncSource from "./HyperSyncSource.res.mjs";
 
 function getSyncConfig(param) {
-  var queryTimeoutMillis = Belt_Option.getWithDefault(param.queryTimeoutMillis, 20000);
+  let queryTimeoutMillis = Stdlib_Option.getOr(param.queryTimeoutMillis, 20000);
   return {
-          initialBlockInterval: Belt_Option.getWithDefault(Env.Configurable.SyncConfig.initialBlockInterval, Belt_Option.getWithDefault(param.initialBlockInterval, 10000)),
-          backoffMultiplicative: Belt_Option.getWithDefault(Env.Configurable.SyncConfig.backoffMultiplicative, Belt_Option.getWithDefault(param.backoffMultiplicative, 0.8)),
-          accelerationAdditive: Belt_Option.getWithDefault(Env.Configurable.SyncConfig.accelerationAdditive, Belt_Option.getWithDefault(param.accelerationAdditive, 500)),
-          intervalCeiling: Belt_Option.getWithDefault(Env.Configurable.SyncConfig.intervalCeiling, Belt_Option.getWithDefault(param.intervalCeiling, 10000)),
-          backoffMillis: Belt_Option.getWithDefault(param.backoffMillis, 5000),
-          queryTimeoutMillis: queryTimeoutMillis,
-          fallbackStallTimeout: Belt_Option.getWithDefault(param.fallbackStallTimeout, queryTimeoutMillis / 2 | 0),
-          pollingInterval: Belt_Option.getWithDefault(param.pollingInterval, 1000)
-        };
+    initialBlockInterval: Stdlib_Option.getOr(Env.Configurable.SyncConfig.initialBlockInterval, Stdlib_Option.getOr(param.initialBlockInterval, 10000)),
+    backoffMultiplicative: Stdlib_Option.getOr(Env.Configurable.SyncConfig.backoffMultiplicative, Stdlib_Option.getOr(param.backoffMultiplicative, 0.8)),
+    accelerationAdditive: Stdlib_Option.getOr(Env.Configurable.SyncConfig.accelerationAdditive, Stdlib_Option.getOr(param.accelerationAdditive, 500)),
+    intervalCeiling: Stdlib_Option.getOr(Env.Configurable.SyncConfig.intervalCeiling, Stdlib_Option.getOr(param.intervalCeiling, 10000)),
+    backoffMillis: Stdlib_Option.getOr(param.backoffMillis, 5000),
+    queryTimeoutMillis: queryTimeoutMillis,
+    fallbackStallTimeout: Stdlib_Option.getOr(param.fallbackStallTimeout, queryTimeoutMillis / 2 | 0),
+    pollingInterval: Stdlib_Option.getOr(param.pollingInterval, 1000)
+  };
 }
 
 function makeSources(chain, contracts, hyperSync, allEventSignatures, rpcs, lowercaseAddresses) {
-  var eventRouter = EventRouter.fromEvmEventModsOrThrow(Belt_Array.flatMap(contracts, (function (contract) {
-              return contract.events;
-            })), chain);
-  var sources = hyperSync !== undefined ? [HyperSyncSource.make({
-            chain: chain,
-            endpointUrl: hyperSync,
-            allEventSignatures: allEventSignatures,
-            eventRouter: eventRouter,
-            apiToken: Env.envioApiToken,
-            clientMaxRetries: Env.hyperSyncClientMaxRetries,
-            clientTimeoutMillis: Env.hyperSyncClientTimeoutMillis,
-            lowercaseAddresses: lowercaseAddresses,
-            serializationFormat: Env.hypersyncClientSerializationFormat,
-            enableQueryCaching: Env.hypersyncClientEnableQueryCaching
-          })] : [];
-  rpcs.forEach(function (param) {
-        var source = RpcSource.make({
-              sourceFor: param.sourceFor,
-              syncConfig: getSyncConfig(Belt_Option.getWithDefault(param.syncConfig, {})),
-              url: param.url,
-              chain: chain,
-              eventRouter: eventRouter,
-              allEventSignatures: allEventSignatures,
-              lowercaseAddresses: lowercaseAddresses,
-              ws: param.ws
-            });
-        sources.push(source);
-      });
+  let eventRouter = EventRouter.fromEvmEventModsOrThrow(Belt_Array.flatMap(contracts, contract => contract.events), chain);
+  let sources = hyperSync !== undefined ? [HyperSyncSource.make({
+        chain: chain,
+        endpointUrl: hyperSync,
+        allEventSignatures: allEventSignatures,
+        eventRouter: eventRouter,
+        apiToken: Env.envioApiToken,
+        clientMaxRetries: Env.hyperSyncClientMaxRetries,
+        clientTimeoutMillis: Env.hyperSyncClientTimeoutMillis,
+        lowercaseAddresses: lowercaseAddresses,
+        serializationFormat: Env.hypersyncClientSerializationFormat,
+        enableQueryCaching: Env.hypersyncClientEnableQueryCaching
+      })] : [];
+  rpcs.forEach(param => {
+    let source = RpcSource.make({
+      sourceFor: param.sourceFor,
+      syncConfig: getSyncConfig(Stdlib_Option.getOr(param.syncConfig, {})),
+      url: param.url,
+      chain: chain,
+      eventRouter: eventRouter,
+      allEventSignatures: allEventSignatures,
+      lowercaseAddresses: lowercaseAddresses,
+      ws: param.ws
+    });
+    sources.push(source);
+  });
   return sources;
 }
 
 export {
-  getSyncConfig ,
-  makeSources ,
+  getSyncConfig,
+  makeSources,
 }
 /* Env Not a pure module */

package/src/sources/Fuel.res

@@ -2,7 +2,7 @@
 @get external getTimestamp: Internal.eventBlock => int = "time"
 @get external getId: Internal.eventBlock => string = "id"
 
-let cleanUpRawEventFieldsInPlace: Js.Json.t => unit = %raw(`fields => {
+let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.id
     delete fields.height
     delete fields.time
@@ -19,4 +19,17 @@ let ecosystem: Ecosystem.t = {
   getTimestamp,
   getId,
   cleanUpRawEventFieldsInPlace,
+  onBlockMethodName: "onBlock",
+  // Fuel filter shape: `{block: {height: {_gte?, _lte?, _every?}}}`.
+  // Inner range chunk parsed by `blockRangeSchema` in `Main.res`.
+  onBlockFilterSchema: S.object(s =>
+    s.field("block", S.option(S.object(s2 => s2.field("height", S.unknown))))
+  ),
+  // Fuel event filter shape: `{block: {height: {_gte?}}, params?, ...}`.
+  // Analogous to EVM, but keyed by `block.height` instead of
+  // `block.number`. See `Evm.res` for the rationale on the two-stage
+  // parse and the `_lte`/`_every` rejection.
+  onEventBlockFilterSchema: S.object(s =>
+    s.field("block", S.option(S.object(s2 => s2.field("height", S.unknown))))
+  ),
 }

package/src/sources/Fuel.res.mjs

@@ -1,19 +1,20 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-var cleanUpRawEventFieldsInPlace = (fields => {
+let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.id
     delete fields.height
     delete fields.time
   });
 
-var ecosystem_blockFields = [
+let ecosystem_blockFields = [
   "id",
   "height",
   "time"
 ];
 
-var ecosystem_transactionFields = ["id"];
+let ecosystem_transactionFields = ["id"];
 
 function ecosystem_getNumber(prim) {
   return prim.height;
@@ -27,7 +28,11 @@ function ecosystem_getId(prim) {
   return prim.id;
 }
 
-var ecosystem = {
+let ecosystem_onBlockFilterSchema = S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("height", S$RescriptSchema.unknown)))));
+
+let ecosystem_onEventBlockFilterSchema = S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("height", S$RescriptSchema.unknown)))));
+
+let ecosystem = {
   name: "fuel",
   blockFields: ecosystem_blockFields,
   transactionFields: ecosystem_transactionFields,
@@ -37,11 +42,14 @@ var ecosystem = {
   getNumber: ecosystem_getNumber,
   getTimestamp: ecosystem_getTimestamp,
   getId: ecosystem_getId,
-  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace
+  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
+  onBlockMethodName: "onBlock",
+  onBlockFilterSchema: ecosystem_onBlockFilterSchema,
+  onEventBlockFilterSchema: ecosystem_onEventBlockFilterSchema
 };
 
 export {
-  cleanUpRawEventFieldsInPlace ,
-  ecosystem ,
+  cleanUpRawEventFieldsInPlace,
+  ecosystem,
 }
-/* No side effect */
+/* ecosystem Not a pure module */

package/src/sources/FuelSDK.res

@@ -15,7 +15,7 @@ type receiptType =
   | @as(12) Burn
 
 @module("./vendored-fuel-abi-coder.js")
-external transpileAbi: Js.Json.t => EvmTypes.Abi.t = "transpileAbi"
+external transpileAbi: JSON.t => EvmTypes.Abi.t = "transpileAbi"
 
 @module("./vendored-fuel-abi-coder.js") @scope("AbiCoder")
 external getLogDecoder: (~abi: EvmTypes.Abi.t, ~logId: string) => string => unknown =

package/src/sources/FuelSDK.res.mjs

@@ -11,19 +11,17 @@ function getLogDecoder(prim0, prim1) {
 }
 
 function getLogDataDecoder(abi, logId) {
-  var decode = VendoredFuelAbiCoderJs.AbiCoder.getLogDecoder(abi, logId);
-  return function (data) {
-    return decode(data);
-  };
+  let decode = VendoredFuelAbiCoderJs.AbiCoder.getLogDecoder(abi, logId);
+  return data => decode(data);
 }
 
-var Receipt = {
+let Receipt = {
   getLogDataDecoder: getLogDataDecoder
 };
 
 export {
-  transpileAbi ,
-  getLogDecoder ,
-  Receipt ,
+  transpileAbi,
+  getLogDecoder,
+  Receipt,
 }
 /* ./vendored-fuel-abi-coder.js Not a pure module */