Merge remote-tracking branch 'origin/main' into feat/passthrough-params

FilOzone · Dec 3, 2024 · dd32b04 · dd32b04
2 parents fb85616 + c994801
commit dd32b04
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/SimplePDPService.sol b/src/SimplePDPService.sol
@@ -105,26 +105,40 @@ contract SimplePDPService is PDPListener, PDPRecordKeeper, Initializable, UUPSUp
         return 2880;
     }
 
-    // Number of epochs at the end of a provoing period during which a 
+    // Number of epochs at the end of a proving period during which a
     // proof of possession can be submitted
     function challengeWindow() public pure returns (uint256) {
         return 60;
     }
 
-    // The start of the next challenge window
-    // Useful for querying before nextProvingPeriod to determine challengeEpoch
-    function nextChallengeWindowStart(uint256 setId) public view returns (uint256) {
+    // The start of the challenge window for the current proving period
+    function thisChallengeWindowStart(uint256 setId) public view returns (uint256) {
         if (provingDeadlines[setId] == 0) {
-            revert("Proving period not yet open");
+            revert("Proving not yet started");
         }
+
         uint256 periodsSkipped;
         // Proving period is open 0 skipped periods
         if (block.number <= provingDeadlines[setId]) {
             periodsSkipped = 0;
         } else { // Proving period has closed possibly some skipped periods
-            periodsSkipped = (block.number - (provingDeadlines[setId] + 1)) / getMaxProvingPeriod();
+            periodsSkipped = 1 + (block.number - (provingDeadlines[setId] + 1)) / getMaxProvingPeriod();
+        }
+        return provingDeadlines[setId] + periodsSkipped*getMaxProvingPeriod() - challengeWindow();
+    }
+
+    // The start of the NEXT OPEN proving period's challenge window
+    // Useful for querying before nextProvingPeriod to determine challengeEpoch to submit for nextProvingPeriod
+    function nextChallengeWindowStart(uint256 setId) public view returns (uint256) {
+        if (provingDeadlines[setId] == 0) {
+            revert("Proving not yet started");
+        }
+        // If the current period is open this is the next period's challenge window
+        if (block.number <= provingDeadlines[setId]) {
+            return thisChallengeWindowStart(setId) + getMaxProvingPeriod();
         }
-        return provingDeadlines[setId] + getMaxProvingPeriod()*(periodsSkipped+1) - challengeWindow();
+        // If the current period is not yet open this is the current period's challenge window
+        return thisChallengeWindowStart(setId);
     }
 
     // Challenges / merkle inclusion proofs provided per proof set
@@ -204,7 +218,7 @@ contract SimplePDPService is PDPListener, PDPRecordKeeper, Initializable, UUPSUp
         if (faultPeriods > 0) {
             emit FaultRecord(faultPeriods);
         }
-        provingDeadlines[proofSetId] = nextDeadline; 
+        provingDeadlines[proofSetId] = nextDeadline;
         provenThisPeriod[proofSetId] = false;
     }
 }
diff --git a/test/SimplePDPService.t.sol b/test/SimplePDPService.t.sol
@@ -158,7 +158,7 @@ contract SimplePDPServiceFaultsTest is Test {
         assertFalse(pdpService.provenThisPeriod(proofSetId));
 
         vm.expectRevert("One call to nextProvingPeriod allowed per proving period");
-        pdpService.nextProvingPeriod(proofSetId, challengeEpoch, leafCount, empty); 
+        pdpService.nextProvingPeriod(proofSetId, challengeEpoch, leafCount, empty);
     }
 
     function testFaultWithinOpenPeriod() public {
@@ -277,7 +277,7 @@ contract SimplePDPServiceFaultsTest is Test {
 
     function testMissChallengeWindowAfterFaults() public {
         pdpService.rootsAdded(proofSetId, 0, new PDPVerifier.RootData[](0), empty);
-        
+
         // Skip 2 proving periods
         vm.roll(block.number + pdpService.getMaxProvingPeriod() * 3 - 100);
 
@@ -286,7 +286,7 @@ contract SimplePDPServiceFaultsTest is Test {
         vm.expectRevert("Next challenge epoch must fall within the next challenge window");
         pdpService.nextProvingPeriod(proofSetId, tooEarly, leafCount, empty);
 
-        // Too late 
+        // Too late
         uint256 tooLate = pdpService.nextChallengeWindowStart(proofSetId)+pdpService.challengeWindow()+1;
         vm.expectRevert("Next challenge epoch must fall within the next challenge window");
         pdpService.nextProvingPeriod(proofSetId, tooLate, leafCount, empty);