make required changes

Author: parzival1821

.gitignore

@@ -1,4 +1,5 @@
 # VIM
 *.swp
-foundry.lock
-my-changes.txt
+
+# Foundry
+foundry.lock

service_contracts/.gitignore

@@ -13,5 +13,4 @@ package-lock.json
 foundry.lock
 
 # Ignore IDEs
-.idea
-new_changes.txt
+.idea

service_contracts/src/FilecoinWarmStorageService.sol

@@ -1498,7 +1498,7 @@ contract FilecoinWarmStorageService is
         if (toEpoch >= activationEpoch && toEpoch < block.number) {
             // if `toEpoch` lies after activation, and `fromEpoch` lies before activation, then update the `fromEpoch`, as follows :
             if (fromEpoch < activationEpoch - 1) {
-                fromEpoch = activationEpoch - 1; 
+                fromEpoch = activationEpoch - 1;
             }
 
             uint256 startingPeriod = getProvingPeriodForEpoch(dataSetId, fromEpoch + 1);
@@ -1507,11 +1507,10 @@ contract FilecoinWarmStorageService is
             // lets handle first period separately
             uint256 startingPeriod_deadline = _calcPeriodDeadline(dataSetId, startingPeriod);
 
-
             if (toEpoch < startingPeriod_deadline) {
                 // alternative way to check the same : `startingPeriod == endingPeriod`
                 if (_isPeriodProven(dataSetId, startingPeriod, currentPeriod)) {
-                    provenEpochCount = (toEpoch - fromEpoch); // epochs : (`from + 1` -> `to`)  (both inclusive) 
+                    provenEpochCount = (toEpoch - fromEpoch); // epochs : (`from + 1` -> `to`)  (both inclusive)
                     lastProvenEpoch = toEpoch;
                 }
             } else {
@@ -1530,7 +1529,7 @@ contract FilecoinWarmStorageService is
                 // now handle the last period separately
                 if (_isPeriodProven(dataSetId, endingPeriod, currentPeriod)) {
                     // then the epochs to add = `endingPeriod_starting` to `toEpoch`. But since `endingPeriod_starting` is simply the ending of its previous period + 1, so  epochs : (`deadline + 1` -> `to`)
-                    provenEpochCount += (toEpoch - _calcPeriodDeadline(dataSetId, endingPeriod - 1)); 
+                    provenEpochCount += (toEpoch - _calcPeriodDeadline(dataSetId, endingPeriod - 1));
                     lastProvenEpoch = toEpoch;
                 }
             }

service_contracts/test/FilecoinWarmStorageService.t.sol

@@ -4261,8 +4261,6 @@ contract FilecoinWarmStorageServiceUpgradeTest is Test {
  * @notice Tests for validatePayment function - ensures optimized implementation
  * maintains same behavior as the original loop-based version
  */
-
-
 contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
     /**
      * @notice Test: All epochs proven - should pay full amount
@@ -4273,10 +4271,8 @@ contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
         // Start proving
         (uint64 maxProvingPeriod, uint256 challengeWindow,,) = viewContract.getPDPConfig();
 
-        // Capture activation epoch BEFORE calling nextProvingPeriod 
-
-        // uint256 _activationEpoch = block.number; // using this line is causing the activationEpoch variable to change every time we call vm.roll (some bug maybe) so better to do use the following line : 
-        uint256 _activationEpoch = 1; // because in testing environment, starting block number is 1
+        // Capture activation epoch BEFORE calling nextProvingPeriod
+        uint256 _activationEpoch = vm.getBlockNumber();
         uint256 firstChallengeEpoch = _activationEpoch + maxProvingPeriod - (challengeWindow / 2);
 
         vm.prank(address(mockPDPVerifier));
@@ -4322,7 +4318,7 @@ contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
         uint256 toEpoch = _activationEpoch + (maxProvingPeriod * 3) - 1; // inclusive end, all 3 periods
         uint256 proposedAmount = 1000e6;
 
-        // Move past the periods we're validating, so that toEpoch becomes less than block.number 
+        // Move past the periods we're validating, so that toEpoch becomes less than block.number
         vm.roll(toEpoch + 1);
         vm.prank(address(payments));
         IValidator.ValidationResult memory result =
@@ -4346,7 +4342,7 @@ contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
         vm.prank(address(mockPDPVerifier));
         pdpServiceWithPayments.nextProvingPeriod(dataSetId, challengeEpoch, 100, "");
 
-        uint256 activationEpoch = 1; // same reason as the above test
+        uint256 activationEpoch = vm.getBlockNumber();
 
         // Move forward 3 periods without submitting proofs
         vm.roll(activationEpoch + (maxProvingPeriod * 3));
@@ -4380,7 +4376,7 @@ contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
         vm.prank(address(mockPDPVerifier));
         pdpServiceWithPayments.nextProvingPeriod(dataSetId, firstChallengeEpoch, 100, "");
 
-        uint256 activationEpoch = 1;
+        uint256 activationEpoch = vm.getBlockNumber();
 
         // Submit proof for period 0
         vm.roll(firstChallengeEpoch);
@@ -4465,7 +4461,7 @@ contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
         vm.prank(address(mockPDPVerifier));
         pdpServiceWithPayments.nextProvingPeriod(dataSetId, challengeEpoch, 100, "");
 
-        uint256 activationEpoch = block.number;
+        uint256 activationEpoch = vm.getBlockNumber();
 
         // Try to validate for epochs before activation
         FilecoinWarmStorageService.DataSetInfoView memory info = viewContract.getDataSet(dataSetId);
@@ -4494,7 +4490,7 @@ contract ValidatePaymentTest is FilecoinWarmStorageServiceTest {
         vm.prank(address(mockPDPVerifier));
         pdpServiceWithPayments.nextProvingPeriod(dataSetId, challengeEpoch, 100, "");
 
-        uint256 activationEpoch = 1;
+        uint256 activationEpoch = vm.getBlockNumber();
 
         // Submit proof for period 0
         vm.roll(challengeEpoch);