Increase MINIMUM_RECOVERY_WINDOW

zkemail · May 31, 2024 · 373fef1 · 373fef1
1 parent 59ee198
commit 373fef1
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 4 deletions.
diff --git a/src/ZkEmailRecovery.sol b/src/ZkEmailRecovery.sol
@@ -66,7 +66,7 @@ contract ZkEmailRecovery is EmailAccountRecovery, IZkEmailRecovery {
      * Minimum required time window between when a recovery attempt becomes valid and when it
      * becomes invalid
      */
-    uint256 public constant MINIMUM_RECOVERY_WINDOW = 1 days;
+    uint256 public constant MINIMUM_RECOVERY_WINDOW = 2 days;
 
     /**
      * Account address to recovery config

diff --git a/test/unit/ZkEmailRecovery/updateRecoveryConfig.t.sol b/test/unit/ZkEmailRecovery/updateRecoveryConfig.t.sol
@@ -81,8 +81,26 @@ contract ZkEmailRecovery_updateRecoveryConfig_Test is UnitBase {
     }
 
     function test_UpdateRecoveryConfig_RevertWhen_RecoveryWindowTooShort() public {
-        uint256 newDelay = 1 hours;
-        uint256 newExpiry = 24 hours;
+        uint256 newDelay = 1 days;
+        uint256 newExpiry = 2 days;
+
+        IZkEmailRecovery.RecoveryConfig memory recoveryConfig =
+            IZkEmailRecovery.RecoveryConfig(recoveryModuleAddress, newDelay, newExpiry);
+
+        vm.startPrank(accountAddress);
+        zkEmailRecovery.configureRecovery(
+            recoveryModuleAddress, guardians, guardianWeights, threshold, delay, expiry
+        );
+        vm.stopPrank();
+
+        vm.startPrank(accountAddress);
+        vm.expectRevert(IZkEmailRecovery.RecoveryWindowTooShort.selector);
+        zkEmailRecovery.updateRecoveryConfig(recoveryConfig);
+    }
+
+    function test_UpdateRecoveryConfig_RevertWhen_RecoveryWindowTooShortByOneSecond() public {
+        uint256 newDelay = 1 seconds;
+        uint256 newExpiry = 2 days;
 
         IZkEmailRecovery.RecoveryConfig memory recoveryConfig =
             IZkEmailRecovery.RecoveryConfig(recoveryModuleAddress, newDelay, newExpiry);
@@ -98,7 +116,32 @@ contract ZkEmailRecovery_updateRecoveryConfig_Test is UnitBase {
         zkEmailRecovery.updateRecoveryConfig(recoveryConfig);
     }
 
-    function test_UpdateRecoveryConfig_UpdateRecoveryConfig_Succeeds() public {
+    function test_UpdateRecoveryConfig_SucceedsWhenRecoveryWindowEqualsMinimumRecoveryWindow()
+        public
+    {
+        address newRecoveryModule = address(1);
+        uint256 newDelay = 0 seconds;
+        uint256 newExpiry = 2 days;
+
+        IZkEmailRecovery.RecoveryConfig memory recoveryConfig =
+            IZkEmailRecovery.RecoveryConfig(newRecoveryModule, newDelay, newExpiry);
+
+        vm.startPrank(accountAddress);
+        zkEmailRecovery.configureRecovery(
+            recoveryModuleAddress, guardians, guardianWeights, threshold, delay, expiry
+        );
+        vm.stopPrank();
+
+        vm.startPrank(accountAddress);
+        zkEmailRecovery.updateRecoveryConfig(recoveryConfig);
+
+        recoveryConfig = zkEmailRecovery.getRecoveryConfig(accountAddress);
+        assertEq(recoveryConfig.recoveryModule, newRecoveryModule);
+        assertEq(recoveryConfig.delay, newDelay);
+        assertEq(recoveryConfig.expiry, newExpiry);
+    }
+
+    function test_UpdateRecoveryConfig_Succeeds() public {
         address newRecoveryModule = address(1);
         uint256 newDelay = 1 days;
         uint256 newExpiry = 4 weeks;