envio 3.7.0-svm-alpha.1 → 3.7.0

package/package.json

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

package/src/Core.res

@@ -11,6 +11,8 @@ type fuelHyperSyncClientCtor
 type transactionStoreCtor
 type blockStoreCtor
 type addressStoreCtor
+// Test-only: a local HyperSync server, bound by MockHyperSyncServer in envio-tests.
+type mockHyperSyncServerCtor
 type fromUserApiOptions = {
   schema?: string,
   env?: dict<string>,
@@ -43,6 +45,8 @@ type addon = {
   blockStore: blockStoreCtor,
   @as("AddressStore")
   addressStore: addressStoreCtor,
+  @as("MockHyperSyncServer")
+  mockHyperSyncServer: mockHyperSyncServerCtor,
   // Ordered transaction-field names exposed for the field-code contract test
   // (the ReScript `transactionFields` arrays must match the Rust ordinals).
   evmTransactionFieldNames: unit => array<string>,

package/src/bindings/ClickHouse.res

@@ -14,8 +14,13 @@ type execParams = {query: string}
 @module("@clickhouse/client")
 external createClient: clientConfig => client = "createClient"
 
+// `command`, not `exec`: exec hands its response stream to the caller and holds
+// the socket until it is consumed, which nothing here does. The pool is 10
+// sockets wide, so a schema whose DDL needs more than that — initialize issues
+// 2N+3 statements for N entities — stalled every statement past the tenth until
+// the 30s request timeout freed one. command destroys the stream for us.
 @send
-external exec: (client, execParams) => promise<unit> = "exec"
+external command: (client, execParams) => promise<unit> = "command"
 
 @send
 external close: client => promise<unit> = "close"
@@ -628,21 +633,21 @@ let initialize = async (
       // CLUSTER removes the database from every node — the engine's own log
       // can't replicate the drop of the database it lives in — and SYNC waits
       // for the drop to finish before the CREATE below.
-      await client->exec({
+      await client->command({
         query: `DROP DATABASE IF EXISTS ${database} ON CLUSTER '{cluster}' SYNC`,
       })
     } else {
-      await client->exec({
+      await client->command({
         query: `TRUNCATE DATABASE IF EXISTS ${database}${onClusterClause(~onCluster=ddlOnCluster)}`,
       })
     }
-    await client->exec({
+    await client->command({
       query: `CREATE DATABASE IF NOT EXISTS ${database}${databaseOnClusterClause}${databaseEngineClause}`,
     })
 
     await Promise.all(
       entities->Array.map(entityConfig =>
-        client->exec({
+        client->command({
           query: makeCreateHistoryTableQuery(
             ~entityConfig,
             ~database,
@@ -653,7 +658,7 @@ let initialize = async (
         })
       ),
     )->Utils.Promise.ignoreValue
-    await client->exec({
+    await client->command({
       query: makeCreateCheckpointsTableQuery(
         ~database,
         ~replicated,
@@ -670,14 +675,14 @@ let initialize = async (
     // caught up before creating the views. ON CLUSTER must precede the
     // database name in this command's grammar.
     if hasReplicatedDatabaseEngine {
-      await client->exec({
+      await client->command({
         query: `SYSTEM SYNC DATABASE REPLICA ON CLUSTER '{cluster}' ${database}`,
       })
     }
 
     await Promise.all(
       entities->Array.map(entityConfig =>
-        client->exec({
+        client->command({
           query: makeCreateViewQuery(~entityConfig, ~database, ~onCluster=ddlOnCluster),
         })
       ),
@@ -697,7 +702,7 @@ let resume = async (client, ~database: string, ~checkpointId: Internal.checkpoin
   try {
     // Try to use the database - will throw if it doesn't exist
     try {
-      await client->exec({query: `USE ${database}`})
+      await client->command({query: `USE ${database}`})
     } catch {
     | exn =>
       Logging.errorWithExn(
@@ -717,14 +722,14 @@ let resume = async (client, ~database: string, ~checkpointId: Internal.checkpoin
     await Promise.all(
       tables->Array.map(table => {
         let tableName = table["name"]
-        client->exec({
+        client->command({
           query: `ALTER TABLE ${database}.\`${tableName}\` DELETE WHERE \`${EntityHistory.checkpointIdFieldName}\` > ${checkpointId->BigInt.toString}`,
         })
       }),
     )->Utils.Promise.ignoreValue
 
     // Delete stale checkpoints
-    await client->exec({
+    await client->command({
       query: `DELETE FROM ${database}.\`${InternalTable.Checkpoints.table.tableName}\` WHERE \`${Table.idFieldName}\` > ${checkpointId->BigInt.toString}`,
     })
   } catch {

package/src/bindings/ClickHouse.res.mjs

@@ -428,31 +428,31 @@ async function initialize(client, database, entities, param, chainIdModeOpt) {
       }
     }
     if (hasReplicatedDatabaseEngine) {
-      await client.exec({
+      await client.command({
         query: `DROP DATABASE IF EXISTS ` + database + ` ON CLUSTER '{cluster}' SYNC`
       });
     } else {
-      await client.exec({
+      await client.command({
         query: `TRUNCATE DATABASE IF EXISTS ` + database + (
           ddlOnCluster ? ` ON CLUSTER '{cluster}'` : ""
         )
       });
     }
-    await client.exec({
+    await client.command({
       query: `CREATE DATABASE IF NOT EXISTS ` + database + databaseOnClusterClause + databaseEngineClause
     });
-    await Promise.all(entities.map(entityConfig => client.exec({
+    await Promise.all(entities.map(entityConfig => client.command({
       query: makeCreateHistoryTableQuery(entityConfig, database, replicated, ddlOnCluster, chainIdMode)
     })));
-    await client.exec({
+    await client.command({
       query: makeCreateCheckpointsTableQuery(database, replicated, ddlOnCluster, chainIdMode)
     });
     if (hasReplicatedDatabaseEngine) {
-      await client.exec({
+      await client.command({
         query: `SYSTEM SYNC DATABASE REPLICA ON CLUSTER '{cluster}' ` + database
       });
     }
-    await Promise.all(entities.map(entityConfig => client.exec({
+    await Promise.all(entities.map(entityConfig => client.command({
       query: makeCreateViewQuery(entityConfig, database, ddlOnCluster)
     })));
     return Logging.trace("ClickHouse storage initialization completed successfully");
@@ -466,7 +466,7 @@ async function initialize(client, database, entities, param, chainIdModeOpt) {
 async function resume(client, database, checkpointId) {
   try {
     try {
-      await client.exec({
+      await client.command({
         query: `USE ` + database
       });
     } catch (raw_exn) {
@@ -480,11 +480,11 @@ async function resume(client, database, checkpointId) {
     let tables = (await tablesResult.json()).data;
     await Promise.all(tables.map(table => {
       let tableName = table.name;
-      return client.exec({
+      return client.command({
         query: `ALTER TABLE ` + database + `.\`` + tableName + `\` DELETE WHERE \`` + EntityHistory.checkpointIdFieldName + `\` > ` + checkpointId.toString()
       });
     }));
-    return await client.exec({
+    return await client.command({
       query: `DELETE FROM ` + database + `.\`` + InternalTable.Checkpoints.table.tableName + `\` WHERE \`` + Table.idFieldName + `\` > ` + checkpointId.toString()
     });
   } catch (raw_exn$1) {

package/src/sources/EvmHyperSyncSource.res

@@ -194,7 +194,11 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     }
   }
 
-  let getBlockHashes = HyperSync.makeGetBlockHashes(~query=client.getBlockHashes)
+  // Called through the client rather than passed as a value: the client is a
+  // napi class, so a detached method reference loses the instance it belongs to.
+  let getBlockHashes = HyperSync.makeGetBlockHashes(
+    ~query=(~blockNumbers) => client.getBlockHashes(~blockNumbers),
+  )
 
   {
     name,

package/src/sources/EvmHyperSyncSource.res.mjs

@@ -137,7 +137,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       requestStats: requestStats
     };
   };
-  let getBlockHashes = HyperSync.makeGetBlockHashes(client.getBlockHashes);
+  let getBlockHashes = HyperSync.makeGetBlockHashes(blockNumbers => client.getBlockHashes(blockNumbers));
   return {
     name: "HyperSync",
     sourceFor: "Sync",

package/src/sources/SvmHyperSyncSource.res

@@ -182,7 +182,11 @@ let make = (
     }
   }
 
-  let getBlockHashes = HyperSync.makeGetBlockHashes(~query=client.getBlockHashes)
+  // Called through the client rather than passed as a value: the client is a
+  // napi class, so a detached method reference loses the instance it belongs to.
+  let getBlockHashes = HyperSync.makeGetBlockHashes(
+    ~query=(~blockNumbers) => client.getBlockHashes(~blockNumbers),
+  )
 
   {
     name,

package/src/sources/SvmHyperSyncSource.res.mjs

@@ -127,7 +127,7 @@ function make(param) {
       requestStats: requestStats
     };
   };
-  let getBlockHashes = HyperSync.makeGetBlockHashes(client.getBlockHashes);
+  let getBlockHashes = HyperSync.makeGetBlockHashes(blockNumbers => client.getBlockHashes(blockNumbers));
   return {
     name: "SvmHyperSync",
     sourceFor: "Sync",