envio 2.29.0-alpha.2 → 2.29.0

package/src/FetchState.res.js

@@ -21,7 +21,6 @@ function copy(fetchState) {
   return {
           partitions: fetchState.partitions,
           nextPartitionIndex: fetchState.nextPartitionIndex,
-          isFetchingAtHead: fetchState.isFetchingAtHead,
           startBlock: fetchState.startBlock,
           endBlock: fetchState.endBlock,
           maxAddrInPartition: fetchState.maxAddrInPartition,
@@ -31,8 +30,10 @@ function copy(fetchState) {
           dcsToStore: fetchState.dcsToStore,
           chainId: fetchState.chainId,
           latestFullyFetchedBlock: fetchState.latestFullyFetchedBlock,
+          latestOnBlockBlockNumber: fetchState.latestOnBlockBlockNumber,
           blockLag: fetchState.blockLag,
           queue: fetchState.queue.slice(0),
+          targetBufferSize: fetchState.targetBufferSize,
           onBlockConfigs: fetchState.onBlockConfigs
         };
 }
@@ -112,16 +113,43 @@ function mergeIntoPartition(p, target, maxAddrInPartition) {
         ];
 }
 
-function checkIsWithinSyncRange(latestFetchedBlock, currentBlockHeight) {
-  return (currentBlockHeight - latestFetchedBlock.blockNumber) / currentBlockHeight <= 0.001;
+function bufferBlockNumber(param) {
+  var latestOnBlockBlockNumber = param.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = param.latestFullyFetchedBlock;
+  if (latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber) {
+    return latestOnBlockBlockNumber;
+  } else {
+    return latestFullyFetchedBlock.blockNumber;
+  }
+}
+
+function bufferBlock(param) {
+  var latestOnBlockBlockNumber = param.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = param.latestFullyFetchedBlock;
+  if (latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber) {
+    return {
+            blockNumber: latestOnBlockBlockNumber,
+            blockTimestamp: 0
+          };
+  } else {
+    return latestFullyFetchedBlock;
+  }
+}
+
+function compareBufferItem(a, b) {
+  var blockDiff = b.blockNumber - a.blockNumber | 0;
+  if (blockDiff === 0) {
+    return b.logIndex - a.logIndex | 0;
+  } else {
+    return blockDiff;
+  }
 }
 
-function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexingContractsOpt, dcsToStoreOpt, currentBlockHeight, queueOpt, blockLagOpt) {
+function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexingContractsOpt, dcsToStoreOpt, mutItems, blockLagOpt) {
   var partitions = partitionsOpt !== undefined ? partitionsOpt : fetchState.partitions;
   var nextPartitionIndex = nextPartitionIndexOpt !== undefined ? nextPartitionIndexOpt : fetchState.nextPartitionIndex;
   var indexingContracts = indexingContractsOpt !== undefined ? indexingContractsOpt : fetchState.indexingContracts;
   var dcsToStore = dcsToStoreOpt !== undefined ? Caml_option.valFromOption(dcsToStoreOpt) : fetchState.dcsToStore;
-  var queue = queueOpt !== undefined ? queueOpt : fetchState.queue;
   var blockLag = blockLagOpt !== undefined ? blockLagOpt : fetchState.blockLag;
   var firstPartition = partitions[0];
   var latestFullyFetchedBlock = firstPartition.latestFetchedBlock;
@@ -133,30 +161,80 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
     
   }
   var latestFullyFetchedBlock$1 = latestFullyFetchedBlock;
-  var isFetchingAtHead = currentBlockHeight !== undefined ? (
-      latestFullyFetchedBlock$1.blockNumber >= currentBlockHeight ? true : fetchState.isFetchingAtHead && checkIsWithinSyncRange(latestFullyFetchedBlock$1, currentBlockHeight)
-    ) : fetchState.isFetchingAtHead;
-  var bufferSize = queue.length;
+  var mutItemsRef = mutItems;
+  var onBlockConfigs = fetchState.onBlockConfigs;
+  var latestOnBlockBlockNumber;
+  if (onBlockConfigs.length !== 0) {
+    var mutItems$1 = mutItemsRef;
+    var item = (
+        mutItems$1 !== undefined ? mutItems$1 : fetchState.queue
+      ).at(-fetchState.targetBufferSize | 0);
+    var maxBlockNumber = item !== undefined ? item.blockNumber : latestFullyFetchedBlock$1.blockNumber;
+    var mutItems$2 = mutItemsRef;
+    var mutItems$3 = mutItems$2 !== undefined ? mutItems$2 : fetchState.queue.slice(0);
+    mutItemsRef = mutItems$3;
+    var newItemsCounter = 0;
+    var latestOnBlockBlockNumber$1 = fetchState.latestOnBlockBlockNumber;
+    while(latestOnBlockBlockNumber$1 < maxBlockNumber && newItemsCounter <= fetchState.targetBufferSize) {
+      var blockNumber = latestOnBlockBlockNumber$1 + 1 | 0;
+      latestOnBlockBlockNumber$1 = blockNumber;
+      for(var configIdx = 0 ,configIdx_finish = onBlockConfigs.length; configIdx < configIdx_finish; ++configIdx){
+        var onBlockConfig = onBlockConfigs[configIdx];
+        var startBlock = onBlockConfig.startBlock;
+        var handlerStartBlock = startBlock !== undefined ? startBlock : fetchState.startBlock;
+        var tmp = false;
+        if (blockNumber >= handlerStartBlock) {
+          var endBlock = onBlockConfig.endBlock;
+          tmp = endBlock !== undefined ? blockNumber <= endBlock : true;
+        }
+        if (tmp && Caml_int32.mod_(blockNumber - handlerStartBlock | 0, onBlockConfig.interval) === 0) {
+          mutItems$3.push({
+                kind: 1,
+                onBlockConfig: onBlockConfig,
+                blockNumber: blockNumber,
+                logIndex: 16777216 + onBlockConfig.index | 0
+              });
+          newItemsCounter = newItemsCounter + 1 | 0;
+        }
+        
+      }
+    };
+    latestOnBlockBlockNumber = latestOnBlockBlockNumber$1;
+  } else {
+    latestOnBlockBlockNumber = latestFullyFetchedBlock$1.blockNumber;
+  }
+  var mutItems$4 = mutItemsRef;
+  var updatedFetchState_startBlock = fetchState.startBlock;
+  var updatedFetchState_endBlock = fetchState.endBlock;
+  var updatedFetchState_maxAddrInPartition = fetchState.maxAddrInPartition;
+  var updatedFetchState_normalSelection = fetchState.normalSelection;
+  var updatedFetchState_contractConfigs = fetchState.contractConfigs;
+  var updatedFetchState_chainId = fetchState.chainId;
+  var updatedFetchState_queue = mutItems$4 !== undefined ? mutItems$4.sort(compareBufferItem) : fetchState.queue;
+  var updatedFetchState_targetBufferSize = fetchState.targetBufferSize;
+  var updatedFetchState_onBlockConfigs = fetchState.onBlockConfigs;
+  var updatedFetchState = {
+    partitions: partitions,
+    nextPartitionIndex: nextPartitionIndex,
+    startBlock: updatedFetchState_startBlock,
+    endBlock: updatedFetchState_endBlock,
+    maxAddrInPartition: updatedFetchState_maxAddrInPartition,
+    normalSelection: updatedFetchState_normalSelection,
+    indexingContracts: indexingContracts,
+    contractConfigs: updatedFetchState_contractConfigs,
+    dcsToStore: dcsToStore,
+    chainId: updatedFetchState_chainId,
+    latestFullyFetchedBlock: latestFullyFetchedBlock$1,
+    latestOnBlockBlockNumber: latestOnBlockBlockNumber,
+    blockLag: blockLag,
+    queue: updatedFetchState_queue,
+    targetBufferSize: updatedFetchState_targetBufferSize,
+    onBlockConfigs: updatedFetchState_onBlockConfigs
+  };
   Prometheus.IndexingPartitions.set(partitions.length, fetchState.chainId);
-  Prometheus.IndexingBufferSize.set(bufferSize, fetchState.chainId);
-  Prometheus.IndexingBufferBlockNumber.set(latestFullyFetchedBlock$1.blockNumber, fetchState.chainId);
-  return {
-          partitions: partitions,
-          nextPartitionIndex: nextPartitionIndex,
-          isFetchingAtHead: isFetchingAtHead,
-          startBlock: fetchState.startBlock,
-          endBlock: fetchState.endBlock,
-          maxAddrInPartition: fetchState.maxAddrInPartition,
-          normalSelection: fetchState.normalSelection,
-          indexingContracts: indexingContracts,
-          contractConfigs: fetchState.contractConfigs,
-          dcsToStore: dcsToStore,
-          chainId: fetchState.chainId,
-          latestFullyFetchedBlock: latestFullyFetchedBlock$1,
-          blockLag: blockLag,
-          queue: queue,
-          onBlockConfigs: fetchState.onBlockConfigs
-        };
+  Prometheus.IndexingBufferSize.set(updatedFetchState_queue.length, fetchState.chainId);
+  Prometheus.IndexingBufferBlockNumber.set(latestOnBlockBlockNumber < latestFullyFetchedBlock$1.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock$1.blockNumber, fetchState.chainId);
+  return updatedFetchState;
 }
 
 function numAddresses(fetchState) {
@@ -173,7 +251,7 @@ function warnDifferentContractType(fetchState, existingContract, dc) {
   Logging.childWarn(logger, "Skipping contract registration: Contract address is already registered for one contract and cannot be registered for another contract.");
 }
 
-function registerDynamicContracts(fetchState, dynamicContracts, currentBlockHeight) {
+function registerDynamicContracts(fetchState, dynamicContracts) {
   if (Utils.$$Array.isEmpty(fetchState.normalSelection.eventConfigs)) {
     Js_exn.raiseError("Invalid configuration. No events to fetch for the dynamic contract registration.");
   }
@@ -326,23 +404,14 @@ function registerDynamicContracts(fetchState, dynamicContracts, currentBlockHeig
   }
   Prometheus.IndexingAddresses.set(Object.keys(fetchState.indexingContracts).length + dcsToStore.length | 0, fetchState.chainId);
   var existingDcs = fetchState.dcsToStore;
-  return updateInternal(fetchState, fetchState.partitions.concat(newPartitions), fetchState.nextPartitionIndex + newPartitions.length | 0, Object.assign(registeringContracts, indexingContracts), Caml_option.some(existingDcs !== undefined ? Belt_Array.concat(existingDcs, dcsToStore) : dcsToStore), currentBlockHeight, undefined, undefined);
+  return updateInternal(fetchState, fetchState.partitions.concat(newPartitions), fetchState.nextPartitionIndex + newPartitions.length | 0, Object.assign(registeringContracts, indexingContracts), Caml_option.some(existingDcs !== undefined ? Belt_Array.concat(existingDcs, dcsToStore) : dcsToStore), undefined, undefined);
 }
 
 var UnexpectedPartitionNotFound = /* @__PURE__ */Caml_exceptions.create("FetchState.UnexpectedPartitionNotFound");
 
 var UnexpectedMergeQueryResponse = /* @__PURE__ */Caml_exceptions.create("FetchState.UnexpectedMergeQueryResponse");
 
-function compareBufferItem(a, b) {
-  var blockDiff = b.blockNumber - a.blockNumber | 0;
-  if (blockDiff === 0) {
-    return b.logIndex - a.logIndex | 0;
-  } else {
-    return blockDiff;
-  }
-}
-
-function handleQueryResult(fetchState, query, latestFetchedBlock, newItems, currentBlockHeight) {
+function handleQueryResult(fetchState, query, latestFetchedBlock, newItems) {
   var partitions = fetchState.partitions;
   var partitionId = query.partitionId;
   var pIndex = Belt_Array.getIndexBy(partitions, (function (p) {
@@ -412,46 +481,7 @@ function handleQueryResult(fetchState, query, latestFetchedBlock, newItems, curr
     };
   }
   return Belt_Result.map(tmp, (function (partitions) {
-                var newQueue = Belt_Array.concat(fetchState.queue, newItems);
-                var onBlockConfigs = fetchState.onBlockConfigs;
-                if (onBlockConfigs !== undefined) {
-                  var prevLatestFetchedBlockNumber = fetchState.latestFullyFetchedBlock.blockNumber;
-                  var nextLatestFullyFetchedBlockNumber = latestFetchedBlock.blockNumber;
-                  for(var idx = 0 ,idx_finish = partitions.length; idx < idx_finish; ++idx){
-                    var p = partitions[idx];
-                    if (nextLatestFullyFetchedBlockNumber > p.latestFetchedBlock.blockNumber) {
-                      nextLatestFullyFetchedBlockNumber = p.latestFetchedBlock.blockNumber;
-                    }
-                    
-                  }
-                  var nextLatestFullyFetchedBlockNumber$1 = nextLatestFullyFetchedBlockNumber;
-                  if (nextLatestFullyFetchedBlockNumber$1 > prevLatestFetchedBlockNumber) {
-                    for(var configIdx = 0 ,configIdx_finish = onBlockConfigs.length; configIdx < configIdx_finish; ++configIdx){
-                      var onBlockConfig = onBlockConfigs[configIdx];
-                      var startBlock = onBlockConfig.startBlock;
-                      var handlerStartBlock = startBlock !== undefined ? startBlock : fetchState.startBlock;
-                      var rangeStart = Caml.int_max(handlerStartBlock, prevLatestFetchedBlockNumber + 1 | 0);
-                      var endBlock = onBlockConfig.endBlock;
-                      var rangeEnd = endBlock !== undefined && endBlock < nextLatestFullyFetchedBlockNumber$1 ? endBlock : nextLatestFullyFetchedBlockNumber$1;
-                      if (rangeStart <= rangeEnd) {
-                        for(var blockNumber = rangeStart; blockNumber <= rangeEnd; ++blockNumber){
-                          if (Caml_int32.mod_(blockNumber - handlerStartBlock | 0, onBlockConfig.interval) === 0) {
-                            newQueue.push({
-                                  kind: 1,
-                                  onBlockConfig: onBlockConfig,
-                                  blockNumber: blockNumber,
-                                  logIndex: 16777216
-                                });
-                          }
-                          
-                        }
-                      }
-                      
-                    }
-                  }
-                  
-                }
-                return updateInternal(fetchState, partitions, undefined, undefined, undefined, currentBlockHeight, newQueue.sort(compareBufferItem), undefined);
+                return updateInternal(fetchState, partitions, undefined, undefined, undefined, newItems.length !== 0 ? Belt_Array.concat(fetchState.queue, newItems) : undefined, undefined);
               }));
 }
 
@@ -538,7 +568,7 @@ function isFullPartition(p, maxAddrInPartition) {
   }
 }
 
-function getNextQuery(param, concurrencyLimit, targetBufferSize, currentBlockHeight, stateId) {
+function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
   var queue = param.queue;
   var blockLag = param.blockLag;
   var indexingContracts = param.indexingContracts;
@@ -600,7 +630,7 @@ function getNextQuery(param, concurrencyLimit, targetBufferSize, currentBlockHei
       
     }
   }
-  var targetBlockIdx = queue.length - targetBufferSize | 0;
+  var targetBlockIdx = queue.length - param.targetBufferSize | 0;
   var maxQueryBlockNumber;
   if (targetBlockIdx < 0) {
     maxQueryBlockNumber = currentBlockHeight;
@@ -681,30 +711,50 @@ function makeNoItem(param) {
         };
 }
 
-function getEarliestEvent(param) {
-  var queue = param.queue;
-  var latestFullyFetchedBlock = param.latestFullyFetchedBlock;
-  var item = Utils.$$Array.last(queue);
-  if (item !== undefined && item.blockNumber <= latestFullyFetchedBlock.blockNumber) {
+function getEarliestEvent(fetchState) {
+  var queue = fetchState.queue;
+  var item = Utils.$$Array.last(fetchState.queue);
+  if (item !== undefined) {
+    var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+    var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+    if (item.blockNumber <= (
+        latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
+      )) {
+      return {
+              TAG: "Item",
+              _0: {
+                item: item,
+                popItemOffQueue: (function () {
+                    queue.pop();
+                  })
+              }
+            };
+    }
+    var latestOnBlockBlockNumber$1 = fetchState.latestOnBlockBlockNumber;
+    var latestFullyFetchedBlock$1 = fetchState.latestFullyFetchedBlock;
     return {
-            TAG: "Item",
-            _0: {
-              item: item,
-              popItemOffQueue: (function () {
-                  queue.pop();
-                })
-            }
+            TAG: "NoItem",
+            latestFetchedBlock: latestOnBlockBlockNumber$1 < latestFullyFetchedBlock$1.blockNumber ? ({
+                  blockNumber: latestOnBlockBlockNumber$1,
+                  blockTimestamp: 0
+                }) : latestFullyFetchedBlock$1
           };
   } else {
+    var latestOnBlockBlockNumber$2 = fetchState.latestOnBlockBlockNumber;
+    var latestFullyFetchedBlock$2 = fetchState.latestFullyFetchedBlock;
     return {
             TAG: "NoItem",
-            latestFetchedBlock: latestFullyFetchedBlock
+            latestFetchedBlock: latestOnBlockBlockNumber$2 < latestFullyFetchedBlock$2.blockNumber ? ({
+                  blockNumber: latestOnBlockBlockNumber$2,
+                  blockTimestamp: 0
+                }) : latestFullyFetchedBlock$2
           };
   }
 }
 
-function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition, chainId, progressBlockNumberOpt, onBlockConfigs, blockLagOpt) {
+function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition, chainId, targetBufferSize, progressBlockNumberOpt, onBlockConfigsOpt, blockLagOpt) {
   var progressBlockNumber = progressBlockNumberOpt !== undefined ? progressBlockNumberOpt : startBlock - 1 | 0;
+  var onBlockConfigs = onBlockConfigsOpt !== undefined ? onBlockConfigsOpt : [];
   var blockLag = blockLagOpt !== undefined ? blockLagOpt : 0;
   var latestFetchedBlock = {
     blockNumber: progressBlockNumber,
@@ -801,7 +851,6 @@ function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition,
   return {
           partitions: partitions,
           nextPartitionIndex: partitions.length,
-          isFetchingAtHead: false,
           startBlock: startBlock,
           endBlock: endBlock,
           maxAddrInPartition: maxAddrInPartition,
@@ -811,8 +860,10 @@ function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition,
           dcsToStore: undefined,
           chainId: chainId,
           latestFullyFetchedBlock: latestFetchedBlock,
+          latestOnBlockBlockNumber: progressBlockNumber,
           blockLag: blockLag,
           queue: [],
+          targetBufferSize: targetBufferSize,
           onBlockConfigs: onBlockConfigs
         };
 }
@@ -821,10 +872,6 @@ function bufferSize(param) {
   return param.queue.length;
 }
 
-function getLatestFullyFetchedBlock(param) {
-  return param.latestFullyFetchedBlock;
-}
-
 function pruneQueueFromFirstChangeEvent(queue, firstChangeEvent) {
   return Belt_Array.keep(queue, (function (item) {
                 var tmp;
@@ -910,7 +957,24 @@ function rollback(fetchState, firstChangeEvent) {
   } else {
     tmp = undefined;
   }
-  return updateInternal(fetchState, partitions, undefined, indexingContracts, Caml_option.some(tmp), undefined, pruneQueueFromFirstChangeEvent(fetchState.queue, firstChangeEvent), undefined);
+  return updateInternal({
+              partitions: fetchState.partitions,
+              nextPartitionIndex: fetchState.nextPartitionIndex,
+              startBlock: fetchState.startBlock,
+              endBlock: fetchState.endBlock,
+              maxAddrInPartition: fetchState.maxAddrInPartition,
+              normalSelection: fetchState.normalSelection,
+              indexingContracts: fetchState.indexingContracts,
+              contractConfigs: fetchState.contractConfigs,
+              dcsToStore: fetchState.dcsToStore,
+              chainId: fetchState.chainId,
+              latestFullyFetchedBlock: fetchState.latestFullyFetchedBlock,
+              latestOnBlockBlockNumber: firstChangeEvent.blockNumber - 1 | 0,
+              blockLag: fetchState.blockLag,
+              queue: fetchState.queue,
+              targetBufferSize: fetchState.targetBufferSize,
+              onBlockConfigs: fetchState.onBlockConfigs
+            }, partitions, undefined, indexingContracts, Caml_option.some(tmp), pruneQueueFromFirstChangeEvent(fetchState.queue, firstChangeEvent), undefined);
 }
 
 function isActivelyIndexing(fetchState) {
@@ -918,7 +982,11 @@ function isActivelyIndexing(fetchState) {
   if (endBlock === undefined) {
     return true;
   }
-  var isPastEndblock = fetchState.latestFullyFetchedBlock.blockNumber >= endBlock;
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  var isPastEndblock = (
+    latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
+  ) >= endBlock;
   if (isPastEndblock) {
     return bufferSize(fetchState) > 0;
   } else {
@@ -926,36 +994,44 @@ function isActivelyIndexing(fetchState) {
   }
 }
 
-function isReadyToEnterReorgThreshold(param, currentBlockHeight) {
-  var blockLag = param.blockLag;
-  var latestFullyFetchedBlock = param.latestFullyFetchedBlock;
-  var endBlock = param.endBlock;
+function isReadyToEnterReorgThreshold(fetchState, currentBlockHeight) {
+  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 && latestFullyFetchedBlock.blockNumber >= endBlock ? true : latestFullyFetchedBlock.blockNumber >= (currentBlockHeight - blockLag | 0)
+      endBlock !== undefined && bufferBlockNumber >= endBlock ? true : bufferBlockNumber >= (currentBlockHeight - blockLag | 0)
     )) {
-    return Utils.$$Array.isEmpty(param.queue);
+    return Utils.$$Array.isEmpty(fetchState.queue);
   } else {
     return false;
   }
 }
 
-function hasBatchItem(param) {
-  var item = Utils.$$Array.last(param.queue);
-  if (item !== undefined) {
-    return item.blockNumber <= param.latestFullyFetchedBlock.blockNumber;
-  } else {
+function hasBatchItem(fetchState) {
+  var item = Utils.$$Array.last(fetchState.queue);
+  if (item === undefined) {
     return false;
   }
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  return item.blockNumber <= (
+          latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
+        );
 }
 
-function hasFullBatch(param, maxBatchSize) {
-  var queue = param.queue;
+function hasFullBatch(fetchState, maxBatchSize) {
+  var queue = fetchState.queue;
   var targetBlockIdx = queue.length - maxBatchSize | 0;
   if (targetBlockIdx < 0) {
     return false;
-  } else {
-    return queue[targetBlockIdx].blockNumber <= param.latestFullyFetchedBlock.blockNumber;
   }
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  return queue[targetBlockIdx].blockNumber <= (
+          latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
+        );
 }
 
 function filterAndSortForUnorderedBatch(fetchStates, maxBatchSize) {
@@ -980,18 +1056,20 @@ function filterAndSortForUnorderedBatch(fetchStates, maxBatchSize) {
             });
 }
 
-function getProgressBlockNumber(param) {
-  var latestFullyFetchedBlock = param.latestFullyFetchedBlock;
-  var item = Utils.$$Array.last(param.queue);
-  if (item !== undefined && latestFullyFetchedBlock.blockNumber >= item.blockNumber) {
+function getProgressBlockNumber(fetchState) {
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  var bufferBlockNumber = latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber;
+  var item = Utils.$$Array.last(fetchState.queue);
+  if (item !== undefined && bufferBlockNumber >= item.blockNumber) {
     return item.blockNumber - 1 | 0;
   } else {
-    return latestFullyFetchedBlock.blockNumber;
+    return bufferBlockNumber;
   }
 }
 
-function getProgressNextBlockLogIndex(param) {
-  var match = Utils.$$Array.last(param.queue);
+function getProgressNextBlockLogIndex(fetchState) {
+  var match = Utils.$$Array.last(fetchState.queue);
   if (match === undefined) {
     return ;
   }
@@ -999,7 +1077,11 @@ function getProgressNextBlockLogIndex(param) {
     return ;
   }
   var logIndex = match.logIndex;
-  if (param.latestFullyFetchedBlock.blockNumber >= match.blockNumber && logIndex > 0) {
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  if ((
+      latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
+    ) >= match.blockNumber && logIndex > 0) {
     return logIndex - 1 | 0;
   }
   
@@ -1009,15 +1091,16 @@ var blockItemLogIndex = 16777216;
 
 exports.copy = copy;
 exports.mergeIntoPartition = mergeIntoPartition;
-exports.checkIsWithinSyncRange = checkIsWithinSyncRange;
+exports.bufferBlockNumber = bufferBlockNumber;
+exports.bufferBlock = bufferBlock;
+exports.compareBufferItem = compareBufferItem;
+exports.blockItemLogIndex = blockItemLogIndex;
 exports.updateInternal = updateInternal;
 exports.numAddresses = numAddresses;
 exports.warnDifferentContractType = warnDifferentContractType;
 exports.registerDynamicContracts = registerDynamicContracts;
 exports.UnexpectedPartitionNotFound = UnexpectedPartitionNotFound;
 exports.UnexpectedMergeQueryResponse = UnexpectedMergeQueryResponse;
-exports.compareBufferItem = compareBufferItem;
-exports.blockItemLogIndex = blockItemLogIndex;
 exports.handleQueryResult = handleQueryResult;
 exports.makePartitionQuery = makePartitionQuery;
 exports.startFetchingQueries = startFetchingQueries;
@@ -1029,7 +1112,6 @@ exports.makeNoItem = makeNoItem;
 exports.getEarliestEvent = getEarliestEvent;
 exports.make = make;
 exports.bufferSize = bufferSize;
-exports.getLatestFullyFetchedBlock = getLatestFullyFetchedBlock;
 exports.pruneQueueFromFirstChangeEvent = pruneQueueFromFirstChangeEvent;
 exports.rollbackPartition = rollbackPartition;
 exports.rollback = rollback;

package/src/Logging.res.js

@@ -8,7 +8,6 @@ var Js_exn = require("rescript/lib/js/js_exn.js");
 var Js_dict = require("rescript/lib/js/js_dict.js");
 var Caml_obj = require("rescript/lib/js/caml_obj.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
-var EcsPinoFormat = require("@elastic/ecs-pino-format");
 
 var logLevels = Js_dict.fromArray([
       [
@@ -75,13 +74,13 @@ function makeLogger(logStrategy, logFilePath, defaultFileLogLevel, userLogLevel)
   };
   switch (logStrategy) {
     case "ecs-file" :
-        var newrecord = Caml_obj.obj_dup(EcsPinoFormat());
+        var newrecord = Caml_obj.obj_dup(Pino.ECS.make());
         return Pino$1((newrecord.customLevels = logLevels, newrecord), Pino$1.transport(pinoFile));
     case "ecs-console" :
-        var newrecord$1 = Caml_obj.obj_dup(EcsPinoFormat());
+        var newrecord$1 = Caml_obj.obj_dup(Pino.ECS.make());
         return Pino$1((newrecord$1.customLevels = logLevels, newrecord$1.level = userLogLevel, newrecord$1));
     case "ecs-console-multistream" :
-        return makeMultiStreamLogger(undefined, EcsPinoFormat());
+        return makeMultiStreamLogger(undefined, Pino.ECS.make());
     case "file-only" :
         return Pino$1({
                     level: defaultFileLogLevel,

package/src/Utils.res

@@ -303,6 +303,8 @@ Helper to check if a value exists in an array
 
   @send
   external copy: array<'a> => array<'a> = "slice"
+
+  @send external at: (array<'a>, int) => option<'a> = "at"
 }
 
 module String = {

package/src/bindings/Pino.res

@@ -110,6 +110,7 @@ let createChildParams: 'a => childParams = Utils.magic
 module ECS = {
   @module
   external make: 'a => options = "@elastic/ecs-pino-format"
+  let make = make
 }
 
 /**

package/src/bindings/Pino.res.js

@@ -7,6 +7,7 @@ var Caml_obj = require("rescript/lib/js/caml_obj.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var PinoPretty = require("pino-pretty");
+var EcsPinoFormat = require("@elastic/ecs-pino-format");
 
 function createPinoMessage(message) {
   return message;
@@ -31,7 +32,13 @@ function createChildParams(prim) {
   return prim;
 }
 
-var ECS = {};
+function make(prim) {
+  return EcsPinoFormat(prim);
+}
+
+var ECS = {
+  make: make
+};
 
 function makeFormatter(logLevels) {
   return PinoPretty.prettyFactory({
@@ -63,7 +70,7 @@ function makeStreams(userLogLevel, formatter, logFile, defaultFileLogLevel) {
   return Belt_Array.concat([stream], maybeFileStream);
 }
 
-function make(userLogLevel, customLevels, logFile, options, defaultFileLogLevel) {
+function make$1(userLogLevel, customLevels, logFile, options, defaultFileLogLevel) {
   var options$1;
   if (options !== undefined) {
     var newrecord = Caml_obj.obj_dup(options);
@@ -84,7 +91,7 @@ function make(userLogLevel, customLevels, logFile, options, defaultFileLogLevel)
 var MultiStreamLogger = {
   makeFormatter: makeFormatter,
   makeStreams: makeStreams,
-  make: make
+  make: make$1
 };
 
 exports.createPinoMessage = createPinoMessage;

package/src/db/EntityHistory.res

@@ -188,9 +188,6 @@ let fromTable = (table: table, ~schema: S.t<'entity>): t<'entity> => {
       switch field.fieldName {
       //id is not nullable and should be part of the pk
       | "id" => {...field, fieldName: id, isPrimaryKey: true}->Field->Some
-      //db_write_timestamp can be removed for this. TODO: remove this when we depracate
-      //automatic db_write_timestamp creation
-      | "db_write_timestamp" => None
       | _ =>
         {
           ...field,