envio 3.2.1 → 3.3.0-alpha.1

package/src/sources/HyperFuelSource.res

@@ -2,6 +2,8 @@ open Source
 
 exception EventRoutingFailed
 
+let isUnauthorizedError = (message: string) => message->String.includes("401 Unauthorized")
+
 let mintEventTag = "mint"
 let burnEventTag = "burn"
 let transferEventTag = "transfer"
@@ -207,11 +209,26 @@ let memoGetSelectionConfig = (~chain) => {
 type options = {
   chain: ChainMap.Chain.t,
   endpointUrl: string,
+  apiToken: option<string>,
 }
 
-let make = ({chain, endpointUrl}: options): t => {
+let make = ({chain, endpointUrl, apiToken}: options): t => {
   let name = "HyperFuel"
 
+  let apiToken = switch apiToken {
+  | Some(token) => token
+  | None =>
+    JsError.throwWithMessage(`An Envio API token is required for using HyperFuel 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 = switch HyperFuelClient.make({url: endpointUrl, apiToken}) {
+  | client => client
+  | exception exn =>
+    exn->ErrorHandling.mkLogAndRaise(~msg="Failed to instantiate the HyperFuel client")
+  }
+
   let getSelectionConfig = memoGetSelectionConfig(~chain)
 
   let getItemsOrThrow = async (
@@ -239,12 +256,12 @@ let make = ({chain, endpointUrl}: options): t => {
       ~method="getLogs",
     )
     let pageUnsafe = try await HyperFuel.GetLogs.query(
-      ~serverUrl=endpointUrl,
+      ~client,
       ~fromBlock,
       ~toBlock,
       ~recieptsSelection,
     ) catch {
-    | HyperSync.GetLogs.Error(error) =>
+    | HyperFuel.GetLogs.Error(error) =>
       throw(
         Source.GetItemsError(
           Source.FailedGettingItems({
@@ -397,7 +414,7 @@ let make = ({chain, endpointUrl}: options): t => {
         blockNumber: block.height,
         blockHash: block.id,
         logIndex: receiptIndex,
-        event: {
+        payload: {
           contractName: eventConfig.contractName,
           eventName: eventConfig.name,
           chainId,
@@ -408,7 +425,7 @@ let make = ({chain, endpointUrl}: options): t => {
           block: block->Obj.magic,
           srcAddress: contractAddress,
           logIndex: receiptIndex,
-        }->Internal.fromGenericEvent,
+        }->Fuel.fromPayload,
       })
     })
 
@@ -450,8 +467,6 @@ let make = ({chain, endpointUrl}: options): t => {
   let getBlockHashes = (~blockNumbers as _, ~logger as _) =>
     JsError.throwWithMessage("HyperFuel does not support getting block hashes")
 
-  let jsonApiClient = EnvioApiClient.make(endpointUrl)
-
   {
     name,
     sourceFor: Sync,
@@ -461,7 +476,17 @@ let make = ({chain, endpointUrl}: options): t => {
     poweredByHyperSync: true,
     getHeightOrThrow: async () => {
       let timerRef = Hrtime.makeTimer()
-      let height = await HyperFuel.heightRoute->Rest.fetch((), ~client=jsonApiClient)
+      let height = try await client->HyperFuelClient.getHeight catch {
+      | JsExn(e) =>
+        switch e->JsExn.message {
+        | Some(message) if message->isUnauthorizedError =>
+          Logging.error(`Your ENVIO_API_TOKEN was rejected by HyperFuel (401 Unauthorized). The indexer will not be able to fetch events. Update the token and try again using 'envio start' or 'envio dev'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens`)
+          // Retrying an unauthorized request can never succeed, so block forever
+          let _ = await Promise.make((_, _) => ())
+          0
+        | _ => throw(JsExn(e))
+        }
+      }
       let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
       Prometheus.SourceRequestCount.increment(
         ~sourceName=name,

package/src/sources/HyperFuelSource.res.mjs

@@ -1,21 +1,24 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Rest from "../vendored/Rest.res.mjs";
 import * as Hrtime from "../bindings/Hrtime.res.mjs";
 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 Prometheus from "../Prometheus.res.mjs";
 import * as EventRouter from "./EventRouter.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";
-import * as EnvioApiClient from "./EnvioApiClient.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as HyperFuelClient from "./HyperFuelClient.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
 let EventRoutingFailed = /* @__PURE__ */Primitive_exceptions.create("HyperFuelSource.EventRoutingFailed");
 
+function isUnauthorizedError(message) {
+  return message.includes("401 Unauthorized");
+}
+
 let mintEventTag = "mint";
 
 let burnEventTag = "burn";
@@ -176,9 +179,22 @@ function memoGetSelectionConfig(chain) {
 }
 
 function make(param) {
-  let endpointUrl = param.endpointUrl;
+  let apiToken = param.apiToken;
   let chain = param.chain;
   let name = "HyperFuel";
+  let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperFuel 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 = HyperFuelClient.make({
+      url: param.endpointUrl,
+      apiToken: apiToken$1
+    });
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
+    client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the HyperFuel client", exn);
+  }
   let getSelectionConfig = memoGetSelectionConfig(chain);
   let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, param, selection, retry, logger) => {
     let totalTimeRef = Hrtime.makeTimer();
@@ -188,10 +204,10 @@ function make(param) {
     Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
     let pageUnsafe;
     try {
-      pageUnsafe = await HyperFuel.GetLogs.query(endpointUrl, fromBlock, toBlock, recieptsSelection);
+      pageUnsafe = await HyperFuel.GetLogs.query(client, fromBlock, toBlock, recieptsSelection);
     } catch (raw_error) {
       let error = Primitive_exceptions.internalToException(raw_error);
-      if (error.RE_EXN_ID === HyperSync.GetLogs.$$Error) {
+      if (error.RE_EXN_ID === HyperFuel.GetLogs.$$Error) {
         let error$1 = error._1;
         let tmp;
         if (typeof error$1 !== "object") {
@@ -339,7 +355,7 @@ function make(param) {
         blockNumber: block.height,
         blockHash: block.id,
         logIndex: receiptIndex,
-        event: {
+        payload: {
           contractName: eventConfig$1.contractName,
           eventName: eventConfig$1.name,
           params: params,
@@ -388,7 +404,6 @@ function make(param) {
     };
   };
   let getBlockHashes = (param, param$1) => Stdlib_JsError.throwWithMessage("HyperFuel does not support getting block hashes");
-  let jsonApiClient = EnvioApiClient.make(endpointUrl);
   return {
     name: name,
     sourceFor: "Sync",
@@ -398,7 +413,37 @@ function make(param) {
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
       let timerRef = Hrtime.makeTimer();
-      let height = await Rest.fetch(HyperFuel.heightRoute, undefined, jsonApiClient);
+      let height;
+      try {
+        height = await client.getHeight();
+      } catch (raw_e) {
+        let e = Primitive_exceptions.internalToException(raw_e);
+        if (e.RE_EXN_ID === "JsExn") {
+          let e$1 = e._1;
+          let message = Stdlib_JsExn.message(e$1);
+          if (message !== undefined) {
+            if (message.includes("401 Unauthorized")) {
+              Logging.error(`Your ENVIO_API_TOKEN was rejected by HyperFuel (401 Unauthorized). The indexer will not be able to fetch events. Update the token and try again using 'envio start' or 'envio dev'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens`);
+              await new Promise((param, param$1) => {});
+              height = 0;
+            } else {
+              throw {
+                RE_EXN_ID: "JsExn",
+                _1: e$1,
+                Error: new Error()
+              };
+            }
+          } else {
+            throw {
+              RE_EXN_ID: "JsExn",
+              _1: e$1,
+              Error: new Error()
+            };
+          }
+        } else {
+          throw e;
+        }
+      }
       let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
       Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
@@ -410,6 +455,7 @@ function make(param) {
 
 export {
   EventRoutingFailed,
+  isUnauthorizedError,
   mintEventTag,
   burnEventTag,
   transferEventTag,
@@ -422,4 +468,4 @@ export {
   memoGetSelectionConfig,
   make,
 }
-/* Rest Not a pure module */
+/* Logging Not a pure module */

package/src/sources/HyperSyncSource.res

@@ -206,16 +206,18 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       blockNumber: block.number->Option.getUnsafe,
       blockHash: block.hash->Option.getUnsafe,
       logIndex,
-      event: {
+      payload: {
         contractName: eventConfig.contractName,
         eventName: eventConfig.name,
         chainId,
         params,
-        transaction,
+        transaction: transaction->(
+          Utils.magic: HyperSyncClient.ResponseTypes.transaction => Internal.eventTransaction
+        ),
         block: block->(Utils.magic: HyperSyncClient.ResponseTypes.block => Internal.eventBlock),
         srcAddress,
         logIndex,
-      }->Internal.fromGenericEvent,
+      }->Evm.fromPayload,
     })
   }
 

package/src/sources/HyperSyncSource.res.mjs

@@ -135,7 +135,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       blockNumber: block.number,
       blockHash: block.hash,
       logIndex: logIndex,
-      event: {
+      payload: {
         contractName: eventConfig.contractName,
         eventName: eventConfig.name,
         params: params,

package/src/sources/RpcSource.res

@@ -1200,7 +1200,7 @@ let make = (
                   blockHash: block->getBlockHash,
                   chain,
                   logIndex: log.logIndex,
-                  event: {
+                  payload: {
                     contractName: eventConfig.contractName,
                     eventName: eventConfig.name,
                     chainId: chain->ChainMap.Chain.toChainId,
@@ -1209,7 +1209,7 @@ let make = (
                     block,
                     srcAddress: routedAddress,
                     logIndex: log.logIndex,
-                  }->Internal.fromGenericEvent,
+                  }->Evm.fromPayload,
                 })
               }
             )(),

package/src/sources/RpcSource.res.mjs

@@ -1131,7 +1131,7 @@ function make(param) {
           blockNumber: block.number,
           blockHash: block.hash,
           logIndex: log.logIndex,
-          event: {
+          payload: {
             contractName: eventConfig.contractName,
             eventName: eventConfig.name,
             params: decoded$1,

package/src/sources/SourceManager.res

@@ -11,16 +11,12 @@ type sourceState = {
   mutable lastFailedAt: option<float>,
 }
 
-// Ideally the ChainFetcher name suits this better
-// But currently the ChainFetcher module is immutable
-// and handles both processing and fetching.
-// So this module is to encapsulate the fetching logic only
+// Encapsulates the fetching logic for a chain's sources.
 // with a mutable state for easier reasoning and testing.
 type t = {
   sourcesState: array<sourceState>,
   mutable statusStart: Hrtime.timeRef,
   mutable status: sourceManagerStatus,
-  maxPartitionConcurrency: int,
   newBlockStallTimeout: int,
   newBlockStallTimeoutRealtime: int,
   stalledPollingInterval: int,
@@ -46,6 +42,10 @@ type t = {
 
 let getActiveSource = sourceManager => sourceManager.activeSource
 
+// Partition queries currently in flight on this chain's sources. Summed across
+// chains by CrossChainState to enforce the indexer-wide concurrency budget.
+let inFlightCount = sourceManager => sourceManager.fetchingPartitionsCount
+
 let getRateLimitTimeMs = sourceManager =>
   sourceManager.committedRateLimitTimeMs +.
   switch sourceManager.activeRateLimitStartMs {
@@ -151,7 +151,6 @@ let makeGetHeightRetryInterval = (
 
 let make = (
   ~sources: array<Source.t>,
-  ~maxPartitionConcurrency,
   ~isRealtime,
   ~newBlockStallTimeout=60_000,
   ~newBlockStallTimeoutRealtime=20_000,
@@ -172,16 +171,11 @@ let make = (
   | None =>
     JsError.throwWithMessage("Invalid configuration, no data-source for historical sync provided")
   }
-  Prometheus.IndexingMaxConcurrency.set(
-    ~maxConcurrency=maxPartitionConcurrency,
-    ~chainId=initialActiveSource.chain->ChainMap.Chain.toChainId,
-  )
   Prometheus.IndexingConcurrency.set(
     ~concurrency=0,
     ~chainId=initialActiveSource.chain->ChainMap.Chain.toChainId,
   )
   {
-    maxPartitionConcurrency,
     sourcesState: sources->Array.map(source => {
       source,
       knownHeight: 0,
@@ -223,24 +217,20 @@ let trackNewStatus = (sourceManager: t, ~newStatus) => {
   sourceManager.status = newStatus
 }
 
-let fetchNext = async (
+// Carry out the fetch decision made by CrossChainState.checkAndFetch: either
+// dispatch the admitted queries or start waiting for a new block. Selection
+// (getNextQuery + cross-chain admission) happens upstream so the budget is split
+// per query across all chains.
+let dispatch = async (
   sourceManager: t,
   ~fetchState: FetchState.t,
   ~executeQuery,
   ~waitForNewBlock,
   ~onNewBlock,
+  ~action: FetchState.nextQuery,
   ~stateId,
 ) => {
-  let {maxPartitionConcurrency} = sourceManager
-
-  let nextQuery = fetchState->FetchState.getNextQuery(
-    ~concurrencyLimit={
-      maxPartitionConcurrency - sourceManager.fetchingPartitionsCount
-    },
-  )
-
-  switch nextQuery {
-  | ReachedMaxConcurrency
+  switch action {
   | NothingToQuery => ()
   | WaitingForNewBlock =>
     switch sourceManager.waitingForNewBlockStateId {
@@ -261,7 +251,8 @@ let fetchNext = async (
       }
     }
   | Ready(queries) => {
-      fetchState->FetchState.startFetchingQueries(~queries)
+      // Queries are already marked in flight by ChainState.startFetchingQueries
+      // when they were admitted; here we just execute them.
       sourceManager.fetchingPartitionsCount =
         sourceManager.fetchingPartitionsCount + queries->Array.length
       Prometheus.IndexingConcurrency.set(

package/src/sources/SourceManager.res.mjs

@@ -18,6 +18,10 @@ function getActiveSource(sourceManager) {
   return sourceManager.activeSource;
 }
 
+function inFlightCount(sourceManager) {
+  return sourceManager.fetchingPartitionsCount;
+}
+
 function getRateLimitTimeMs(sourceManager) {
   let startMs = sourceManager.activeRateLimitStartMs;
   return sourceManager.committedRateLimitTimeMs + (
@@ -115,7 +119,7 @@ function makeGetHeightRetryInterval(initialRetryInterval, backoffMultiplicative,
   };
 }
 
-function make(sources, maxPartitionConcurrency, isRealtime, newBlockStallTimeoutOpt, newBlockStallTimeoutRealtimeOpt, stalledPollingIntervalOpt, reducedPollingIntervalOpt, recoveryTimeoutOpt, getHeightRetryIntervalOpt) {
+function make(sources, isRealtime, newBlockStallTimeoutOpt, newBlockStallTimeoutRealtimeOpt, stalledPollingIntervalOpt, reducedPollingIntervalOpt, recoveryTimeoutOpt, getHeightRetryIntervalOpt) {
   let newBlockStallTimeout = newBlockStallTimeoutOpt !== undefined ? newBlockStallTimeoutOpt : 60000;
   let newBlockStallTimeoutRealtime = newBlockStallTimeoutRealtimeOpt !== undefined ? newBlockStallTimeoutRealtimeOpt : 20000;
   let stalledPollingInterval = stalledPollingIntervalOpt !== undefined ? stalledPollingIntervalOpt : 5000;
@@ -125,7 +129,6 @@ function make(sources, maxPartitionConcurrency, isRealtime, newBlockStallTimeout
   let hasRealtime = sources.some(s => s.sourceFor === "Realtime");
   let source = sources.find(source => getSourceRole(source.sourceFor, isRealtime, hasRealtime) === "Primary");
   let initialActiveSource = source !== undefined ? source : Stdlib_JsError.throwWithMessage("Invalid configuration, no data-source for historical sync provided");
-  Prometheus.IndexingMaxConcurrency.set(maxPartitionConcurrency, initialActiveSource.chain);
   Prometheus.IndexingConcurrency.set(0, initialActiveSource.chain);
   return {
     sourcesState: sources.map(source => ({
@@ -138,7 +141,6 @@ function make(sources, maxPartitionConcurrency, isRealtime, newBlockStallTimeout
     })),
     statusStart: Hrtime.makeTimer(),
     status: "Idle",
-    maxPartitionConcurrency: maxPartitionConcurrency,
     newBlockStallTimeout: newBlockStallTimeout,
     newBlockStallTimeoutRealtime: newBlockStallTimeoutRealtime,
     stalledPollingInterval: stalledPollingInterval,
@@ -175,33 +177,28 @@ function trackNewStatus(sourceManager, newStatus) {
   sourceManager.status = newStatus;
 }
 
-async function fetchNext(sourceManager, fetchState, executeQuery, waitForNewBlock, onNewBlock, stateId) {
-  let nextQuery = FetchState.getNextQuery(fetchState, sourceManager.maxPartitionConcurrency - sourceManager.fetchingPartitionsCount | 0);
-  if (typeof nextQuery !== "object") {
-    switch (nextQuery) {
-      case "WaitingForNewBlock" :
-        let waitingStateId = sourceManager.waitingForNewBlockStateId;
-        if (waitingStateId !== undefined && waitingStateId >= stateId) {
-          return;
-        }
-        trackNewStatus(sourceManager, "WaitingForNewBlock");
-        sourceManager.waitingForNewBlockStateId = stateId;
-        let knownHeight = await waitForNewBlock(fetchState.knownHeight);
-        let waitingStateId$1 = sourceManager.waitingForNewBlockStateId;
-        if (waitingStateId$1 !== undefined && waitingStateId$1 === stateId) {
-          trackNewStatus(sourceManager, "Idle");
-          sourceManager.waitingForNewBlockStateId = undefined;
-          return onNewBlock(knownHeight);
-        } else {
-          return;
-        }
-      case "ReachedMaxConcurrency" :
-      case "NothingToQuery" :
-        return;
+async function dispatch(sourceManager, fetchState, executeQuery, waitForNewBlock, onNewBlock, action, stateId) {
+  if (typeof action !== "object") {
+    if (action !== "WaitingForNewBlock") {
+      return;
+    }
+    let waitingStateId = sourceManager.waitingForNewBlockStateId;
+    if (waitingStateId !== undefined && waitingStateId >= stateId) {
+      return;
+    }
+    trackNewStatus(sourceManager, "WaitingForNewBlock");
+    sourceManager.waitingForNewBlockStateId = stateId;
+    let knownHeight = await waitForNewBlock(fetchState.knownHeight);
+    let waitingStateId$1 = sourceManager.waitingForNewBlockStateId;
+    if (waitingStateId$1 !== undefined && waitingStateId$1 === stateId) {
+      trackNewStatus(sourceManager, "Idle");
+      sourceManager.waitingForNewBlockStateId = undefined;
+      return onNewBlock(knownHeight);
+    } else {
+      return;
     }
   } else {
-    let queries = nextQuery._0;
-    FetchState.startFetchingQueries(fetchState, queries);
+    let queries = action._0;
     sourceManager.fetchingPartitionsCount = sourceManager.fetchingPartitionsCount + queries.length | 0;
     Prometheus.IndexingConcurrency.set(sourceManager.fetchingPartitionsCount, sourceManager.activeSource.chain);
     trackNewStatus(sourceManager, "Querieng");
@@ -680,8 +677,9 @@ export {
   getSourceRole,
   make,
   getActiveSource,
+  inFlightCount,
   onReorg,
-  fetchNext,
+  dispatch,
   waitForNewBlock,
   executeQuery,
   makeGetHeightRetryInterval,

package/src/sources/SourceManager.resi

@@ -10,7 +10,6 @@ let getSourceRole: (
 
 let make: (
   ~sources: array<Source.t>,
-  ~maxPartitionConcurrency: int,
   ~isRealtime: bool,
   ~newBlockStallTimeout: int=?,
   ~newBlockStallTimeoutRealtime: int=?,
@@ -22,14 +21,17 @@ let make: (
 
 let getActiveSource: t => Source.t
 
+let inFlightCount: t => int
+
 let onReorg: (t, ~rollbackTargetBlock: int) => unit
 
-let fetchNext: (
+let dispatch: (
   t,
   ~fetchState: FetchState.t,
   ~executeQuery: FetchState.query => promise<unit>,
   ~waitForNewBlock: (~knownHeight: int) => promise<int>,
   ~onNewBlock: (~knownHeight: int) => unit,
+  ~action: FetchState.nextQuery,
   ~stateId: int,
 ) => promise<unit>
 

package/src/sources/Svm.res

@@ -4,7 +4,7 @@ let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.time
   }`)
 
-let ecosystem: Ecosystem.t = {
+let make = (~logger: Pino.t): Ecosystem.t => {
   name: Svm,
   blockFields: ["slot"],
   transactionFields: [],
@@ -19,6 +19,23 @@ let ecosystem: Ecosystem.t = {
   // SVM has no event handlers, so there is no `onEvent` `where` value to
   // parse. The schema is a no-op object that always surfaces `None`.
   onEventBlockFilterSchema: S.object(_ => None),
+  logger,
+  toEvent: eventItem => eventItem.payload->Internal.payloadToEvent,
+  toEventLogger: eventItem => {
+    let instruction =
+      eventItem.payload->(Utils.magic: Internal.eventPayload => Envio.svmInstruction)
+    Logging.createChildFrom(
+      ~logger,
+      ~params={
+        "program": eventItem.eventConfig.contractName,
+        "instruction": eventItem.eventConfig.name,
+        "chainId": eventItem.chain->ChainMap.Chain.toChainId,
+        "slot": eventItem.blockNumber,
+        "programId": instruction.programId,
+      },
+    )
+  },
+  toRawEvent: _ => JsError.throwWithMessage("Raw events are not supported for SVM"),
 }
 
 module GetFinalizedSlot = {

package/src/sources/Svm.res.mjs

@@ -4,6 +4,7 @@ import * as Rpc from "./Rpc.res.mjs";
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Hrtime from "../bindings/Hrtime.res.mjs";
+import * as Logging from "../Logging.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
@@ -14,26 +15,33 @@ let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.time
   });
 
-let ecosystem_blockFields = ["slot"];
-
-let ecosystem_transactionFields = [];
-
-let ecosystem_onBlockFilterSchema = S$RescriptSchema.object(s => s.f("slot", S$RescriptSchema.option(S$RescriptSchema.unknown)));
-
-let ecosystem_onEventBlockFilterSchema = S$RescriptSchema.object(param => {});
-
-let ecosystem = {
-  name: "svm",
-  blockFields: ecosystem_blockFields,
-  transactionFields: ecosystem_transactionFields,
-  blockNumberName: "height",
-  blockTimestampName: "time",
-  blockHashName: "hash",
-  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
-  onBlockMethodName: "onSlot",
-  onBlockFilterSchema: ecosystem_onBlockFilterSchema,
-  onEventBlockFilterSchema: ecosystem_onEventBlockFilterSchema
-};
+function make(logger) {
+  return {
+    name: "svm",
+    blockFields: ["slot"],
+    transactionFields: [],
+    blockNumberName: "height",
+    blockTimestampName: "time",
+    blockHashName: "hash",
+    cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace,
+    onBlockMethodName: "onSlot",
+    onBlockFilterSchema: S$RescriptSchema.object(s => s.f("slot", S$RescriptSchema.option(S$RescriptSchema.unknown))),
+    onEventBlockFilterSchema: S$RescriptSchema.object(param => {}),
+    logger: logger,
+    toEvent: eventItem => eventItem.payload,
+    toEventLogger: eventItem => {
+      let instruction = eventItem.payload;
+      return Logging.createChildFrom(logger, {
+        program: eventItem.eventConfig.contractName,
+        instruction: eventItem.eventConfig.name,
+        chainId: eventItem.chain,
+        slot: eventItem.blockNumber,
+        programId: instruction.programId
+      });
+    },
+    toRawEvent: param => Stdlib_JsError.throwWithMessage("Raw events are not supported for SVM")
+  };
+}
 
 let route = Rpc.makeRpcRoute("getSlot", S$RescriptSchema.tuple(s => {
   s.tag(0, {
@@ -72,8 +80,8 @@ function makeRPCSource(chain, rpc, sourceForOpt) {
 
 export {
   cleanUpRawEventFieldsInPlace,
-  ecosystem,
+  make,
   GetFinalizedSlot,
   makeRPCSource,
 }
-/* ecosystem Not a pure module */
+/* route Not a pure module */

package/src/sources/SvmHyperSyncSource.res

@@ -510,7 +510,7 @@ let make = ({chain, endpointUrl, apiToken, eventConfigs, clientTimeoutMillis}: o
             blockNumber: instr.slot,
             blockHash: "",
             logIndex: synthLogIndex(instr),
-            event: payload->(Utils.magic: Envio.svmInstruction => Internal.event),
+            payload: payload->(Utils.magic: Envio.svmInstruction => Internal.eventPayload),
           }),
         )
         ->ignore

package/src/sources/SvmHyperSyncSource.res.mjs

@@ -420,7 +420,7 @@ function make(param) {
           blockNumber: instr.slot,
           blockHash: "",
           logIndex: synthLogIndex(instr),
-          event: payload
+          payload: payload
         });
       }
     });