envio 3.0.0-alpha.2 → 3.0.0-alpha.20

package/src/InMemoryStore.res.mjs

@@ -2,12 +2,12 @@
 
 import * as $$Array from "rescript/lib/es6/array.js";
 import * as Utils from "./Utils.res.mjs";
+import * as Config from "./Config.res.mjs";
 import * as Js_dict from "rescript/lib/es6/js_dict.js";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
 import * as EventUtils from "./EventUtils.res.mjs";
 import * as ErrorHandling from "./ErrorHandling.res.mjs";
 import * as InMemoryTable from "./InMemoryTable.res.mjs";
-import * as InternalTable from "./db/InternalTable.res.mjs";
 import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
 
 function hashRawEventsKey(key) {
@@ -102,7 +102,7 @@ function isRollingBack(inMemoryStore) {
 }
 
 function setBatchDcs(inMemoryStore, batch, shouldSaveHistory) {
-  var inMemTable = getInMemTable(inMemoryStore, InternalTable.DynamicContractRegistry.config);
+  var inMemTable = getInMemTable(inMemoryStore, Config.DynamicContractRegistry.entityConfig);
   var itemIdx = 0;
   for(var checkpoint = 0 ,checkpoint_finish = batch.checkpointIds.length; checkpoint < checkpoint_finish; ++checkpoint){
     var checkpointId = batch.checkpointIds[checkpoint];
@@ -114,7 +114,7 @@ function setBatchDcs(inMemoryStore, batch, shouldSaveHistory) {
       if (dcs !== undefined) {
         for(var dcIdx = 0 ,dcIdx_finish = dcs.length; dcIdx < dcIdx_finish; ++dcIdx){
           var dc = dcs[dcIdx];
-          var entity_id = InternalTable.DynamicContractRegistry.makeId(chainId, dc.address);
+          var entity_id = Config.DynamicContractRegistry.makeId(chainId, dc.address);
           var entity_registering_event_block_number = item.blockNumber;
           var entity_registering_event_log_index = item.logIndex;
           var entity_registering_event_block_timestamp = item.timestamp;

package/src/InMemoryTable.res

@@ -51,7 +51,7 @@ module Entity = {
   // Helper to extract entity ID from any entity
   exception UnexpectedIdNotDefinedOnEntity
   let getEntityIdUnsafe = (entity: 'entity): string =>
-    switch Utils.magic(entity)["id"] {
+    switch (entity->(Utils.magic: 'entity => {"id": option<string>}))["id"] {
     | Some(id) => id
     | None =>
       UnexpectedIdNotDefinedOnEntity->ErrorHandling.mkLogAndRaise(

package/src/InMemoryTable.res.mjs

@@ -54,7 +54,7 @@ var UnexpectedIdNotDefinedOnEntity = /* @__PURE__ */Caml_exceptions.create("InMe
 function getEntityIdUnsafe(entity) {
   var id = entity.id;
   if (id !== undefined) {
-    return Caml_option.valFromOption(id);
+    return id;
   } else {
     return ErrorHandling.mkLogAndRaise(undefined, "Property 'id' does not exist on expected entity object", {
                 RE_EXN_ID: UnexpectedIdNotDefinedOnEntity

package/src/Internal.gen.ts

@@ -45,6 +45,10 @@ export type genericHandlerWithLoader<loader,handler,eventFilters> = {
   readonly eventFilters?: eventFilters
 };
 
+export abstract class fuelEventConfig { protected opaque!: any }; /* simulate opaque types */
+
+export abstract class evmEventConfig { protected opaque!: any }; /* simulate opaque types */
+
 export type eventOptions<eventFilters> = { readonly wildcard?: boolean; readonly eventFilters?: eventFilters };
 
 export type fuelSupplyParams = { readonly subId: string; readonly amount: bigint };

package/src/Internal.res

@@ -2,6 +2,228 @@ type eventParams
 type eventBlock
 type eventTransaction
 
+// Field name variants for type-safe field selection.
+// @unboxed compiles to plain strings at runtime, matching JS property names.
+@unboxed
+type evmBlockField =
+  | @as("number") Number
+  | @as("timestamp") Timestamp
+  | @as("hash") Hash
+  | @as("parentHash") ParentHash
+  | @as("nonce") Nonce
+  | @as("sha3Uncles") Sha3Uncles
+  | @as("logsBloom") LogsBloom
+  | @as("transactionsRoot") TransactionsRoot
+  | @as("stateRoot") StateRoot
+  | @as("receiptsRoot") ReceiptsRoot
+  | @as("miner") Miner
+  | @as("difficulty") Difficulty
+  | @as("totalDifficulty") TotalDifficulty
+  | @as("extraData") ExtraData
+  | @as("size") Size
+  | @as("gasLimit") GasLimit
+  | @as("gasUsed") GasUsed
+  | @as("uncles") Uncles
+  | @as("baseFeePerGas") BaseFeePerGas
+  | @as("blobGasUsed") BlobGasUsed
+  | @as("excessBlobGas") ExcessBlobGas
+  | @as("parentBeaconBlockRoot") ParentBeaconBlockRoot
+  | @as("withdrawalsRoot") WithdrawalsRoot
+  | @as("l1BlockNumber") L1BlockNumber
+  | @as("sendCount") SendCount
+  | @as("sendRoot") SendRoot
+  | @as("mixHash") MixHash
+
+@unboxed
+type evmTransactionField =
+  | @as("transactionIndex") TransactionIndex
+  | @as("hash") Hash
+  | @as("from") From
+  | @as("to") To
+  | @as("gas") Gas
+  | @as("gasPrice") GasPrice
+  | @as("maxPriorityFeePerGas") MaxPriorityFeePerGas
+  | @as("maxFeePerGas") MaxFeePerGas
+  | @as("cumulativeGasUsed") CumulativeGasUsed
+  | @as("effectiveGasPrice") EffectiveGasPrice
+  | @as("gasUsed") GasUsed
+  | @as("input") Input
+  | @as("nonce") Nonce
+  | @as("value") Value
+  | @as("v") V
+  | @as("r") R
+  | @as("s") S
+  | @as("contractAddress") ContractAddress
+  | @as("logsBloom") LogsBloom
+  | @as("root") Root
+  | @as("status") Status
+  | @as("yParity") YParity
+  | @as("accessList") AccessList
+  | @as("maxFeePerBlobGas") MaxFeePerBlobGas
+  | @as("blobVersionedHashes") BlobVersionedHashes
+  | @as("type") Type
+  | @as("l1Fee") L1Fee
+  | @as("l1GasPrice") L1GasPrice
+  | @as("l1GasUsed") L1GasUsed
+  | @as("l1FeeScalar") L1FeeScalar
+  | @as("gasUsedForL1") GasUsedForL1
+  | @as("authorizationList") AuthorizationList
+
+let allEvmBlockFields: array<evmBlockField> = [
+  Number,
+  Timestamp,
+  Hash,
+  ParentHash,
+  Nonce,
+  Sha3Uncles,
+  LogsBloom,
+  TransactionsRoot,
+  StateRoot,
+  ReceiptsRoot,
+  Miner,
+  Difficulty,
+  TotalDifficulty,
+  ExtraData,
+  Size,
+  GasLimit,
+  GasUsed,
+  Uncles,
+  BaseFeePerGas,
+  BlobGasUsed,
+  ExcessBlobGas,
+  ParentBeaconBlockRoot,
+  WithdrawalsRoot,
+  L1BlockNumber,
+  SendCount,
+  SendRoot,
+  MixHash,
+]
+let evmBlockFieldSchema = S.enum(allEvmBlockFields)
+
+let allEvmTransactionFields: array<evmTransactionField> = [
+  TransactionIndex,
+  Hash,
+  From,
+  To,
+  Gas,
+  GasPrice,
+  MaxPriorityFeePerGas,
+  MaxFeePerGas,
+  CumulativeGasUsed,
+  EffectiveGasPrice,
+  GasUsed,
+  Input,
+  Nonce,
+  Value,
+  V,
+  R,
+  S,
+  ContractAddress,
+  LogsBloom,
+  Root,
+  Status,
+  YParity,
+  AccessList,
+  MaxFeePerBlobGas,
+  BlobVersionedHashes,
+  Type,
+  L1Fee,
+  L1GasPrice,
+  L1GasUsed,
+  L1FeeScalar,
+  GasUsedForL1,
+  AuthorizationList,
+]
+let evmTransactionFieldSchema = S.enum(allEvmTransactionFields)
+
+// Static sets of nullable field names — used by RpcSource and HyperSyncSource to wrap schemas with S.nullable
+let evmNullableBlockFields = Utils.Set.fromArray(
+  (
+    [
+      Nonce,
+      Difficulty,
+      TotalDifficulty,
+      Uncles,
+      BaseFeePerGas,
+      BlobGasUsed,
+      ExcessBlobGas,
+      ParentBeaconBlockRoot,
+      WithdrawalsRoot,
+      L1BlockNumber,
+      SendCount,
+      SendRoot,
+      MixHash,
+    ]: array<evmBlockField>
+  ),
+)
+let evmNullableTransactionFields = Utils.Set.fromArray(
+  (
+    [
+      GasPrice,
+      V,
+      R,
+      S,
+      YParity,
+      MaxPriorityFeePerGas,
+      MaxFeePerGas,
+      MaxFeePerBlobGas,
+      BlobVersionedHashes,
+      ContractAddress,
+      Root,
+      Status,
+      L1Fee,
+      L1GasPrice,
+      L1GasUsed,
+      L1FeeScalar,
+      GasUsedForL1,
+      From,
+      To,
+      Type,
+    ]: array<evmTransactionField>
+  ),
+)
+
+// Shared EVM transaction fields type used by both RPC and HyperSync sources
+// Field names match HyperSyncClient.ResponseTypes.transaction for consistency
+type evmTransactionFields = {
+  from?: Address.t,
+  to?: Address.t,
+  gas?: bigint,
+  gasPrice?: bigint,
+  hash?: string,
+  input?: string,
+  nonce?: bigint,
+  transactionIndex?: int,
+  value?: bigint,
+  // Signature fields - optional for ZKSync EIP-712 compatibility
+  v?: string,
+  r?: string,
+  s?: string,
+  yParity?: string,
+  // EIP-1559 fields
+  maxPriorityFeePerGas?: bigint,
+  maxFeePerGas?: bigint,
+  // EIP-4844 blob fields
+  maxFeePerBlobGas?: bigint,
+  blobVersionedHashes?: array<string>,
+  // Receipt fields (from joined transaction receipts)
+  cumulativeGasUsed?: bigint,
+  effectiveGasPrice?: bigint,
+  gasUsed?: bigint,
+  contractAddress?: string,
+  logsBloom?: string,
+  @as("type")
+  type_?: int,
+  root?: string,
+  status?: int,
+  // L2 specific fields (Optimism, Arbitrum, etc.)
+  l1Fee?: bigint,
+  l1GasPrice?: bigint,
+  l1GasUsed?: bigint,
+  l1FeeScalar?: float,
+  gasUsedForL1?: bigint,
+}
+
 @genType
 type genericEvent<'params, 'block, 'transaction> = {
   params: 'params,
@@ -65,7 +287,6 @@ type chains = dict<chainInfo>
 type loaderReturn
 type handlerContext = private {
   isPreload: bool,
-  chains: chains,
   chain: chainInfo,
 }
 type handlerArgs = {
@@ -107,6 +328,7 @@ type fuelEventKind =
   | Burn
   | Transfer
   | Call
+@genType.opaque
 type fuelEventConfig = {
   ...eventConfig,
   kind: fuelEventKind,
@@ -128,12 +350,13 @@ type eventFiltersArgs = {chainId: int, addresses: array<Address.t>}
 type eventFilters =
   Static(array<topicSelection>) | Dynamic(array<Address.t> => array<topicSelection>)
 
+@genType.opaque
 type evmEventConfig = {
   ...eventConfig,
   getEventFiltersOrThrow: ChainMap.Chain.t => eventFilters,
-  blockSchema: S.schema<eventBlock>,
-  transactionSchema: S.schema<eventTransaction>,
   convertHyperSyncEventArgs: HyperSyncClient.Decoder.decodedEvent => eventParams,
+  selectedBlockFields: Utils.Set.t<evmBlockField>,
+  selectedTransactionFields: Utils.Set.t<evmTransactionField>,
 }
 type evmContractConfig = {
   name: string,
@@ -169,7 +392,8 @@ type eventItem = private {
 type blockEvent
 
 type onBlockArgs = {
-  block: blockEvent,
+  slot?: int,
+  block?: blockEvent,
   context: handlerContext,
 }
 
@@ -244,18 +468,12 @@ let fuelTransferParamsSchema = S.schema(s => {
 })
 
 type entity = private {id: string}
-type clickHouseSetUpdatesCache = {
-  tableName: string,
-  convertOrThrow: Change.t<entity> => Js.Json.t,
-}
 type genericEntityConfig<'entity> = {
   name: string,
   index: int,
   schema: S.t<'entity>,
   rowsSchema: S.t<array<'entity>>,
   table: Table.table,
-  mutable clickHouseSetUpdatesCache?: clickHouseSetUpdatesCache,
-  mutable pgEntityHistoryCache?: EntityHistory.pgEntityHistory<'entity>,
 }
 type entityConfig = genericEntityConfig<entity>
 external fromGenericEntityConfig: genericEntityConfig<'entity> => entityConfig = "%identity"
@@ -312,11 +530,11 @@ let makeCacheTable = (~effectName) => {
 @genType.import(("./Types.ts", "Invalid"))
 type noEventFilters
 
-type checkpointId = float
+type checkpointId = bigint
 
 type reorgCheckpoint = {
   @as("id")
-  checkpointId: float,
+  checkpointId: bigint,
   @as("chain_id")
   chainId: int,
   @as("block_number")

package/src/Internal.res.mjs

@@ -5,6 +5,114 @@ import * as $$BigInt from "./bindings/BigInt.res.mjs";
 import * as Address from "./Address.res.mjs";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
+var allEvmBlockFields = [
+  "number",
+  "timestamp",
+  "hash",
+  "parentHash",
+  "nonce",
+  "sha3Uncles",
+  "logsBloom",
+  "transactionsRoot",
+  "stateRoot",
+  "receiptsRoot",
+  "miner",
+  "difficulty",
+  "totalDifficulty",
+  "extraData",
+  "size",
+  "gasLimit",
+  "gasUsed",
+  "uncles",
+  "baseFeePerGas",
+  "blobGasUsed",
+  "excessBlobGas",
+  "parentBeaconBlockRoot",
+  "withdrawalsRoot",
+  "l1BlockNumber",
+  "sendCount",
+  "sendRoot",
+  "mixHash"
+];
+
+var evmBlockFieldSchema = S$RescriptSchema.$$enum(allEvmBlockFields);
+
+var allEvmTransactionFields = [
+  "transactionIndex",
+  "hash",
+  "from",
+  "to",
+  "gas",
+  "gasPrice",
+  "maxPriorityFeePerGas",
+  "maxFeePerGas",
+  "cumulativeGasUsed",
+  "effectiveGasPrice",
+  "gasUsed",
+  "input",
+  "nonce",
+  "value",
+  "v",
+  "r",
+  "s",
+  "contractAddress",
+  "logsBloom",
+  "root",
+  "status",
+  "yParity",
+  "accessList",
+  "maxFeePerBlobGas",
+  "blobVersionedHashes",
+  "type",
+  "l1Fee",
+  "l1GasPrice",
+  "l1GasUsed",
+  "l1FeeScalar",
+  "gasUsedForL1",
+  "authorizationList"
+];
+
+var evmTransactionFieldSchema = S$RescriptSchema.$$enum(allEvmTransactionFields);
+
+var evmNullableBlockFields = new Set([
+      "nonce",
+      "difficulty",
+      "totalDifficulty",
+      "uncles",
+      "baseFeePerGas",
+      "blobGasUsed",
+      "excessBlobGas",
+      "parentBeaconBlockRoot",
+      "withdrawalsRoot",
+      "l1BlockNumber",
+      "sendCount",
+      "sendRoot",
+      "mixHash"
+    ]);
+
+var evmNullableTransactionFields = new Set([
+      "gasPrice",
+      "v",
+      "r",
+      "s",
+      "yParity",
+      "maxPriorityFeePerGas",
+      "maxFeePerGas",
+      "maxFeePerBlobGas",
+      "blobVersionedHashes",
+      "contractAddress",
+      "root",
+      "status",
+      "l1Fee",
+      "l1GasPrice",
+      "l1GasUsed",
+      "l1FeeScalar",
+      "gasUsedForL1",
+      "from",
+      "to",
+      "type"
+    ]);
+
 function getItemChainId(item) {
   if (item.kind === 0) {
     return item.chain;
@@ -47,6 +155,12 @@ function makeCacheTable(effectName) {
 }
 
 export {
+  allEvmBlockFields ,
+  evmBlockFieldSchema ,
+  allEvmTransactionFields ,
+  evmTransactionFieldSchema ,
+  evmNullableBlockFields ,
+  evmNullableTransactionFields ,
   getItemChainId ,
   fuelSupplyParamsSchema ,
   fuelTransferParamsSchema ,
@@ -55,4 +169,4 @@ export {
   effectCacheItemRowsSchema ,
   makeCacheTable ,
 }
-/* fuelSupplyParamsSchema Not a pure module */
+/* evmBlockFieldSchema Not a pure module */