Merge pull request #1756 from OffchainLabs/legacy-valid-batch-count

Fix an off-by-one when loading legacy validation info
OffchainLabs · Jul 13, 2023 · d92bf38 · d92bf38
2 parents 5523970 + b77f84d
commit d92bf38
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/staker/block_validator.go b/staker/block_validator.go
@@ -984,9 +984,12 @@ func (v *BlockValidator) checkLegacyValid() error {
 		log.Warn("legacy valid batch ahead of db", "current", batchCount, "required", requiredBatchCount)
 		return nil
 	}
-	msgCount, err := v.inboxTracker.GetBatchMessageCount(v.legacyValidInfo.AfterPosition.BatchNumber)
-	if err != nil {
-		return err
+	var msgCount arbutil.MessageIndex
+	if v.legacyValidInfo.AfterPosition.BatchNumber > 0 {
+		msgCount, err = v.inboxTracker.GetBatchMessageCount(v.legacyValidInfo.AfterPosition.BatchNumber - 1)
+		if err != nil {
+			return err
+		}
 	}
 	msgCount += arbutil.MessageIndex(v.legacyValidInfo.AfterPosition.PosInBatch)
 	processedCount, err := v.streamer.GetProcessedMessageCount()