envio 3.5.0-alpha.2 → 3.5.0-rc.0

package/src/sources/Svm.res.mjs

@@ -3,6 +3,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 ChainId from "../ChainId.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Internal from "../Internal.res.mjs";
 import * as BlockStore from "./BlockStore.res.mjs";
@@ -47,7 +48,7 @@ function make(logger) {
       return Logging.createChildFrom(logger, {
         program: eventItem.onEventRegistration.eventConfig.contractName,
         instruction: eventItem.onEventRegistration.eventConfig.name,
-        chainId: eventItem.chain,
+        chainId: eventItem.chainId,
         slot: eventItem.blockNumber,
         programId: instruction.programId
       });
@@ -66,16 +67,16 @@ let GetFinalizedSlot = {
   route: route
 };
 
-function makeRPCSource(chain, rpc, sourceForOpt) {
+function makeRPCSource(chainId, rpc, sourceForOpt) {
   let sourceFor = sourceForOpt !== undefined ? sourceForOpt : "Sync";
   let client = Rest.client(rpc, undefined);
   let host = Utils.Url.getHostFromUrl(rpc);
-  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
+  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + ChainId.toString(chainId) + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
   return {
     name: name,
     sourceFor: sourceFor,
-    chain: chain,
+    chainId: chainId,
     poweredByHyperSync: false,
     pollingInterval: 10000,
     getBlockHashes: (param, param$1) => Stdlib_JsError.throwWithMessage("Svm does not support getting block hashes"),

package/src/sources/SvmHyperSyncClient.res

@@ -25,6 +25,8 @@ module Registration = {
     contractName: string,
     programId: string,
     isWildcard: bool,
+    // Earliest slot this registration accepts; `None` is unrestricted.
+    startBlock: option<int>,
     discriminator?: string,
     discriminatorByteLen: int,
     isInner?: bool,
@@ -52,6 +54,7 @@ module Registration = {
         contractName: eventConfig.contractName,
         programId: eventConfig.programId->SvmTypes.Pubkey.toString,
         isWildcard: reg.isWildcard,
+        startBlock: reg.startBlock,
         discriminator: ?eventConfig.discriminator,
         discriminatorByteLen: eventConfig.discriminatorByteLen,
         isInner: ?eventConfig.isInner,

package/src/sources/SvmHyperSyncClient.res.mjs

@@ -18,6 +18,7 @@ function fromOnEventRegistrations(onEventRegistrations) {
       contractName: eventConfig.contractName,
       programId: eventConfig.programId,
       isWildcard: reg.isWildcard,
+      startBlock: reg.startBlock,
       discriminator: eventConfig.discriminator,
       discriminatorByteLen: eventConfig.discriminatorByteLen,
       isInner: eventConfig.isInner,

package/src/sources/SvmHyperSyncSource.res

@@ -1,7 +1,7 @@
 open Source
 
 type options = {
-  chain: ChainMap.Chain.t,
+  chainId: ChainId.t,
   endpointUrl: string,
   apiToken: option<string>,
   onEventRegistrations: array<Internal.svmOnEventRegistration>,
@@ -68,7 +68,7 @@ let toSvmInstruction = (
 }
 
 let make = (
-  {chain, endpointUrl, apiToken, onEventRegistrations, clientTimeoutMillis, addressStore}: options,
+  {chainId, endpointUrl, apiToken, onEventRegistrations, clientTimeoutMillis, addressStore}: options,
 ): t => {
   let name = "SvmHyperSync"
 
@@ -159,7 +159,7 @@ let make = (
       )
       Internal.Event({
         onEventRegistration,
-        chain,
+        chainId,
         blockNumber: item.slot,
         logIndex: synthLogIndex(
           ~transactionIndex=item.transactionIndex,
@@ -283,7 +283,7 @@ let make = (
   {
     name,
     sourceFor: Sync,
-    chain,
+    chainId,
     pollingInterval: 1000,
     poweredByHyperSync: true,
     getBlockHashes,

package/src/sources/SvmHyperSyncSource.res.mjs

@@ -57,7 +57,7 @@ function toSvmInstruction(item, programName, instructionName) {
 
 function make(param) {
   let onEventRegistrations = param.onEventRegistrations;
-  let chain = param.chain;
+  let chainId = param.chainId;
   let client = SvmHyperSyncClient.make(param.endpointUrl, param.apiToken, param.clientTimeoutMillis, undefined, undefined, undefined, SvmHyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), param.addressStore);
   let getItemsOrThrow = async (fromBlock, toBlock, addressSet, knownHeight, param, selection, itemsTarget, retry, param$1) => {
     let totalTimeRef = Performance.now();
@@ -113,7 +113,7 @@ function make(param) {
       return {
         kind: 0,
         onEventRegistration: onEventRegistration,
-        chain: chain,
+        chainId: chainId,
         blockNumber: item.slot,
         logIndex: synthLogIndex(item.transactionIndex, item.instructionAddress),
         transactionIndex: item.transactionIndex,
@@ -243,7 +243,7 @@ function make(param) {
   return {
     name: "SvmHyperSync",
     sourceFor: "Sync",
-    chain: chain,
+    chainId: chainId,
     poweredByHyperSync: true,
     pollingInterval: 1000,
     getBlockHashes: getBlockHashes,

package/src/tui/Tui.res

@@ -204,7 +204,7 @@ module App = {
             knownHeight: data.knownHeight,
             latestFetchedBlockNumber,
             eventsProcessed: numEventsProcessed,
-            chainId: (cs->ChainState.chainConfig).id->Int.toString,
+            chainId: (cs->ChainState.chainConfig).id->ChainId.toString,
             progressBlock: committedProgressBlockNumber < data.startBlock
               ? Some(data.startBlock)
               : Some(committedProgressBlockNumber),

package/src/tui/Tui.res.mjs

@@ -4,6 +4,7 @@ import * as Env from "../Env.res.mjs";
 import * as Ink from "./bindings/Ink.res.mjs";
 import * as Ink$1 from "ink";
 import * as React from "react";
+import * as ChainId from "../ChainId.res.mjs";
 import * as SyncETA from "./components/SyncETA.res.mjs";
 import * as TuiData from "./components/TuiData.res.mjs";
 import * as Messages from "./components/Messages.res.mjs";
@@ -255,7 +256,7 @@ function Tui$App(props) {
         break;
     }
     return {
-      chainId: ChainState.chainConfig(cs).id.toString(),
+      chainId: ChainId.toString(ChainState.chainConfig(cs).id),
       eventsProcessed: numEventsProcessed,
       progressBlock: committedProgressBlockNumber < data.startBlock ? data.startBlock : committedProgressBlockNumber,
       bufferBlock: latestFetchedBlockNumber,

package/src/tui/components/CustomHooks.res

@@ -4,16 +4,16 @@ module InitApi = {
     envioVersion: string,
     envioApiToken: option<string>,
     ecosystem: ecosystem,
-    hyperSyncNetworks: array<int>,
-    rpcNetworks: array<int>,
+    hyperSyncNetworks: array<ChainId.t>,
+    rpcNetworks: array<ChainId.t>,
   }
 
   let bodySchema = S.object(s => {
     envioVersion: s.field("envioVersion", S.string),
     envioApiToken: s.field("envioApiToken", S.option(S.string)),
     ecosystem: s.field("ecosystem", S.enum([Evm, Fuel, Svm])),
-    hyperSyncNetworks: s.field("hyperSyncNetworks", S.array(S.int)),
-    rpcNetworks: s.field("rpcNetworks", S.array(S.int)),
+    hyperSyncNetworks: s.field("hyperSyncNetworks", S.array(ChainId.schema)),
+    rpcNetworks: s.field("rpcNetworks", S.array(ChainId.schema)),
   })
 
   let makeBody = (~envioVersion, ~envioApiToken, ~config: Config.t) => {
@@ -28,6 +28,7 @@ module InitApi = {
       | Config.EvmSourceConfig({hypersync: None}) => false
       | Config.FuelSourceConfig(_) => true // Fuel always uses HyperFuel
       | Config.SvmSourceConfig(_) => false
+      | Config.SimulateSourceConfig(_) => false
       | Config.CustomSources(sources) => sources->Array.some(s => s.poweredByHyperSync)
       }
       switch usesHyperSync {

package/src/tui/components/CustomHooks.res.mjs

@@ -4,6 +4,7 @@ import * as Env from "../../Env.res.mjs";
 import * as Rest from "../../vendored/Rest.res.mjs";
 import * as Utils from "../../Utils.res.mjs";
 import * as React from "react";
+import * as ChainId from "../../ChainId.res.mjs";
 import * as Logging from "../../Logging.res.mjs";
 import * as ChainMap from "../../ChainMap.res.mjs";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
@@ -17,8 +18,8 @@ let bodySchema = S$RescriptSchema.object(s => ({
     "fuel",
     "svm"
   ])),
-  hyperSyncNetworks: s.f("hyperSyncNetworks", S$RescriptSchema.array(S$RescriptSchema.int)),
-  rpcNetworks: s.f("rpcNetworks", S$RescriptSchema.array(S$RescriptSchema.int))
+  hyperSyncNetworks: s.f("hyperSyncNetworks", S$RescriptSchema.array(ChainId.schema)),
+  rpcNetworks: s.f("rpcNetworks", S$RescriptSchema.array(ChainId.schema))
 }));
 
 function makeBody(envioVersion, envioApiToken, config) {
@@ -35,6 +36,7 @@ function makeBody(envioVersion, envioApiToken, config) {
         usesHyperSync = true;
         break;
       case "SvmSourceConfig" :
+      case "SimulateSourceConfig" :
         usesHyperSync = false;
         break;
       case "CustomSources" :