envio 2.29.2 → 2.30.0

package/src/FetchState.res.js

@@ -14,30 +14,8 @@ var Caml_int32 = require("rescript/lib/js/caml_int32.js");
 var Prometheus = require("./Prometheus.res.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var Belt_Result = require("rescript/lib/js/belt_Result.js");
-var Caml_option = require("rescript/lib/js/caml_option.js");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
 
-function copy(fetchState) {
-  return {
-          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: fetchState.latestOnBlockBlockNumber,
-          blockLag: fetchState.blockLag,
-          queue: fetchState.queue.slice(0),
-          targetBufferSize: fetchState.targetBufferSize,
-          onBlockConfigs: fetchState.onBlockConfigs
-        };
-}
-
 function mergeIntoPartition(p, target, maxAddrInPartition) {
   if (!p.selection.dependsOnAddresses) {
     return [
@@ -137,9 +115,9 @@ function bufferBlock(param) {
 }
 
 function compareBufferItem(a, b) {
-  var blockDiff = b.blockNumber - a.blockNumber | 0;
+  var blockDiff = a.blockNumber - b.blockNumber | 0;
   if (blockDiff === 0) {
-    return b.logIndex - a.logIndex | 0;
+    return a.logIndex - b.logIndex | 0;
   } else {
     return blockDiff;
   }
@@ -149,7 +127,7 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
   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 dcsToStore = dcsToStoreOpt !== undefined ? dcsToStoreOpt : fetchState.dcsToStore;
   var blockLag = blockLagOpt !== undefined ? blockLagOpt : fetchState.blockLag;
   var firstPartition = partitions[0];
   var latestFullyFetchedBlock = firstPartition.latestFetchedBlock;
@@ -166,12 +144,10 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
   var latestOnBlockBlockNumber;
   if (onBlockConfigs.length !== 0) {
     var mutItems$1 = mutItemsRef;
-    var item = (
-        mutItems$1 !== undefined ? mutItems$1 : fetchState.queue
-      ).at(-fetchState.targetBufferSize | 0);
+    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 mutItems$2 = mutItemsRef;
-    var mutItems$3 = mutItems$2 !== undefined ? mutItems$2 : fetchState.queue.slice(0);
+    var mutItems$3 = mutItems$2 !== undefined ? mutItems$2 : fetchState.buffer.slice(0);
     mutItemsRef = mutItems$3;
     var newItemsCounter = 0;
     var latestOnBlockBlockNumber$1 = fetchState.latestOnBlockBlockNumber;
@@ -210,7 +186,7 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
   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_buffer = mutItems$4 !== undefined ? mutItems$4.sort(compareBufferItem) : fetchState.buffer;
   var updatedFetchState_targetBufferSize = fetchState.targetBufferSize;
   var updatedFetchState_onBlockConfigs = fetchState.onBlockConfigs;
   var updatedFetchState = {
@@ -227,12 +203,12 @@ function updateInternal(fetchState, partitionsOpt, nextPartitionIndexOpt, indexi
     latestFullyFetchedBlock: latestFullyFetchedBlock$1,
     latestOnBlockBlockNumber: latestOnBlockBlockNumber,
     blockLag: blockLag,
-    queue: updatedFetchState_queue,
+    buffer: updatedFetchState_buffer,
     targetBufferSize: updatedFetchState_targetBufferSize,
     onBlockConfigs: updatedFetchState_onBlockConfigs
   };
   Prometheus.IndexingPartitions.set(partitions.length, fetchState.chainId);
-  Prometheus.IndexingBufferSize.set(updatedFetchState_queue.length, fetchState.chainId);
+  Prometheus.IndexingBufferSize.set(updatedFetchState_buffer.length, fetchState.chainId);
   Prometheus.IndexingBufferBlockNumber.set(latestOnBlockBlockNumber < latestFullyFetchedBlock$1.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock$1.blockNumber, fetchState.chainId);
   return updatedFetchState;
 }
@@ -404,7 +380,7 @@ function registerDynamicContracts(fetchState, dynamicContracts) {
   }
   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), undefined, undefined);
+  return updateInternal(fetchState, fetchState.partitions.concat(newPartitions), fetchState.nextPartitionIndex + newPartitions.length | 0, Object.assign(registeringContracts, indexingContracts), existingDcs.length !== 0 ? Belt_Array.concat(existingDcs, dcsToStore) : dcsToStore, undefined, undefined);
 }
 
 var UnexpectedPartitionNotFound = /* @__PURE__ */Caml_exceptions.create("FetchState.UnexpectedPartitionNotFound");
@@ -481,7 +457,7 @@ function handleQueryResult(fetchState, query, latestFetchedBlock, newItems) {
     };
   }
   return Belt_Result.map(tmp, (function (partitions) {
-                return updateInternal(fetchState, partitions, undefined, undefined, undefined, newItems.length !== 0 ? Belt_Array.concat(fetchState.queue, newItems) : undefined, undefined);
+                return updateInternal(fetchState, partitions, undefined, undefined, undefined, newItems.length !== 0 ? Belt_Array.concat(fetchState.buffer, newItems) : undefined, undefined);
               }));
 }
 
@@ -569,7 +545,6 @@ function isFullPartition(p, maxAddrInPartition) {
 }
 
 function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
-  var queue = param.queue;
   var blockLag = param.blockLag;
   var indexingContracts = param.indexingContracts;
   var maxAddrInPartition = param.maxAddrInPartition;
@@ -630,14 +605,8 @@ function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
       
     }
   }
-  var targetBlockIdx = queue.length - param.targetBufferSize | 0;
-  var maxQueryBlockNumber;
-  if (targetBlockIdx < 0) {
-    maxQueryBlockNumber = currentBlockHeight;
-  } else {
-    var item = Belt_Array.get(queue, targetBlockIdx);
-    maxQueryBlockNumber = item !== undefined && item.blockNumber < currentBlockHeight ? item.blockNumber : currentBlockHeight;
-  }
+  var item = Belt_Array.get(param.buffer, param.targetBufferSize - 1 | 0);
+  var maxQueryBlockNumber = item !== undefined && item.blockNumber < currentBlockHeight ? item.blockNumber : currentBlockHeight;
   var queries = [];
   var registerPartitionQuery = function (p, mergeTarget) {
     if (!(!checkIsFetchingPartition(p) && p.latestFetchedBlock.blockNumber < maxQueryBlockNumber)) {
@@ -704,52 +673,61 @@ function getNextQuery(param, concurrencyLimit, currentBlockHeight, stateId) {
   }
 }
 
-function makeNoItem(param) {
-  return {
-          TAG: "NoItem",
-          latestFetchedBlock: param.latestFetchedBlock
-        };
+function getTimestampAt(fetchState, index) {
+  var match = Belt_Array.get(fetchState.buffer, index);
+  if (match !== undefined) {
+    if (match.kind === 0) {
+      return match.timestamp;
+    } else {
+      return Js_exn.raiseError("Block handlers are not supported for ordered multichain mode.");
+    }
+  }
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  return (
+          latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? ({
+                blockNumber: latestOnBlockBlockNumber,
+                blockTimestamp: 0
+              }) : latestFullyFetchedBlock
+        ).blockTimestamp;
 }
 
-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: "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: latestOnBlockBlockNumber$2 < latestFullyFetchedBlock$2.blockNumber ? ({
-                  blockNumber: latestOnBlockBlockNumber$2,
-                  blockTimestamp: 0
-                }) : latestFullyFetchedBlock$2
-          };
+function hasReadyItem(fetchState) {
+  var item = Belt_Array.get(fetchState.buffer, 0);
+  if (item === undefined) {
+    return false;
   }
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  return item.blockNumber <= (
+          latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
+        );
+}
+
+function getReadyItemsCount(fetchState, targetSize, fromItem) {
+  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
+  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
+  var readyBlockNumber = latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber;
+  var acc = 0;
+  var isFinished = false;
+  while(!isFinished) {
+    var item = Belt_Array.get(fetchState.buffer, fromItem + acc | 0);
+    if (item !== undefined) {
+      var itemBlockNumber = item.blockNumber;
+      if (itemBlockNumber <= readyBlockNumber) {
+        acc = acc + 1 | 0;
+        if (acc === targetSize) {
+          readyBlockNumber = itemBlockNumber;
+        }
+        
+      } else {
+        isFinished = true;
+      }
+    } else {
+      isFinished = true;
+    }
+  };
+  return acc;
 }
 
 function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition, chainId, targetBufferSize, progressBlockNumberOpt, onBlockConfigsOpt, blockLagOpt) {
@@ -857,23 +835,23 @@ function make(startBlock, endBlock, eventConfigs, contracts, maxAddrInPartition,
           normalSelection: normalSelection,
           indexingContracts: indexingContracts,
           contractConfigs: contractConfigs,
-          dcsToStore: undefined,
+          dcsToStore: [],
           chainId: chainId,
           latestFullyFetchedBlock: latestFetchedBlock,
           latestOnBlockBlockNumber: progressBlockNumber,
           blockLag: blockLag,
-          queue: [],
+          buffer: [],
           targetBufferSize: targetBufferSize,
           onBlockConfigs: onBlockConfigs
         };
 }
 
 function bufferSize(param) {
-  return param.queue.length;
+  return param.buffer.length;
 }
 
-function pruneQueueFromFirstChangeEvent(queue, firstChangeEvent) {
-  return Belt_Array.keep(queue, (function (item) {
+function pruneQueueFromFirstChangeEvent(buffer, firstChangeEvent) {
+  return Belt_Array.keep(buffer, (function (item) {
                 var tmp;
                 tmp = item.kind === 0 ? [
                     item.blockNumber,
@@ -949,16 +927,7 @@ function rollback(fetchState, firstChangeEvent) {
   var partitions = Belt_Array.keepMap(fetchState.partitions, (function (p) {
           return rollbackPartition(p, firstChangeEvent, addressesToRemove);
         }));
-  var dcsToStore = fetchState.dcsToStore;
-  var tmp;
-  if (dcsToStore !== undefined) {
-    var filtered = dcsToStore.filter(function (dc) {
-          return !addressesToRemove.has(dc.address);
-        });
-    tmp = filtered.length !== 0 ? filtered : undefined;
-  } else {
-    tmp = undefined;
-  }
+  var empty = fetchState.dcsToStore;
   return updateInternal({
               partitions: fetchState.partitions,
               nextPartitionIndex: fetchState.nextPartitionIndex,
@@ -973,10 +942,12 @@ function rollback(fetchState, firstChangeEvent) {
               latestFullyFetchedBlock: fetchState.latestFullyFetchedBlock,
               latestOnBlockBlockNumber: firstChangeEvent.blockNumber - 1 | 0,
               blockLag: fetchState.blockLag,
-              queue: fetchState.queue,
+              buffer: fetchState.buffer,
               targetBufferSize: fetchState.targetBufferSize,
               onBlockConfigs: fetchState.onBlockConfigs
-            }, partitions, undefined, indexingContracts, Caml_option.some(tmp), pruneQueueFromFirstChangeEvent(fetchState.queue, firstChangeEvent), undefined);
+            }, partitions, undefined, indexingContracts, empty.length !== 0 ? empty.filter(function (dc) {
+                    return !addressesToRemove.has(dc.address);
+                  }) : empty, pruneQueueFromFirstChangeEvent(fetchState.buffer, firstChangeEvent), undefined);
 }
 
 function isActivelyIndexing(fetchState) {
@@ -1005,14 +976,14 @@ function isReadyToEnterReorgThreshold(fetchState, currentBlockHeight) {
   if (currentBlockHeight !== 0 && (
       endBlock !== undefined && bufferBlockNumber >= endBlock ? true : bufferBlockNumber >= (currentBlockHeight - blockLag | 0)
     )) {
-    return Utils.$$Array.isEmpty(fetchState.queue);
+    return Utils.$$Array.isEmpty(fetchState.buffer);
   } else {
     return false;
   }
 }
 
-function hasBatchItem(fetchState) {
-  var item = Utils.$$Array.last(fetchState.queue);
+function hasFullBatch(fetchState, batchSizeTarget) {
+  var item = Belt_Array.get(fetchState.buffer, batchSizeTarget - 1 | 0);
   if (item === undefined) {
     return false;
   }
@@ -1023,23 +994,10 @@ function hasBatchItem(fetchState) {
         );
 }
 
-function hasFullBatch(fetchState, maxBatchSize) {
-  var queue = fetchState.queue;
-  var targetBlockIdx = queue.length - maxBatchSize | 0;
-  if (targetBlockIdx < 0) {
-    return false;
-  }
-  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
-  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
-  return queue[targetBlockIdx].blockNumber <= (
-          latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
-        );
-}
-
-function filterAndSortForUnorderedBatch(fetchStates, maxBatchSize) {
-  return Belt_Array.keepU(fetchStates, hasBatchItem).sort(function (a, b) {
-              var match = hasFullBatch(a, maxBatchSize);
-              var match$1 = hasFullBatch(b, maxBatchSize);
+function filterAndSortForUnorderedBatch(fetchStates, batchSizeTarget) {
+  return Belt_Array.keepU(fetchStates, hasReadyItem).sort(function (a, b) {
+              var match = hasFullBatch(a, batchSizeTarget);
+              var match$1 = hasFullBatch(b, batchSizeTarget);
               if (match) {
                 if (!match$1) {
                   return -1;
@@ -1048,8 +1006,8 @@ function filterAndSortForUnorderedBatch(fetchStates, maxBatchSize) {
               } else if (match$1) {
                 return 1;
               }
-              var match$2 = Utils.$$Array.lastUnsafe(a.queue);
-              var match$3 = Utils.$$Array.lastUnsafe(b.queue);
+              var match$2 = a.buffer[0];
+              var match$3 = b.buffer[0];
               if (match$2.kind === 0 && match$3.kind === 0) {
                 return match$2.timestamp - match$3.timestamp | 0;
               } else {
@@ -1062,7 +1020,7 @@ 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);
+  var item = Belt_Array.get(fetchState.buffer, 0);
   if (item !== undefined && bufferBlockNumber >= item.blockNumber) {
     return item.blockNumber - 1 | 0;
   } else {
@@ -1070,28 +1028,8 @@ function getProgressBlockNumber(fetchState) {
   }
 }
 
-function getProgressNextBlockLogIndex(fetchState) {
-  var match = Utils.$$Array.last(fetchState.queue);
-  if (match === undefined) {
-    return ;
-  }
-  if (match.kind !== 0) {
-    return ;
-  }
-  var logIndex = match.logIndex;
-  var latestOnBlockBlockNumber = fetchState.latestOnBlockBlockNumber;
-  var latestFullyFetchedBlock = fetchState.latestFullyFetchedBlock;
-  if ((
-      latestOnBlockBlockNumber < latestFullyFetchedBlock.blockNumber ? latestOnBlockBlockNumber : latestFullyFetchedBlock.blockNumber
-    ) >= match.blockNumber && logIndex > 0) {
-    return logIndex - 1 | 0;
-  }
-  
-}
-
 var blockItemLogIndex = 16777216;
 
-exports.copy = copy;
 exports.mergeIntoPartition = mergeIntoPartition;
 exports.bufferBlockNumber = bufferBlockNumber;
 exports.bufferBlock = bufferBlock;
@@ -1110,8 +1048,9 @@ exports.addressesByContractNameCount = addressesByContractNameCount;
 exports.addressesByContractNameGetAll = addressesByContractNameGetAll;
 exports.isFullPartition = isFullPartition;
 exports.getNextQuery = getNextQuery;
-exports.makeNoItem = makeNoItem;
-exports.getEarliestEvent = getEarliestEvent;
+exports.getTimestampAt = getTimestampAt;
+exports.hasReadyItem = hasReadyItem;
+exports.getReadyItemsCount = getReadyItemsCount;
 exports.make = make;
 exports.bufferSize = bufferSize;
 exports.pruneQueueFromFirstChangeEvent = pruneQueueFromFirstChangeEvent;
@@ -1121,5 +1060,4 @@ exports.isActivelyIndexing = isActivelyIndexing;
 exports.isReadyToEnterReorgThreshold = isReadyToEnterReorgThreshold;
 exports.filterAndSortForUnorderedBatch = filterAndSortForUnorderedBatch;
 exports.getProgressBlockNumber = getProgressBlockNumber;
-exports.getProgressNextBlockLogIndex = getProgressNextBlockLogIndex;
 /* Utils Not a pure module */