envio 3.9.0 → 3.10.0-subgraph

package/src/RollbackCommit.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as ChainId from "./ChainId.res.mjs";
 import * as EnvioGlobal from "./EnvioGlobal.res.mjs";
 
 let callbacks = EnvioGlobal.value.rollbackCommitCallbacks;
@@ -16,10 +15,10 @@ function register(callback) {
   };
 }
 
-async function fire(progressBlockNumberByChainId) {
-  await Promise.all(Object.entries(progressBlockNumberByChainId).flatMap(param => {
-    let args_chainId = ChainId.normalizeOrThrow(param[0]);
-    let args_rollbackToBlock = param[1];
+async function fire(progressedChains) {
+  await Promise.all(progressedChains.flatMap(param => {
+    let args_chainId = param.chainId;
+    let args_rollbackToBlock = param.progressBlockNumber;
     let args = {
       chainId: args_chainId,
       rollbackToBlock: args_rollbackToBlock
@@ -33,4 +32,4 @@ export {
   register,
   fire,
 }
-/* ChainId Not a pure module */
+/* EnvioGlobal Not a pure module */

package/src/SafeCheckpointTracking.res

@@ -33,15 +33,15 @@ let make = (
   }
 }
 
-let getSafeCheckpointId = (safeCheckpointTracking: t, ~sourceBlockNumber: int) => {
+let getSafeCheckpointId = (safeCheckpointTracking: t, ~sourceBlockNumber: int): option<
+  Internal.checkpointId,
+> => {
   let safeBlockNumber = sourceBlockNumber - safeCheckpointTracking.maxReorgDepth
 
   switch safeCheckpointTracking.checkpointIds {
-  | [] => 0n
-  | _
-    if safeCheckpointTracking.checkpointBlockNumbers->Array.getUnsafe(0) >
-      safeBlockNumber => 0n
-  | [checkpointId] => checkpointId
+  | [] => None
+  | _ if safeCheckpointTracking.checkpointBlockNumbers->Array.getUnsafe(0) > safeBlockNumber => None
+  | [checkpointId] => Some(checkpointId)
   | _ => {
       let trackingCheckpointsCount = safeCheckpointTracking.checkpointIds->Array.length
       let result = ref(None)
@@ -52,16 +52,15 @@ let getSafeCheckpointId = (safeCheckpointTracking: t, ~sourceBlockNumber: int) =
           safeCheckpointTracking.checkpointBlockNumbers->Array.getUnsafe(idx.contents) >
             safeBlockNumber
         ) {
-          result :=
-            Some(safeCheckpointTracking.checkpointIds->Array.getUnsafe(idx.contents - 1))
+          result := Some(safeCheckpointTracking.checkpointIds->Array.getUnsafe(idx.contents - 1))
         }
         idx := idx.contents + 1
       }
 
       switch result.contents {
-      | Some(checkpointId) => checkpointId
+      | Some(_) => result.contents
       | None =>
-        safeCheckpointTracking.checkpointIds->Array.getUnsafe(trackingCheckpointsCount - 1)
+        Some(safeCheckpointTracking.checkpointIds->Array.getUnsafe(trackingCheckpointsCount - 1))
       }
     }
   }
@@ -75,7 +74,8 @@ let updateOnNewBatch = (
   ~batchCheckpointBlockNumbers: array<int>,
   ~batchCheckpointChainIds: array<ChainId.t>,
 ) => {
-  let safeCheckpointId = getSafeCheckpointId(safeCheckpointTracking, ~sourceBlockNumber)
+  let safeCheckpointId =
+    getSafeCheckpointId(safeCheckpointTracking, ~sourceBlockNumber)->Option.getOr(0n)
 
   let mutCheckpointIds = []
   let mutCheckpointBlockNumbers = []

package/src/SafeCheckpointTracking.res.mjs

@@ -1,5 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 
 function make(maxReorgDepth, shouldRollbackOnReorg, chainReorgCheckpoints) {
   if (!(maxReorgDepth > 0 && shouldRollbackOnReorg)) {
@@ -22,10 +23,10 @@ function getSafeCheckpointId(safeCheckpointTracking, sourceBlockNumber) {
   let safeBlockNumber = sourceBlockNumber - safeCheckpointTracking.maxReorgDepth | 0;
   let match = safeCheckpointTracking.checkpointIds;
   if (match.length === 0) {
-    return 0n;
+    return;
   }
   if (safeCheckpointTracking.checkpointBlockNumbers[0] > safeBlockNumber) {
-    return 0n;
+    return;
   }
   if (match.length === 1) {
     return match[0];
@@ -39,16 +40,16 @@ function getSafeCheckpointId(safeCheckpointTracking, sourceBlockNumber) {
     }
     idx = idx + 1 | 0;
   };
-  let checkpointId = result;
-  if (checkpointId !== undefined) {
-    return checkpointId;
+  let match$1 = result;
+  if (match$1 !== undefined) {
+    return result;
   } else {
     return safeCheckpointTracking.checkpointIds[trackingCheckpointsCount - 1 | 0];
   }
 }
 
 function updateOnNewBatch(safeCheckpointTracking, sourceBlockNumber, chainId, batchCheckpointIds, batchCheckpointBlockNumbers, batchCheckpointChainIds) {
-  let safeCheckpointId = getSafeCheckpointId(safeCheckpointTracking, sourceBlockNumber);
+  let safeCheckpointId = Stdlib_Option.getOr(getSafeCheckpointId(safeCheckpointTracking, sourceBlockNumber), 0n);
   let mutCheckpointIds = [];
   let mutCheckpointBlockNumbers = [];
   for (let idx = 0, idx_finish = safeCheckpointTracking.checkpointIds.length; idx < idx_finish; ++idx) {

package/src/SimulateItems.res

@@ -338,11 +338,12 @@ let parse = (
       | None =>
         switch blockJson {
         | Some(bj) =>
-          switch (bj->(Utils.magic: JSON.t => dict<JSON.t>))->Dict.get("slot") {
+          switch bj->(Utils.magic: JSON.t => dict<JSON.t>)->Dict.get("slot") {
           | Some(v) =>
-            v->(Utils.magic: JSON.t => Nullable.t<int>)->Nullable.toOption->Option.getOr(
-              currentBlock.contents,
-            )
+            v
+            ->(Utils.magic: JSON.t => Nullable.t<int>)
+            ->Nullable.toOption
+            ->Option.getOr(currentBlock.contents)
           | None => currentBlock.contents
           }
         | None => currentBlock.contents
@@ -371,13 +372,23 @@ let parse = (
         | None => []
         }
       }
-      let data = item.data->Option.getOr(svmEventConfig.discriminator->Option.getOr("0x"))
-      let argsJson = item.args->Option.mapOr("{}", args => args->JSON.stringify)
+      let data = switch (item.data, svmEventConfig.discriminator) {
+      | (Some(data), _) => data
+      | (None, Some(discriminator)) =>
+        discriminator
+        ->String.replace("0x", "")
+        ->NodeJs.Buffer.fromHex
+        ->Uint8Array.fromArrayLikeOrIterable
+      | (None, None) => Uint8Array.fromLength(0)
+      }
+      let args = item.args->Option.getOr(Dict.make()->(Utils.magic: dict<unknown> => unknown))
       let logs = item.logs->Option.map(logs =>
-        logs->Array.map((log): SvmHyperSyncClient.EventItems.log => {
-          kind: log.kind->Null.fromOption,
-          message: log.message->Null.fromOption,
-        })
+        logs->Array.map(
+          (log): SvmHyperSyncClient.EventItems.log => {
+            kind: log.kind->Null.fromOption,
+            message: log.message->Null.fromOption,
+          },
+        )
       )
 
       let liveRegistrations = liveRegistrationsFor(~config, ~chainId, ~eventConfig)
@@ -414,13 +425,13 @@ let parse = (
             accountIndex: ?activity.transactionAccountIndex,
             isSigner: ?activity.isSigner,
             isWritable: ?activity.isWritable,
-            preBalance: ?activity.lamports->Option.flatMap(l => l.pre),
-            postBalance: ?activity.lamports->Option.flatMap(l => l.post),
-            mint: ?activity.token->Option.flatMap(t => t.mint),
-            owner: ?activity.token->Option.flatMap(t => t.owner),
-            decimals: ?activity.token->Option.flatMap(t => t.decimals),
-            preAmount: ?activity.token->Option.flatMap(t => t.preAmount),
-            postAmount: ?activity.token->Option.flatMap(t => t.postAmount),
+            preBalance: ?(activity.lamports->Option.flatMap(l => l.pre)),
+            postBalance: ?(activity.lamports->Option.flatMap(l => l.post)),
+            mint: ?(activity.token->Option.flatMap(t => t.mint)),
+            owner: ?(activity.token->Option.flatMap(t => t.owner)),
+            decimals: ?(activity.token->Option.flatMap(t => t.decimals)),
+            preAmount: ?(activity.token->Option.flatMap(t => t.preAmount)),
+            postAmount: ?(activity.token->Option.flatMap(t => t.postAmount)),
           })
           ->ignore
         )
@@ -456,7 +467,11 @@ let parse = (
             accounts: accountArguments,
             data,
             isInner: item.isInner->Option.getOr(false),
-            argsJson,
+            // As the Rust client does: present exactly when this registration
+            // selected `args`.
+            args: onEventRegistration.fieldSelection.instructionFields->Utils.Set.has("args")
+              ? Null.make(args)
+              : Null.null,
             logs: logs->Null.fromOption,
           },
           ~programName,

package/src/SimulateItems.res.mjs

@@ -245,8 +245,12 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
               }
             }) : [];
         }
-        let data = Stdlib_Option.getOr(rawJson.data, Stdlib_Option.getOr(eventConfig.discriminator, "0x"));
-        let argsJson = Stdlib_Option.mapOr(rawJson.args, "{}", args => JSON.stringify(args));
+        let match$3 = rawJson.data;
+        let match$4 = eventConfig.discriminator;
+        let data = match$3 !== undefined ? match$3 : (
+            match$4 !== undefined ? Uint8Array.from(Buffer.from(match$4.replace("0x", ""), "hex")) : new Uint8Array(0)
+          );
+        let args$1 = Stdlib_Option.getOr(rawJson.args, {});
         let logs = Stdlib_Option.map(rawJson.logs, logs => logs.map(log => ({
           kind: Stdlib_Null.fromOption(log.kind),
           message: Stdlib_Null.fromOption(log.message)
@@ -312,7 +316,7 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
             accounts: accountArguments,
             data: data,
             isInner: Stdlib_Option.getOr(rawJson.isInner, false),
-            argsJson: argsJson,
+            args: newrecord.fieldSelection.instructionFields.has("args") ? args$1 : null,
             logs: Stdlib_Null.fromOption(logs)
           }, match$1, match$2, eventConfig, newrecord.fieldSelection);
           payload["srcAddress"] = programId;
@@ -329,14 +333,14 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
         });
         return;
     }
-    let match$3 = rawJson.contract;
-    let match$4 = rawJson.event;
-    let match$5 = match$3 !== undefined && match$4 !== undefined ? [
-        match$3,
-        match$4
+    let match$5 = rawJson.contract;
+    let match$6 = rawJson.event;
+    let match$7 = match$5 !== undefined && match$6 !== undefined ? [
+        match$5,
+        match$6
       ] : Stdlib_JsError.throwWithMessage(`simulate: Invalid item. Each item must have "contract" and "event" fields.`);
-    let eventName = match$5[1];
-    let contractName = match$5[0];
+    let eventName = match$7[1];
+    let contractName = match$7[0];
     let ec$1 = findEventConfig(config, contractName, eventName);
     let eventConfig$1 = ec$1 !== undefined ? ec$1 : Stdlib_JsError.throwWithMessage(`simulate: Event "` + eventName + `" not found on contract "` + contractName + `". Check that the contract and event names match your config.yaml.`);
     let json = rawJson.params;
@@ -359,32 +363,32 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
     let blockJson$2 = (blockJson$1 == null) ? undefined : Primitive_option.some(blockJson$1);
     let transactionJson = rawJson.transaction;
     let transactionJson$1 = (transactionJson == null) ? undefined : Primitive_option.some(transactionJson);
-    let match$6 = config.ecosystem.name;
-    let match$7;
-    switch (match$6) {
+    let match$8 = config.ecosystem.name;
+    let match$9;
+    switch (match$8) {
       case "evm" :
         let block$2 = parseEvmSimulateBlock(currentBlock.contents, blockJson$2);
-        match$7 = [
+        match$9 = [
           block$2,
           block$2.number
         ];
         break;
       case "fuel" :
         let block$3 = parseFuelSimulateBlock(currentBlock.contents, blockJson$2);
-        match$7 = [
+        match$9 = [
           block$3,
           block$3.height
         ];
         break;
       case "svm" :
-        match$7 = Stdlib_JsError.throwWithMessage("simulate is not supported for SVM ecosystem");
+        match$9 = Stdlib_JsError.throwWithMessage("simulate is not supported for SVM ecosystem");
         break;
     }
-    let blockNumber = match$7[1];
-    let block$4 = match$7[0];
-    let match$8 = config.ecosystem.name;
+    let blockNumber = match$9[1];
+    let block$4 = match$9[0];
+    let match$10 = config.ecosystem.name;
     let transaction$1;
-    switch (match$8) {
+    switch (match$10) {
       case "evm" :
         transaction$1 = parseEvmSimulateTransaction(transactionJson$1);
         break;
@@ -411,9 +415,9 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
       }
     });
     if (Utils.$$Array.isEmpty(liveRegistrations$1)) {
-      let match$9 = ChainMap.values(config.chainMap).length;
+      let match$11 = ChainMap.values(config.chainMap).length;
       Stdlib_JsError.throwWithMessage(`simulate: no handler runs for event "` + eventName + `" on contract "` + contractName + `"` + (
-        match$9 !== 1 ? ` on chain ` + ChainId.toString(chainId) : ""
+        match$11 !== 1 ? ` on chain ` + ChainId.toString(chainId) : ""
       ) + `. Register a handler with indexer.onEvent (and check any \`where\` filter isn't excluding this chain) before simulating it.`);
     }
     liveRegistrations$1.forEach(reg => {

package/src/Sink.res

@@ -1,44 +1,56 @@
 type t = {
   name: string,
-  initialize: (
-    ~chainConfigs: array<Config.chain>=?,
-    ~entities: array<Internal.entityConfig>=?,
-    ~enums: array<Table.enumConfig<Table.enum>>=?,
+  initialize: (~entities: array<Internal.entityConfig>) => promise<unit>,
+  resume: (
+    ~checkpointId: Internal.checkpointId,
+    ~chains: array<Persistence.initialChainState>,
+    ~entities: array<Internal.entityConfig>,
   ) => promise<unit>,
-  resume: (~checkpointId: Internal.checkpointId) => promise<unit>,
   writeBatch: (
     ~batch: Batch.t,
     ~updatedEntities: array<Persistence.updatedEntity>,
   ) => promise<unit>,
 }
 
-let makeClickHouse = (~host, ~database, ~username, ~password, ~chainIdMode: ChainId.mode=Int32): t => {
-  let client = ClickHouse.createClient({
-    url: host,
-    username,
-    password,
-  })
-
-  // Don't pass database to the client; it would fail if the database doesn't
-  // exist yet. Each query qualifies the name explicitly or runs USE first.
-
-  let cache = Dict.make()
+let makeClickHouse = (
+  ~host,
+  ~database,
+  ~username,
+  ~password,
+  ~chainIdMode: ChainId.mode=Int32,
+): t => {
+  let sink = ClickHouse.makeSink(~host, ~username, ~password, ~database, ~chainIdMode)
+  let registry = ClickHouse.makeRegistry()
+  let mirrored = (entities: array<Internal.entityConfig>) =>
+    entities->Array.filter(e => e.storage.clickhouse)
 
   {
     name: "clickhouse",
-    initialize: (~chainConfigs as _=[], ~entities=[], ~enums=[]) => {
-      ClickHouse.initialize(client, ~database, ~entities, ~enums, ~chainIdMode)
+    initialize: (~entities) => {
+      ClickHouse.initialize(sink, ~entities=mirrored(entities))
     },
-    resume: (~checkpointId) => {
-      ClickHouse.resume(client, ~database, ~checkpointId)
+    resume: (~checkpointId, ~chains, ~entities) => {
+      ClickHouse.resume(sink, ~checkpointId, ~chains, ~entities=mirrored(entities))
     },
     writeBatch: async (~batch, ~updatedEntities) => {
-      await Promise.all(
-        updatedEntities->Array.map(({entityConfig, scope, changes}) => {
-          ClickHouse.setUpdatesOrThrow(client, ~cache, ~changes, ~entityConfig, ~scope, ~database)
-        }),
-      )->Utils.Promise.ignoreValue
-      await ClickHouse.setCheckpointsOrThrow(client, ~batch, ~database)
+      // Staging reads JS values, so it holds the isolate and runs here. The
+      // encode and the round trips happen in Rust, which also keeps the
+      // checkpoints behind the rows they cover.
+      let entities = []
+      let checkpoints = try {
+        updatedEntities->Array.forEach(({entityConfig, scope, changes}) =>
+          switch ClickHouse.stageUpdatesOrThrow(sink, ~registry, ~changes, ~entityConfig, ~scope) {
+          | Some(handle) => entities->Array.push(handle)
+          | None => ()
+          }
+        )
+        ClickHouse.stageCheckpointsOrThrow(sink, ~registry, ~batch)
+      } catch {
+      | exn =>
+        sink->ClickHouseSink.discard(entities)
+        throw(exn)
+      }
+      await ClickHouse.writeStagedOrThrow(sink, ~entities, ~checkpoints)
     },
   }
 }

package/src/Sink.res.mjs

@@ -1,28 +1,33 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as ClickHouse from "./bindings/ClickHouse.res.mjs";
-import * as Client from "@clickhouse/client";
 
 function makeClickHouse(host, database, username, password, chainIdModeOpt) {
   let chainIdMode = chainIdModeOpt !== undefined ? chainIdModeOpt : "int32";
-  let client = Client.createClient({
-    url: host,
-    username: username,
-    password: password
-  });
-  let cache = {};
+  let sink = ClickHouse.makeSink(host, username, password, database, chainIdMode);
+  let registry = ClickHouse.makeRegistry();
+  let mirrored = entities => entities.filter(e => e.storage.clickhouse);
   return {
     name: "clickhouse",
-    initialize: ($staropt$star, $staropt$star$1, $staropt$star$2) => {
-      $staropt$star !== undefined;
-      let entities = $staropt$star$1 !== undefined ? $staropt$star$1 : [];
-      let enums = $staropt$star$2 !== undefined ? $staropt$star$2 : [];
-      return ClickHouse.initialize(client, database, entities, enums, chainIdMode);
-    },
-    resume: checkpointId => ClickHouse.resume(client, database, checkpointId),
+    initialize: entities => ClickHouse.initialize(sink, mirrored(entities)),
+    resume: (checkpointId, chains, entities) => ClickHouse.resume(sink, checkpointId, chains, mirrored(entities)),
     writeBatch: async (batch, updatedEntities) => {
-      await Promise.all(updatedEntities.map(param => ClickHouse.setUpdatesOrThrow(client, cache, param.changes, param.entityConfig, param.scope, database)));
-      return await ClickHouse.setCheckpointsOrThrow(client, batch, database);
+      let entities = [];
+      let checkpoints;
+      try {
+        updatedEntities.forEach(param => {
+          let handle = ClickHouse.stageUpdatesOrThrow(sink, registry, param.changes, param.entityConfig, param.scope);
+          if (handle !== undefined) {
+            entities.push(handle);
+            return;
+          }
+        });
+        checkpoints = ClickHouse.stageCheckpointsOrThrow(sink, registry, batch);
+      } catch (exn) {
+        sink.discard(entities);
+        throw exn;
+      }
+      return await ClickHouse.writeStagedOrThrow(sink, entities, checkpoints);
     }
   };
 }

package/src/TestIndexer.res

@@ -589,7 +589,7 @@ let makeInMemoryStorage = (~state: testIndexerState): Persistence.storage => {
     JsError.throwWithMessage(
       "TestIndexer: initialize should not be called; the initial state is derived from config.",
     ),
-  resumeInitialState: async () =>
+  resumeInitialState: async (~entities as _, ~throwIfIncompatible as _) =>
     JsError.throwWithMessage(
       "TestIndexer: resumeInitialState should not be called; the initial state is derived from config.",
     ),
@@ -625,22 +625,22 @@ let makeInMemoryStorage = (~state: testIndexerState): Persistence.storage => {
   dumpEffectCache: async () => (),
   reset: async () => (),
   setChainMeta: async _ => Obj.magic(),
-  pruneStaleCheckpoints: async (~safeCheckpointId as _) => (),
+  pruneStaleCheckpoints: async (~safeCheckpoints as _) => (),
   pruneStaleEntityHistory: async (
     ~entityName as _,
     ~entityIndex as _,
     ~chainIdColumn as _,
-    ~safeCheckpointId as _,
+    ~safeCheckpoints as _,
   ) => (),
   getRollbackTargetCheckpoint: async (~reorgChainId as _, ~lastKnownValidBlockNumber as _) =>
     JsError.throwWithMessage(
       "TestIndexer: Rollback is not supported. The runner forces rollbackOnReorg off, so this should be unreachable.",
     ),
-  getRollbackProgressDiff: async (~rollbackTargetCheckpointId as _) =>
+  getRollbackProgressDiff: async (~floors as _) =>
     JsError.throwWithMessage(
       "TestIndexer: Rollback is not supported. The runner forces rollbackOnReorg off, so this should be unreachable.",
     ),
-  getRollbackData: async (~entityConfig as _, ~rollbackTargetCheckpointId as _) =>
+  getRollbackData: async (~entityConfig as _, ~floors as _) =>
     JsError.throwWithMessage(
       "TestIndexer: Rollback is not supported. The runner forces rollbackOnReorg off, so this should be unreachable.",
     ),

package/src/TestIndexer.res.mjs

@@ -385,7 +385,7 @@ function makeInMemoryStorage(state) {
     name: "test-inmemory",
     isInitialized: async () => true,
     initialize: async (param, param$1, param$2, param$3, param$4) => Stdlib_JsError.throwWithMessage("TestIndexer: initialize should not be called; the initial state is derived from config."),
-    resumeInitialState: async () => Stdlib_JsError.throwWithMessage("TestIndexer: resumeInitialState should not be called; the initial state is derived from config."),
+    resumeInitialState: async (param, param$1) => Stdlib_JsError.throwWithMessage("TestIndexer: resumeInitialState should not be called; the initial state is derived from config."),
     loadOrThrow: async (filter, table) => handleLoad(state, table.tableName, filter),
     ensureQueryIndexes: async (param, param$1) => {},
     ensureSchemaIndexes: async param => {},