envio 3.1.1 → 3.2.0

package/src/sources/Evm.res.mjs

@@ -74,18 +74,6 @@ let ecosystem_transactionFields = [
   "authorizationList"
 ];
 
-function ecosystem_getNumber(prim) {
-  return prim.number;
-}
-
-function ecosystem_getTimestamp(prim) {
-  return prim.timestamp;
-}
-
-function ecosystem_getId(prim) {
-  return prim.hash;
-}
-
 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)))));
@@ -97,9 +85,6 @@ let ecosystem = {
   blockNumberName: "number",
   blockTimestampName: "timestamp",
   blockHashName: "hash",
-  getNumber: ecosystem_getNumber,
-  getTimestamp: ecosystem_getTimestamp,
-  getId: ecosystem_getId,
   cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
   onBlockMethodName: "onBlock",
   onBlockFilterSchema: ecosystem_onBlockFilterSchema,

package/src/sources/EvmChain.res

@@ -67,7 +67,7 @@ let makeSources = (
 ) => {
   let eventRouter =
     contracts
-    ->Belt.Array.flatMap(contract => contract.events)
+    ->Array.flatMap(contract => contract.events)
     ->EventRouter.fromEvmEventModsOrThrow(~chain)
 
   let allEventParams = collectEventParams(contracts)

package/src/sources/EvmChain.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Env from "../Env.res.mjs";
 import * as RpcSource from "./RpcSource.res.mjs";
-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";
@@ -38,7 +37,7 @@ function collectEventParams(contracts) {
 }
 
 function makeSources(chain, contracts, hyperSync, rpcs, lowercaseAddresses) {
-  let eventRouter = EventRouter.fromEvmEventModsOrThrow(Belt_Array.flatMap(contracts, contract => contract.events), chain);
+  let eventRouter = EventRouter.fromEvmEventModsOrThrow(contracts.flatMap(contract => contract.events), chain);
   let allEventParams = collectEventParams(contracts);
   let sources = hyperSync !== undefined ? [HyperSyncSource.make({
         chain: chain,

package/src/sources/EvmRpcClient.res

@@ -0,0 +1,42 @@
+type cfg = {url: string, httpReqTimeoutMillis?: int}
+
+type t = {getHeight: unit => promise<int>}
+
+@send
+external classNew: (Core.evmRpcClientCtor, cfg) => t = "new"
+
+// Rust encodes JSON-RPC errors as a JSON payload in the napi error's
+// message: `{"kind":"JsonRpcError","code":-32005,"message":"..."}`.
+// Parse it back so callers keep matching on Rpc.JsonRpcError.
+let getJsonRpcError = (exn: exn): option<Rpc.rpcError> =>
+  switch exn {
+  | JsExn(e) =>
+    switch e->JsExn.message {
+    | Some(msg) =>
+      switch msg->JSON.parseOrThrow->JSON.Decode.object {
+      | exception _ => None
+      | None => None
+      | Some(obj) =>
+        switch (obj->Dict.get("kind"), obj->Dict.get("code"), obj->Dict.get("message")) {
+        | (Some(String("JsonRpcError")), Some(Number(code)), Some(String(message))) =>
+          Some({code: code->Float.toInt, message})
+        | _ => None
+        }
+      }
+    | None => None
+    }
+  | _ => None
+  }
+
+let coerceErrorOrThrow = exn =>
+  switch exn->getJsonRpcError {
+  | Some(rpcError) => throw(Rpc.JsonRpcError(rpcError))
+  | None => exn->throw
+  }
+
+let make = (~url, ~httpReqTimeoutMillis=?) => {
+  let client = Core.getAddon().evmRpcClient->classNew({url, ?httpReqTimeoutMillis})
+  {
+    getHeight: () => client.getHeight()->Promise.catch(coerceErrorOrThrow),
+  }
+}

package/src/sources/EvmRpcClient.res.mjs

@@ -0,0 +1,64 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Rpc from "./Rpc.res.mjs";
+import * as Core from "../Core.res.mjs";
+import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
+import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
+
+function getJsonRpcError(exn) {
+  if (exn.RE_EXN_ID !== "JsExn") {
+    return;
+  }
+  let msg = Stdlib_JsExn.message(exn._1);
+  if (msg === undefined) {
+    return;
+  }
+  let obj;
+  try {
+    obj = Stdlib_JSON.Decode.object(JSON.parse(msg));
+  } catch (exn$1) {
+    return;
+  }
+  if (obj === undefined) {
+    return;
+  }
+  let match = obj["kind"];
+  let match$1 = obj["code"];
+  let match$2 = obj["message"];
+  if (match === "JsonRpcError" && typeof match$1 === "number" && typeof match$2 === "string") {
+    return {
+      code: match$1 | 0,
+      message: match$2
+    };
+  }
+}
+
+function coerceErrorOrThrow(exn) {
+  let rpcError = getJsonRpcError(exn);
+  if (rpcError !== undefined) {
+    throw {
+      RE_EXN_ID: Rpc.JsonRpcError,
+      _1: rpcError,
+      Error: new Error()
+    };
+  }
+  throw exn;
+}
+
+function make(url, httpReqTimeoutMillis) {
+  let client = Core.getAddon().EvmRpcClient.new({
+    url: url,
+    httpReqTimeoutMillis: httpReqTimeoutMillis
+  });
+  return {
+    getHeight: () => Stdlib_Promise.$$catch(client.getHeight(), coerceErrorOrThrow)
+  };
+}
+
+export {
+  getJsonRpcError,
+  coerceErrorOrThrow,
+  make,
+}
+/* Rpc Not a pure module */

package/src/sources/Fuel.res

@@ -1,7 +1,3 @@
-@get external getNumber: Internal.eventBlock => int = "height"
-@get external getTimestamp: Internal.eventBlock => int = "time"
-@get external getId: Internal.eventBlock => string = "id"
-
 let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.id
     delete fields.height
@@ -15,9 +11,6 @@ let ecosystem: Ecosystem.t = {
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "id",
-  getNumber,
-  getTimestamp,
-  getId,
   cleanUpRawEventFieldsInPlace,
   onBlockMethodName: "onBlock",
   // Fuel filter shape: `{block: {height: {_gte?, _lte?, _every?}}}`.

package/src/sources/Fuel.res.mjs

@@ -16,18 +16,6 @@ let ecosystem_blockFields = [
 
 let ecosystem_transactionFields = ["id"];
 
-function ecosystem_getNumber(prim) {
-  return prim.height;
-}
-
-function ecosystem_getTimestamp(prim) {
-  return prim.time;
-}
-
-function ecosystem_getId(prim) {
-  return prim.id;
-}
-
 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)))));
@@ -39,9 +27,6 @@ let ecosystem = {
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "id",
-  getNumber: ecosystem_getNumber,
-  getTimestamp: ecosystem_getTimestamp,
-  getId: ecosystem_getId,
   cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
   onBlockMethodName: "onBlock",
   onBlockFilterSchema: ecosystem_onBlockFilterSchema,

package/src/sources/HyperFuelSource.res

@@ -163,7 +163,7 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
           wildcardLogDataRbs->Array.push(rb)->ignore
         } else {
           switch nonWildcardLogDataRbsByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-          | Some(arr) => arr->Belt.Array.push(rb)
+          | Some(arr) => arr->Array.push(rb)
           | None => nonWildcardLogDataRbsByContract->Dict.set(contractName, [rb])
           }
         }
@@ -395,6 +395,7 @@ let make = ({chain, endpointUrl}: options): t => {
         timestamp: block.time,
         chain,
         blockNumber: block.height,
+        blockHash: block.id,
         logIndex: receiptIndex,
         event: {
           contractName: eventConfig.contractName,
@@ -407,7 +408,7 @@ let make = ({chain, endpointUrl}: options): t => {
           block: block->Obj.magic,
           srcAddress: contractAddress,
           logIndex: receiptIndex,
-        },
+        }->Internal.fromGenericEvent,
       })
     })
 
@@ -420,8 +421,8 @@ let make = ({chain, endpointUrl}: options): t => {
       blockHash: block.id,
     })
 
-    let latestFetchedBlockTimestamp = switch pageUnsafe.items->Belt.Array.get(
-      pageUnsafe.items->Belt.Array.length - 1,
+    let latestFetchedBlockTimestamp = switch pageUnsafe.items->Array.get(
+      pageUnsafe.items->Array.length - 1,
     ) {
     | Some({block}) if block.height == heighestBlockQueried => block.time
     | _ => 0

package/src/sources/HyperFuelSource.res.mjs

@@ -6,7 +6,6 @@ import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperFuel from "./HyperFuel.res.mjs";
 import * as HyperSync from "./HyperSync.res.mjs";
-import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as EventRouter from "./EventRouter.res.mjs";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
@@ -338,6 +337,7 @@ function make(param) {
         timestamp: block.time,
         chain: chain,
         blockNumber: block.height,
+        blockHash: block.id,
         logIndex: receiptIndex,
         event: {
           contractName: eventConfig$1.contractName,
@@ -361,7 +361,7 @@ function make(param) {
         blockNumber: block.height
       };
     });
-    let match = Belt_Array.get(pageUnsafe.items, pageUnsafe.items.length - 1 | 0);
+    let match = pageUnsafe.items[pageUnsafe.items.length - 1 | 0];
     let latestFetchedBlockTimestamp;
     if (match !== undefined) {
       let block = match.block;

package/src/sources/HyperSyncClient.res

@@ -337,13 +337,13 @@ module Decoder = {
 
   @send
   external classFromParams: (
-    Core.decoderCtor,
+    Core.evmDecoderCtor,
     array<eventParamsInput>,
     ~checksumAddresses: bool=?,
   ) => tWithParams = "fromParams"
 
   let fromParams = (eventParams, ~checksumAddresses=?) =>
-    Core.getAddon().decoder->classFromParams(eventParams, ~checksumAddresses?)
+    Core.getAddon().evmDecoder->classFromParams(eventParams, ~checksumAddresses?)
 }
 
 module EventItems = {
@@ -372,11 +372,15 @@ type t = {
 }
 
 @send
-external classNew: (Core.hypersyncClientCtor, cfg, string, array<Decoder.eventParamsInput>) => t =
-  "new"
+external classNew: (
+  Core.evmHypersyncClientCtor,
+  cfg,
+  string,
+  array<Decoder.eventParamsInput>,
+) => t = "new"
 
 let makeWithAgent = (cfg, ~userAgent, ~eventParams) =>
-  Core.getAddon().hypersyncClient->classNew(cfg, userAgent, eventParams)
+  Core.getAddon().evmHypersyncClient->classNew(cfg, userAgent, eventParams)
 
 type logLevel = [#trace | #debug | #info | #warn | #error]
 let logLevelSchema: S.t<logLevel> = S.enum([#trace, #debug, #info, #warn, #error])

package/src/sources/HyperSyncClient.res.mjs

@@ -59,7 +59,7 @@ let ResponseTypes = {
 };
 
 function fromParams(eventParams, checksumAddresses) {
-  return Core.getAddon().Decoder.fromParams(eventParams, checksumAddresses !== undefined ? Primitive_option.valFromOption(checksumAddresses) : undefined);
+  return Core.getAddon().EvmDecoder.fromParams(eventParams, checksumAddresses !== undefined ? Primitive_option.valFromOption(checksumAddresses) : undefined);
 }
 
 let Decoder = {
@@ -69,7 +69,7 @@ let Decoder = {
 let EventItems = {};
 
 function makeWithAgent(cfg, userAgent, eventParams) {
-  return Core.getAddon().HypersyncClient.new(cfg, userAgent, eventParams);
+  return Core.getAddon().EvmHypersyncClient.new(cfg, userAgent, eventParams);
 }
 
 let logLevelSchema = S$RescriptSchema.$$enum([

package/src/sources/HyperSyncHeightStream.res

@@ -36,7 +36,7 @@ let subscribe = (~hyperSyncUrl, ~apiToken, ~chainId, ~onHeight: int => unit): (u
     // Clear any pending stale/reconnect timeout to avoid double reconnect
     timeoutIdRef.contents->clearTimeout
     let delay =
-      baseDuration * Math.pow(2.0, ~exp=errorCount.contents->Belt.Int.toFloat)->Belt.Float.toInt
+      baseDuration * Math.pow(2.0, ~exp=errorCount.contents->Int.toFloat)->Float.toInt
     timeoutIdRef := setTimeout(() => refreshEventSource(), Pervasives.min(delay, 60_000))
   }
   and refreshEventSource = () => {
@@ -100,7 +100,7 @@ let subscribe = (~hyperSyncUrl, ~apiToken, ~chainId, ~onHeight: int => unit): (u
     })
 
     es->EventSource.addEventListener("height", event => {
-      switch event.data->Belt.Int.fromString {
+      switch event.data->Int.fromString {
       | Some(height) =>
         // Track the SSE height event
         Prometheus.SourceRequestCount.increment(

package/src/sources/HyperSyncHeightStream.res.mjs

@@ -2,8 +2,8 @@
 
 import * as Utils from "../Utils.res.mjs";
 import * as Logging from "../Logging.res.mjs";
-import * as Belt_Int from "@rescript/runtime/lib/es6/Belt_Int.js";
 import * as Prometheus from "../Prometheus.res.mjs";
+import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as Eventsource from "eventsource";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
@@ -81,7 +81,7 @@ function subscribe(hyperSyncUrl, apiToken, chainId, onHeight) {
     };
     es$1.addEventListener("ping", _event => updateTimeoutId());
     es$1.addEventListener("height", event => {
-      let height = Belt_Int.fromString(event.data);
+      let height = Stdlib_Int.fromString(event.data, undefined);
       if (height !== undefined) {
         Prometheus.SourceRequestCount.increment("HyperSync", chainId, "heightStream");
         updateTimeoutId();

package/src/sources/HyperSyncSource.res

@@ -201,9 +201,10 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
 
     Internal.Event({
       eventConfig: (eventConfig :> Internal.eventConfig),
-      timestamp: block.timestamp->Belt.Option.getUnsafe,
+      timestamp: block.timestamp->Option.getUnsafe,
       chain,
-      blockNumber: block.number->Belt.Option.getUnsafe,
+      blockNumber: block.number->Option.getUnsafe,
+      blockHash: block.hash->Option.getUnsafe,
       logIndex,
       event: {
         contractName: eventConfig.contractName,
@@ -338,7 +339,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
       }
     }
 
-    pageUnsafe.items->Belt.Array.forEach(item => {
+    pageUnsafe.items->Array.forEach(item => {
       let chainId = chain->ChainMap.Chain.toChainId
       let maybeEventConfig =
         eventRouter->EventRouter.get(
@@ -348,7 +349,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
           ),
           ~indexingAddresses,
           ~contractAddress=item.srcAddress,
-          ~blockNumber=item.block.number->Belt.Option.getUnsafe,
+          ~blockNumber=item.block.number->Option.getUnsafe,
         )
 
       switch maybeEventConfig {
@@ -363,7 +364,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
           handleDecodeFailure(
             ~eventConfig,
             ~logIndex=item.logIndex,
-            ~blockNumber=item.block.number->Belt.Option.getUnsafe,
+            ~blockNumber=item.block.number->Option.getUnsafe,
             ~chainId,
             ~exn=UndefinedValue,
           )
@@ -378,7 +379,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
     // and the parent of the range's first block. Duplicates are allowed; reorg
     // detection notices same-block-number-different-hash collisions itself.
     let blockHashes = []
-    pageUnsafe.items->Belt.Array.forEach(({block}) => {
+    pageUnsafe.items->Array.forEach(({block}) => {
       switch (block.number, block.hash) {
       | (Some(blockNumber), Some(blockHash)) =>
         blockHashes->Array.push({ReorgDetection.blockNumber, blockHash})->ignore
@@ -405,9 +406,9 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`)
     let latestFetchedBlockTimestamp = switch pageUnsafe.rollbackGuard {
     | Some({timestamp}) => timestamp
     | None =>
-      switch pageUnsafe.items->Belt.Array.get(pageUnsafe.items->Belt.Array.length - 1) {
-      | Some({block}) if block.number->Belt.Option.getUnsafe == heighestBlockQueried =>
-        block.timestamp->Belt.Option.getUnsafe
+      switch pageUnsafe.items->Array.get(pageUnsafe.items->Array.length - 1) {
+      | Some({block}) if block.number->Option.getUnsafe == heighestBlockQueried =>
+        block.timestamp->Option.getUnsafe
       | _ => 0
       }
     }

package/src/sources/HyperSyncSource.res.mjs

@@ -5,7 +5,6 @@ import * as Hrtime from "../bindings/Hrtime.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 Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as EventRouter from "./EventRouter.res.mjs";
 import * as LogSelection from "../LogSelection.res.mjs";
@@ -134,6 +133,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`);
       timestamp: block.timestamp,
       chain: chain,
       blockNumber: block.number,
+      blockHash: block.hash,
       logIndex: logIndex,
       event: {
         contractName: eventConfig.contractName,
@@ -214,7 +214,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`);
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
     let parsingTimeRef = Hrtime.makeTimer();
     let parsedQueueItems = [];
-    Belt_Array.forEach(pageUnsafe.items, item => {
+    pageUnsafe.items.forEach(item => {
       let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, item.block.number, indexingAddresses);
       if (maybeEventConfig === undefined) {
         return;
@@ -244,7 +244,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`);
     });
     let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingTimeRef));
     let blockHashes = [];
-    Belt_Array.forEach(pageUnsafe.items, param => {
+    pageUnsafe.items.forEach(param => {
       let block = param.block;
       let match = block.number;
       let match$1 = block.hash;
@@ -272,7 +272,7 @@ Learn more or get a free API token at: https://envio.dev/app/api-tokens`);
     if (match$1 !== undefined) {
       latestFetchedBlockTimestamp = match$1.timestamp;
     } else {
-      let match$2 = Belt_Array.get(pageUnsafe.items, pageUnsafe.items.length - 1 | 0);
+      let match$2 = pageUnsafe.items[pageUnsafe.items.length - 1 | 0];
       if (match$2 !== undefined) {
         let block = match$2.block;
         latestFetchedBlockTimestamp = block.number === heighestBlockQueried ? block.timestamp : 0;

package/src/sources/Rpc.res

@@ -100,7 +100,7 @@ module GetLogs = {
       }
     }
 
-    topics->Belt.Array.map(toTopicFilter)
+    topics->Array.map(toTopicFilter)
   }
 
   let mapTopicQuery = ({topic0, topic1, topic2, topic3}: Internal.topicSelection): topicQuery =>
@@ -214,10 +214,6 @@ module GetBlockByNumber = {
   let rawRoute = makeRpcRoute("eth_getBlockByNumber", paramsSchema, S.null(S.json(~validate=false)))
 }
 
-module GetBlockHeight = {
-  let route = makeRpcRoute("eth_blockNumber", S.tuple(_ => ()), hexIntSchema)
-}
-
 module GetTransactionByHash = {
   let rawRoute = makeRpcRoute(
     "eth_getTransactionByHash",

package/src/sources/Rpc.res.mjs

@@ -4,7 +4,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 Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as Stdlib_BigInt from "@rescript/runtime/lib/es6/Stdlib_BigInt.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
@@ -124,7 +123,7 @@ function makeTopicQuery(topic0Opt, topic1Opt, topic2Opt, topic3Opt) {
     let single = topic[0];
     return single;
   };
-  return Belt_Array.map(topics, toTopicFilter);
+  return topics.map(toTopicFilter);
 }
 
 function mapTopicQuery(param) {
@@ -210,12 +209,6 @@ let GetBlockByNumber = {
   rawRoute: rawRoute
 };
 
-let route$2 = makeRpcRoute("eth_blockNumber", S$RescriptSchema.tuple(param => {}), hexIntSchema);
-
-let GetBlockHeight = {
-  route: route$2
-};
-
 let rawRoute$1 = makeRpcRoute("eth_getTransactionByHash", S$RescriptSchema.tuple1(S$RescriptSchema.string), S$RescriptSchema.$$null(S$RescriptSchema.json(false)));
 
 let GetTransactionByHash = {
@@ -257,7 +250,6 @@ export {
   decimalFloatSchema,
   GetLogs,
   GetBlockByNumber,
-  GetBlockHeight,
   GetTransactionByHash,
   GetTransactionReceipt,
   getLogs,