envio 3.0.1 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.mjs",
@@ -71,10 +71,10 @@
     "tsx": "4.21.0"
   },
   "optionalDependencies": {
-    "envio-linux-x64": "3.0.1",
-    "envio-linux-x64-musl": "3.0.1",
-    "envio-linux-arm64": "3.0.1",
-    "envio-darwin-x64": "3.0.1",
-    "envio-darwin-arm64": "3.0.1"
+    "envio-linux-x64": "3.0.2",
+    "envio-linux-x64-musl": "3.0.2",
+    "envio-linux-arm64": "3.0.2",
+    "envio-darwin-x64": "3.0.2",
+    "envio-darwin-arm64": "3.0.2"
   }
 }

package/src/EventConfigBuilder.res

@@ -142,25 +142,28 @@ let rec abiTypeToDefaultValue = (abiType: string): unknown => {
 
 // ============== Named-tuple (struct) schema helpers ==============
 
-// Build a simulate schema that honours component names: whenever an event param
-// (or nested field) has components, we decode it as an object with named fields
-// rather than a positional tuple. Walks through array wrappers so `struct[]`
-// still produces `array<{...}>`.
-let rec componentsToSimulateSchema = (abiType: string, components: array<eventParamComponent>): S.t<
-  unknown,
-> => {
+// Build an object schema that honours component names: whenever an event param
+// (or nested field) has components, decode/serialize it as an object with
+// named fields rather than a positional tuple. Walks through array wrappers so
+// `struct[]` still produces `array<{...}>`. `~leafSchema` picks the per-ABI
+// schema for non-tuple leaves (raw-event vs simulate variants differ in how
+// they accept primitives — string-encoded numbers vs native bigints).
+let rec componentsToObjectSchema = (
+  ~leafSchema: string => S.t<unknown>,
+  abiType: string,
+  components: array<eventParamComponent>,
+): S.t<unknown> => {
   if abiType->String.endsWith("]") {
     let bracketIdx = abiType->String.lastIndexOf("[")
     let baseType = abiType->String.slice(~start=0, ~end=bracketIdx)
-    S.array(componentsToSimulateSchema(baseType, components))->S.toUnknown
+    S.array(componentsToObjectSchema(~leafSchema, baseType, components))->S.toUnknown
   } else {
-    // Must be a tuple at this level: build a record keyed by component names.
     S.object(s => {
       let dict = Dict.make()
       components->Array.forEach(c => {
         let childSchema = switch c.components {
-        | Some(sub) => componentsToSimulateSchema(c.abiType, sub)
-        | None => abiTypeToSimulateSchema(c.abiType)
+        | Some(sub) => componentsToObjectSchema(~leafSchema, c.abiType, sub)
+        | None => leafSchema(c.abiType)
         }
         dict->Dict.set(c.name, s.field(c.name, childSchema))
       })
@@ -233,7 +236,16 @@ let buildParamsSchema = (params: array<eventParam>): S.t<Internal.eventParams> =
     S.object(s => {
       let dict = Dict.make()
       params->Array.forEach(p => {
-        dict->Dict.set(p.name, s.field(p.name, abiTypeToSchema(p.abiType)))
+        // Indexed structs arrive as keccak256 topic hashes (single hex
+        // strings), so they keep the positional/leaf path; only non-indexed
+        // tuple params get the named-object shape that the HyperSync decoder
+        // (componentsToRemapper) produces.
+        let paramSchema = switch p.components {
+        | Some(components) if !p.indexed =>
+          componentsToObjectSchema(~leafSchema=abiTypeToSchema, p.abiType, components)
+        | _ => abiTypeToSchema(p.abiType)
+        }
+        dict->Dict.set(p.name, s.field(p.name, paramSchema))
       })
       dict
     })->(Utils.magic: S.t<dict<unknown>> => S.t<Internal.eventParams>)
@@ -255,7 +267,7 @@ let buildSimulateParamsSchema = (params: array<eventParam>): S.t<Internal.eventP
       params->Array.forEach(p => {
         let (paramSchema, paramDefault) = switch p.components {
         | Some(components) => (
-            componentsToSimulateSchema(p.abiType, components),
+            componentsToObjectSchema(~leafSchema=abiTypeToSimulateSchema, p.abiType, components),
             componentsToDefaultValue(p.abiType, components),
           )
         | None => (abiTypeToSimulateSchema(p.abiType), abiTypeToDefaultValue(p.abiType))

package/src/EventConfigBuilder.res.mjs

@@ -144,13 +144,13 @@ function abiTypeToDefaultValue(abiType) {
   }
 }
 
-function componentsToSimulateSchema(abiType, components) {
+function componentsToObjectSchema(leafSchema, abiType, components) {
   if (!abiType.endsWith("]")) {
     return S$RescriptSchema.object(s => {
       let dict = {};
       components.forEach(c => {
         let sub = c.components;
-        let childSchema = sub !== undefined ? componentsToSimulateSchema(c.abiType, sub) : abiTypeToSimulateSchema(c.abiType);
+        let childSchema = sub !== undefined ? componentsToObjectSchema(leafSchema, c.abiType, sub) : leafSchema(c.abiType);
         dict[c.name] = s.f(c.name, childSchema);
       });
       return dict;
@@ -158,7 +158,7 @@ function componentsToSimulateSchema(abiType, components) {
   }
   let bracketIdx = abiType.lastIndexOf("[");
   let baseType = abiType.slice(0, bracketIdx);
-  return S$RescriptSchema.array(componentsToSimulateSchema(baseType, components));
+  return S$RescriptSchema.array(componentsToObjectSchema(leafSchema, baseType, components));
 }
 
 function componentsToDefaultValue(abiType, components) {
@@ -197,7 +197,9 @@ function buildParamsSchema(params) {
     return S$RescriptSchema.object(s => {
       let dict = {};
       params.forEach(p => {
-        dict[p.name] = s.f(p.name, abiTypeToSchema(p.abiType));
+        let components = p.components;
+        let paramSchema = components !== undefined && !p.indexed ? componentsToObjectSchema(abiTypeToSchema, p.abiType, components) : abiTypeToSchema(p.abiType);
+        dict[p.name] = s.f(p.name, paramSchema);
       });
       return dict;
     });
@@ -213,7 +215,7 @@ function buildSimulateParamsSchema(params) {
       params.forEach(p => {
         let components = p.components;
         let match = components !== undefined ? [
-            componentsToSimulateSchema(p.abiType, components),
+            componentsToObjectSchema(abiTypeToSimulateSchema, p.abiType, components),
             componentsToDefaultValue(p.abiType, components)
           ] : [
             abiTypeToSimulateSchema(p.abiType),
@@ -417,7 +419,7 @@ export {
   abiTypeToSchema,
   abiTypeToSimulateSchema,
   abiTypeToDefaultValue,
-  componentsToSimulateSchema,
+  componentsToObjectSchema,
   componentsToDefaultValue,
   componentsToRemapper,
   buildParamsSchema,

package/src/bindings/ClickHouse.res

@@ -426,6 +426,10 @@ let initialize = async (
     | Some(engine) => ` ENGINE = ${engine}`
     | None => ""
     }
+    // Replicated database engine requires CREATE DATABASE to run on every
+    // replica; ON CLUSTER fans the DDL out via Keeper. The '{cluster}' macro
+    // resolves to each node's configured cluster name.
+    let onClusterClause = replicated ? ` ON CLUSTER '{cluster}'` : ""
 
     switch databaseEngine {
     | Some(engineSpec) => {
@@ -445,9 +449,9 @@ let initialize = async (
     | None => ()
     }
 
-    await client->exec({query: `TRUNCATE DATABASE IF EXISTS ${database}`})
+    await client->exec({query: `TRUNCATE DATABASE IF EXISTS ${database}${onClusterClause}`})
     await client->exec({
-      query: `CREATE DATABASE IF NOT EXISTS ${database}${databaseEngineClause}`,
+      query: `CREATE DATABASE IF NOT EXISTS ${database}${onClusterClause}${databaseEngineClause}`,
     })
     await client->exec({query: `USE ${database}`})
 

package/src/bindings/ClickHouse.res.mjs

@@ -301,6 +301,7 @@ async function initialize(client, database, entities, param) {
     let replicated = Env.ClickHouse.replicated();
     let databaseEngine = Env.ClickHouse.databaseEngine();
     let databaseEngineClause = databaseEngine !== undefined ? ` ENGINE = ` + databaseEngine : "";
+    let onClusterClause = replicated ? ` ON CLUSTER '{cluster}'` : "";
     if (databaseEngine !== undefined) {
       let expectedEngineName = databaseEngine.split("(")[0].trim();
       let existingResult = await client.query({
@@ -316,10 +317,10 @@ async function initialize(client, database, entities, param) {
       }
     }
     await client.exec({
-      query: `TRUNCATE DATABASE IF EXISTS ` + database
+      query: `TRUNCATE DATABASE IF EXISTS ` + database + onClusterClause
     });
     await client.exec({
-      query: `CREATE DATABASE IF NOT EXISTS ` + database + databaseEngineClause
+      query: `CREATE DATABASE IF NOT EXISTS ` + database + onClusterClause + databaseEngineClause
     });
     await client.exec({
       query: `USE ` + database