envio 3.0.0-alpha.2 → 3.0.0-alpha.21

package/src/db/InternalTable.res.mjs

@@ -2,67 +2,16 @@
 
 import * as Table from "./Table.res.mjs";
 import * as Utils from "../Utils.res.mjs";
+import * as $$BigInt from "../bindings/BigInt.res.mjs";
+import * as Config from "../Config.res.mjs";
 import * as Js_exn from "rescript/lib/es6/js_exn.js";
 import * as Address from "../Address.res.mjs";
 import * as Js_dict from "rescript/lib/es6/js_dict.js";
 import * as Js_null from "rescript/lib/es6/js_null.js";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
+import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 
-var name = "dynamic_contract_registry";
-
-function makeId(chainId, contractAddress) {
-  return String(chainId) + "-" + contractAddress;
-}
-
-var schema = S$RescriptSchema.schema(function (s) {
-      return {
-              id: s.m(S$RescriptSchema.string),
-              chain_id: s.m(S$RescriptSchema.$$int),
-              registering_event_block_number: s.m(S$RescriptSchema.$$int),
-              registering_event_log_index: s.m(S$RescriptSchema.$$int),
-              registering_event_block_timestamp: s.m(S$RescriptSchema.$$int),
-              registering_event_contract_name: s.m(S$RescriptSchema.string),
-              registering_event_name: s.m(S$RescriptSchema.string),
-              registering_event_src_address: s.m(Address.schema),
-              contract_address: s.m(Address.schema),
-              contract_name: s.m(S$RescriptSchema.string)
-            };
-    });
-
-var rowsSchema = S$RescriptSchema.array(schema);
-
-var table = Table.mkTable(name, undefined, [
-      Table.mkField("id", "String", S$RescriptSchema.string, undefined, undefined, undefined, true, undefined, undefined),
-      Table.mkField("chain_id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_block_number", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_log_index", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_block_timestamp", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("registering_event_src_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("contract_address", "String", Address.schema, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined)
-    ]);
-
-var config = {
-  name: name,
-  index: -1,
-  schema: schema,
-  rowsSchema: rowsSchema,
-  table: table
-};
-
-var DynamicContractRegistry = {
-  name: name,
-  index: -1,
-  makeId: makeId,
-  schema: schema,
-  rowsSchema: rowsSchema,
-  table: table,
-  config: config
-};
-
 var fields = [
   "id",
   "start_block",
@@ -74,11 +23,10 @@ var fields = [
   "progress_block",
   "ready_at",
   "events_processed",
-  "_is_hyper_sync",
-  "_num_batches_fetched"
+  "_is_hyper_sync"
 ];
 
-var table$1 = Table.mkTable("envio_chains", undefined, [
+var table = Table.mkTable("envio_chains", undefined, [
       Table.mkField("id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("start_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("end_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
@@ -87,10 +35,9 @@ var table$1 = Table.mkTable("envio_chains", undefined, [
       Table.mkField("source_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("first_event_block", "Int32", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, undefined, undefined, undefined),
       Table.mkField("ready_at", "Date", S$RescriptSchema.$$null(Utils.Schema.dbDate), undefined, undefined, true, undefined, undefined, undefined),
-      Table.mkField("events_processed", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("events_processed", "UInt52", S$RescriptSchema.$$float, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("_is_hyper_sync", "Boolean", S$RescriptSchema.bool, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("progress_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("_num_batches_fetched", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
+      Table.mkField("progress_block", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined)
     ]);
 
 function initialFromConfig(chainConfig) {
@@ -99,14 +46,13 @@ function initialFromConfig(chainConfig) {
           start_block: chainConfig.startBlock,
           end_block: Js_null.fromOption(chainConfig.endBlock),
           max_reorg_depth: chainConfig.maxReorgDepth,
+          source_block: 0,
           progress_block: -1,
           events_processed: 0,
           first_event_block: null,
           buffer_block: -1,
-          source_block: 0,
           ready_at: null,
-          _is_hyper_sync: false,
-          _num_batches_fetched: 0
+          _is_hyper_sync: false
         };
 }
 
@@ -123,6 +69,8 @@ function makeInitialValuesQuery(pgSchema, chainConfigs) {
                   var value = Js_dict.get(initialValues, field);
                   var match = typeof value;
                   switch (match) {
+                    case "bigint" :
+                        return value.toString();
                     case "boolean" :
                         if (value) {
                           return "true";
@@ -139,16 +87,14 @@ function makeInitialValuesQuery(pgSchema, chainConfigs) {
                 }));
           return "(" + values.join(", ") + ")";
         }));
-  return "INSERT INTO \"" + pgSchema + "\".\"" + table$1.tableName + "\" (" + columnNames.join(", ") + ")\nVALUES " + valuesRows.join(",\n       ") + ";";
+  return "INSERT INTO \"" + pgSchema + "\".\"" + table.tableName + "\" (" + columnNames.join(", ") + ")\nVALUES " + valuesRows.join(",\n       ") + ";";
 }
 
 var metaFields = [
-  "source_block",
   "buffer_block",
   "first_event_block",
   "ready_at",
-  "_is_hyper_sync",
-  "_num_batches_fetched"
+  "_is_hyper_sync"
 ];
 
 function makeMetaFieldsUpdateQuery(pgSchema) {
@@ -156,11 +102,11 @@ function makeMetaFieldsUpdateQuery(pgSchema) {
           var paramIndex = index + 2 | 0;
           return "\"" + field + "\" = $" + String(paramIndex);
         }));
-  return "UPDATE \"" + pgSchema + "\".\"" + table$1.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"" + "id" + "\" = $1;";
+  return "UPDATE \"" + pgSchema + "\".\"" + table.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"" + "id" + "\" = $1;";
 }
 
 function makeGetInitialStateQuery(pgSchema) {
-  return "SELECT \"" + "id" + "\" as \"id\",\n\"" + "start_block" + "\" as \"startBlock\",\n\"" + "end_block" + "\" as \"endBlock\",\n\"" + "max_reorg_depth" + "\" as \"maxReorgDepth\",\n\"" + "first_event_block" + "\" as \"firstEventBlockNumber\",\n\"" + "ready_at" + "\" as \"timestampCaughtUpToHeadOrEndblock\",\n\"" + "events_processed" + "\" as \"numEventsProcessed\",\n\"" + "progress_block" + "\" as \"progressBlockNumber\",\n(\n  SELECT COALESCE(json_agg(json_build_object(\n    'address', \"contract_address\",\n    'contractName', \"contract_name\",\n    'startBlock', \"registering_event_block_number\",\n    'registrationBlock', \"registering_event_block_number\"\n  )), '[]'::json)\n  FROM \"" + pgSchema + "\".\"" + table.tableName + "\"\n  WHERE \"chain_id\" = chains.\"" + "id" + "\"\n) as \"dynamicContracts\"\nFROM \"" + pgSchema + "\".\"" + table$1.tableName + "\" as chains;";
+  return "SELECT \"" + "id" + "\" as \"id\",\n\"" + "start_block" + "\" as \"startBlock\",\n\"" + "end_block" + "\" as \"endBlock\",\n\"" + "max_reorg_depth" + "\" as \"maxReorgDepth\",\n\"" + "first_event_block" + "\" as \"firstEventBlockNumber\",\n\"" + "ready_at" + "\" as \"timestampCaughtUpToHeadOrEndblock\",\n\"" + "events_processed" + "\"::float8 as \"numEventsProcessed\",\n\"" + "progress_block" + "\" as \"progressBlockNumber\",\n\"" + "source_block" + "\" as \"sourceBlockNumber\",\n(\n  SELECT COALESCE(json_agg(json_build_object(\n    'address', \"contract_address\",\n    'contractName', \"contract_name\",\n    'startBlock', \"registering_event_block_number\",\n    'registrationBlock', \"registering_event_block_number\"\n  )), '[]'::json)\n  FROM \"" + pgSchema + "\".\"" + Config.DynamicContractRegistry.table.tableName + "\"\n  WHERE \"chain_id\" = chains.\"" + "id" + "\"\n) as \"dynamicContracts\"\nFROM \"" + pgSchema + "\".\"" + table.tableName + "\" as chains;";
 }
 
 function getInitialState(sql, pgSchema) {
@@ -169,7 +115,8 @@ function getInitialState(sql, pgSchema) {
 
 var progressFields = [
   "progress_block",
-  "events_processed"
+  "events_processed",
+  "source_block"
 ];
 
 function makeProgressFieldsUpdateQuery(pgSchema) {
@@ -177,7 +124,7 @@ function makeProgressFieldsUpdateQuery(pgSchema) {
           var paramIndex = index + 2 | 0;
           return "\"" + field + "\" = $" + String(paramIndex);
         }));
-  return "UPDATE \"" + pgSchema + "\".\"" + table$1.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"id\" = $1;";
+  return "UPDATE \"" + pgSchema + "\".\"" + table.tableName + "\"\nSET " + setClauses.join(",\n    ") + "\nWHERE \"id\" = $1;";
 }
 
 function setMeta(sql, pgSchema, chainsData) {
@@ -202,7 +149,9 @@ function setProgressedChains(sql, pgSchema, progressedChains) {
         var params = [];
         params.push(data.chainId);
         progressFields.forEach(function (field) {
-              params.push(field === "progress_block" ? data.progressBlockNumber : data.totalEventsProcessed);
+              params.push(field === "source_block" ? data.sourceBlockNumber : (
+                      field === "progress_block" ? data.progressBlockNumber : data.totalEventsProcessed
+                    ));
             });
         promises.push(sql.unsafe(query, params, {prepare: true}));
       });
@@ -211,7 +160,7 @@ function setProgressedChains(sql, pgSchema, progressedChains) {
 
 var Chains = {
   fields: fields,
-  table: table$1,
+  table: table,
   initialFromConfig: initialFromConfig,
   makeInitialValuesQuery: makeInitialValuesQuery,
   metaFields: metaFields,
@@ -224,7 +173,7 @@ var Chains = {
   setProgressedChains: setProgressedChains
 };
 
-var table$2 = Table.mkTable("persisted_state", undefined, [
+var table$1 = Table.mkTable("persisted_state", undefined, [
       Table.mkField("id", "Serial", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("envio_version", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("config_hash", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
@@ -233,11 +182,24 @@ var table$2 = Table.mkTable("persisted_state", undefined, [
     ]);
 
 var PersistedState = {
-  table: table$2
+  table: table$1
 };
 
-var table$3 = Table.mkTable("envio_checkpoints", undefined, [
-      Table.mkField("id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, true, undefined, undefined),
+var dbSchema = S$RescriptSchema.object(function (s) {
+      return {
+              id: s.f("id", $$BigInt.schema),
+              chain_id: s.f("chain_id", S$RescriptSchema.$$int),
+              block_number: s.f("block_number", S$RescriptSchema.$$int),
+              block_hash: s.f("block_hash", S$RescriptSchema.union([
+                        S$RescriptSchema.string,
+                        S$RescriptSchema.literal(null)
+                      ])),
+              events_processed: s.f("events_processed", S$RescriptSchema.$$int)
+            };
+    });
+
+var table$2 = Table.mkTable("envio_checkpoints", undefined, [
+      Table.mkField("id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, true, undefined, undefined),
       Table.mkField("chain_id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("block_number", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("block_hash", "String", S$RescriptSchema.$$null(S$RescriptSchema.string), undefined, undefined, true, undefined, undefined, undefined),
@@ -245,21 +207,22 @@ var table$3 = Table.mkTable("envio_checkpoints", undefined, [
     ]);
 
 function makeGetReorgCheckpointsQuery(pgSchema) {
-  return "WITH reorg_chains AS (\n  SELECT \n    \"" + "id" + "\" as id,\n    \"" + "source_block" + "\" - \"" + "max_reorg_depth" + "\" AS safe_block\n  FROM \"" + pgSchema + "\".\"" + table$1.tableName + "\"\n  WHERE \"" + "max_reorg_depth" + "\" > 0\n    AND \"" + "progress_block" + "\" > \"" + "source_block" + "\" - \"" + "max_reorg_depth" + "\"\n)\nSELECT \n  cp.\"" + "id" + "\", \n  cp.\"" + "chain_id" + "\", \n  cp.\"" + "block_number" + "\", \n  cp.\"" + "block_hash" + "\"\nFROM \"" + pgSchema + "\".\"" + table$3.tableName + "\" cp\nINNER JOIN reorg_chains rc \n  ON cp.\"" + "chain_id" + "\" = rc.id\nWHERE cp.\"" + "block_hash" + "\" IS NOT NULL\n  AND cp.\"" + "block_number" + "\" >= rc.safe_block;";
+  return "WITH reorg_chains AS (\n  SELECT \n    \"" + "id" + "\" as id,\n    \"" + "source_block" + "\" - \"" + "max_reorg_depth" + "\" AS safe_block\n  FROM \"" + pgSchema + "\".\"" + table.tableName + "\"\n  WHERE \"" + "max_reorg_depth" + "\" > 0\n    AND \"" + "progress_block" + "\" > \"" + "source_block" + "\" - \"" + "max_reorg_depth" + "\"\n)\nSELECT \n  cp.\"" + "id" + "\", \n  cp.\"" + "chain_id" + "\", \n  cp.\"" + "block_number" + "\", \n  cp.\"" + "block_hash" + "\"\nFROM \"" + pgSchema + "\".\"" + table$2.tableName + "\" cp\nINNER JOIN reorg_chains rc \n  ON cp.\"" + "chain_id" + "\" = rc.id\nWHERE cp.\"" + "block_hash" + "\" IS NOT NULL\n  AND cp.\"" + "block_number" + "\" >= rc.safe_block;";
 }
 
 function makeCommitedCheckpointIdQuery(pgSchema) {
-  return "SELECT COALESCE(MAX(" + "id" + "), " + String(0) + ") AS id FROM \"" + pgSchema + "\".\"" + table$3.tableName + "\";";
+  return "SELECT COALESCE(MAX(" + "id" + "), " + (0n).toString() + ") AS id FROM \"" + pgSchema + "\".\"" + table$2.tableName + "\";";
 }
 
 function makeInsertCheckpointQuery(pgSchema) {
-  return "INSERT INTO \"" + pgSchema + "\".\"" + table$3.tableName + "\" (\"" + "id" + "\", \"" + "chain_id" + "\", \"" + "block_number" + "\", \"" + "block_hash" + "\", \"" + "events_processed" + "\")\nSELECT * FROM unnest($1::INTEGER[],$2::INTEGER[],$3::INTEGER[],$4::TEXT[],$5::INTEGER[]);";
+  return "INSERT INTO \"" + pgSchema + "\".\"" + table$2.tableName + "\" (\"" + "id" + "\", \"" + "chain_id" + "\", \"" + "block_number" + "\", \"" + "block_hash" + "\", \"" + "events_processed" + "\")\nSELECT * FROM unnest($1::BIGINT[],$2::INTEGER[],$3::INTEGER[],$4::TEXT[],$5::INTEGER[]);";
 }
 
 function insert(sql, pgSchema, checkpointIds, checkpointChainIds, checkpointBlockNumbers, checkpointBlockHashes, checkpointEventsProcessed) {
   var query = makeInsertCheckpointQuery(pgSchema);
+  var checkpointIdStrings = $$BigInt.arrayToStringArray(checkpointIds);
   return sql.unsafe(query, [
-              checkpointIds,
+              checkpointIdStrings,
               checkpointChainIds,
               checkpointBlockNumbers,
               checkpointBlockHashes,
@@ -268,39 +231,45 @@ function insert(sql, pgSchema, checkpointIds, checkpointChainIds, checkpointBloc
 }
 
 function rollback(sql, pgSchema, rollbackTargetCheckpointId) {
-  return sql.unsafe("DELETE FROM \"" + pgSchema + "\".\"" + table$3.tableName + "\" WHERE \"" + "id" + "\" > $1;", [rollbackTargetCheckpointId], {prepare: true});
+  return sql.unsafe("DELETE FROM \"" + pgSchema + "\".\"" + table$2.tableName + "\" WHERE \"" + "id" + "\" > $1;", [rollbackTargetCheckpointId.toString()], {prepare: true});
 }
 
 function makePruneStaleCheckpointsQuery(pgSchema) {
-  return "DELETE FROM \"" + pgSchema + "\".\"" + table$3.tableName + "\" WHERE \"" + "id" + "\" < $1;";
+  return "DELETE FROM \"" + pgSchema + "\".\"" + table$2.tableName + "\" WHERE \"" + "id" + "\" < $1;";
 }
 
 function pruneStaleCheckpoints(sql, pgSchema, safeCheckpointId) {
-  return sql.unsafe(makePruneStaleCheckpointsQuery(pgSchema), [safeCheckpointId], {prepare: true});
+  return sql.unsafe(makePruneStaleCheckpointsQuery(pgSchema), [safeCheckpointId.toString()], {prepare: true});
 }
 
 function makeGetRollbackTargetCheckpointQuery(pgSchema) {
-  return "SELECT \"" + "id" + "\" FROM \"" + pgSchema + "\".\"" + table$3.tableName + "\"\nWHERE \n  \"" + "chain_id" + "\" = $1 AND\n  \"" + "block_number" + "\" <= $2\nORDER BY \"" + "id" + "\" DESC\nLIMIT 1;";
+  return "SELECT \"" + "id" + "\" FROM \"" + pgSchema + "\".\"" + table$2.tableName + "\"\nWHERE \n  \"" + "chain_id" + "\" = $1 AND\n  \"" + "block_number" + "\" <= $2\nORDER BY \"" + "id" + "\" DESC\nLIMIT 1;";
 }
 
 function getRollbackTargetCheckpoint(sql, pgSchema, reorgChainId, lastKnownValidBlockNumber) {
-  return sql.unsafe(makeGetRollbackTargetCheckpointQuery(pgSchema), [
-              reorgChainId,
-              lastKnownValidBlockNumber
-            ], {prepare: true});
+  var rawResult = sql.unsafe(makeGetRollbackTargetCheckpointQuery(pgSchema), [
+        reorgChainId,
+        lastKnownValidBlockNumber
+      ], {prepare: true});
+  return rawResult.then(function (rows) {
+              return Belt_Option.map(Belt_Array.get(rows, 0), (function (row) {
+                            return BigInt(row.id);
+                          }));
+            });
 }
 
 function makeGetRollbackProgressDiffQuery(pgSchema) {
-  return "SELECT \n  \"" + "chain_id" + "\",\n  SUM(\"" + "events_processed" + "\") as events_processed_diff,\n  MIN(\"" + "block_number" + "\") - 1 as new_progress_block_number\nFROM \"" + pgSchema + "\".\"" + table$3.tableName + "\"\nWHERE \"" + "id" + "\" > $1\nGROUP BY \"" + "chain_id" + "\";";
+  return "SELECT \n  \"" + "chain_id" + "\",\n  SUM(\"" + "events_processed" + "\") as events_processed_diff,\n  MIN(\"" + "block_number" + "\") - 1 as new_progress_block_number\nFROM \"" + pgSchema + "\".\"" + table$2.tableName + "\"\nWHERE \"" + "id" + "\" > $1\nGROUP BY \"" + "chain_id" + "\";";
 }
 
 function getRollbackProgressDiff(sql, pgSchema, rollbackTargetCheckpointId) {
-  return sql.unsafe(makeGetRollbackProgressDiffQuery(pgSchema), [rollbackTargetCheckpointId], {prepare: true});
+  return sql.unsafe(makeGetRollbackProgressDiffQuery(pgSchema), [rollbackTargetCheckpointId.toString()], {prepare: true});
 }
 
 var Checkpoints = {
-  initialCheckpointId: 0,
-  table: table$3,
+  dbSchema: dbSchema,
+  initialCheckpointId: 0n,
+  table: table$2,
   makeGetReorgCheckpointsQuery: makeGetReorgCheckpointsQuery,
   makeCommitedCheckpointIdQuery: makeCommitedCheckpointIdQuery,
   makeInsertCheckpointQuery: makeInsertCheckpointQuery,
@@ -314,7 +283,7 @@ var Checkpoints = {
   getRollbackProgressDiff: getRollbackProgressDiff
 };
 
-var schema$1 = S$RescriptSchema.schema(function (s) {
+var schema = S$RescriptSchema.schema(function (s) {
       return {
               chain_id: s.m(S$RescriptSchema.$$int),
               event_id: s.m(S$RescriptSchema.bigint),
@@ -331,11 +300,9 @@ var schema$1 = S$RescriptSchema.schema(function (s) {
             };
     });
 
-var table$4 = Table.mkTable("raw_events", undefined, [
+var table$3 = Table.mkTable("raw_events", undefined, [
       Table.mkField("chain_id", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("event_id", {
-            type: "BigInt"
-          }, S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined),
+      Table.mkField("event_id", "UInt64", S$RescriptSchema.bigint, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("event_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("contract_name", "String", S$RescriptSchema.string, undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("block_number", "Int32", S$RescriptSchema.$$int, undefined, undefined, undefined, undefined, undefined, undefined),
@@ -346,12 +313,12 @@ var table$4 = Table.mkTable("raw_events", undefined, [
       Table.mkField("block_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("transaction_fields", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
       Table.mkField("params", "Json", S$RescriptSchema.json(false), undefined, undefined, undefined, undefined, undefined, undefined),
-      Table.mkField("serial", "Serial", S$RescriptSchema.$$null(S$RescriptSchema.$$int), undefined, undefined, true, true, undefined, undefined)
+      Table.mkField("serial", "BigSerial", S$RescriptSchema.$$null(S$RescriptSchema.bigint), undefined, undefined, true, true, undefined, undefined)
     ]);
 
 var RawEvents = {
-  schema: schema$1,
-  table: table$4
+  schema: schema,
+  table: table$3
 };
 
 var metaViewName = "_meta";
@@ -359,11 +326,11 @@ var metaViewName = "_meta";
 var chainMetadataViewName = "chain_metadata";
 
 function makeMetaViewQuery(pgSchema) {
-  return "CREATE VIEW \"" + pgSchema + "\".\"" + metaViewName + "\" AS \nSELECT \n  \"" + "id" + "\" AS \"chainId\",\n  \"" + "start_block" + "\" AS \"startBlock\", \n  \"" + "end_block" + "\" AS \"endBlock\",\n  \"" + "progress_block" + "\" AS \"progressBlock\",\n  \"" + "buffer_block" + "\" AS \"bufferBlock\",\n  \"" + "first_event_block" + "\" AS \"firstEventBlock\",\n  \"" + "events_processed" + "\" AS \"eventsProcessed\",\n  \"" + "source_block" + "\" AS \"sourceBlock\",\n  \"" + "ready_at" + "\" AS \"readyAt\",\n  (\"" + "ready_at" + "\" IS NOT NULL) AS \"isReady\"\nFROM \"" + pgSchema + "\".\"" + table$1.tableName + "\"\nORDER BY \"" + "id" + "\";";
+  return "CREATE VIEW \"" + pgSchema + "\".\"" + metaViewName + "\" AS \nSELECT \n  \"" + "id" + "\" AS \"chainId\",\n  \"" + "start_block" + "\" AS \"startBlock\", \n  \"" + "end_block" + "\" AS \"endBlock\",\n  \"" + "progress_block" + "\" AS \"progressBlock\",\n  \"" + "buffer_block" + "\" AS \"bufferBlock\",\n  \"" + "first_event_block" + "\" AS \"firstEventBlock\",\n  \"" + "events_processed" + "\"::float4 AS \"eventsProcessed\",\n  \"" + "source_block" + "\" AS \"sourceBlock\",\n  \"" + "ready_at" + "\" AS \"readyAt\",\n  (\"" + "ready_at" + "\" IS NOT NULL) AS \"isReady\"\nFROM \"" + pgSchema + "\".\"" + table.tableName + "\"\nORDER BY \"" + "id" + "\";";
 }
 
 function makeChainMetadataViewQuery(pgSchema) {
-  return "CREATE VIEW \"" + pgSchema + "\".\"" + chainMetadataViewName + "\" AS \nSELECT \n  \"" + "source_block" + "\" AS \"block_height\",\n  \"" + "id" + "\" AS \"chain_id\",\n  \"" + "end_block" + "\" AS \"end_block\", \n  \"" + "first_event_block" + "\" AS \"first_event_block_number\",\n  \"" + "_is_hyper_sync" + "\" AS \"is_hyper_sync\",\n  \"" + "buffer_block" + "\" AS \"latest_fetched_block_number\",\n  \"" + "progress_block" + "\" AS \"latest_processed_block\",\n  \"" + "_num_batches_fetched" + "\" AS \"num_batches_fetched\",\n  \"" + "events_processed" + "\" AS \"num_events_processed\",\n  \"" + "start_block" + "\" AS \"start_block\",\n  \"" + "ready_at" + "\" AS \"timestamp_caught_up_to_head_or_endblock\"\nFROM \"" + pgSchema + "\".\"" + table$1.tableName + "\";";
+  return "CREATE VIEW \"" + pgSchema + "\".\"" + chainMetadataViewName + "\" AS \nSELECT \n  \"" + "source_block" + "\" AS \"block_height\",\n  \"" + "id" + "\" AS \"chain_id\",\n  \"" + "end_block" + "\" AS \"end_block\", \n  \"" + "first_event_block" + "\" AS \"first_event_block_number\",\n  \"" + "_is_hyper_sync" + "\" AS \"is_hyper_sync\",\n  \"" + "buffer_block" + "\" AS \"latest_fetched_block_number\",\n  \"" + "progress_block" + "\" AS \"latest_processed_block\",\n  0 AS \"num_batches_fetched\",\n  \"" + "events_processed" + "\"::float4 AS \"num_events_processed\",\n  \"" + "start_block" + "\" AS \"start_block\",\n  \"" + "ready_at" + "\" AS \"timestamp_caught_up_to_head_or_endblock\"\nFROM \"" + pgSchema + "\".\"" + table.tableName + "\";";
 }
 
 var Views = {
@@ -379,6 +346,8 @@ var isNullable = true;
 
 var isIndex = true;
 
+var DynamicContractRegistry;
+
 export {
   isPrimaryKey ,
   isNullable ,
@@ -390,4 +359,4 @@ export {
   RawEvents ,
   Views ,
 }
-/* schema Not a pure module */
+/* table Not a pure module */

package/src/db/Table.res

@@ -22,11 +22,14 @@ type fieldType =
   | String
   | Boolean
   | Uint32
+  | UInt52
+  | UInt64
   | Int32
   | Number
   | BigInt({precision?: int})
   | BigDecimal({config?: (int, int)}) // (precision, scale)
   | Serial
+  | BigSerial
   | Json
   | Date
   | Enum({config: enumConfig<enum>})
@@ -113,6 +116,8 @@ let getPgFieldType = (
   | Boolean => (Postgres.Boolean :> string)
   | Int32 => (Postgres.Integer :> string)
   | Uint32 => (Postgres.BigInt :> string)
+  | UInt52 => (Postgres.BigInt :> string)
+  | UInt64 => (Postgres.BigInt :> string)
   | Number => (Postgres.DoublePrecision :> string)
   | BigInt({?precision}) =>
     (Postgres.Numeric :> string) ++
@@ -129,6 +134,7 @@ let getPgFieldType = (
     }
 
   | Serial => (Postgres.Serial :> string)
+  | BigSerial => (Postgres.BigSerial :> string)
   | Json => (Postgres.JsonB :> string)
   | Date =>
     (isNullable ? Postgres.TimestampWithTimezoneNull : Postgres.TimestampWithTimezone :> string)
@@ -147,10 +153,17 @@ let getPgFieldType = (
   columnType ++ (isArray ? "[]" : "")
 }
 
+type indexFieldDirection = Asc | Desc
+
+type compositeIndexField = {
+  fieldName: string,
+  direction: indexFieldDirection,
+}
+
 type table = {
   tableName: string,
   fields: array<fieldOrDerived>,
-  compositeIndices: array<array<string>>,
+  compositeIndices: array<array<compositeIndexField>>,
 }
 
 let mkTable = (tableName, ~compositeIndices=[], ~fields) => {
@@ -226,14 +239,15 @@ exception NonExistingTableField(string)
 Gets all composite indicies (whether they are single indices or not)
 And maps the fields defined to their actual db name (some have _id suffix)
 */
-let getUnfilteredCompositeIndicesUnsafe = (table): array<array<string>> => {
+let getUnfilteredCompositeIndicesUnsafe = (table): array<array<compositeIndexField>> => {
   table.compositeIndices->Array.map(compositeIndex =>
-    compositeIndex->Array.map(userDefinedFieldName =>
-      switch table->getFieldByName(userDefinedFieldName) {
+    compositeIndex->Array.map(indexField => {
+      let dbFieldName = switch table->getFieldByName(indexField.fieldName) {
       | Some(field) => field->getFieldName
-      | None => raise(NonExistingTableField(userDefinedFieldName)) //Unexpected should be validated in schema parser
+      | None => raise(NonExistingTableField(indexField.fieldName)) //Unexpected should be validated in schema parser
       }
-    )
+      {fieldName: dbFieldName, direction: indexField.direction}
+    })
   )
 }
 
@@ -347,7 +361,12 @@ let getSingleIndices = (table): array<string> => {
   ->getUnfilteredCompositeIndicesUnsafe
   //get all composite indices with only 1 field defined
   //this is still a single index
-  ->Array.keep(cidx => cidx->Array.length == 1)
+  ->Array.keepMap(cidx =>
+    switch cidx {
+    | [{fieldName}] => Some([fieldName])
+    | _ => None
+    }
+  )
   ->Array.concat([indexFields])
   ->Array.concatMany
   ->Set.String.fromArray
@@ -359,7 +378,7 @@ let getSingleIndices = (table): array<string> => {
 Gets all composite indicies
 And maps the fields defined to their actual db name (some have _id suffix)
 */
-let getCompositeIndices = (table): array<array<string>> => {
+let getCompositeIndices = (table): array<array<compositeIndexField>> => {
   table
   ->getUnfilteredCompositeIndicesUnsafe
   ->Array.keep(ind => ind->Array.length > 1)

package/src/db/Table.res.mjs

@@ -83,9 +83,6 @@ function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNu
       case "Boolean" :
           columnType = "BOOLEAN";
           break;
-      case "Uint32" :
-          columnType = "BIGINT";
-          break;
       case "Int32" :
           columnType = "INTEGER";
           break;
@@ -95,13 +92,17 @@ function getPgFieldType(fieldType, pgSchema, isArray, isNumericArrayAsText, isNu
       case "Serial" :
           columnType = "SERIAL";
           break;
+      case "BigSerial" :
+          columnType = "BIGSERIAL";
+          break;
       case "Json" :
           columnType = "JSONB";
           break;
       case "Date" :
           columnType = isNullable ? "TIMESTAMP WITH TIME ZONE NULL" : "TIMESTAMP WITH TIME ZONE";
           break;
-      
+      default:
+        columnType = "BIGINT";
     }
   } else {
     switch (fieldType.type) {
@@ -230,16 +231,22 @@ var NonExistingTableField = /* @__PURE__ */Caml_exceptions.create("Table.NonExis
 
 function getUnfilteredCompositeIndicesUnsafe(table) {
   return Belt_Array.map(table.compositeIndices, (function (compositeIndex) {
-                return Belt_Array.map(compositeIndex, (function (userDefinedFieldName) {
-                              var field = getFieldByName(table, userDefinedFieldName);
+                return Belt_Array.map(compositeIndex, (function (indexField) {
+                              var field = getFieldByName(table, indexField.fieldName);
+                              var dbFieldName;
                               if (field !== undefined) {
-                                return getFieldName(field);
+                                dbFieldName = getFieldName(field);
+                              } else {
+                                throw {
+                                      RE_EXN_ID: NonExistingTableField,
+                                      _1: indexField.fieldName,
+                                      Error: new Error()
+                                    };
                               }
-                              throw {
-                                    RE_EXN_ID: NonExistingTableField,
-                                    _1: userDefinedFieldName,
-                                    Error: new Error()
-                                  };
+                              return {
+                                      fieldName: dbFieldName,
+                                      direction: indexField.direction
+                                    };
                             }));
               }));
 }
@@ -354,8 +361,12 @@ function getSingleIndices(table) {
           }
           
         }));
-  return Belt_SetString.toArray(Belt_SetString.fromArray(Belt_Array.concatMany(Belt_Array.concat(Belt_Array.keep(getUnfilteredCompositeIndicesUnsafe(table), (function (cidx) {
-                                  return cidx.length === 1;
+  return Belt_SetString.toArray(Belt_SetString.fromArray(Belt_Array.concatMany(Belt_Array.concat(Belt_Array.keepMap(getUnfilteredCompositeIndicesUnsafe(table), (function (cidx) {
+                                  if (cidx.length !== 1) {
+                                    return ;
+                                  }
+                                  var match = cidx[0];
+                                  return [match.fieldName];
                                 })), [indexFields])))).sort();
 }
 

package/src/sources/Evm.res

@@ -0,0 +1,84 @@
+@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,
+}