Exclude end time of permission to remove additional period (#73)

* Rebase * Add test for revert on time equals permission end
coinbase · Oct 15, 2024 · 14d9bab · 14d9bab
1 parent 37021cd
commit 14d9bab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/SpendPermissionManager.sol b/src/SpendPermissionManager.sol
@@ -228,7 +228,7 @@ contract SpendPermissionManager is EIP712 {
         uint48 currentTimestamp = uint48(block.timestamp);
         if (currentTimestamp < spendPermission.start) {
             revert BeforeSpendPermissionStart(spendPermission.start);
-        } else if (currentTimestamp > spendPermission.end) {
+        } else if (currentTimestamp >= spendPermission.end) {
             revert AfterSpendPermissionEnd(spendPermission.end);
         }
 

diff --git a/test/src/SpendPermissions/getCurrentPeriod.t.sol b/test/src/SpendPermissions/getCurrentPeriod.t.sol
@@ -5,7 +5,7 @@ import {SpendPermissionManager} from "../../../src/SpendPermissionManager.sol";
 
 import {SpendPermissionManagerBase} from "../../base/SpendPermissionManagerBase.sol";
 
-contract GetCurrentCycleTest is SpendPermissionManagerBase {
+contract GetCurrentPeriodTest is SpendPermissionManagerBase {
     function setUp() public {
         _initializeSpendPermissionManager();
     }
@@ -20,6 +20,17 @@ contract GetCurrentCycleTest is SpendPermissionManagerBase {
         mockSpendPermissionManager.getCurrentPeriod(spendPermission);
     }
 
+    function test_getCurrentPeriod_revert_equalSpendPermissionEnd(uint48 end) public {
+        vm.assume(end > 0);
+        vm.assume(end < type(uint48).max);
+
+        SpendPermissionManager.SpendPermission memory spendPermission = _createSpendPermission();
+        spendPermission.end = end;
+        vm.warp(end);
+        vm.expectRevert(abi.encodeWithSelector(SpendPermissionManager.AfterSpendPermissionEnd.selector, end));
+        mockSpendPermissionManager.getCurrentPeriod(spendPermission);
+    }
+
     function test_getCurrentPeriod_revert_afterSpendPermissionEnd(uint48 end) public {
         vm.assume(end > 0);
         vm.assume(end < type(uint48).max);
@@ -183,6 +194,7 @@ contract GetCurrentCycleTest is SpendPermissionManagerBase {
     ) public {
         vm.assume(start > 0);
         vm.assume(period > 0);
+        vm.assume(start < type(uint48).max);
         vm.assume(uint256(start) + uint256(period) > type(uint48).max); // force overflow
         vm.assume(allowance > 0);