envio 3.0.2 → 3.1.0-rc.0

package/src/ChainFetcher.res

@@ -51,6 +51,7 @@ let make = (
   ~reorgCheckpoints: array<Internal.reorgCheckpoint>,
   ~maxReorgDepth,
   ~knownHeight=0,
+  ~reducedPollingInterval=?,
 ): t => {
   // We don't need the router itself, but only validation logic,
   // since now event router is created for selection of events
@@ -210,10 +211,6 @@ let make = (
         Utils.magic: array<Internal.eventConfig> => array<Internal.evmEventConfig>
       ),
     })
-    // Collect all event signatures from contracts
-    let allEventSignatures =
-      chainConfig.contracts->Array.flatMap(contract => contract.eventSignatures)
-    // Convert rpcs to EvmChain.rpc format
     let evmRpcs: array<EvmChain.rpc> = rpcs->Array.map((rpc): EvmChain.rpc => {
       let syncConfig = rpc.syncConfig
       let ws = rpc.ws
@@ -228,7 +225,6 @@ let make = (
       ~chain,
       ~contracts=evmContracts,
       ~hyperSync=hypersync,
-      ~allEventSignatures,
       ~rpcs=evmRpcs,
       ~lowercaseAddresses,
     )
@@ -245,6 +241,7 @@ let make = (
       ~sources,
       ~maxPartitionConcurrency=Env.maxPartitionConcurrency,
       ~isRealtime,
+      ~reducedPollingInterval?,
     ),
     reorgDetection: ReorgDetection.make(
       ~chainReorgCheckpoints,
@@ -305,6 +302,7 @@ let makeFromDbState = (
   ~config,
   ~registrations,
   ~targetBufferSize,
+  ~reducedPollingInterval=?,
 ) => {
   let chainId = chainConfig.id
   let logger = Logging.createChild(~params={"chainId": chainId})
@@ -337,6 +335,7 @@ let makeFromDbState = (
     ~isInReorgThreshold,
     ~isRealtime,
     ~knownHeight=resumedChainState.sourceBlockNumber,
+    ~reducedPollingInterval?,
   )
 }
 

package/src/ChainFetcher.res.mjs

@@ -37,7 +37,7 @@ function configAddresses(chainConfig) {
   return addresses;
 }
 
-function make(chainConfig, indexingAddresses, startBlock, endBlock, firstEventBlockOpt, progressBlockNumber, config, registrations, targetBufferSize, logger, timestampCaughtUpToHeadOrEndblock, numEventsProcessed, isInReorgThreshold, isRealtime, reorgCheckpoints, maxReorgDepth, knownHeightOpt) {
+function make(chainConfig, indexingAddresses, startBlock, endBlock, firstEventBlockOpt, progressBlockNumber, config, registrations, targetBufferSize, logger, timestampCaughtUpToHeadOrEndblock, numEventsProcessed, isInReorgThreshold, isRealtime, reorgCheckpoints, maxReorgDepth, knownHeightOpt, reducedPollingInterval) {
   let firstEventBlock = firstEventBlockOpt !== undefined ? Primitive_option.valFromOption(firstEventBlockOpt) : undefined;
   let knownHeight = knownHeightOpt !== undefined ? knownHeightOpt : 0;
   let eventRouter = EventRouter.empty();
@@ -113,7 +113,6 @@ function make(chainConfig, indexingAddresses, startBlock, endBlock, firstEventBl
         abi: contract.abi,
         events: contract.events
       }));
-      let allEventSignatures = chainConfig.contracts.flatMap(contract => contract.eventSignatures);
       let evmRpcs = sources.rpcs.map(rpc => {
         let syncConfig = rpc.syncConfig;
         let ws = rpc.ws;
@@ -124,7 +123,7 @@ function make(chainConfig, indexingAddresses, startBlock, endBlock, firstEventBl
           ws: ws
         };
       });
-      sources$1 = EvmChain.makeSources(chain, evmContracts, sources.hypersync, allEventSignatures, evmRpcs, lowercaseAddresses);
+      sources$1 = EvmChain.makeSources(chain, evmContracts, sources.hypersync, evmRpcs, lowercaseAddresses);
       break;
     case "FuelSourceConfig" :
       sources$1 = [HyperFuelSource.make({
@@ -142,7 +141,7 @@ function make(chainConfig, indexingAddresses, startBlock, endBlock, firstEventBl
   return {
     logger: logger,
     fetchState: fetchState,
-    sourceManager: SourceManager.make(sources$1, Env.maxPartitionConcurrency, isRealtime, undefined, undefined, undefined, undefined, undefined, undefined),
+    sourceManager: SourceManager.make(sources$1, Env.maxPartitionConcurrency, isRealtime, undefined, undefined, undefined, reducedPollingInterval, undefined, undefined),
     chainConfig: chainConfig,
     isProgressAtHead: false,
     timestampCaughtUpToHeadOrEndblock: timestampCaughtUpToHeadOrEndblock,
@@ -157,17 +156,17 @@ function makeFromConfig(chainConfig, config, registrations, targetBufferSize, kn
   let logger = Logging.createChild({
     chainId: chainConfig.id
   });
-  return make(chainConfig, configAddresses(chainConfig), chainConfig.startBlock, chainConfig.endBlock, undefined, -1, config, registrations, targetBufferSize, logger, undefined, 0, false, false, [], chainConfig.maxReorgDepth, knownHeight);
+  return make(chainConfig, configAddresses(chainConfig), chainConfig.startBlock, chainConfig.endBlock, undefined, -1, config, registrations, targetBufferSize, logger, undefined, 0, false, false, [], chainConfig.maxReorgDepth, knownHeight, undefined);
 }
 
-function makeFromDbState(chainConfig, resumedChainState, reorgCheckpoints, isInReorgThreshold, isRealtime, config, registrations, targetBufferSize) {
+function makeFromDbState(chainConfig, resumedChainState, reorgCheckpoints, isInReorgThreshold, isRealtime, config, registrations, targetBufferSize, reducedPollingInterval) {
   let chainId = chainConfig.id;
   let logger = Logging.createChild({
     chainId: chainId
   });
   Prometheus.ProgressEventsCount.set(resumedChainState.numEventsProcessed, chainId);
   let progressBlockNumber = resumedChainState.progressBlockNumber >= 0 ? resumedChainState.progressBlockNumber : resumedChainState.startBlock - 1 | 0;
-  return make(chainConfig, resumedChainState.indexingAddresses, resumedChainState.startBlock, resumedChainState.endBlock, Primitive_option.some(resumedChainState.firstEventBlockNumber), progressBlockNumber, config, registrations, targetBufferSize, logger, Env.updateSyncTimeOnRestart ? undefined : resumedChainState.timestampCaughtUpToHeadOrEndblock, resumedChainState.numEventsProcessed, isInReorgThreshold, isRealtime, reorgCheckpoints, resumedChainState.maxReorgDepth, resumedChainState.sourceBlockNumber);
+  return make(chainConfig, resumedChainState.indexingAddresses, resumedChainState.startBlock, resumedChainState.endBlock, Primitive_option.some(resumedChainState.firstEventBlockNumber), progressBlockNumber, config, registrations, targetBufferSize, logger, Env.updateSyncTimeOnRestart ? undefined : resumedChainState.timestampCaughtUpToHeadOrEndblock, resumedChainState.numEventsProcessed, isInReorgThreshold, isRealtime, reorgCheckpoints, resumedChainState.maxReorgDepth, resumedChainState.sourceBlockNumber, reducedPollingInterval);
 }
 
 async function runContractRegistersOrThrow(itemsWithContractRegister, config) {

package/src/ChainManager.res

@@ -1,7 +1,5 @@
 type t = {
-  committedCheckpointId: bigint,
   chainFetchers: ChainMap.t<ChainFetcher.t>,
-  multichain: Config.multichain,
   isInReorgThreshold: bool,
   // True once every chain has caught up to head/endBlock. Monotonic during a run.
   isRealtime: bool,
@@ -35,6 +33,7 @@ let makeFromDbState = (
   ~initialState: Persistence.initialState,
   ~config: Config.t,
   ~registrations,
+  ~reducedPollingInterval=?,
 ): t => {
   let isInReorgThreshold = if initialState.cleanRun {
     false
@@ -81,6 +80,7 @@ let makeFromDbState = (
           ~targetBufferSize,
           ~config,
           ~registrations,
+          ~reducedPollingInterval?,
         ),
       )
     })
@@ -105,8 +105,6 @@ let makeFromDbState = (
   }
 
   {
-    committedCheckpointId: initialState.checkpointId,
-    multichain: config.multichain,
     chainFetchers,
     isInReorgThreshold,
     isRealtime,
@@ -128,17 +126,21 @@ let setChainFetcher = (chainManager: t, chainFetcher: ChainFetcher.t) => {
 }
 
 let nextItemIsNone = (chainManager: t): bool => {
-  !Batch.hasMultichainReadyItem(
+  !Batch.hasReadyItem(
     chainManager.chainFetchers->ChainMap.map(cf => {
       cf.fetchState
     }),
-    ~multichain=chainManager.multichain,
   )
 }
 
-let createBatch = (chainManager: t, ~batchSizeTarget: int, ~isRollback: bool): Batch.t => {
+let createBatch = (
+  chainManager: t,
+  ~committedCheckpointId,
+  ~batchSizeTarget: int,
+  ~isRollback: bool,
+): Batch.t => {
   Batch.make(
-    ~checkpointIdBeforeBatch=chainManager.committedCheckpointId->BigInt.add(
+    ~checkpointIdBeforeBatch=committedCheckpointId->BigInt.add(
       // Since for rollback we have a diff checkpoint id.
       // This is needed to currectly overwrite old state
       // in an append-only ClickHouse insert.
@@ -152,7 +154,6 @@ let createBatch = (chainManager: t, ~batchSizeTarget: int, ~isRollback: bool): B
       reorgDetection: cf.reorgDetection,
       chainConfig: cf.chainConfig,
     }),
-    ~multichain=chainManager.multichain,
     ~batchSizeTarget,
   )
 }

package/src/ChainManager.res.mjs

@@ -38,7 +38,7 @@ function calculateTargetBufferSize(activeChainsCount) {
   }
 }
 
-function makeFromDbState(initialState, config, registrations) {
+function makeFromDbState(initialState, config, registrations, reducedPollingInterval) {
   let isInReorgThreshold = initialState.cleanRun ? false : initialState.chains.some(chain => isProgressInReorgThreshold(chain.progressBlockNumber, chain.sourceBlockNumber, chain.maxReorgDepth));
   let targetBufferSize = calculateTargetBufferSize(initialState.chains.length);
   Prometheus.ProcessingMaxBatchSize.set(config.batchSize);
@@ -54,7 +54,7 @@ function makeFromDbState(initialState, config, registrations) {
     let chainConfig = ChainMap.get(config.chainMap, chain);
     return [
       chain,
-      ChainFetcher.makeFromDbState(chainConfig, resumedChainState, initialState.reorgCheckpoints, isInReorgThreshold, isRealtime, config, registrations, targetBufferSize)
+      ChainFetcher.makeFromDbState(chainConfig, resumedChainState, initialState.reorgCheckpoints, isInReorgThreshold, isRealtime, config, registrations, targetBufferSize, reducedPollingInterval)
     ];
   });
   let chainFetchers = ChainMap.fromArrayUnsafe(chainFetchersArr);
@@ -77,9 +77,7 @@ function makeFromDbState(initialState, config, registrations) {
     Prometheus.ProgressReady.setAllReady();
   }
   return {
-    committedCheckpointId: initialState.checkpointId,
     chainFetchers: chainFetchers,
-    multichain: config.multichain,
     isInReorgThreshold: isInReorgThreshold,
     isRealtime: isRealtime
   };
@@ -91,20 +89,18 @@ function getChainFetcher(chainManager, chain) {
 
 function setChainFetcher(chainManager, chainFetcher) {
   return {
-    committedCheckpointId: chainManager.committedCheckpointId,
     chainFetchers: ChainMap.set(chainManager.chainFetchers, ChainMap.Chain.makeUnsafe(chainFetcher.chainConfig.id), chainFetcher),
-    multichain: chainManager.multichain,
     isInReorgThreshold: chainManager.isInReorgThreshold,
     isRealtime: chainManager.isRealtime
   };
 }
 
 function nextItemIsNone(chainManager) {
-  return !Batch.hasMultichainReadyItem(ChainMap.map(chainManager.chainFetchers, cf => cf.fetchState), chainManager.multichain);
+  return !Batch.hasReadyItem(ChainMap.map(chainManager.chainFetchers, cf => cf.fetchState));
 }
 
-function createBatch(chainManager, batchSizeTarget, isRollback) {
-  return Batch.make(chainManager.committedCheckpointId + (
+function createBatch(chainManager, committedCheckpointId, batchSizeTarget, isRollback) {
+  return Batch.make(committedCheckpointId + (
     isRollback ? 1n : 0n
   ), ChainMap.map(chainManager.chainFetchers, cf => ({
     fetchState: cf.fetchState,
@@ -113,7 +109,7 @@ function createBatch(chainManager, batchSizeTarget, isRollback) {
     sourceBlockNumber: cf.fetchState.knownHeight,
     totalEventsProcessed: cf.numEventsProcessed,
     chainConfig: cf.chainConfig
-  })), chainManager.multichain, batchSizeTarget);
+  })), batchSizeTarget);
 }
 
 function isProgressAtHead(chainManager) {

package/src/Config.res

@@ -15,8 +15,6 @@ type contract = {
   addresses: array<Address.t>,
   events: array<Internal.eventConfig>,
   startBlock: option<int>,
-  // EVM-specific: event sighashes for HyperSync queries
-  eventSignatures: array<string>,
 }
 
 // Sources are instantiated lazily in ChainFetcher from this config.
@@ -56,10 +54,6 @@ type sourceSync = {
   pollingInterval: int,
 }
 
-type multichain = Internal.multichain =
-  | @as("ordered") Ordered
-  | @as("unordered") Unordered
-
 type storage = {
   postgres: bool,
   clickhouse: bool,
@@ -78,7 +72,6 @@ type t = {
   shouldRollbackOnReorg: bool,
   shouldSaveFullHistory: bool,
   storage: storage,
-  multichain: multichain,
   chainMap: ChainMap.t<chain>,
   defaultChain: option<chain>,
   ecosystem: Ecosystem.t,
@@ -203,10 +196,9 @@ let publicConfigChainSchema = S.schema(s =>
 
 let contractEventItemSchema = S.schema(s =>
   {
-    "event": s.matches(S.string),
     "name": s.matches(S.string),
     "sighash": s.matches(S.string),
-    "params": s.matches(S.option(S.array(EventConfigBuilder.eventParamSchema))),
+    "params": s.matches(S.option(S.array(EventConfigBuilder.paramMetaSchema))),
     "kind": s.matches(S.option(S.string)),
     "blockFields": s.matches(S.option(S.array(Internal.evmBlockFieldSchema))),
     "transactionFields": s.matches(S.option(S.array(Internal.evmTransactionFieldSchema))),
@@ -241,8 +233,6 @@ let publicConfigEvmSchema = S.schema(s =>
   }
 )
 
-let multichainSchema = S.enum([Ordered, Unordered])
-
 let compositeIndexFieldSchema = S.schema(s =>
   {
     "fieldName": s.matches(S.string),
@@ -255,6 +245,7 @@ let derivedFieldSchema = S.schema(s =>
     "fieldName": s.matches(S.string),
     "derivedFromEntity": s.matches(S.string),
     "derivedFromField": s.matches(S.string),
+    "description": s.matches(S.option(S.string)),
   }
 )
 
@@ -270,6 +261,7 @@ let propertySchema = S.schema(s =>
     "entity": s.matches(S.option(S.string)),
     "precision": s.matches(S.option(S.int)),
     "scale": s.matches(S.option(S.int)),
+    "description": s.matches(S.option(S.string)),
   }
 )
 
@@ -287,6 +279,7 @@ let entityJsonSchema = S.schema(s =>
     "properties": s.matches(S.array(propertySchema)),
     "derivedFields": s.matches(S.option(S.array(derivedFieldSchema))),
     "compositeIndices": s.matches(S.option(S.array(S.array(compositeIndexFieldSchema)))),
+    "description": s.matches(S.option(S.string)),
   }
 )
 
@@ -379,6 +372,7 @@ let parseEntitiesFromJson = (
         ~isArray,
         ~isIndex,
         ~linkedEntity=?prop["linkedEntity"],
+        ~description=?prop["description"],
       )
     })
 
@@ -390,6 +384,7 @@ let parseEntitiesFromJson = (
           df["fieldName"],
           ~derivedFromEntity=df["derivedFromEntity"],
           ~derivedFromField=df["derivedFromField"],
+          ~description=?df["description"],
         )
       )
 
@@ -409,6 +404,7 @@ let parseEntitiesFromJson = (
       entityName,
       ~fields=Array.concat(fields, derivedFields),
       ~compositeIndices,
+      ~description=?entityJson["description"],
     )
 
     // Build schema dynamically from properties
@@ -470,7 +466,6 @@ let publicConfigSchema = S.schema(s =>
     "description": s.matches(S.option(S.string)),
     "handlers": s.matches(S.option(S.string)),
     "isDev": s.matches(S.option(S.bool)),
-    "multichain": s.matches(S.option(multichainSchema)),
     "fullBatchSize": s.matches(S.option(S.int)),
     "rollbackOnReorg": s.matches(S.option(S.bool)),
     "saveFullHistory": s.matches(S.option(S.bool)),
@@ -544,12 +539,7 @@ let fromPublic = (publicConfigJson: JSON.t) => {
   | None => (Utils.Set.fromArray(EventConfigBuilder.alwaysIncludedBlockFields), Utils.Set.make())
   }
 
-  // Build contract data lookup: ABI, event signatures, event configs (keyed by capitalized name)
-  let contractDataByName: dict<{
-    "abi": EvmTypes.Abi.t,
-    "eventSignatures": array<string>,
-    "events": option<array<_>>,
-  }> = Dict.make()
+  let contractDataByName: dict<{"abi": EvmTypes.Abi.t, "events": option<array<_>>}> = Dict.make()
   switch publicContractsConfig {
   | Some(contractsDict) =>
     contractsDict
@@ -557,13 +547,9 @@ let fromPublic = (publicConfigJson: JSON.t) => {
     ->Array.forEach(((contractName, contractConfig)) => {
       let capitalizedName = contractName->Utils.String.capitalize
       let abi = contractConfig["abi"]->(Utils.magic: JSON.t => EvmTypes.Abi.t)
-      let eventSignatures = switch contractConfig["events"] {
-      | Some(events) => events->Array.map(eventItem => eventItem["event"])
-      | None => []
-      }
       contractDataByName->Dict.set(
         capitalizedName,
-        {"abi": abi, "eventSignatures": eventSignatures, "events": contractConfig["events"]},
+        {"abi": abi, "events": contractConfig["events"]},
       )
     })
   | None => ()
@@ -691,7 +677,6 @@ let fromPublic = (publicConfigJson: JSON.t) => {
             addresses,
             events,
             startBlock,
-            eventSignatures: contractData["eventSignatures"],
           }
         })
 
@@ -826,7 +811,6 @@ let fromPublic = (publicConfigJson: JSON.t) => {
     shouldRollbackOnReorg: publicConfig["rollbackOnReorg"]->Option.getOr(true),
     shouldSaveFullHistory: publicConfig["saveFullHistory"]->Option.getOr(false),
     storage: globalStorage,
-    multichain: publicConfig["multichain"]->Option.getOr(Unordered),
     chainMap,
     defaultChain: chains->Array.get(0),
     enableRawEvents: publicConfig["rawEvents"]->Option.getOr(false),

package/src/Config.res.mjs

@@ -44,12 +44,12 @@ let schema = S$RescriptSchema.schema(s => ({
 let rowsSchema = S$RescriptSchema.array(schema);
 
 let table = Table.mkTable(name, undefined, [
-  Table.mkField("id", "String", S$RescriptSchema.string, undefined, undefined, undefined, true, undefined, undefined),
-  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("registration_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("registration_log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
-]);
+  Table.mkField("id", "String", S$RescriptSchema.string, undefined, undefined, undefined, true, undefined, undefined, undefined),
+  Table.mkField("chain_id", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("registration_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("registration_log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+], undefined);
 
 let entityConfig_storage = {
   postgres: true,
@@ -114,10 +114,9 @@ let publicConfigChainSchema = S$RescriptSchema.schema(s => ({
 }));
 
 let contractEventItemSchema = S$RescriptSchema.schema(s => ({
-  event: s.m(S$RescriptSchema.string),
   name: s.m(S$RescriptSchema.string),
   sighash: s.m(S$RescriptSchema.string),
-  params: s.m(S$RescriptSchema.option(S$RescriptSchema.array(EventConfigBuilder.eventParamSchema))),
+  params: s.m(S$RescriptSchema.option(S$RescriptSchema.array(EventConfigBuilder.paramMetaSchema))),
   kind: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   blockFields: s.m(S$RescriptSchema.option(S$RescriptSchema.array(Internal.evmBlockFieldSchema))),
   transactionFields: s.m(S$RescriptSchema.option(S$RescriptSchema.array(Internal.evmTransactionFieldSchema)))
@@ -145,11 +144,6 @@ let publicConfigEvmSchema = S$RescriptSchema.schema(s => ({
   globalTransactionFields: s.m(S$RescriptSchema.option(S$RescriptSchema.array(Internal.evmTransactionFieldSchema)))
 }));
 
-let multichainSchema = S$RescriptSchema.$$enum([
-  "ordered",
-  "unordered"
-]);
-
 let compositeIndexFieldSchema = S$RescriptSchema.schema(s => ({
   fieldName: s.m(S$RescriptSchema.string),
   direction: s.m(S$RescriptSchema.string)
@@ -158,7 +152,8 @@ let compositeIndexFieldSchema = S$RescriptSchema.schema(s => ({
 let derivedFieldSchema = S$RescriptSchema.schema(s => ({
   fieldName: s.m(S$RescriptSchema.string),
   derivedFromEntity: s.m(S$RescriptSchema.string),
-  derivedFromField: s.m(S$RescriptSchema.string)
+  derivedFromField: s.m(S$RescriptSchema.string),
+  description: s.m(S$RescriptSchema.option(S$RescriptSchema.string))
 }));
 
 let propertySchema = S$RescriptSchema.schema(s => ({
@@ -171,7 +166,8 @@ let propertySchema = S$RescriptSchema.schema(s => ({
   enum: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   entity: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   precision: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
-  scale: s.m(S$RescriptSchema.option(S$RescriptSchema.int))
+  scale: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
+  description: s.m(S$RescriptSchema.option(S$RescriptSchema.string))
 }));
 
 let entityStorageSchema = S$RescriptSchema.schema(s => ({
@@ -184,7 +180,8 @@ let entityJsonSchema = S$RescriptSchema.schema(s => ({
   storage: s.m(S$RescriptSchema.option(entityStorageSchema)),
   properties: s.m(S$RescriptSchema.array(propertySchema)),
   derivedFields: s.m(S$RescriptSchema.option(S$RescriptSchema.array(derivedFieldSchema))),
-  compositeIndices: s.m(S$RescriptSchema.option(S$RescriptSchema.array(S$RescriptSchema.array(compositeIndexFieldSchema))))
+  compositeIndices: s.m(S$RescriptSchema.option(S$RescriptSchema.array(S$RescriptSchema.array(compositeIndexFieldSchema)))),
+  description: s.m(S$RescriptSchema.option(S$RescriptSchema.string))
 }));
 
 function getFieldTypeAndSchema(prop, enumConfigsByName) {
@@ -302,14 +299,14 @@ function parseEntitiesFromJson(entitiesJson, enumConfigsByName, globalStorage) {
     let entityName = entityJson.name;
     let fields = entityJson.properties.map(prop => {
       let match = getFieldTypeAndSchema(prop, enumConfigsByName);
-      return Table.mkField(prop.name, match[0], match[1], undefined, match[3], match[2], prop.name === "id", match[4], prop.linkedEntity);
+      return Table.mkField(prop.name, match[0], match[1], undefined, match[3], match[2], prop.name === "id", match[4], prop.linkedEntity, prop.description);
     });
-    let derivedFields = Stdlib_Option.getOr(entityJson.derivedFields, []).map(df => Table.mkDerivedFromField(df.fieldName, df.derivedFromEntity, df.derivedFromField));
+    let derivedFields = Stdlib_Option.getOr(entityJson.derivedFields, []).map(df => Table.mkDerivedFromField(df.fieldName, df.derivedFromEntity, df.derivedFromField, df.description));
     let compositeIndices = Stdlib_Option.getOr(entityJson.compositeIndices, []).map(ci => ci.map(f => ({
       fieldName: f.fieldName,
       direction: f.direction === "Asc" ? "Asc" : "Desc"
     })));
-    let table = Table.mkTable(entityName, compositeIndices, fields.concat(derivedFields));
+    let table = Table.mkTable(entityName, compositeIndices, fields.concat(derivedFields), entityJson.description);
     let schema = S$RescriptSchema.schema(s => {
       let dict = {};
       entityJson.properties.forEach(prop => {
@@ -355,7 +352,6 @@ let publicConfigSchema = S$RescriptSchema.schema(s => ({
   description: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   handlers: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   isDev: s.m(S$RescriptSchema.option(S$RescriptSchema.bool)),
-  multichain: s.m(S$RescriptSchema.option(multichainSchema)),
   fullBatchSize: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
   rollbackOnReorg: s.m(S$RescriptSchema.option(S$RescriptSchema.bool)),
   saveFullHistory: s.m(S$RescriptSchema.option(S$RescriptSchema.bool)),
@@ -453,11 +449,8 @@ function fromPublic(publicConfigJson) {
       let contractConfig = param[1];
       let capitalizedName = Utils.$$String.capitalize(param[0]);
       let abi = contractConfig.abi;
-      let events = contractConfig.events;
-      let eventSignatures = events !== undefined ? events.map(eventItem => eventItem.event) : [];
       contractDataByName[capitalizedName] = {
         abi: abi,
-        eventSignatures: eventSignatures,
         events: contractConfig.events
       };
     });
@@ -525,8 +518,7 @@ function fromPublic(publicConfigJson) {
         abi: contractData.abi,
         addresses: addresses,
         events: events,
-        startBlock: startBlock,
-        eventSignatures: contractData.eventSignatures
+        startBlock: startBlock
       };
     });
     let sourceConfig;
@@ -634,7 +626,6 @@ function fromPublic(publicConfigJson) {
     shouldRollbackOnReorg: Stdlib_Option.getOr(publicConfig.rollbackOnReorg, true),
     shouldSaveFullHistory: Stdlib_Option.getOr(publicConfig.saveFullHistory, false),
     storage: globalStorage,
-    multichain: Stdlib_Option.getOr(publicConfig.multichain, "unordered"),
     chainMap: chainMap,
     defaultChain: chains[0],
     ecosystem: ecosystem,
@@ -943,7 +934,6 @@ export {
   contractConfigSchema,
   publicConfigEcosystemSchema,
   publicConfigEvmSchema,
-  multichainSchema,
   compositeIndexFieldSchema,
   derivedFieldSchema,
   propertySchema,

package/src/Core.res

@@ -4,9 +4,16 @@
 
 // NAPI encodes Rust `Option<T>` as `null | T` (never `undefined`), so the
 // tighter `Null.t` captures the exact boundary shape.
+type hypersyncClientCtor
+type decoderCtor
+
 type addon = {
   getConfigJson: (~configPath: Null.t<string>, ~directory: Null.t<string>) => string,
   runCli: (~args: array<string>, ~envioPackageDir: Null.t<string>) => promise<Null.t<string>>,
+  @as("HypersyncClient")
+  hypersyncClient: hypersyncClientCtor,
+  @as("Decoder")
+  decoder: decoderCtor,
 }
 
 @module("node:module") external createRequire: string => {..} = "createRequire"

package/src/Ctx.res

@@ -2,4 +2,5 @@ type t = {
   registrations: HandlerRegister.registrations,
   config: Config.t,
   persistence: Persistence.t,
+  inMemoryStore: InMemoryStore.t,
 }

package/src/Env.res

@@ -66,7 +66,6 @@ let hypersyncClientEnableQueryCaching =
 
 let hypersyncLogLevel =
   envSafe->EnvSafe.get("ENVIO_HYPERSYNC_LOG_LEVEL", HyperSyncClient.logLevelSchema, ~fallback=#info)
-HyperSyncClient.setLogLevel(hypersyncLogLevel)
 
 let logStrategy =
   envSafe->EnvSafe.get(

package/src/Env.res.mjs

@@ -7,7 +7,6 @@ import * as Belt_Option from "@rescript/runtime/lib/es6/Belt_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as HyperSyncClient from "./sources/HyperSyncClient.res.mjs";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
-import * as HypersyncClient from "@envio-dev/hypersync-client";
 
 import 'dotenv/config'
 ;
@@ -62,8 +61,6 @@ let hypersyncClientEnableQueryCaching = EnvSafe.get(envSafe, "ENVIO_HYPERSYNC_CL
 
 let hypersyncLogLevel = EnvSafe.get(envSafe, "ENVIO_HYPERSYNC_LOG_LEVEL", HyperSyncClient.logLevelSchema, undefined, "info", undefined, undefined);
 
-HypersyncClient.setLogLevel(hypersyncLogLevel);
-
 let logStrategy = EnvSafe.get(envSafe, "LOG_STRATEGY", S$RescriptSchema.$$enum([
   "ecs-file",
   "ecs-console",