envio 3.5.1 → 3.6.1-subgraph

package/src/bindings/ClickHouse.res.mjs

@@ -5,6 +5,7 @@ import * as Table from "../db/Table.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 Persistence from "../Persistence.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as EntityHistory from "../db/EntityHistory.res.mjs";
@@ -197,11 +198,14 @@ async function setCheckpointsOrThrow(client, batch, database) {
   }
 }
 
-async function setUpdatesOrThrow(client, cache, changes, entityConfig, database) {
+async function setUpdatesOrThrow(client, cache, changes, entityConfig, scope, database) {
   if (changes.length === 0) {
     return;
   }
-  let cached = cache.get(entityConfig);
+  let chainIdField = Table.getChainIdField(entityConfig.table);
+  let scopeChainId = Internal.chainScopeChainId(scope);
+  let cacheKey = entityConfig.name + `|` + Internal.chainScopeToString(scope);
+  let cached = cache[cacheKey];
   let match;
   if (cached !== undefined) {
     match = cached;
@@ -211,6 +215,9 @@ async function setUpdatesOrThrow(client, cache, changes, entityConfig, database)
       EntityHistory.makeSetUpdateSchema(Table.getIdSchema(entityConfig.table), makeClickHouseEntitySchema(entityConfig.table)),
       S$RescriptSchema.object(s => {
         s.tag(EntityHistory.changeFieldName, "DELETE");
+        if (chainIdField !== undefined && scopeChainId !== undefined) {
+          s.tag(Table.getClickHouseDbFieldName(chainIdField), Primitive_option.valFromOption(scopeChainId));
+        }
         return {
           type: "DELETE",
           entityId: s.f(Table.idFieldName, Table.getIdSchema(entityConfig.table)),
@@ -222,12 +229,30 @@ async function setUpdatesOrThrow(client, cache, changes, entityConfig, database)
       tableName: cached_tableName,
       convertOrThrow: cached_convertOrThrow
     };
-    cache.set(entityConfig, cached$1);
+    cache[cacheKey] = cached$1;
     match = cached$1;
   }
   let tableName = match.tableName;
+  let changes$1;
+  if (chainIdField !== undefined && scopeChainId !== undefined) {
+    let chainId = Primitive_option.valFromOption(scopeChainId);
+    changes$1 = changes.map(change => {
+      if (change.type === "SET") {
+        return {
+          type: "SET",
+          entityId: change.entityId,
+          entity: Internal.stampChainId(change.entity, chainIdField.fieldName, chainId),
+          checkpointId: change.checkpointId
+        };
+      } else {
+        return change;
+      }
+    });
+  } else {
+    changes$1 = changes;
+  }
   try {
-    let values = match.convertOrThrow(changes);
+    let values = match.convertOrThrow(changes$1);
     return await insertWithRetry(client, tableName, values, "JSONEachRow", undefined);
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
@@ -346,6 +371,13 @@ ORDER BY (` + "id" + `)`;
 function makeCreateViewQuery(entityConfig, database, onClusterOpt) {
   let onCluster = onClusterOpt !== undefined ? onClusterOpt : false;
   let historyTableName = EntityHistory.historyTableName(entityConfig.name, entityConfig.index);
+  let field = Table.getChainIdField(entityConfig.table);
+  let dedupKey = (
+    field !== undefined ? [
+        Table.idFieldName,
+        Table.getClickHouseDbFieldName(field)
+      ] : [Table.idFieldName]
+  ).map(name => `\`` + name + `\``).join(", ");
   let checkpointsTableName = InternalTable.Checkpoints.table.tableName;
   let entityFields = Stdlib_Array.filterMap(entityConfig.table.fields, field => {
     if (field.TAG !== "Field") {
@@ -363,7 +395,7 @@ FROM (
   FROM ` + database + `.\`` + historyTableName + `\`
   WHERE \`` + EntityHistory.checkpointIdFieldName + `\` <= (SELECT max(` + "id" + `) FROM ` + database + `.\`` + checkpointsTableName + `\`)
   ORDER BY \`` + EntityHistory.checkpointIdFieldName + `\` DESC
-  LIMIT 1 BY \`` + Table.idFieldName + `\`
+  LIMIT 1 BY ` + dedupKey + `
 )
 WHERE \`` + EntityHistory.changeFieldName + `\` = '` + "SET" + `'`;
 }

package/src/db/EntityHistory.res

@@ -82,27 +82,41 @@ type safeReorgBlocks = {
 // - Rollbacks will not cross the safe checkpoint id, so rows older than the anchor can never be referenced again.
 // - If nothing changed in reorg threshold (after the safe checkpoint), the current state for that id can be reconstructed from the
 //   origin table; we do not need a pre-safe anchor for it.
-let makePruneStaleEntityHistoryQuery = (~entityName, ~entityIndex, ~pgSchema) => {
+// A per-chain entity's rows are only comparable within a chain, so every id
+// correlation in the history SQL widens to (id, chain id).
+let makeKeyColumns = (~chainIdColumn: option<string>) =>
+  switch chainIdColumn {
+  | Some(column) => ["id", `"${column}"`]
+  | None => ["id"]
+  }
+
+let makeKeyMatch = (~chainIdColumn, ~left, ~right) =>
+  makeKeyColumns(~chainIdColumn)
+  ->Array.map(column => `${left}.${column} = ${right}.${column}`)
+  ->Array.joinUnsafe(" AND ")
+
+let makePruneStaleEntityHistoryQuery = (~entityName, ~entityIndex, ~pgSchema, ~chainIdColumn) => {
   let historyTableRef = `"${pgSchema}"."${historyTableName(~entityName, ~entityIndex)}"`
+  let keyColumns = makeKeyColumns(~chainIdColumn)
+  let anchorKeys = keyColumns->Array.map(column => `t.${column}`)->Array.joinUnsafe(", ")
 
+  // Whether a key still has a row above the safe checkpoint is an aggregate
+  // over the same groups as the anchor, so it's computed in the one pass
+  // rather than as a per-row correlated lookup.
+  // `d.envio_checkpoint_id <= $1` is implied by the rest of the predicate — it
+  // is there to keep the rows above the safe checkpoint out of the join.
   `WITH anchors AS (
-  SELECT t.id, MAX(t.${checkpointIdFieldName}) AS keep_checkpoint_id
-  FROM ${historyTableRef} t WHERE t.${checkpointIdFieldName} <= $1
-  GROUP BY t.id
+  SELECT ${anchorKeys},
+    MAX(t.${checkpointIdFieldName}) FILTER (WHERE t.${checkpointIdFieldName} <= $1) AS keep_checkpoint_id,
+    bool_or(t.${checkpointIdFieldName} > $1) AS has_above
+  FROM ${historyTableRef} t
+  GROUP BY ${anchorKeys}
 )
 DELETE FROM ${historyTableRef} d
 USING anchors a
-WHERE d.id = a.id
-  AND (
-    d.${checkpointIdFieldName} < a.keep_checkpoint_id
-    OR (
-      d.${checkpointIdFieldName} = a.keep_checkpoint_id AND
-      NOT EXISTS (
-        SELECT 1 FROM ${historyTableRef} ps 
-        WHERE ps.id = d.id AND ps.${checkpointIdFieldName} > $1
-      ) 
-    )
-  );`
+WHERE ${makeKeyMatch(~chainIdColumn, ~left="d", ~right="a")}
+  AND d.${checkpointIdFieldName} <= $1
+  AND (d.${checkpointIdFieldName} < a.keep_checkpoint_id OR NOT a.has_above);`
 }
 
 let pruneStaleEntityHistory = (
@@ -110,26 +124,40 @@ let pruneStaleEntityHistory = (
   ~entityName,
   ~entityIndex,
   ~pgSchema,
+  ~chainIdColumn,
   ~safeCheckpointId,
 ): promise<unit> => {
   sql->Postgres.preparedUnsafe(
-    makePruneStaleEntityHistoryQuery(~entityName, ~entityIndex, ~pgSchema),
+    makePruneStaleEntityHistoryQuery(~entityName, ~entityIndex, ~pgSchema, ~chainIdColumn),
     [safeCheckpointId->BigInt.toString]->(Utils.magic: array<string> => unknown),
   )
 }
 
 // If an entity doesn't have a history before the update
 // we create it automatically with envio_checkpoint_id 0
-let makeBackfillHistoryQuery = (~pgSchema, ~entityName, ~entityIndex, ~idPgType) => {
+// The ids belong to a single chain (the flush group's scope), so the chain is
+// bound once as $2 rather than unnested alongside them.
+let makeBackfillHistoryQuery = (
+  ~pgSchema,
+  ~entityName,
+  ~entityIndex,
+  ~idPgType,
+  ~chainIdColumn,
+  ~chainId: option<ChainId.t>,
+) => {
   let historyTableRef = `"${pgSchema}"."${historyTableName(~entityName, ~entityIndex)}"`
+  let chainFilter = switch (chainIdColumn, chainId) {
+  | (Some(column), Some(_)) => ` AND e."${column}" = $2`
+  | _ => ""
+  }
   `WITH target_ids AS (
   SELECT UNNEST($1::${idPgType}[]) AS id
 ),
 missing_history AS (
   SELECT e.*
   FROM "${pgSchema}"."${entityName}" e
-  JOIN target_ids t ON e.id = t.id
-  LEFT JOIN ${historyTableRef} h ON h.id = e.id
+  JOIN target_ids t ON e.id = t.id${chainFilter}
+  LEFT JOIN ${historyTableRef} h ON ${makeKeyMatch(~chainIdColumn, ~left="h", ~right="e")}
   WHERE h.id IS NULL
 )
 INSERT INTO ${historyTableRef}
@@ -142,13 +170,28 @@ let backfillHistory = (
   ~pgSchema,
   ~table: Table.table,
   ~entityIndex,
+  ~chainId: option<ChainId.t>,
   ~ids: array<EntityId.t>,
 ) => {
   let idPgType = table->Table.getIdPgFieldType(~pgSchema)
+  let chainIdColumn = table->Table.getChainIdField->Option.map(Table.getPgDbFieldName)
+  let params = [table->Table.encodeIdsToJson(ids)->(Utils.magic: JSON.t => unknown)]
+  switch (chainIdColumn, chainId) {
+  | (Some(_), Some(chainId)) =>
+    params->Array.push(chainId->(Utils.magic: ChainId.t => unknown))->ignore
+  | _ => ()
+  }
   sql
   ->Postgres.preparedUnsafe(
-    makeBackfillHistoryQuery(~entityName=table.tableName, ~entityIndex, ~pgSchema, ~idPgType),
-    [table->Table.encodeIdsToJson(ids)]->(Utils.magic: array<JSON.t> => unknown),
+    makeBackfillHistoryQuery(
+      ~entityName=table.tableName,
+      ~entityIndex,
+      ~pgSchema,
+      ~idPgType,
+      ~chainIdColumn,
+      ~chainId,
+    ),
+    params->Obj.magic,
   )
   ->Utils.Promise.ignoreValue
 }

package/src/db/EntityHistory.res.mjs

@@ -3,6 +3,8 @@
 import * as Table from "./Table.res.mjs";
 import * as Js_string from "@rescript/runtime/lib/es6/Js_string.js";
 import * as Stdlib_BigInt from "@rescript/runtime/lib/es6/Stdlib_BigInt.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
 let variants = [
@@ -71,42 +73,54 @@ function historyTableName(entityName, entityIndex) {
   return Js_string.slice(0, 63 - entityIndexStr.length | 0, fullName) + entityIndexStr;
 }
 
-function makePruneStaleEntityHistoryQuery(entityName, entityIndex, pgSchema) {
+function makeKeyColumns(chainIdColumn) {
+  if (chainIdColumn !== undefined) {
+    return [
+      "id",
+      `"` + chainIdColumn + `"`
+    ];
+  } else {
+    return ["id"];
+  }
+}
+
+function makeKeyMatch(chainIdColumn, left, right) {
+  return makeKeyColumns(chainIdColumn).map(column => left + `.` + column + ` = ` + right + `.` + column).join(" AND ");
+}
+
+function makePruneStaleEntityHistoryQuery(entityName, entityIndex, pgSchema, chainIdColumn) {
   let historyTableRef = `"` + pgSchema + `"."` + historyTableName(entityName, entityIndex) + `"`;
+  let keyColumns = makeKeyColumns(chainIdColumn);
+  let anchorKeys = keyColumns.map(column => `t.` + column).join(", ");
   return `WITH anchors AS (
-  SELECT t.id, MAX(t.` + checkpointIdFieldName + `) AS keep_checkpoint_id
-  FROM ` + historyTableRef + ` t WHERE t.` + checkpointIdFieldName + ` <= $1
-  GROUP BY t.id
+  SELECT ` + anchorKeys + `,
+    MAX(t.` + checkpointIdFieldName + `) FILTER (WHERE t.` + checkpointIdFieldName + ` <= $1) AS keep_checkpoint_id,
+    bool_or(t.` + checkpointIdFieldName + ` > $1) AS has_above
+  FROM ` + historyTableRef + ` t
+  GROUP BY ` + anchorKeys + `
 )
 DELETE FROM ` + historyTableRef + ` d
 USING anchors a
-WHERE d.id = a.id
-  AND (
-    d.` + checkpointIdFieldName + ` < a.keep_checkpoint_id
-    OR (
-      d.` + checkpointIdFieldName + ` = a.keep_checkpoint_id AND
-      NOT EXISTS (
-        SELECT 1 FROM ` + historyTableRef + ` ps 
-        WHERE ps.id = d.id AND ps.` + checkpointIdFieldName + ` > $1
-      ) 
-    )
-  );`;
+WHERE ` + makeKeyMatch(chainIdColumn, "d", "a") + `
+  AND d.` + checkpointIdFieldName + ` <= $1
+  AND (d.` + checkpointIdFieldName + ` < a.keep_checkpoint_id OR NOT a.has_above);`;
 }
 
-function pruneStaleEntityHistory(sql, entityName, entityIndex, pgSchema, safeCheckpointId) {
-  return sql.unsafe(makePruneStaleEntityHistoryQuery(entityName, entityIndex, pgSchema), [safeCheckpointId.toString()], {prepare: true});
+function pruneStaleEntityHistory(sql, entityName, entityIndex, pgSchema, chainIdColumn, safeCheckpointId) {
+  return sql.unsafe(makePruneStaleEntityHistoryQuery(entityName, entityIndex, pgSchema, chainIdColumn), [safeCheckpointId.toString()], {prepare: true});
 }
 
-function makeBackfillHistoryQuery(pgSchema, entityName, entityIndex, idPgType) {
+function makeBackfillHistoryQuery(pgSchema, entityName, entityIndex, idPgType, chainIdColumn, chainId) {
   let historyTableRef = `"` + pgSchema + `"."` + historyTableName(entityName, entityIndex) + `"`;
+  let chainFilter = chainIdColumn !== undefined && chainId !== undefined ? ` AND e."` + chainIdColumn + `" = $2` : "";
   return `WITH target_ids AS (
   SELECT UNNEST($1::` + idPgType + `[]) AS id
 ),
 missing_history AS (
   SELECT e.*
   FROM "` + pgSchema + `"."` + entityName + `" e
-  JOIN target_ids t ON e.id = t.id
-  LEFT JOIN ` + historyTableRef + ` h ON h.id = e.id
+  JOIN target_ids t ON e.id = t.id` + chainFilter + `
+  LEFT JOIN ` + historyTableRef + ` h ON ` + makeKeyMatch(chainIdColumn, "h", "e") + `
   WHERE h.id IS NULL
 )
 INSERT INTO ` + historyTableRef + `
@@ -114,9 +128,14 @@ SELECT *, 0 AS ` + checkpointIdFieldName + `, '` + "SET" + `' as ` + changeField
 FROM missing_history;`;
 }
 
-function backfillHistory(sql, pgSchema, table, entityIndex, ids) {
+function backfillHistory(sql, pgSchema, table, entityIndex, chainId, ids) {
   let idPgType = Table.getIdPgFieldType(table, pgSchema);
-  return sql.unsafe(makeBackfillHistoryQuery(pgSchema, table.tableName, entityIndex, idPgType), [Table.encodeIdsToJson(table, ids)], {prepare: true});
+  let chainIdColumn = Stdlib_Option.map(Table.getChainIdField(table), Table.getPgDbFieldName);
+  let params = [Table.encodeIdsToJson(table, ids)];
+  if (chainIdColumn !== undefined && chainId !== undefined) {
+    params.push(Primitive_option.valFromOption(chainId));
+  }
+  return sql.unsafe(makeBackfillHistoryQuery(pgSchema, table.tableName, entityIndex, idPgType, chainIdColumn, chainId), params, {prepare: true});
 }
 
 function rollback(sql, pgSchema, entityName, entityIndex, rollbackTargetCheckpointId) {
@@ -138,6 +157,8 @@ export {
   maxPgTableNameLength,
   historyTablePrefix,
   historyTableName,
+  makeKeyColumns,
+  makeKeyMatch,
   makePruneStaleEntityHistoryQuery,
   pruneStaleEntityHistory,
   makeBackfillHistoryQuery,

package/src/db/InternalTable.res.mjs

@@ -26,17 +26,17 @@ let fields = [
 ];
 
 let table = Table.mkTable("envio_chains", undefined, [
-  Table.mkField("id", "ChainId", ChainId.schema, undefined, undefined, undefined, true, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("start_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("buffer_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("source_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("events_processed", "UInt52", S$RescriptSchema.float, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("progress_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("id", "ChainId", ChainId.schema, undefined, undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("start_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("max_reorg_depth", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("buffer_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("source_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.int), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("events_processed", "UInt52", S$RescriptSchema.float, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("progress_block", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 function initialFromConfig(chainConfig) {
@@ -235,8 +235,8 @@ let Chains = {
 };
 
 let table$1 = Table.mkTable("envio_info", undefined, [
-  Table.mkField("id", "Int32", S$RescriptSchema.int, "1", undefined, undefined, true, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("config", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("id", "Int32", S$RescriptSchema.int, "1", undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("config", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 let undefinedTableSqlState = "42P01";
@@ -284,11 +284,11 @@ let dbSchema = S$RescriptSchema.object(s => ({
 }));
 
 let table$2 = Table.mkTable("envio_checkpoints", undefined, [
-  Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("chain_id", "ChainId", ChainId.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("events_processed", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("chain_id", "ChainId", ChainId.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("events_processed", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 function makeGetReorgCheckpointsQuery(pgSchema) {
@@ -412,19 +412,19 @@ let schema = S$RescriptSchema.schema(s => ({
 }));
 
 let table$3 = Table.mkTable("raw_events", undefined, [
-  Table.mkField("chain_id", "ChainId", ChainId.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_timestamp", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
-  Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined, undefined, undefined, undefined)
+  Table.mkField("chain_id", "ChainId", ChainId.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_number", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("log_index", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_timestamp", "Int32", S$RescriptSchema.int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined),
+  Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined, undefined, undefined, undefined, undefined)
 ], undefined);
 
 let RawEvents = {

package/src/db/Table.res

@@ -43,6 +43,10 @@ type field = {
   isNullable: bool,
   isPrimaryKey: bool,
   isIndex: bool,
+  // The chain-id column appended to a per-chain entity's table. It's part of
+  // the primary key but not of the entity schema the handlers see, so the
+  // read paths skip it and the write path stamps it from the flush scope.
+  isChainId: bool,
   linkedEntity: option<string>,
   defaultValue: option<string>,
   description: option<string>,
@@ -71,6 +75,7 @@ let mkField = (
   ~isNullable=false,
   ~isPrimaryKey=false,
   ~isIndex=false,
+  ~isChainId=false,
   ~linkedEntity=?,
   ~description=?,
   ~postgresDbName=?,
@@ -84,6 +89,7 @@ let mkField = (
     isNullable,
     isPrimaryKey,
     isIndex,
+    isChainId,
     linkedEntity,
     defaultValue: default,
     description,
@@ -252,6 +258,16 @@ let getDerivedFromFields = table =>
     }
   )
 
+// The chain-id column of a per-chain entity table. None for cross-chain
+// entities and every internal table.
+let getChainIdField = (table): option<field> =>
+  table.fields->Array.findMap(field =>
+    switch field {
+    | Field({isChainId: true} as field) => Some(field)
+    | _ => None
+    }
+  )
+
 let getFieldByName = (table, fieldName) =>
   table.fields->Array.find(field => field->getUserDefinedFieldName === fieldName)
 
@@ -334,12 +350,13 @@ let queryFields: table => dict<queryField> = Utils.WeakMap.memoize(table => {
 // Parses rows into entity objects keyed by API field names (the camelCase
 // record field names are type-level only), reading each value from the
 // row key produced by ~rowFieldName.
-let makeRowsSchema = (table, ~rowFieldName) =>
+let makeRowsSchema = (table, ~rowFieldName, ~skipChainId=false) =>
   S.array(
     S.object(s => {
       let dict = Dict.make()
       table.fields->Array.forEach(field =>
         switch field {
+        | Field({isChainId: true}) if skipChainId => ()
         | Field(field) =>
           dict->Dict.set(field->getApiFieldName, s.field(field->rowFieldName, field.fieldSchema))
         | DerivedFrom(_) => ()
@@ -361,6 +378,12 @@ let pgRowsSchema: table => S.t<array<unknown>> = Utils.WeakMap.memoize(table =>
   table->makeRowsSchema(~rowFieldName=getPgDbFieldName)
 )
 
+// Rows shaped like the entity the handlers see: the chain-id column is dropped,
+// since the chain is already known from the scope the rows were loaded for.
+let pgEntityRowsSchema: table => S.t<array<unknown>> = Utils.WeakMap.memoize(table =>
+  table->makeRowsSchema(~rowFieldName=getPgDbFieldName, ~skipChainId=true)
+)
+
 exception NonExistingTableField(string)
 
 /*

package/src/db/Table.res.mjs

@@ -16,11 +16,12 @@ function makeEnumConfig(name, variants) {
   };
 }
 
-function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, linkedEntity, description, postgresDbName, clickhouseDbName) {
+function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, isChainIdOpt, linkedEntity, description, postgresDbName, clickhouseDbName) {
   let isArray = isArrayOpt !== undefined ? isArrayOpt : false;
   let isNullable = isNullableOpt !== undefined ? isNullableOpt : false;
   let isPrimaryKey = isPrimaryKeyOpt !== undefined ? isPrimaryKeyOpt : false;
   let isIndex = isIndexOpt !== undefined ? isIndexOpt : false;
+  let isChainId = isChainIdOpt !== undefined ? isChainIdOpt : false;
   return {
     TAG: "Field",
     _0: {
@@ -31,6 +32,7 @@ function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNul
       isNullable: isNullable,
       isPrimaryKey: isPrimaryKey,
       isIndex: isIndex,
+      isChainId: isChainId,
       linkedEntity: linkedEntity,
       defaultValue: $$default,
       description: description,
@@ -225,6 +227,18 @@ function getDerivedFromFields(table) {
   });
 }
 
+function getChainIdField(table) {
+  return Stdlib_Array.findMap(table.fields, field => {
+    if (field.TAG !== "Field") {
+      return;
+    }
+    let field$1 = field._0;
+    if (field$1.isChainId) {
+      return field$1;
+    }
+  });
+}
+
 function getFieldByName(table, fieldName) {
   return table.fields.find(field => getUserDefinedFieldName(field) === fieldName);
 }
@@ -288,7 +302,8 @@ let queryFields = Utils.$$WeakMap.memoize(table => {
   return dict;
 });
 
-function makeRowsSchema(table, rowFieldName) {
+function makeRowsSchema(table, rowFieldName, skipChainIdOpt) {
+  let skipChainId = skipChainIdOpt !== undefined ? skipChainIdOpt : false;
   return S$RescriptSchema.array(S$RescriptSchema.object(s => {
     let dict = {};
     table.fields.forEach(field => {
@@ -296,15 +311,20 @@ function makeRowsSchema(table, rowFieldName) {
         return;
       }
       let field$1 = field._0;
+      if (field$1.isChainId && skipChainId) {
+        return;
+      }
       dict[getApiFieldName(field$1)] = s.f(rowFieldName(field$1), field$1.fieldSchema);
     });
     return dict;
   }));
 }
 
-let rowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getApiFieldName));
+let rowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getApiFieldName, undefined));
+
+let pgRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgDbFieldName, undefined));
 
-let pgRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgDbFieldName));
+let pgEntityRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgDbFieldName, true));
 
 let NonExistingTableField = /* @__PURE__ */Primitive_exceptions.create("Table.NonExistingTableField");
 
@@ -465,6 +485,7 @@ export {
   getNonDefaultFields,
   getLinkedEntityFields,
   getDerivedFromFields,
+  getChainIdField,
   getFieldByName,
   NoIdField,
   getIdFieldOrThrow,
@@ -477,6 +498,7 @@ export {
   makeRowsSchema,
   rowsSchema,
   pgRowsSchema,
+  pgEntityRowsSchema,
   NonExistingTableField,
   getUnfilteredCompositeIndexesUnsafe,
   toSqlParams,

package/src/sources/SourceManager.res

@@ -468,16 +468,16 @@ let getSourceNewHeight = async (
               // head on every (re)connect; waking the wait loop on a height we already
               // know spins it and leaks fallback pollers (#1270).
               if newHeight > sourceState.knownHeight {
+                sourceState->recordRequestStats([{Source.method: "heightPush", seconds: 0.}])
                 sourceState.knownHeight = newHeight
                 let resolvers = sourceState.pendingHeightResolvers
                 sourceState.pendingHeightResolvers = []
                 resolvers->Array.forEach(resolve => resolve(newHeight))
+              } else {
+                sourceState->recordRequestStats([{Source.method: "heightPushIgnored", seconds: 0.}])
               }
             })
             sourceState.unsubscribe = Some(unsubscribe)
-            // Count a subscription (re)start rather than every pushed height —
-            // there's no request/response to time here.
-            sourceState->recordRequestStats([{Source.method: "heightSubscription", seconds: 0.}])
           | _ =>
             // Slowdown polling when the chain isn't progressing
             let pollingInterval = if reducedPolling {
@@ -724,9 +724,7 @@ let executeQuery = async (
     ) {
     | Some(s) =>
       if s.source !== sourceManager.activeSource {
-        let logger = Logging.createChild(
-          ~params={"chainId": sourceManager.activeSource.chainId},
-        )
+        let logger = Logging.createChild(~params={"chainId": sourceManager.activeSource.chainId})
         logger->Logging.childInfo({
           "msg": "Switching data-source",
           "source": s.source.name,
@@ -736,9 +734,7 @@ let executeQuery = async (
       }
       s
     | None =>
-      let logger = Logging.createChild(
-        ~params={"chainId": sourceManager.activeSource.chainId},
-      )
+      let logger = Logging.createChild(~params={"chainId": sourceManager.activeSource.chainId})
       %raw(`null`)->ErrorHandling.mkLogAndRaise(~logger, ~msg=noSourcesError)
     }
     sourceManager.activeSource = sourceState.source
@@ -895,9 +891,7 @@ let getBlockHashes = async (sourceManager: t, ~blockNumbers: array<int>, ~isReal
     let sourceState = switch sourceManager->getNextSource(~isRealtime) {
     | Some(s) => s
     | None =>
-      let logger = Logging.createChild(
-        ~params={"chainId": sourceManager.activeSource.chainId},
-      )
+      let logger = Logging.createChild(~params={"chainId": sourceManager.activeSource.chainId})
       %raw(`null`)->ErrorHandling.mkLogAndRaise(
         ~logger,
         ~msg="No data-sources available for fetching block hashes.",