envio 3.6.1 → 3.7.0

package/src/FetchState.res.mjs

@@ -134,8 +134,8 @@ function getOrThrow(optimizedPartitions, partitionId) {
 
 function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAddrInPartition, nextPartitionIndexRef) {
   let combinedAddresses = p1.addresses.merge(p2.addresses);
-  let p1Below = p1.latestFetchedBlock.blockNumber < potentialMergeBlock;
-  let p2Below = p2.latestFetchedBlock.blockNumber < potentialMergeBlock;
+  let p1Below = p1.latestFetchedBlock < potentialMergeBlock;
+  let p2Below = p2.latestFetchedBlock < potentialMergeBlock;
   let completed = [];
   let continuingBase;
   if (p1Below) {
@@ -181,10 +181,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
         );
       continuingBase = {
         id: newId,
-        latestFetchedBlock: {
-          blockNumber: potentialMergeBlock,
-          blockTimestamp: 0
-        },
+        latestFetchedBlock: potentialMergeBlock,
         selection: p1.selection,
         addresses: p1.addresses,
         mergeBlock: undefined,
@@ -254,7 +251,7 @@ function mergePartitionsAtBlock(p1, p2, potentialMergeBlock, contractName, maxAd
 }
 
 function ascSortFn(a, b) {
-  return Primitive_int.compare(a.latestFetchedBlock.blockNumber, b.latestFetchedBlock.blockNumber);
+  return Primitive_int.compare(a.latestFetchedBlock, b.latestFetchedBlock);
 }
 
 function anchoredContracts(partitions) {
@@ -276,7 +273,7 @@ function anchoredContracts(partitions) {
 
 function getAnchorSafeBlock(p) {
   let safeRef = {
-    contents: p.latestFetchedBlock.blockNumber
+    contents: p.latestFetchedBlock
   };
   p.mutPendingQueries.forEach(pq => {
     let match = safeRef.contents;
@@ -284,23 +281,23 @@ function getAnchorSafeBlock(p) {
       return;
     }
     let toBlock = pq.toBlock;
-    let match$1 = pq.fetchedBlock;
-    if (match$1 === undefined) {
-      if (toBlock !== undefined) {
-        if (toBlock > match) {
-          safeRef.contents = toBlock;
-          return;
-        } else {
-          return;
-        }
+    let blockNumber = pq.fetchedBlock;
+    if (blockNumber !== undefined) {
+      if (blockNumber > match) {
+        safeRef.contents = blockNumber;
+        return;
       } else {
-        safeRef.contents = undefined;
         return;
       }
-    }
-    let blockNumber = match$1.blockNumber;
-    if (blockNumber > match) {
-      safeRef.contents = blockNumber;
+    } else if (toBlock !== undefined) {
+      if (toBlock > match) {
+        safeRef.contents = toBlock;
+        return;
+      } else {
+        return;
+      }
+    } else {
+      safeRef.contents = undefined;
       return;
     }
   });
@@ -339,7 +336,7 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
     let p = partitions[idx];
     let mergeBlock = p.mergeBlock;
     if (mergeBlock !== undefined) {
-      if (p.latestFetchedBlock.blockNumber < mergeBlock || isFetching(p)) {
+      if (p.latestFetchedBlock < mergeBlock || isFetching(p)) {
         newPartitions.push(p);
       }
     } else if (p.dynamicContract !== undefined && p.selection.dependsOnAddresses) {
@@ -351,7 +348,7 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
         let toBlock = match.toBlock;
         potentialMergeBlock = toBlock !== undefined && match.isChunk ? toBlock : undefined;
       } else {
-        potentialMergeBlock = p.latestFetchedBlock.blockNumber;
+        potentialMergeBlock = p.latestFetchedBlock;
       }
       if (potentialMergeBlock !== undefined && pAddressesCount < maxAddrInPartition) {
         let partitionsByMergeBlock = Utils.Dict.getOrInsertEmptyDict(mergingPartitions, contractName);
@@ -421,7 +418,7 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
         if (anchoredContractsSet.has(contractName)) {
           let anchorSafeBlock = anchorSafeBlocks[contractName];
           if (anchorSafeBlock !== undefined) {
-            if (p.latestFetchedBlock.blockNumber < anchorSafeBlock) {
+            if (p.latestFetchedBlock < anchorSafeBlock) {
               anchored.push({
                 id: p.id,
                 latestFetchedBlock: p.latestFetchedBlock,
@@ -442,7 +439,7 @@ function make(partitions, maxAddrInPartition, nextPartitionIndex, dynamicContrac
                 latestFetchedBlock: p.latestFetchedBlock,
                 selection: p.selection,
                 addresses: p.addresses,
-                mergeBlock: p.latestFetchedBlock.blockNumber,
+                mergeBlock: p.latestFetchedBlock,
                 dynamicContract: p.dynamicContract,
                 mutPendingQueries: p.mutPendingQueries,
                 sourceRangeCapacity: p.sourceRangeCapacity,
@@ -493,7 +490,7 @@ function consumeFetchedQueries(mutPendingQueries, initialLatestFetchedBlock) {
     let match = mutPendingQueries[consumedCount];
     if (match !== undefined) {
       let fetchedBlock = match.fetchedBlock;
-      if (fetchedBlock !== undefined && match.fromBlock <= (latestFetchedBlock.blockNumber + 1 | 0)) {
+      if (fetchedBlock !== undefined && match.fromBlock <= (latestFetchedBlock + 1 | 0)) {
         latestFetchedBlock = fetchedBlock;
         consumedCount = consumedCount + 1 | 0;
       } else {
@@ -531,16 +528,16 @@ function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHei
   let mutEntities = Utils.Dict.shallowCopy(optimizedPartitions.entities);
   let pendingQuery = getPendingQueryOrThrow(p, query.fromBlock);
   pendingQuery.fetchedBlock = latestFetchedBlock;
-  let blockRange = (latestFetchedBlock.blockNumber - query.fromBlock | 0) + 1 | 0;
+  let blockRange = (latestFetchedBlock - query.fromBlock | 0) + 1 | 0;
   let observedEventDensity = itemsCount / blockRange;
   let eventDensity = p.eventDensity;
   let updatedEventDensity = eventDensity !== undefined ? (eventDensity + observedEventDensity) / 2 : observedEventDensity;
   let shouldUpdateSourceRangeCapacity = false;
-  if (latestFetchedBlock.blockNumber > p.latestSourceRangeCapacityUpdateBlock) {
+  if (latestFetchedBlock > p.latestSourceRangeCapacityUpdateBlock) {
     let queryToBlock = query.toBlock;
     let tmp;
     if (queryToBlock !== undefined) {
-      if (latestFetchedBlock.blockNumber < queryToBlock) {
+      if (latestFetchedBlock < queryToBlock) {
         let itemsTarget = query.itemsTarget;
         tmp = itemsTarget !== undefined ? itemsCount < itemsTarget : true;
       } else {
@@ -548,7 +545,7 @@ function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHei
         tmp = minHistoryRange !== undefined ? ((queryToBlock - query.fromBlock | 0) + 1 | 0) >= minHistoryRange : false;
       }
     } else {
-      tmp = latestFetchedBlock.blockNumber < (knownHeight - 10 | 0);
+      tmp = latestFetchedBlock < (knownHeight - 10 | 0);
     }
     shouldUpdateSourceRangeCapacity = tmp;
   }
@@ -562,7 +559,7 @@ function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHei
     let match = mutPendingQueries[consumedCount];
     if (match !== undefined) {
       let fetchedBlock = match.fetchedBlock;
-      if (fetchedBlock !== undefined && match.fromBlock <= (latestFetchedBlock$1.blockNumber + 1 | 0)) {
+      if (fetchedBlock !== undefined && match.fromBlock <= (latestFetchedBlock$1 + 1 | 0)) {
         latestFetchedBlock$1 = fetchedBlock;
         consumedCount = consumedCount + 1 | 0;
       } else {
@@ -578,7 +575,7 @@ function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHei
   let updatedLatestFetchedBlock = latestFetchedBlock$1;
   let mergeBlock = p.mergeBlock;
   let partitionReachedMergeBlock = (
-    mergeBlock !== undefined ? updatedLatestFetchedBlock.blockNumber >= mergeBlock : false
+    mergeBlock !== undefined ? updatedLatestFetchedBlock >= mergeBlock : false
   ) && !isFetching(p);
   if (partitionReachedMergeBlock) {
     Utils.Dict.deleteInPlace(mutEntities, p.id);
@@ -590,7 +587,7 @@ function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHei
   let updatedMainPartition_mergeBlock = p.mergeBlock;
   let updatedMainPartition_dynamicContract = p.dynamicContract;
   let updatedMainPartition_mutPendingQueries = p.mutPendingQueries;
-  let updatedMainPartition_latestSourceRangeCapacityUpdateBlock = shouldUpdateSourceRangeCapacity ? latestFetchedBlock.blockNumber : p.latestSourceRangeCapacityUpdateBlock;
+  let updatedMainPartition_latestSourceRangeCapacityUpdateBlock = shouldUpdateSourceRangeCapacity ? latestFetchedBlock : p.latestSourceRangeCapacityUpdateBlock;
   let updatedMainPartition = {
     id: updatedMainPartition_id,
     latestFetchedBlock: updatedLatestFetchedBlock,
@@ -613,7 +610,7 @@ function handleQueryResponseForPartition(optimizedPartitions, p, query, knownHei
   let idx = ids.indexOf(p.id);
   let isAfter = jdx => {
     if (jdx < count) {
-      return mutEntities[ids[jdx]].latestFetchedBlock.blockNumber < updatedLatestFetchedBlock.blockNumber;
+      return mutEntities[ids[jdx]].latestFetchedBlock < updatedLatestFetchedBlock;
     } else {
       return false;
     }
@@ -679,8 +676,8 @@ function bufferBlockNumber(param) {
   let optimizedPartitions = param.optimizedPartitions;
   let id = optimizedPartitions.idsInAscOrder[0];
   let latestFullyFetchedBlock = id !== undefined ? optimizedPartitions.entities[id].latestFetchedBlock : undefined;
-  if (latestFullyFetchedBlock !== undefined && latestOnBlockBlockNumber >= latestFullyFetchedBlock.blockNumber) {
-    return latestFullyFetchedBlock.blockNumber;
+  if (latestFullyFetchedBlock !== undefined && latestOnBlockBlockNumber >= latestFullyFetchedBlock) {
+    return latestFullyFetchedBlock;
   } else {
     return latestOnBlockBlockNumber;
   }
@@ -691,13 +688,10 @@ function bufferBlock(param) {
   let optimizedPartitions = param.optimizedPartitions;
   let id = optimizedPartitions.idsInAscOrder[0];
   let latestFullyFetchedBlock = id !== undefined ? optimizedPartitions.entities[id].latestFetchedBlock : undefined;
-  if (latestFullyFetchedBlock !== undefined && latestOnBlockBlockNumber >= latestFullyFetchedBlock.blockNumber) {
+  if (latestFullyFetchedBlock !== undefined && latestOnBlockBlockNumber >= latestFullyFetchedBlock) {
     return latestFullyFetchedBlock;
   } else {
-    return {
-      blockNumber: latestOnBlockBlockNumber,
-      blockTimestamp: 0
-    };
+    return latestOnBlockBlockNumber;
   }
 }
 
@@ -725,6 +719,50 @@ function getRegistrationIndex(item) {
   }
 }
 
+function comparePath(a, b) {
+  let la = a.length;
+  let lb = b.length;
+  let shared = la < lb ? la : lb;
+  let i = 0;
+  let result = 0;
+  while (result === 0 && i < shared) {
+    let x = a[i];
+    let y = b[i];
+    if (x !== y) {
+      result = x < y ? -1 : 1;
+    }
+    i = i + 1 | 0;
+  };
+  if (result !== 0) {
+    return result;
+  } else if (la === lb) {
+    return 0;
+  } else if (la < lb) {
+    return -1;
+  } else {
+    return 1;
+  }
+}
+
+function compareTiebreak(a, b) {
+  let match = a.orderPath;
+  let match$1 = b.orderPath;
+  let byPath;
+  byPath = (match == null) || (match$1 == null) ? 0 : comparePath(match, match$1);
+  if (byPath !== 0) {
+    return byPath;
+  }
+  let ia = getRegistrationIndex(a);
+  let ib = getRegistrationIndex(b);
+  if (ia < ib) {
+    return -1;
+  } else if (ia > ib) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
 function compareBufferItem(a, b) {
   let ba = a.blockNumber;
   let bb = b.blockNumber;
@@ -735,6 +773,15 @@ function compareBufferItem(a, b) {
       return 1;
     }
   }
+  let ka = a.kind;
+  let kb = b.kind;
+  if (ka !== kb) {
+    if (ka < kb) {
+      return -1;
+    } else {
+      return 1;
+    }
+  }
   let la = a.logIndex;
   let lb = b.logIndex;
   if (la !== lb) {
@@ -743,15 +790,8 @@ function compareBufferItem(a, b) {
     } else {
       return 1;
     }
-  }
-  let ia = getRegistrationIndex(a);
-  let ib = getRegistrationIndex(b);
-  if (ia < ib) {
-    return -1;
-  } else if (ia > ib) {
-    return 1;
   } else {
-    return 0;
+    return compareTiebreak(a, b);
   }
 }
 
@@ -822,8 +862,7 @@ function appendOnBlockItems(mutItems, onBlockRegistrations, indexerStartBlock, f
         mutItems.push({
           kind: 1,
           onBlockRegistration: onBlockRegistration,
-          blockNumber: blockNumber,
-          logIndex: 16777216 + onBlockRegistration.index | 0
+          blockNumber: blockNumber
         });
         newItemsCounter = newItemsCounter + 1 | 0;
       }
@@ -851,7 +890,7 @@ function updateInternal(fetchState, optimizedPartitionsOpt, mutItems, mutItemsSo
     } else {
       let id = optimizedPartitions.idsInAscOrder[0];
       let latestFullyFetchedBlock = id !== undefined ? optimizedPartitions.entities[id].latestFetchedBlock : undefined;
-      maxBlockNumber = latestFullyFetchedBlock !== undefined ? latestFullyFetchedBlock.blockNumber : knownHeight;
+      maxBlockNumber = latestFullyFetchedBlock !== undefined ? latestFullyFetchedBlock : knownHeight;
     }
     latestOnBlockBlockNumber = appendOnBlockItems(blockItems, onBlockRegistrations, fetchState.startBlock, fetchState.latestOnBlockBlockNumber, maxBlockNumber, fetchState.maxOnBlockBufferSize);
   } else {
@@ -888,9 +927,9 @@ function addClientFilteredContract(clientFilteredContracts, contractName, chainI
 }
 
 function claimedFetchedBlock(p, knownHeight) {
-  return Stdlib_Array.reduce(p.mutPendingQueries, p.latestFetchedBlock.blockNumber, (max, q) => {
-    let match = q.fetchedBlock;
-    return Primitive_int.max(max, match !== undefined ? match.blockNumber : Stdlib_Option.getOr(q.toBlock, knownHeight));
+  return Stdlib_Array.reduce(p.mutPendingQueries, p.latestFetchedBlock, (max, q) => {
+    let blockNumber = q.fetchedBlock;
+    return Primitive_int.max(max, blockNumber !== undefined ? blockNumber : Stdlib_Option.getOr(q.toBlock, knownHeight));
   });
 }
 
@@ -912,7 +951,7 @@ function collapseClientFilteredContracts(partitions, clientFilteredContracts, no
     latestFetchedBlock: p.latestFetchedBlock,
     selection: p.selection,
     addresses: p.addresses,
-    mergeBlock: p.latestFetchedBlock.blockNumber,
+    mergeBlock: p.latestFetchedBlock,
     dynamicContract: p.dynamicContract,
     mutPendingQueries: p.mutPendingQueries,
     sourceRangeCapacity: p.sourceRangeCapacity,
@@ -972,7 +1011,7 @@ function collapseClientFilteredContracts(partitions, clientFilteredContracts, no
   };
   let considerFrontier = b => {
     let m = minFrontierRef.contents;
-    if (m !== undefined && m.blockNumber <= b.blockNumber) {
+    if (m !== undefined && m <= b) {
       return;
     } else {
       minFrontierRef.contents = b;
@@ -1028,7 +1067,7 @@ function collapseClientFilteredContracts(partitions, clientFilteredContracts, no
     kept.push(standingOut);
     let catchUpToBlock = claimedFetchedBlock(standingOut, knownHeight);
     let minFrontier = minFrontierRef.contents;
-    if (minFrontier !== undefined && minFrontier.blockNumber < catchUpToBlock) {
+    if (minFrontier !== undefined && minFrontier < catchUpToBlock) {
       let id$1 = nextPartitionIndexRef.contents.toString();
       nextPartitionIndexRef.contents = nextPartitionIndexRef.contents + 1 | 0;
       kept.push({
@@ -1125,10 +1164,7 @@ function createPartitions(registeringSetsByContract, addressStore, dynamicContra
     if (clientFilteredContracts.has(contractName) && !isAnchored) {
       let match = groups[0];
       if (match !== undefined) {
-        clientFilteredFrontiers.push({
-          blockNumber: Primitive_int.max(match.startBlock - 1 | 0, progressBlockNumber),
-          blockTimestamp: 0
-        });
+        clientFilteredFrontiers.push(Primitive_int.max(match.startBlock - 1 | 0, progressBlockNumber));
       }
     } else {
       let offsetRef = 0;
@@ -1147,11 +1183,7 @@ function createPartitions(registeringSetsByContract, addressStore, dynamicContra
             joining = false;
           }
         };
-        let latestFetchedBlock_blockNumber = Primitive_int.max(startBlock - 1 | 0, progressBlockNumber);
-        let latestFetchedBlock = {
-          blockNumber: latestFetchedBlock_blockNumber,
-          blockTimestamp: 0
-        };
+        let latestFetchedBlock = Primitive_int.max(startBlock - 1 | 0, progressBlockNumber);
         let remainingRef = countRef;
         let chunkOffsetRef = offsetRef;
         while (remainingRef > 0) {
@@ -1187,8 +1219,8 @@ function createPartitions(registeringSetsByContract, addressStore, dynamicContra
     while (nextIdx$1 < nonDynamicPartitions.length) {
       let nextP = nonDynamicPartitions[nextIdx$1];
       let currentP = currentPRef;
-      let currentPBlock = currentP.latestFetchedBlock.blockNumber;
-      let nextPBlock = nextP.latestFetchedBlock.blockNumber;
+      let currentPBlock = currentP.latestFetchedBlock;
+      let nextPBlock = nextP.latestFetchedBlock;
       let totalCount = currentP.addresses.size() + nextP.addresses.size() | 0;
       if (totalCount > maxAddrInPartition) {
         mergedNonDynamic.push(currentP);
@@ -1430,7 +1462,7 @@ function pushGapFillQueries(queries, partitionId, rangeFromBlock, rangeEndBlock,
 function walkPartitionPending(p, partitionId, inFlightCount, candidates, headBlockNumber, chainTargetBlock, partitionBudget, queryEndBlock) {
   let maybeChunkRange = getMinHistoryRange(p);
   let pendingCount = p.mutPendingQueries.length;
-  let cursor = p.latestFetchedBlock.blockNumber + 1 | 0;
+  let cursor = p.latestFetchedBlock + 1 | 0;
   let canContinue = true;
   let chunksUsedThisCall = 0;
   let pqIdx = 0;
@@ -1443,13 +1475,8 @@ function walkPartitionPending(p, partitionId, inFlightCount, candidates, headBlo
     }
     let toBlock = pq.toBlock;
     if (toBlock !== undefined && pq.isChunk) {
-      let match = pq.fetchedBlock;
-      if (match !== undefined) {
-        let blockNumber = match.blockNumber;
-        cursor = blockNumber < toBlock ? blockNumber + 1 | 0 : toBlock + 1 | 0;
-      } else {
-        cursor = toBlock + 1 | 0;
-      }
+      let blockNumber = pq.fetchedBlock;
+      cursor = blockNumber !== undefined && blockNumber < toBlock ? blockNumber + 1 | 0 : toBlock + 1 | 0;
     } else {
       canContinue = false;
     }
@@ -1609,7 +1636,7 @@ function getNextQuery(param, chainTargetBlock, chainTargetItems) {
       }
     }
     inFlightCounts[idx] = inFlightCount;
-    if (p.mutPendingQueries.length !== 0 || p.latestFetchedBlock.blockNumber < headBlockNumber) {
+    if (p.mutPendingQueries.length !== 0 || p.latestFetchedBlock < headBlockNumber) {
       shouldWaitForNewBlock = false;
     }
   }
@@ -1707,10 +1734,6 @@ function make$1(startBlock, endBlock, onEventRegistrations, addressStore, addres
   let firstEventBlock = firstEventBlockOpt !== undefined ? Primitive_option.valFromOption(firstEventBlockOpt) : undefined;
   let clientFilterAddressThreshold = clientFilterAddressThresholdOpt !== undefined ? Primitive_option.valFromOption(clientFilterAddressThresholdOpt) : undefined;
   let isResumed = isResumedOpt !== undefined ? isResumedOpt : false;
-  let latestFetchedBlock = {
-    blockNumber: progressBlockNumber,
-    blockTimestamp: 0
-  };
   let notDependingOnAddresses = [];
   let normalRegistrations = [];
   let contractNamesWithNormalEvents = new Set();
@@ -1726,7 +1749,7 @@ function make$1(startBlock, endBlock, onEventRegistrations, addressStore, addres
   if (notDependingOnAddresses.length !== 0) {
     partitions.push({
       id: partitions.length.toString(),
-      latestFetchedBlock: latestFetchedBlock,
+      latestFetchedBlock: progressBlockNumber,
       selection: makeSelection(notDependingOnAddresses, false, undefined),
       addresses: addressStore.emptySet(),
       mergeBlock: undefined,
@@ -1781,7 +1804,7 @@ function make$1(startBlock, endBlock, onEventRegistrations, addressStore, addres
   if (knownHeight > 0 && Utils.$$Array.notEmpty(onBlockRegistrations)) {
     let id = optimizedPartitions.idsInAscOrder[0];
     let latestFullyFetchedBlock = id !== undefined ? optimizedPartitions.entities[id].latestFetchedBlock : undefined;
-    let maxBlockNumber = latestFullyFetchedBlock !== undefined ? latestFullyFetchedBlock.blockNumber : knownHeight;
+    let maxBlockNumber = latestFullyFetchedBlock !== undefined ? latestFullyFetchedBlock : knownHeight;
     latestOnBlockBlockNumber = appendOnBlockItems(buffer, onBlockRegistrations, startBlock, progressBlockNumber, maxBlockNumber, maxOnBlockBufferSize);
   } else {
     latestOnBlockBlockNumber = progressBlockNumber;
@@ -1816,19 +1839,16 @@ function rollbackPendingQueries(mutPendingQueries, targetBlockNumber) {
   for (let qIdx = 0, qIdx_finish = mutPendingQueries.length; qIdx < qIdx_finish; ++qIdx) {
     let pq = mutPendingQueries[qIdx];
     if (pq.fromBlock <= targetBlockNumber) {
-      let match = pq.fetchedBlock;
-      if (match !== undefined) {
-        if (match.blockNumber > targetBlockNumber) {
+      let blockNumber = pq.fetchedBlock;
+      if (blockNumber !== undefined) {
+        if (blockNumber > targetBlockNumber) {
           adjusted.push({
             fromBlock: pq.fromBlock,
             toBlock: pq.toBlock,
             isChunk: pq.isChunk,
             itemsTarget: pq.itemsTarget,
             itemsEst: pq.itemsEst,
-            fetchedBlock: {
-              blockNumber: targetBlockNumber,
-              blockTimestamp: 0
-            }
+            fetchedBlock: targetBlockNumber
           });
         } else {
           adjusted.push(pq);
@@ -1857,7 +1877,7 @@ function rollback(fetchState, addressStore, targetBlockNumber) {
   for (let idx = 0, idx_finish = partitions.length; idx < idx_finish; ++idx) {
     let p = partitions[idx];
     if (p.selection.dependsOnAddresses) {
-      if (p.latestFetchedBlock.blockNumber > targetBlockNumber) {
+      if (p.latestFetchedBlock > targetBlockNumber) {
         collectForRecreation(p.addresses.filterByRegistrationBlock(targetBlockNumber));
       } else {
         let mergeBlock = p.mergeBlock;
@@ -1888,10 +1908,7 @@ function rollback(fetchState, addressStore, targetBlockNumber) {
       let mergeBlock$2 = p.mergeBlock;
       keptPartitions.push({
         id: id$1,
-        latestFetchedBlock: p.latestFetchedBlock.blockNumber > targetBlockNumber ? ({
-            blockNumber: targetBlockNumber,
-            blockTimestamp: 0
-          }) : p.latestFetchedBlock,
+        latestFetchedBlock: p.latestFetchedBlock > targetBlockNumber ? targetBlockNumber : p.latestFetchedBlock,
         selection: p.selection,
         addresses: p.addresses,
         mergeBlock: mergeBlock$2 !== undefined && mergeBlock$2 > targetBlockNumber ? targetBlockNumber : mergeBlock$2,
@@ -2082,8 +2099,6 @@ function updateKnownHeight(fetchState, knownHeight) {
   }
 }
 
-let blockItemLogIndex = 16777216;
-
 let maxInFlightChunksPerPartition = 12;
 
 let maxChainConcurrency = Env.maxChainConcurrency;
@@ -2105,9 +2120,10 @@ export {
   bufferBlock,
   bufferReadyCount,
   getRegistrationIndex,
+  comparePath,
+  compareTiebreak,
   compareBufferItem,
   mergeIntoBuffer,
-  blockItemLogIndex,
   appendOnBlockItems,
   updateInternal,
   addClientFilteredContract,