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

package/src/ReorgDetection.res

@@ -77,13 +77,10 @@ let make = (
   }
 }
 
-let getDataByBlockNumberCopyInThreshold = (
-  {dataByBlockNumber, maxReorgDepth}: t,
-  ~currentBlockHeight,
-) => {
+let getDataByBlockNumberCopyInThreshold = ({dataByBlockNumber, maxReorgDepth}: t, ~knownHeight) => {
   // Js engine automatically orders numeric object keys
   let ascBlockNumberKeys = dataByBlockNumber->Js.Dict.keys
-  let thresholdBlockNumber = currentBlockHeight - maxReorgDepth
+  let thresholdBlockNumber = knownHeight - maxReorgDepth
 
   let copy = Js.Dict.empty()
 
@@ -105,10 +102,9 @@ let getDataByBlockNumberCopyInThreshold = (
 let registerReorgGuard = (
   {maxReorgDepth, shouldRollbackOnReorg} as self: t,
   ~reorgGuard: reorgGuard,
-  ~currentBlockHeight,
+  ~knownHeight,
 ) => {
-  let dataByBlockNumberCopyInThreshold =
-    self->getDataByBlockNumberCopyInThreshold(~currentBlockHeight)
+  let dataByBlockNumberCopyInThreshold = self->getDataByBlockNumberCopyInThreshold(~knownHeight)
 
   let {rangeLastBlock, prevRangeLastBlock} = reorgGuard
 
@@ -248,12 +244,12 @@ let rollbackToValidBlockNumber = (
   }
 }
 
-let getThresholdBlockNumbersBelowBlock = (self: t, ~blockNumber: int, ~currentBlockHeight) => {
+let getThresholdBlockNumbersBelowBlock = (self: t, ~blockNumber: int, ~knownHeight) => {
   let arr = []
 
   // Js engine automatically orders numeric object keys
   let ascBlockNumberKeys = self.dataByBlockNumber->Js.Dict.keys
-  let thresholdBlockNumber = currentBlockHeight - self.maxReorgDepth
+  let thresholdBlockNumber = knownHeight - self.maxReorgDepth
 
   for idx in 0 to ascBlockNumberKeys->Array.length - 1 {
     let blockNumberKey = ascBlockNumberKeys->Js.Array2.unsafe_get(idx)

package/src/ReorgDetection.res.mjs

@@ -30,10 +30,10 @@ function make(chainReorgCheckpoints, maxReorgDepth, shouldRollbackOnReorg) {
         };
 }
 
-function getDataByBlockNumberCopyInThreshold(param, currentBlockHeight) {
+function getDataByBlockNumberCopyInThreshold(param, knownHeight) {
   var dataByBlockNumber = param.dataByBlockNumber;
   var ascBlockNumberKeys = Object.keys(dataByBlockNumber);
-  var thresholdBlockNumber = currentBlockHeight - param.maxReorgDepth | 0;
+  var thresholdBlockNumber = knownHeight - param.maxReorgDepth | 0;
   var copy = {};
   for(var idx = 0 ,idx_finish = ascBlockNumberKeys.length; idx < idx_finish; ++idx){
     var blockNumberKey = ascBlockNumberKeys[idx];
@@ -47,10 +47,10 @@ function getDataByBlockNumberCopyInThreshold(param, currentBlockHeight) {
   return copy;
 }
 
-function registerReorgGuard(self, reorgGuard, currentBlockHeight) {
+function registerReorgGuard(self, reorgGuard, knownHeight) {
   var maxReorgDepth = self.maxReorgDepth;
   var shouldRollbackOnReorg = self.shouldRollbackOnReorg;
-  var dataByBlockNumberCopyInThreshold = getDataByBlockNumberCopyInThreshold(self, currentBlockHeight);
+  var dataByBlockNumberCopyInThreshold = getDataByBlockNumberCopyInThreshold(self, knownHeight);
   var prevRangeLastBlock = reorgGuard.prevRangeLastBlock;
   var rangeLastBlock = reorgGuard.rangeLastBlock;
   var scannedBlock = dataByBlockNumberCopyInThreshold[String(rangeLastBlock.blockNumber)];
@@ -159,10 +159,10 @@ function rollbackToValidBlockNumber(param, blockNumber) {
         };
 }
 
-function getThresholdBlockNumbersBelowBlock(self, blockNumber, currentBlockHeight) {
+function getThresholdBlockNumbersBelowBlock(self, blockNumber, knownHeight) {
   var arr = [];
   var ascBlockNumberKeys = Object.keys(self.dataByBlockNumber);
-  var thresholdBlockNumber = currentBlockHeight - self.maxReorgDepth | 0;
+  var thresholdBlockNumber = knownHeight - self.maxReorgDepth | 0;
   for(var idx = 0 ,idx_finish = ascBlockNumberKeys.length; idx < idx_finish; ++idx){
     var blockNumberKey = ascBlockNumberKeys[idx];
     var scannedBlock = self.dataByBlockNumber[blockNumberKey];

package/src/SafeCheckpointTracking.res

@@ -4,7 +4,7 @@
 // The safe checkpoint id can be used to optimize checkpoints traverse logic and
 // make pruning operation super cheap.
 type t = {
-  checkpointIds: array<float>,
+  checkpointIds: array<bigint>,
   checkpointBlockNumbers: array<int>,
   maxReorgDepth: int,
 }
@@ -37,10 +37,10 @@ let getSafeCheckpointId = (safeCheckpointTracking: t, ~sourceBlockNumber: int) =
   let safeBlockNumber = sourceBlockNumber - safeCheckpointTracking.maxReorgDepth
 
   switch safeCheckpointTracking.checkpointIds {
-  | [] => 0.
+  | [] => 0n
   | _
     if safeCheckpointTracking.checkpointBlockNumbers->Belt.Array.getUnsafe(0) >
-      safeBlockNumber => 0.
+      safeBlockNumber => 0n
   | [checkpointId] => checkpointId
   | _ => {
       let trackingCheckpointsCount = safeCheckpointTracking.checkpointIds->Array.length
@@ -71,7 +71,7 @@ let updateOnNewBatch = (
   safeCheckpointTracking: t,
   ~sourceBlockNumber: int,
   ~chainId: int,
-  ~batchCheckpointIds: array<float>,
+  ~batchCheckpointIds: array<bigint>,
   ~batchCheckpointBlockNumbers: array<int>,
   ~batchCheckpointChainIds: array<int>,
 ) => {

package/src/SafeCheckpointTracking.res.mjs

@@ -22,10 +22,10 @@ function getSafeCheckpointId(safeCheckpointTracking, sourceBlockNumber) {
   var safeBlockNumber = sourceBlockNumber - safeCheckpointTracking.maxReorgDepth | 0;
   var match = safeCheckpointTracking.checkpointIds;
   if (match.length === 0) {
-    return 0;
+    return 0n;
   }
   if (safeCheckpointTracking.checkpointBlockNumbers[0] > safeBlockNumber) {
-    return 0;
+    return 0n;
   }
   if (match.length === 1) {
     return match[0];

package/src/Sink.res

@@ -5,7 +5,7 @@ type t = {
     ~entities: array<Internal.entityConfig>=?,
     ~enums: array<Table.enumConfig<Table.enum>>=?,
   ) => promise<unit>,
-  resume: (~checkpointId: float) => promise<unit>,
+  resume: (~checkpointId: Internal.checkpointId) => promise<unit>,
   writeBatch: (
     ~batch: Batch.t,
     ~updatedEntities: array<Persistence.updatedEntity>,
@@ -27,6 +27,8 @@ let makeClickHouse = (~host, ~database, ~username, ~password): t => {
   | None => "envio_sink"
   }
 
+  let cache = Utils.WeakMap.make()
+
   {
     name: "ClickHouse",
     initialize: (~chainConfigs as _=[], ~entities=[], ~enums=[]) => {
@@ -38,7 +40,7 @@ let makeClickHouse = (~host, ~database, ~username, ~password): t => {
     writeBatch: async (~batch, ~updatedEntities) => {
       await Promise.all(
         updatedEntities->Belt.Array.map(({entityConfig, updates}) => {
-          ClickHouse.setUpdatesOrThrow(client, ~updates, ~entityConfig, ~database)
+          ClickHouse.setUpdatesOrThrow(client, ~cache, ~updates, ~entityConfig, ~database)
         }),
       )->Promise.ignoreValue
       await ClickHouse.setCheckpointsOrThrow(client, ~batch, ~database)

package/src/Sink.res.mjs

@@ -11,6 +11,7 @@ function makeClickHouse(host, database, username, password) {
         password: password
       });
   var database$1 = database !== undefined ? database : "envio_sink";
+  var cache = new WeakMap();
   return {
           name: "ClickHouse",
           initialize: (function ($staropt$star, $staropt$star$1, $staropt$star$2) {
@@ -24,7 +25,7 @@ function makeClickHouse(host, database, username, password) {
             }),
           writeBatch: (async function (batch, updatedEntities) {
               await Promise.all(Belt_Array.map(updatedEntities, (function (param) {
-                          return ClickHouse.setUpdatesOrThrow(client, param.updates, param.entityConfig, database$1);
+                          return ClickHouse.setUpdatesOrThrow(client, cache, param.updates, param.entityConfig, database$1);
                         })));
               return await ClickHouse.setCheckpointsOrThrow(client, batch, database$1);
             })

package/src/TableIndices.res

@@ -107,4 +107,3 @@ module Index = {
     | Single(index) => SingleIndex.evaluate(index, ~fieldName, ~fieldValue)
     }
 }
-