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

package/src/FetchState.res.mjs

@@ -121,28 +121,37 @@ function compareBufferItem(a, b) {
   }
 }
 
-function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexingContractsOpt, mutItems, blockLagOpt) {
+function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexingContractsOpt, mutItems, blockLagOpt, knownHeightOpt) {
   var partitions = partitionsOpt !== undefined ? partitionsOpt : fetchState.partitions;
   var nextPartitionIndex = nextPartitionIndexOpt !== undefined ? nextPartitionIndexOpt : fetchState.nextPartitionIndex;
   var indexingContracts = indexingContractsOpt !== undefined ? indexingContractsOpt : fetchState.indexingContracts;
   var blockLag = blockLagOpt !== undefined ? blockLagOpt : fetchState.blockLag;
-  var firstPartition = partitions[0];
-  var latestFullyFetchedBlock = firstPartition.latestFetchedBlock;
-  for(var idx = 0 ,idx_finish = partitions.length; idx < idx_finish; ++idx){
-    var p = partitions[idx];
-    if (latestFullyFetchedBlock.blockNumber > p.latestFetchedBlock.blockNumber) {
-      latestFullyFetchedBlock = p.latestFetchedBlock;
+  var knownHeight = knownHeightOpt !== undefined ? knownHeightOpt : fetchState.knownHeight;
+  var latestFullyFetchedBlock;
+  if (Utils.$$Array.notEmpty(partitions)) {
+    var firstPartition = partitions[0];
+    var latestFullyFetchedBlock$1 = firstPartition.latestFetchedBlock;
+    for(var idx = 0 ,idx_finish = partitions.length; idx < idx_finish; ++idx){
+      var p = partitions[idx];
+      if (latestFullyFetchedBlock$1.blockNumber > p.latestFetchedBlock.blockNumber) {
+        latestFullyFetchedBlock$1 = p.latestFetchedBlock;
+      }
+      
     }
-    
+    latestFullyFetchedBlock = latestFullyFetchedBlock$1;
+  } else {
+    latestFullyFetchedBlock = {
+      blockNumber: knownHeight,
+      blockTimestamp: 0
+    };
   }
-  var latestFullyFetchedBlock$1 = latestFullyFetchedBlock;
   var mutItemsRef = mutItems;
   var onBlockConfigs = fetchState.onBlockConfigs;
   var latestOnBlockBlockNumber;
   if (onBlockConfigs.length !== 0) {
     var mutItems$1 = mutItemsRef;
     var item = Belt_Array.get(mutItems$1 !== undefined ? mutItems$1 : fetchState.buffer, fetchState.targetBufferSize - 1 | 0);
-    var maxBlockNumber = item !== undefined ? item.blockNumber : latestFullyFetchedBlock$1.blockNumber;
+    var maxBlockNumber = item !== undefined ? item.blockNumber : latestFullyFetchedBlock.blockNumber;
     var mutItems$2 = mutItemsRef;
     var mutItems$3 = mutItems$2 !== undefined ? mutItems$2 : fetchState.buffer.slice(0);
     mutItemsRef = mutItems$3;
@@ -174,7 +183,7 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
     };
     latestOnBlockBlockNumber = latestOnBlockBlockNumber$1;
   } else {
-    latestOnBlockBlockNumber = latestFullyFetchedBlock$1.blockNumber;
+    latestOnBlockBlockNumber = latestFullyFetchedBlock.blockNumber;
   }
   var mutItems$4 = mutItemsRef;
   var updatedFetchState_startBlock = fetchState.startBlock;
@@ -196,16 +205,17 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
     indexingContracts: indexingContracts,
     contractConfigs: updatedFetchState_contractConfigs,
     chainId: updatedFetchState_chainId,
-    latestFullyFetchedBlock: latestFullyFetchedBlock$1,
+    latestFullyFetchedBlock: latestFullyFetchedBlock,
     latestOnBlockBlockNumber: latestOnBlockBlockNumber,
     blockLag: blockLag,
     buffer: updatedFetchState_buffer,
     targetBufferSize: updatedFetchState_targetBufferSize,
-    onBlockConfigs: updatedFetchState_onBlockConfigs
+    onBlockConfigs: updatedFetchState_onBlockConfigs,
+    knownHeight: knownHeight
   };
   Prometheus.IndexingPartitions.set(partitions.length, fetchState.chainId);
   Prometheus.IndexingBufferSize.set(updatedFetchState_buffer.length, fetchState.chainId);
-  Prometheus.IndexingBufferBlockNumber.set(latestOnBlockBlockNumber < latestFullyFetchedBlock$1.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock$1.blockNumber, fetchState.chainId);
+  Prometheus.IndexingBufferBlockNumber.set(latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber, fetchState.chainId);
   return updatedFetchState;
 }
 
@@ -389,7 +399,7 @@ function registerDynamicContracts(fetchState, items) {
     newPartitions = partitions;
   }
   Prometheus.IndexingAddresses.set(Object.keys(fetchState.indexingContracts).length + dcsToStore.length | 0, fetchState.chainId);
-  return updateInternal(fetchState, fetchState.partitions.concat(newPartitions), fetchState.nextPartitionIndex + newPartitions.length | 0, Object.assign(registeringContracts, indexingContracts), undefined, undefined);
+  return updateInternal(fetchState, fetchState.partitions.concat(newPartitions), fetchState.nextPartitionIndex + newPartitions.length | 0, Object.assign(registeringContracts, indexingContracts), undefined, undefined, undefined);
 }
 
 var UnexpectedPartitionNotFound = /* @__PURE__ */Caml_exceptions.create("FetchState.UnexpectedPartitionNotFound");
@@ -466,7 +476,7 @@ function handleQueryResult(fetchState, query, latestFetchedBlock, newItems) {
     };
   }
   return Belt_Result.map(tmp, (function (partitions) {
-                return updateInternal(fetchState, partitions, undefined, undefined, newItems.length !== 0 ? Belt_Array.concat(fetchState.buffer, newItems) : undefined, undefined);
+                return updateInternal(fetchState, partitions, undefined, undefined, newItems.length !== 0 ? Belt_Array.concat(fetchState.buffer, newItems) : undefined, undefined, undefined);
               }));
 }
 
@@ -553,14 +563,15 @@ function isFullPartition(p, maxAddrInPartition) {
   }
 }
 
-function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
+function getNextQuery(param, concurrencyLimit, stateId) {
+  var knownHeight = param.knownHeight;
   var blockLag = param.blockLag;
   var indexingContracts = param.indexingContracts;
   var maxAddrInPartition = param.maxAddrInPartition;
   var endBlock = param.endBlock;
   var partitions = param.partitions;
-  var headBlock = currentBlockHeight - blockLag | 0;
-  if (headBlock <= 0) {
+  var headBlockNumber = knownHeight - blockLag | 0;
+  if (headBlockNumber <= 0) {
     return "WaitingForNewBlock";
   }
   if (concurrencyLimit === 0) {
@@ -571,7 +582,10 @@ function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
   var areMergingPartitionsFetching = false;
   var mostBehindMergingPartition;
   var mergingPartitionTarget;
-  var shouldWaitForNewBlock = endBlock !== undefined ? headBlock < endBlock : true;
+  var isOnBlockBehindTheHead = param.latestOnBlockBlockNumber < headBlockNumber;
+  var shouldWaitForNewBlock = (
+    endBlock !== undefined ? headBlockNumber < endBlock : true
+  ) && !isOnBlockBehindTheHead;
   var checkIsFetchingPartition = function (p) {
     var fetchingStateId = p.status.fetchingStateId;
     if (fetchingStateId !== undefined) {
@@ -583,8 +597,8 @@ function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
   for(var idx = 0 ,idx_finish = partitions.length; idx < idx_finish; ++idx){
     var p = partitions[idx];
     var isFetching = checkIsFetchingPartition(p);
-    var hasReachedTheHead = p.latestFetchedBlock.blockNumber >= headBlock;
-    if (isFetching || !hasReachedTheHead) {
+    var isBehindTheHead = p.latestFetchedBlock.blockNumber < headBlockNumber;
+    if (isFetching || isBehindTheHead) {
       shouldWaitForNewBlock = false;
     }
     if (p.selection.dependsOnAddresses ? addressesByContractNameCount(p.addressesByContractName) >= maxAddrInPartition : true) {
@@ -615,7 +629,7 @@ function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
     }
   }
   var item = Belt_Array.get(param.buffer, param.targetBufferSize - 1 | 0);
-  var maxQueryBlockNumber = item !== undefined && item.blockNumber < currentBlockHeight ? item.blockNumber : currentBlockHeight;
+  var maxQueryBlockNumber = item !== undefined && item.blockNumber < knownHeight ? item.blockNumber : knownHeight;
   var queries = [];
   var registerPartitionQuery = function (p, mergeTarget) {
     if (!(!checkIsFetchingPartition(p) && p.latestFetchedBlock.blockNumber < maxQueryBlockNumber)) {
@@ -623,10 +637,10 @@ function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
     }
     var endBlock$1 = blockLag !== 0 ? (
         endBlock !== undefined ? (
-            headBlock < endBlock ? headBlock : endBlock
-          ) : headBlock
+            headBlockNumber < endBlock ? headBlockNumber : endBlock
+          ) : headBlockNumber
       ) : endBlock;
-    var match = maxQueryBlockNumber < currentBlockHeight;
+    var match = maxQueryBlockNumber < knownHeight;
     var endBlock$2 = endBlock$1 !== undefined ? (
         match ? (
             maxQueryBlockNumber < endBlock$1 ? maxQueryBlockNumber : endBlock$1
@@ -739,7 +753,7 @@ function getReadyItemsCount(fetchState, targetSize, fromItem) {
   return acc;
 }
 
-function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition, chainId, targetBufferSize, progressBlockNumberOpt, onBlockConfigsOpt, blockLagOpt) {
+function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition, chainId, targetBufferSize, knownHeight, progressBlockNumberOpt, onBlockConfigsOpt, blockLagOpt) {
   var progressBlockNumber = progressBlockNumberOpt !== undefined ? progressBlockNumberOpt : startBlock - 1 | 0;
   var onBlockConfigs = onBlockConfigsOpt !== undefined ? onBlockConfigsOpt : [];
   var blockLag = blockLagOpt !== undefined ? blockLagOpt : 0;
@@ -824,8 +838,8 @@ function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition,
     }
     
   }
-  if (partitions.length === 0) {
-    Js_exn.raiseError("Invalid configuration: Nothing to fetch. Make sure that you provided at least one contract address to index, or have events with Wildcard mode enabled.");
+  if (Utils.$$Array.isEmpty(partitions) && Utils.$$Array.isEmpty(onBlockConfigs)) {
+    Js_exn.raiseError("Invalid configuration: Nothing to fetch. Make sure that you provided at least one contract address to index, or have events with Wildcard mode enabled, or have onBlock handlers.");
   }
   var numAddresses = Object.keys(indexingContracts).length;
   Prometheus.IndexingAddresses.set(numAddresses, chainId);
@@ -850,7 +864,8 @@ function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition,
           blockLag: blockLag,
           buffer: [],
           targetBufferSize: targetBufferSize,
-          onBlockConfigs: onBlockConfigs
+          onBlockConfigs: onBlockConfigs,
+          knownHeight: knownHeight
         };
 }
 
@@ -931,12 +946,13 @@ function rollback(fetchState, targetBlockNumber) {
               blockLag: fetchState.blockLag,
               buffer: fetchState.buffer,
               targetBufferSize: fetchState.targetBufferSize,
-              onBlockConfigs: fetchState.onBlockConfigs
+              onBlockConfigs: fetchState.onBlockConfigs,
+              knownHeight: fetchState.knownHeight
             }, partitions, undefined, indexingContracts, Belt_Array.keep(fetchState.buffer, (function (item) {
                     var tmp;
                     tmp = item.kind === 0 ? item.blockNumber : item.blockNumber;
                     return tmp <= targetBlockNumber;
-                  })), undefined);
+                  })), undefined, undefined);
 }
 
 function isActivelyIndexing(fetchState) {
@@ -956,14 +972,15 @@ function isActivelyIndexing(fetchState) {
   }
 }
 
-function isReadyToEnterReorgThreshold(fetchState, currentBlockHeight) {
+function isReadyToEnterReorgThreshold(fetchState) {
+  var knownHeight = fetchState.knownHeight;
   var blockLag = fetchState.blockLag;
   var endBlock = fetchState.endBlock;
   var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
   var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
   var bufferBlockNumber = latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber;
-  if (currentBlockHeight !== 0 && (
-      endBlock !== undefined && bufferBlockNumber >= endBlock ? true : bufferBlockNumber >= (currentBlockHeight - blockLag | 0)
+  if (knownHeight !== 0 && (
+      endBlock !== undefined && bufferBlockNumber >= endBlock ? true : bufferBlockNumber >= (knownHeight - blockLag | 0)
     )) {
     return Utils.$$Array.isEmpty(fetchState.buffer);
   } else {
@@ -1045,6 +1062,15 @@ function getUnorderedMultichainProgressBlockNumberAt(fetchState, index) {
   }
 }
 
+function updateKnownHeight(fetchState, knownHeight) {
+  if (knownHeight > fetchState.knownHeight) {
+    Prometheus.setKnownHeight(knownHeight, fetchState.chainId);
+    return updateInternal(fetchState, undefined, undefined, undefined, undefined, undefined, knownHeight);
+  } else {
+    return fetchState;
+  }
+}
+
 var blockItemLogIndex = 16777216;
 
 export {
@@ -1077,5 +1103,6 @@ export {
   isReadyToEnterReorgThreshold ,
   sortForUnorderedBatch ,
   getUnorderedMultichainProgressBlockNumberAt ,
+  updateKnownHeight ,
 }
 /* Utils Not a pure module */