Check recovery is configured in completeRecovery

zkemail · Jun 18, 2024 · 56f5f2f · 56f5f2f
1 parent 38d3e3c
commit 56f5f2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/EmailRecoveryManager.sol b/src/EmailRecoveryManager.sol
@@ -404,6 +404,10 @@ contract EmailRecoveryManager is EmailAccountRecoveryNew, Initializable, IEmailR
         RecoveryRequest memory recoveryRequest = recoveryRequests[account];
 
         uint256 threshold = guardianConfigs[account].threshold;
+        if (threshold == 0) {
+            revert NoRecoveryConfigured();
+        }
+
         if (recoveryRequest.currentWeight < threshold) {
             revert NotEnoughApprovals();
         }

diff --git a/src/interfaces/IEmailRecoveryManager.sol b/src/interfaces/IEmailRecoveryManager.sol
@@ -74,6 +74,7 @@ interface IEmailRecoveryManager {
         GuardianStatus guardianStatus, GuardianStatus expectedGuardianStatus
     );
     error InvalidAccountAddress();
+    error NoRecoveryConfigured();
     error NotEnoughApprovals();
     error DelayNotPassed();
     error RecoveryRequestExpired();

diff --git a/test/integration/EmailRecoveryManager/EmailRecoveryManager.integration.t.sol b/test/integration/EmailRecoveryManager/EmailRecoveryManager.integration.t.sol
@@ -159,7 +159,7 @@ contract EmailRecoveryManager_Integration_Test is OwnableValidatorRecoveryBase {
         instance.uninstallModule(MODULE_TYPE_EXECUTOR, recoveryModuleAddress, "");
         vm.stopPrank();
 
-        // vm.expectRevert(IEmailRecoveryManager.InvalidAccountAddress.selector);
+        vm.expectRevert(IEmailRecoveryManager.NoRecoveryConfigured.selector);
         emailRecoveryManager.completeRecovery(accountAddress, recoveryCalldata);
     }