fix: bug in slot to timestamp conversion (#8839)

fixes issue with autopruning where we weren't converting slot to
timestamp before getting epoch.

Author: just-mitch

l1-contracts/src/core/Rollup.sol

@@ -728,7 +728,7 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
     if (tips.provenBlockNumber == tips.pendingBlockNumber) {
       revert Errors.Rollup__NoEpochToProve();
     } else {
-      return getEpochAt(blocks[getProvenBlockNumber() + 1].slotNumber);
+      return getEpochAt(getTimestampForSlot(blocks[getProvenBlockNumber() + 1].slotNumber));
     }
   }
 
@@ -770,7 +770,8 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
     }
 
     uint256 currentSlot = getCurrentSlot();
-    uint256 oldestPendingEpoch = getEpochAt(blocks[tips.provenBlockNumber + 1].slotNumber);
+    uint256 oldestPendingEpoch =
+      getEpochAt(getTimestampForSlot(blocks[tips.provenBlockNumber + 1].slotNumber));
     uint256 startSlotOfPendingEpoch = oldestPendingEpoch * Constants.AZTEC_EPOCH_DURATION;
 
     // suppose epoch 1 is proven, epoch 2 is pending, epoch 3 is the current epoch.

l1-contracts/test/Rollup.t.sol

@@ -113,7 +113,7 @@ contract RollupTest is DecoderBase {
   }
 
   function testClaimWithWrongEpoch() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
     quote.quote.epochToProve = 1;
 
@@ -126,7 +126,7 @@ contract RollupTest is DecoderBase {
   }
 
   function testClaimWithInsufficientBond() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
     quote.quote.bondAmount = 0;
 
@@ -141,22 +141,18 @@ contract RollupTest is DecoderBase {
   }
 
   function testClaimPastValidUntil() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
     quote.quote.validUntilSlot = 0;
 
-    warpToL2Slot(1);
-
     vm.expectRevert(
       abi.encodeWithSelector(Errors.Rollup__QuoteExpired.selector, 1, quote.quote.validUntilSlot)
     );
     rollup.claimEpochProofRight(quote);
   }
 
   function testClaimSimple() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
-
-    warpToL2Slot(1);
+    _testBlock("mixed_block_1", false, 1);
 
     vm.expectEmit(true, true, true, true);
     emit IRollup.ProofRightClaimed(
@@ -181,9 +177,7 @@ contract RollupTest is DecoderBase {
   }
 
   function testClaimTwice() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
-
-    warpToL2Slot(1);
+    _testBlock("mixed_block_1", false, 1);
 
     rollup.claimEpochProofRight(quote);
 
@@ -208,7 +202,7 @@ contract RollupTest is DecoderBase {
   }
 
   function testClaimOutsideClaimPhase() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
     warpToL2Slot(Constants.AZTEC_EPOCH_DURATION + rollup.CLAIM_DURATION_IN_L2_SLOTS());
 
@@ -223,7 +217,7 @@ contract RollupTest is DecoderBase {
   }
 
   function testNoPruneWhenClaimExists() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
     quote.quote.validUntilSlot = 2 * Constants.AZTEC_EPOCH_DURATION;
 
@@ -238,7 +232,7 @@ contract RollupTest is DecoderBase {
   }
 
   function testPruneWhenClaimExpires() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
     quote.quote.validUntilSlot = 2 * Constants.AZTEC_EPOCH_DURATION;
 
@@ -259,34 +253,36 @@ contract RollupTest is DecoderBase {
   }
 
   function testClaimAfterPrune() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false, 0);
+    _testBlock("mixed_block_1", false, 1);
 
-    quote.quote.validUntilSlot = 2 * Constants.AZTEC_EPOCH_DURATION;
+    quote.quote.validUntilSlot = 3 * Constants.AZTEC_EPOCH_DURATION;
     quote.quote.prover = address(this);
 
     warpToL2Slot(Constants.AZTEC_EPOCH_DURATION + rollup.CLAIM_DURATION_IN_L2_SLOTS() - 1);
 
     rollup.claimEpochProofRight(quote);
 
-    warpToL2Slot(Constants.AZTEC_EPOCH_DURATION * 2);
+    warpToL2Slot(Constants.AZTEC_EPOCH_DURATION * 3);
 
     rollup.prune();
 
-    _testBlock("mixed_block_1", false, Constants.AZTEC_EPOCH_DURATION * 2);
+    _testBlock("mixed_block_1", false, Constants.AZTEC_EPOCH_DURATION * 3);
+
+    quote.quote.epochToProve = 3;
 
     vm.expectEmit(true, true, true, true);
     emit IRollup.ProofRightClaimed(
       quote.quote.epochToProve,
       address(this),
       address(this),
       quote.quote.bondAmount,
-      Constants.AZTEC_EPOCH_DURATION * 2
+      Constants.AZTEC_EPOCH_DURATION * 3
     );
     rollup.claimEpochProofRight(quote);
   }
 
   function testPruneWhenNoProofClaim() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false);
+    _testBlock("mixed_block_1", false, 1);
     warpToL2Slot(Constants.AZTEC_EPOCH_DURATION + rollup.CLAIM_DURATION_IN_L2_SLOTS() - 1);
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__NothingToPrune.selector));
     rollup.prune();
@@ -398,8 +394,26 @@ contract RollupTest is DecoderBase {
     assertNotEq(minHeightEmpty, minHeightMixed, "Invalid min height");
   }
 
+  function testShouldNotBeTooEagerToPrune() public setUpFor("mixed_block_1") {
+    warpToL2Slot(1);
+    _testBlock("mixed_block_1", false, 1);
+    // we prove epoch 0
+    rollup.setAssumeProvenThroughBlockNumber(rollup.getPendingBlockNumber());
+
+    // jump to epoch 1
+    warpToL2Slot(Constants.AZTEC_EPOCH_DURATION);
+    _testBlock("mixed_block_2", false, Constants.AZTEC_EPOCH_DURATION);
+
+    // jump to epoch 2
+    warpToL2Slot(Constants.AZTEC_EPOCH_DURATION * 2);
+
+    vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__NothingToPrune.selector));
+    rollup.prune();
+  }
+
   function testPruneDuringPropose() public setUpFor("mixed_block_1") {
-    _testBlock("mixed_block_1", false);
+    _testBlock("mixed_block_1", false, 1);
+    assertEq(rollup.getEpochToProve(), 0, "Invalid epoch to prove");
     warpToL2Slot(Constants.AZTEC_EPOCH_DURATION * 2);
     _testBlock("mixed_block_1", false, Constants.AZTEC_EPOCH_DURATION * 2);