envio 3.0.0-alpha.2 → 3.0.0-alpha.4

package/src/bindings/ClickHouse.res

@@ -98,6 +98,36 @@ let getClickHouseFieldType = (
   isNullable ? `Nullable(${baseType})` : baseType
 }
 
+// Creates an entity schema from table definition, using clickHouseDate for Date fields
+let makeClickHouseEntitySchema = (table: Table.table): S.t<Internal.entity> => {
+  S.schema(s => {
+    let dict = Js.Dict.empty()
+    table.fields->Belt.Array.forEach(field => {
+      switch field {
+      | Field(f) => {
+          let fieldName = f->Table.getDbFieldName
+          let fieldSchema = switch f.fieldType {
+          | Date => {
+              let dateSchema = Utils.Schema.clickHouseDate->S.toUnknown
+              if f.isNullable {
+                S.null(dateSchema)->S.toUnknown
+              } else if f.isArray {
+                S.array(dateSchema)->S.toUnknown
+              } else {
+                dateSchema
+              }
+            }
+          | _ => f.fieldSchema
+          }
+          dict->Js.Dict.set(fieldName, s.matches(fieldSchema))
+        }
+      | DerivedFrom(_) => () // Skip derived fields
+      }
+    })
+    dict->Utils.magic
+  })
+}
+
 let setCheckpointsOrThrow = async (client, ~batch: Batch.t, ~database: string) => {
   let checkpointsCount = batch.checkpointIds->Array.length
   if checkpointsCount === 0 {
@@ -154,7 +184,7 @@ let setUpdatesOrThrow = async (
           )}\``,
         convertOrThrow: S.compile(
           S.union([
-            EntityHistory.makeSetUpdateSchema(entityConfig.schema),
+            EntityHistory.makeSetUpdateSchema(makeClickHouseEntitySchema(entityConfig.table)),
             S.object(s => {
               s.tag(EntityHistory.changeFieldName, EntityHistory.RowAction.DELETE)
               Change.Delete({

package/src/bindings/ClickHouse.res.mjs

@@ -76,6 +76,31 @@ function getClickHouseFieldType(fieldType, isNullable, isArray) {
   }
 }
 
+function makeClickHouseEntitySchema(table) {
+  return S$RescriptSchema.schema(function (s) {
+              var dict = {};
+              Belt_Array.forEach(table.fields, (function (field) {
+                      if (field.TAG !== "Field") {
+                        return ;
+                      }
+                      var f = field._0;
+                      var fieldName = Table.getDbFieldName(f);
+                      var match = f.fieldType;
+                      var fieldSchema;
+                      if (typeof match !== "object" && match === "Date") {
+                        var dateSchema = Utils.Schema.clickHouseDate;
+                        fieldSchema = f.isNullable ? S$RescriptSchema.$$null(dateSchema) : (
+                            f.isArray ? S$RescriptSchema.array(dateSchema) : dateSchema
+                          );
+                      } else {
+                        fieldSchema = f.fieldSchema;
+                      }
+                      dict[fieldName] = s.m(fieldSchema);
+                    }));
+              return dict;
+            });
+}
+
 async function setCheckpointsOrThrow(client, batch, database) {
   var checkpointsCount = batch.checkpointIds.length;
   if (checkpointsCount === 0) {
@@ -120,7 +145,7 @@ async function setUpdatesOrThrow(client, updates, entityConfig, database) {
   } else {
     var cache_tableName = database + ".\`" + EntityHistory.historyTableName(entityConfig.name, entityConfig.index) + "\`";
     var cache_convertOrThrow = S$RescriptSchema.compile(S$RescriptSchema.union([
-              EntityHistory.makeSetUpdateSchema(entityConfig.schema),
+              EntityHistory.makeSetUpdateSchema(makeClickHouseEntitySchema(entityConfig.table)),
               S$RescriptSchema.object(function (s) {
                     s.tag(EntityHistory.changeFieldName, "DELETE");
                     return {
@@ -264,6 +289,7 @@ async function resume(client, database, checkpointId) {
 
 export {
   getClickHouseFieldType ,
+  makeClickHouseEntitySchema ,
   setCheckpointsOrThrow ,
   setUpdatesOrThrow ,
   makeCreateHistoryTableQuery ,

package/src/bindings/DateFns.res

@@ -0,0 +1,71 @@
+/**
+Formats: 
+hh:mm:ss         | 00:00:00
+do MMM ''yy      | 1st Jan '21
+ha do MMM ''yy   | 8PM 1st Jan '21
+ha               | 8PM
+iii              | Tues
+iii MMM          | Tues Jan
+MMM              | Jan
+`)
+*/
+type dateFormats =
+  | @as("HH:mm:ss") HoursMinSec
+  | @as("ha") Hour
+  | @as("do MMM ''yy") DayMonthYear
+  | @as("ha do MMM ''yy") HourDayMonthYear
+  | @as("h:mma do MMM ''yy") HourMinDayMonthYear
+  | @as("iii") DayName
+  | @as("iii MMM") DayNameMonth
+  | @as("do MMM") DayMonth
+  | @as("MMM") Month
+  | @as("h:mma") HourMin
+
+@module("date-fns") external format: (Js.Date.t, dateFormats) => string = "format"
+
+type formatDistanceToNowOptions = {includeSeconds: bool}
+@module("date-fns")
+external formatDistanceToNow: Js.Date.t => string = "formatDistanceToNow"
+
+@module("date-fns")
+external formatDistance: (Js.Date.t, Js.Date.t) => string = "formatDistance"
+
+@module("date-fns")
+external formatDistanceWithOptions: (Js.Date.t, Js.Date.t, formatDistanceToNowOptions) => string =
+  "formatDistance"
+
+@module("date-fns")
+external formatDistanceToNowWithOptions: (Js.Date.t, formatDistanceToNowOptions) => string =
+  "formatDistanceToNow"
+
+let formatDistanceToNowWithSeconds = (date: Js.Date.t) =>
+  date->formatDistanceToNowWithOptions({includeSeconds: true})
+
+type durationTimeFormat = {
+  years: int,
+  months: int,
+  weeks: int,
+  days: int,
+  hours: int,
+  minutes: int,
+  seconds: int,
+}
+
+@module("date-fns")
+external formatRelative: (Js.Date.t, Js.Date.t) => string = "formatRelative"
+
+type durationFormatOutput = {format: array<string>}
+
+@module("date-fns")
+external formatDuration: (durationTimeFormat, durationFormatOutput) => string = "formatDuration"
+
+type interval = {start: Js_date.t, end: Js_date.t}
+
+@module("date-fns")
+external intervalToDuration: interval => durationTimeFormat = "intervalToDuration"
+
+//helper to convert millis elapsed to duration object
+let durationFromMillis = (millis: int) =>
+  intervalToDuration({start: 0->Utils.magic, end: millis->Utils.magic})
+
+@module("date-fns") external fromUnixTime: float => Js.Date.t = "fromUnixTime"

package/src/bindings/DateFns.res.mjs

@@ -0,0 +1,22 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as DateFns from "date-fns";
+
+function formatDistanceToNowWithSeconds(date) {
+  return DateFns.formatDistanceToNow(date, {
+              includeSeconds: true
+            });
+}
+
+function durationFromMillis(millis) {
+  return DateFns.intervalToDuration({
+              start: 0,
+              end: millis
+            });
+}
+
+export {
+  formatDistanceToNowWithSeconds ,
+  durationFromMillis ,
+}
+/* date-fns Not a pure module */

package/src/bindings/Ethers.res

@@ -2,15 +2,6 @@ type abi = EvmTypes.Abi.t
 
 let makeAbi = (abi: Js.Json.t): abi => abi->Utils.magic
 
-@deprecated("Use Address.t instead. The type will be removed in v3")
-type ethAddress = Address.t
-@deprecated("Use Address.Evm.fromStringOrThrow instead. The function will be removed in v3")
-let getAddressFromStringUnsafe = Address.Evm.fromStringOrThrow
-@deprecated("Use Address.toString instead. The function will be removed in v3")
-let ethAddressToString = Address.toString
-@deprecated("Use Address.schema instead. The function will be removed in v3")
-let ethAddressSchema = Address.schema
-
 type txHash = string
 
 module Constants = {
@@ -18,35 +9,6 @@ module Constants = {
   @module("ethers") @scope("ethers") external zeroAddress: Address.t = "ZeroAddress"
 }
 
-module Addresses = {
-  @genType
-  let mockAddresses = [
-    "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-    "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-    "0x90F79bf6EB2c4f870365E785982E1f101E93b906",
-    "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
-    "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "0x976EA74026E726554dB657fA54763abd0C3a0aa9",
-    "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
-    "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
-    "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-    "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
-    "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
-    "0xFABB0ac9d68B0B445fB7357272Ff202C5651694a",
-    "0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec",
-    "0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097",
-    "0xcd3B766CCDd6AE721141F452C550Ca635964ce71",
-    "0x2546BcD3c84621e976D8185a91A922aE77ECEc30",
-    "0xbDA5747bFD65F08deb54cb465eB87D40e51B197E",
-    "0xdD2FD4581271e230360230F9337D5c0430Bf44C0",
-    "0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199",
-  ]->Belt.Array.map(getAddressFromStringUnsafe)
-  @genType
-  let defaultAddress =
-    mockAddresses[0]
-}
-
 module Filter = {
   type t
 }
@@ -144,41 +106,43 @@ module JsonRpcProvider = {
   @send
   external getLogs: (t, ~filter: Filter.t) => promise<array<log>> = "getLogs"
 
-  @send
-  external getTransaction: (t, ~transactionHash: string) => promise<transaction> = "getTransaction"
-
   let makeGetTransactionFields = (~getTransactionByHash, ~lowercaseAddresses: bool) => async (
     log: log,
-  ): promise<unknown> => {
-    let transaction = await getTransactionByHash(log.transactionHash)
+  ): promise<Internal.evmTransactionFields> => {
+    let transaction: Internal.evmTransactionFields = await getTransactionByHash(log.transactionHash)
     // Mutating should be fine, since the transaction isn't used anywhere else outside the function
     let fields: {..} = transaction->Obj.magic
 
-    // Make it compatible with HyperSync transaction fields
+    // RPC may return null for transactionIndex on pending transactions
     fields["transactionIndex"] = log.transactionIndex
-    fields["input"] = fields["data"]
 
     // NOTE: this is wasteful if these fields are not selected in the users config.
     //       There might be a better way to do this in the `makeThrowingGetEventTransaction` function rather based on the schema.
     //       However this is not extremely expensive and good enough for now (only on rpc sync also).
-    if lowercaseAddresses {
-      open Js.Nullable
-      switch fields["from"] {
-      | Value(from) => fields["from"] = from->Js.String2.toLowerCase
-      | Undefined => ()
-      | Null => ()
-      }
-      switch fields["to"] {
-      | Value(to) => fields["to"] = to->Js.String2.toLowerCase
-      | Undefined => ()
-      | Null => ()
-      }
-      switch fields["contractAddress"] {
-      | Value(contractAddress) =>
-        fields["contractAddress"] = contractAddress->Js.String2.toLowerCase
-      | Undefined => ()
-      | Null => ()
-      }
+    open Js.Nullable
+    switch fields["from"] {
+    | Value(from) =>
+      fields["from"] = lowercaseAddresses
+        ? from->Js.String2.toLowerCase->Address.unsafeFromString
+        : from->Address.Evm.fromStringOrThrow
+    | Undefined => ()
+    | Null => ()
+    }
+    switch fields["to"] {
+    | Value(to) =>
+      fields["to"] = lowercaseAddresses
+        ? to->Js.String2.toLowerCase->Address.unsafeFromString
+        : to->Address.Evm.fromStringOrThrow
+    | Undefined => ()
+    | Null => ()
+    }
+    switch fields["contractAddress"] {
+    | Value(contractAddress) =>
+      fields["contractAddress"] = lowercaseAddresses
+        ? contractAddress->Js.String2.toLowerCase->Address.unsafeFromString
+        : contractAddress->Address.Evm.fromStringOrThrow
+    | Undefined => ()
+    | Null => ()
     }
 
     fields->Obj.magic

package/src/bindings/Ethers.res.mjs

@@ -2,52 +2,14 @@
 
 import * as Ethers from "ethers";
 import * as Address from "../Address.res.mjs";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Caml_array from "rescript/lib/es6/caml_array.js";
 import * as Caml_option from "rescript/lib/es6/caml_option.js";
 
 function makeAbi(abi) {
   return abi;
 }
 
-var getAddressFromStringUnsafe = Address.Evm.fromStringOrThrow;
-
-function ethAddressToString(prim) {
-  return prim;
-}
-
 var Constants = {};
 
-var mockAddresses = Belt_Array.map([
-      "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-      "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-      "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-      "0x90F79bf6EB2c4f870365E785982E1f101E93b906",
-      "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
-      "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-      "0x976EA74026E726554dB657fA54763abd0C3a0aa9",
-      "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
-      "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
-      "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-      "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
-      "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
-      "0xFABB0ac9d68B0B445fB7357272Ff202C5651694a",
-      "0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec",
-      "0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097",
-      "0xcd3B766CCDd6AE721141F452C550Ca635964ce71",
-      "0x2546BcD3c84621e976D8185a91A922aE77ECEc30",
-      "0xbDA5747bFD65F08deb54cb465eB87D40e51B197E",
-      "0xdD2FD4581271e230360230F9337D5c0430Bf44C0",
-      "0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199"
-    ], getAddressFromStringUnsafe);
-
-var defaultAddress = Caml_array.get(mockAddresses, 0);
-
-var Addresses = {
-  mockAddresses: mockAddresses,
-  defaultAddress: defaultAddress
-};
-
 var Filter = {};
 
 function toFilter(combinedFilter) {
@@ -81,26 +43,23 @@ function makeGetTransactionFields(getTransactionByHash, lowercaseAddresses) {
   return async function (log) {
     var transaction = await getTransactionByHash(log.transactionHash);
     transaction.transactionIndex = log.transactionIndex;
-    transaction.input = transaction.data;
-    if (lowercaseAddresses) {
-      var from = transaction.from;
-      if (from === null || from === undefined) {
-        from === null;
-      } else {
-        transaction.from = from.toLowerCase();
-      }
-      var to = transaction.to;
-      if (to === null || to === undefined) {
-        to === null;
-      } else {
-        transaction.to = to.toLowerCase();
-      }
-      var contractAddress = transaction.contractAddress;
-      if (contractAddress === null || contractAddress === undefined) {
-        contractAddress === null;
-      } else {
-        transaction.contractAddress = contractAddress.toLowerCase();
-      }
+    var from = transaction.from;
+    if (from === null || from === undefined) {
+      from === null;
+    } else {
+      transaction.from = lowercaseAddresses ? from.toLowerCase() : Address.Evm.fromStringOrThrow(from);
+    }
+    var to = transaction.to;
+    if (to === null || to === undefined) {
+      to === null;
+    } else {
+      transaction.to = lowercaseAddresses ? to.toLowerCase() : Address.Evm.fromStringOrThrow(to);
+    }
+    var contractAddress = transaction.contractAddress;
+    if (contractAddress === null || contractAddress === undefined) {
+      contractAddress === null;
+    } else {
+      transaction.contractAddress = lowercaseAddresses ? contractAddress.toLowerCase() : Address.Evm.fromStringOrThrow(contractAddress);
     }
     return transaction;
   };
@@ -112,19 +71,13 @@ var JsonRpcProvider = {
   makeGetTransactionFields: makeGetTransactionFields
 };
 
-var ethAddressSchema = Address.schema;
-
 export {
   makeAbi ,
-  getAddressFromStringUnsafe ,
-  ethAddressToString ,
-  ethAddressSchema ,
   Constants ,
-  Addresses ,
   Filter ,
   CombinedFilter ,
   logToMinimumParseableLogData ,
   Network ,
   JsonRpcProvider ,
 }
-/* mockAddresses Not a pure module */
+/* ethers Not a pure module */

package/src/sources/Evm.res

@@ -0,0 +1,87 @@
+@get external getNumber: Internal.eventBlock => int = "number"
+@get external getTimestamp: Internal.eventBlock => int = "timestamp"
+@get external getId: Internal.eventBlock => string = "hash"
+
+let cleanUpRawEventFieldsInPlace: Js.Json.t => unit = %raw(`fields => {
+    delete fields.hash
+    delete fields.number
+    delete fields.timestamp
+  }`)
+
+let ecosystem: Ecosystem.t = {
+  name: Evm,
+  blockFields: [
+    "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",
+  ],
+  transactionFields: [
+    "transactionIndex",
+    "hash",
+    "from",
+    "to",
+    "gas",
+    "gasPrice",
+    "maxPriorityFeePerGas",
+    "maxFeePerGas",
+    "cumulativeGasUsed",
+    "effectiveGasPrice",
+    "gasUsed",
+    "input",
+    "nonce",
+    "value",
+    "v",
+    "r",
+    "s",
+    "contractAddress",
+    "logsBloom",
+    "root",
+    "status",
+    "yParity",
+    "chainId",
+    "maxFeePerBlobGas",
+    "blobVersionedHashes",
+    "type",
+    "l1Fee",
+    "l1GasPrice",
+    "l1GasUsed",
+    "l1FeeScalar",
+    "gasUsedForL1",
+    "accessList",
+    "authorizationList",
+  ],
+  blockNumberName: "number",
+  blockTimestampName: "timestamp",
+  blockHashName: "hash",
+  getNumber,
+  getTimestamp,
+  getId,
+  cleanUpRawEventFieldsInPlace,
+}
+
+
+

package/src/sources/Evm.res.mjs

@@ -0,0 +1,105 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+
+var cleanUpRawEventFieldsInPlace = (fields => {
+    delete fields.hash
+    delete fields.number
+    delete fields.timestamp
+  });
+
+var ecosystem_blockFields = [
+  "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 ecosystem_transactionFields = [
+  "transactionIndex",
+  "hash",
+  "from",
+  "to",
+  "gas",
+  "gasPrice",
+  "maxPriorityFeePerGas",
+  "maxFeePerGas",
+  "cumulativeGasUsed",
+  "effectiveGasPrice",
+  "gasUsed",
+  "input",
+  "nonce",
+  "value",
+  "v",
+  "r",
+  "s",
+  "contractAddress",
+  "logsBloom",
+  "root",
+  "status",
+  "yParity",
+  "chainId",
+  "maxFeePerBlobGas",
+  "blobVersionedHashes",
+  "type",
+  "l1Fee",
+  "l1GasPrice",
+  "l1GasUsed",
+  "l1FeeScalar",
+  "gasUsedForL1",
+  "accessList",
+  "authorizationList"
+];
+
+function ecosystem_getNumber(prim) {
+  return prim.number;
+}
+
+function ecosystem_getTimestamp(prim) {
+  return prim.timestamp;
+}
+
+function ecosystem_getId(prim) {
+  return prim.hash;
+}
+
+var ecosystem = {
+  name: "evm",
+  blockFields: ecosystem_blockFields,
+  transactionFields: ecosystem_transactionFields,
+  blockNumberName: "number",
+  blockTimestampName: "timestamp",
+  blockHashName: "hash",
+  getNumber: ecosystem_getNumber,
+  getTimestamp: ecosystem_getTimestamp,
+  getId: ecosystem_getId,
+  cleanUpRawEventFieldsInPlace: cleanUpRawEventFieldsInPlace
+};
+
+export {
+  cleanUpRawEventFieldsInPlace ,
+  ecosystem ,
+}
+/* No side effect */