Add functions which returns the user state is in module enabled or recovery is activated.

package.json

@@ -27,11 +27,11 @@
   "dependencies": {
     "@matterlabs": "github:matter-labs/era-contracts",
     "@openzeppelin/contracts-upgradeable": "v5.0.1",
-    "@rhinestone/modulekit": "github:rhinestonewtf/modulekit#test/safe-latest",
+    "@rhinestone/modulekit": "github:rhinestonewtf/modulekit",
     "@zk-email/contracts": "v6.0.3",
     "email-wallet-sdk": "github:zkemail/email-wallet-sdk",
     "erc7579-implementation": "github:erc7579/erc7579-implementation",
-    "ether-email-auth": "github:zkemail/ether-email-auth",
+    "ether-email-auth": "github:zkemail/ether-email-auth#711c7892c244b210febe9d6f8cc28eddbce5fbdc",
     "solidity-stringutils": "github:Arachnid/solidity-stringutils"
   },
   "files": [

src/EmailRecoveryManager.sol

@@ -103,6 +103,16 @@ abstract contract EmailRecoveryManager is
         return recoveryRequests[account];
     }
 
+    /**
+     * @notice Checks if the recovery is activated for a given account
+     * @param recoveredAccount The address of the recovered account for which the activation status is being checked
+     * @return bool True if the recovery request is activated, false otherwise
+     */     
+    function isActivated(address recoveredAccount) public view override returns (bool) {
+        return guardianConfigs[recoveredAccount].threshold > 0;
+    }
+
+
     /**
      * @notice Returns a two-dimensional array of strings representing the subject templates for an
      * acceptance by a new guardian.

src/interfaces/IEmailRecoveryModule.sol

@@ -2,5 +2,6 @@
 pragma solidity ^0.8.25;
 
 interface IEmailRecoveryModule {
+    function isAuthorizedToBeRecovered(address account) external view returns (bool);
     function canStartRecoveryRequest(address smartAccount) external view returns (bool);
 }

src/interfaces/IUniversalEmailRecoveryModule.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.25;
 
 interface IUniversalEmailRecoveryModule {
+    function isAuthorizedToBeRecovered(address account) external returns (bool);
     function canStartRecoveryRequest(
         address account,
         address validator

src/modules/EmailRecoveryModule.sol

@@ -34,12 +34,17 @@ contract EmailRecoveryModule is EmailRecoveryManager, ERC7579ExecutorBase, IEmai
      */
     bytes4 public immutable selector;
 
+    /**
+     * Mapping of Account address to authorized validator
+     */
+    mapping(address account => bool isAuthorized) internal authorized;
+
     event RecoveryExecuted(address indexed account, address indexed validator);
 
     error InvalidSelector(bytes4 selector);
     error InvalidOnInstallData();
     error InvalidValidator(address validator);
-
+    
     constructor(
         address verifier,
         address dkimRegistry,
@@ -97,7 +102,7 @@ contract EmailRecoveryModule is EmailRecoveryManager, ERC7579ExecutorBase, IEmai
         ) {
             revert InvalidValidator(validator);
         }
-
+        authorized[msg.sender] = true;
         configureRecovery(guardians, weights, threshold, delay, expiry);
     }
 
@@ -106,6 +111,7 @@ contract EmailRecoveryModule is EmailRecoveryManager, ERC7579ExecutorBase, IEmai
      * @dev the data parameter is not used
      */
     function onUninstall(bytes calldata /* data */ ) external {
+        authorized[msg.sender] = false;
         deInitRecoveryModule();
     }
 
@@ -118,6 +124,15 @@ contract EmailRecoveryModule is EmailRecoveryManager, ERC7579ExecutorBase, IEmai
         return getGuardianConfig(account).threshold != 0;
     }
 
+    /**
+     * Check if the recovery module is authorized to recover the account
+     * @param account The smart account to check
+     * @return true if the module is authorized, false otherwise
+     */
+    function isAuthorizedToBeRecovered(address account) external view returns (bool) {
+        return authorized[account];
+    }
+
     /**
      * Check if a recovery request can be initiated based on guardian acceptance
      * @param account The smart account to check

src/modules/UniversalEmailRecoveryModule.sol

@@ -229,6 +229,15 @@ contract UniversalEmailRecoveryModule is
         return getGuardianConfig(account).threshold != 0;
     }
 
+    /**
+     * Check if the recovery module is authorized to recover the account
+     * @param account The smart account to check
+     * @return true if the module is authorized, false otherwise
+     */
+    function isAuthorizedToBeRecovered(address account) external view returns (bool) {
+        return validatorCount[account] > 0;
+    }
+
     /**
      * Check if a recovery request can be initiated based on guardian acceptance
      * @param account The smart account to check

test/unit/EmailRecoveryManager/configureRecovery.t.sol

@@ -42,6 +42,9 @@ contract EmailRecoveryManager_configureRecovery_Test is UnitBase {
         vm.startPrank(accountAddress);
         emailRecoveryModule.workaround_validatorsPush(accountAddress, validatorAddress);
 
+        bool isActivated = emailRecoveryModule.isActivated(accountAddress);
+        assertFalse(isActivated);
+
         vm.expectEmit();
         emit IEmailRecoveryManager.RecoveryConfigured(
             instance.account, guardians.length, totalWeight, threshold
@@ -66,6 +69,9 @@ contract EmailRecoveryManager_configureRecovery_Test is UnitBase {
             emailRecoveryModule.getGuardian(accountAddress, guardians[0]);
         assertEq(uint256(guardian.status), uint256(GuardianStatus.REQUESTED));
         assertEq(guardian.weight, guardianWeights[0]);
+
+        isActivated = emailRecoveryModule.isActivated(accountAddress);
+        assertTrue(isActivated);
     }
 
     function test_ConfigureRecovery_RevertWhen_ZeroGuardians() public {

test/unit/EmailRecoveryManager/deInitRecoveryModule.t.sol

@@ -28,6 +28,9 @@ contract EmailRecoveryManager_deInitRecoveryModule_Test is UnitBase {
         acceptGuardian(accountSalt1);
         acceptGuardian(accountSalt2);
 
+        bool isActivated = emailRecoveryModule.isActivated(accountAddress);
+        assertTrue(isActivated);
+
         vm.prank(accountAddress);
         vm.expectEmit();
         emit IEmailRecoveryManager.RecoveryDeInitialized(accountAddress);
@@ -66,5 +69,8 @@ contract EmailRecoveryManager_deInitRecoveryModule_Test is UnitBase {
         assertEq(guardianConfig.totalWeight, 0);
         assertEq(guardianConfig.acceptedWeight, 0);
         assertEq(guardianConfig.threshold, 0);
+
+        isActivated = emailRecoveryModule.isActivated(accountAddress);
+        assertFalse(isActivated);
     }
 }

test/unit/EmailRecoveryManager/updateRecoveryConfig.t.sol

@@ -98,6 +98,9 @@ contract EmailRecoveryManager_updateRecoveryConfig_Test is UnitBase {
         recoveryConfig = emailRecoveryModule.getRecoveryConfig(accountAddress);
         assertEq(recoveryConfig.delay, newDelay);
         assertEq(recoveryConfig.expiry, newExpiry);
+
+        bool isActivated = emailRecoveryModule.isActivated(accountAddress);
+        assertTrue(isActivated);
     }
 
     function test_UpdateRecoveryConfig_Succeeds() public {
@@ -117,5 +120,8 @@ contract EmailRecoveryManager_updateRecoveryConfig_Test is UnitBase {
         recoveryConfig = emailRecoveryModule.getRecoveryConfig(accountAddress);
         assertEq(recoveryConfig.delay, newDelay);
         assertEq(recoveryConfig.expiry, newExpiry);
+
+        bool isActivated = emailRecoveryModule.isActivated(accountAddress);
+        assertTrue(isActivated);
     }
 }

test/unit/modules/EmailRecoveryModule/onInstall.t.sol

@@ -49,5 +49,8 @@ contract EmailRecoveryModule_onInstall_Test is EmailRecoveryModuleBase {
 
         bool isInitialized = emailRecoveryModule.isInitialized(accountAddress);
         assertTrue(isInitialized);
+
+        bool isAuthorizedToBeRecovered = emailRecoveryModule.isAuthorizedToBeRecovered(accountAddress);
+        assertTrue(isAuthorizedToBeRecovered);
     }
 }

test/unit/modules/EmailRecoveryModule/onUninstall.t.sol

@@ -22,5 +22,8 @@ contract EmailRecoveryModule_onUninstall_Test is EmailRecoveryModuleBase {
 
         bool isInitialized = emailRecoveryModule.isInitialized(accountAddress);
         assertFalse(isInitialized);
+
+        bool isAuthorizedToBeRecovered = emailRecoveryModule.isAuthorizedToBeRecovered(accountAddress);
+        assertFalse(isAuthorizedToBeRecovered);
     }
 }

test/unit/modules/UniversalEmailRecoveryModule/onInstall.t.sol

@@ -54,5 +54,8 @@ contract UniversalEmailRecoveryModule_onInstall_Test is UnitBase {
         bytes4[] memory allowedSelectors = emailRecoveryModule.getAllowedSelectors(accountAddress);
         assertEq(allowedValidators.length, 1);
         assertEq(allowedSelectors.length, 1);
+
+        bool isAuthorizedToBeRecovered = emailRecoveryModule.isAuthorizedToBeRecovered(accountAddress);
+        assertTrue(isAuthorizedToBeRecovered);
     }
 }

test/unit/modules/UniversalEmailRecoveryModule/onUninstall.t.sol

@@ -62,5 +62,8 @@ contract UniversalEmailRecoveryModule_onUninstall_Test is UnitBase {
         allowedSelectors = emailRecoveryModule.getAllowedSelectors(accountAddress);
         assertEq(allowedValidators.length, 0);
         assertEq(allowedSelectors.length, 0);
+
+        bool isAuthorizedToBeRecovered = emailRecoveryModule.isAuthorizedToBeRecovered(accountAddress);
+        assertFalse(isAuthorizedToBeRecovered);
     }
 }