Decompose the factory to reduce its contract size.

script/DeploySafeRecovery.s.sol

@@ -5,6 +5,7 @@ import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
 import { SafeRecoverySubjectHandler } from "src/handlers/SafeRecoverySubjectHandler.sol";
 import { EmailRecoveryFactory } from "src/EmailRecoveryFactory.sol";
+import { EmailRecoveryUniversalFactory } from "src/EmailRecoveryUniversalFactory.sol";
 import { Verifier } from "ether-email-auth/packages/contracts/src/utils/Verifier.sol";
 import { ECDSAOwnedDKIMRegistry } from
     "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
@@ -44,7 +45,8 @@ contract DeploySafeRecovery_Script is Script {
             console.log("Deployed Email Auth at", emailAuthImpl);
         }
 
-        EmailRecoveryFactory factory = new EmailRecoveryFactory(verifier, emailAuthImpl);
+        EmailRecoveryUniversalFactory factory =
+            new EmailRecoveryUniversalFactory(verifier, emailAuthImpl);
         (address module, address manager, address subjectHandler) = factory
             .deployUniversalEmailRecoveryModule(
             bytes32(uint256(0)),

script/DeployUniversalEmailRecoveryModule.s.sol

@@ -8,7 +8,7 @@ import { Verifier } from "ether-email-auth/packages/contracts/src/utils/Verifier
 import { ECDSAOwnedDKIMRegistry } from
     "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
 import { EmailAuth } from "ether-email-auth/packages/contracts/src/EmailAuth.sol";
-import { EmailRecoveryFactory } from "src/EmailRecoveryFactory.sol";
+import { EmailRecoveryUniversalFactory } from "src/EmailRecoveryUniversalFactory.sol";
 
 contract DeployUniversalEmailRecoveryModuleScript is Script {
     function run() public {
@@ -38,11 +38,11 @@ contract DeployUniversalEmailRecoveryModuleScript is Script {
 
         address _factory = vm.envOr("RECOVERY_FACTORY", address(0));
         if (_factory == address(0)) {
-            _factory = address(new EmailRecoveryFactory(verifier, emailAuthImpl));
+            _factory = address(new EmailRecoveryUniversalFactory(verifier, emailAuthImpl));
             console.log("Deployed Email Recovery Factory at", _factory);
         }
         {
-            EmailRecoveryFactory factory = EmailRecoveryFactory(_factory);
+            EmailRecoveryUniversalFactory factory = EmailRecoveryUniversalFactory(_factory);
             (address module, address manager, address subjectHandler) = factory
                 .deployUniversalEmailRecoveryModule(
                 bytes32(uint256(0)),

src/EmailRecoveryFactory.sol

@@ -54,36 +54,4 @@ contract EmailRecoveryFactory {
 
         return (emailRecoveryModule, emailRecoveryManager, subjectHandler);
     }
-
-    function deployUniversalEmailRecoveryModule(
-        bytes32 subjectHandlerSalt,
-        bytes32 recoveryManagerSalt,
-        bytes32 recoveryModuleSalt,
-        bytes memory subjectHandlerBytecode,
-        address dkimRegistry
-    )
-        external
-        returns (address, address, address)
-    {
-        // Deploy subject handler
-        address subjectHandler = Create2.deploy(0, subjectHandlerSalt, subjectHandlerBytecode);
-
-        // Deploy recovery manager
-        address emailRecoveryManager = address(
-            new EmailRecoveryManager{ salt: recoveryManagerSalt }(
-                verifier, dkimRegistry, emailAuthImpl, subjectHandler
-            )
-        );
-
-        // Deploy recovery module
-        address emailRecoveryModule = address(
-            new UniversalEmailRecoveryModule{ salt: recoveryModuleSalt }(emailRecoveryManager)
-        );
-
-        // Initialize recovery manager with module address
-        EmailRecoveryManager(emailRecoveryManager).initialize(emailRecoveryModule);
-        emit EmailRecoveryModuleDeployed(emailRecoveryModule, emailRecoveryManager, subjectHandler);
-
-        return (emailRecoveryModule, emailRecoveryManager, subjectHandler);
-    }
 }

src/EmailRecoveryUniversalFactory.sol

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.25;
+
+import { Create2 } from "@openzeppelin/contracts/utils/Create2.sol";
+import { EmailRecoveryManager } from "./EmailRecoveryManager.sol";
+import { UniversalEmailRecoveryModule } from "./modules/UniversalEmailRecoveryModule.sol";
+
+contract EmailRecoveryUniversalFactory {
+    address public immutable verifier;
+    address public immutable emailAuthImpl;
+
+    event EmailRecoveryModuleDeployed(
+        address emailRecoveryModule, address emailRecoveryManager, address subjectHandler
+    );
+
+    constructor(address _verifier, address _emailAuthImpl) {
+        verifier = _verifier;
+        emailAuthImpl = _emailAuthImpl;
+    }
+
+    function deployUniversalEmailRecoveryModule(
+        bytes32 subjectHandlerSalt,
+        bytes32 recoveryManagerSalt,
+        bytes32 recoveryModuleSalt,
+        bytes memory subjectHandlerBytecode,
+        address dkimRegistry
+    )
+        external
+        returns (address, address, address)
+    {
+        // Deploy subject handler
+        address subjectHandler = Create2.deploy(0, subjectHandlerSalt, subjectHandlerBytecode);
+
+        // Deploy recovery manager
+        address emailRecoveryManager = address(
+            new EmailRecoveryManager{ salt: recoveryManagerSalt }(
+                verifier, dkimRegistry, emailAuthImpl, subjectHandler
+            )
+        );
+
+        // Deploy recovery module
+        address emailRecoveryModule = address(
+            new UniversalEmailRecoveryModule{ salt: recoveryModuleSalt }(emailRecoveryManager)
+        );
+
+        // Initialize recovery manager with module address
+        EmailRecoveryManager(emailRecoveryManager).initialize(emailRecoveryModule);
+        emit EmailRecoveryModuleDeployed(emailRecoveryModule, emailRecoveryManager, subjectHandler);
+
+        return (emailRecoveryModule, emailRecoveryManager, subjectHandler);
+    }
+}

test/integration/OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModuleBase.t.sol

@@ -13,6 +13,7 @@ import {
 import { SubjectUtils } from "ether-email-auth/packages/contracts/src/libraries/SubjectUtils.sol";
 import { EmailRecoverySubjectHandler } from "src/handlers/EmailRecoverySubjectHandler.sol";
 import { EmailRecoveryFactory } from "src/EmailRecoveryFactory.sol";
+import { EmailRecoveryUniversalFactory } from "src/EmailRecoveryUniversalFactory.sol";
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
 import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { IntegrationBase } from "../../IntegrationBase.t.sol";
@@ -23,7 +24,7 @@ abstract contract OwnableValidatorRecovery_UniversalEmailRecoveryModule_Base is
     using Strings for uint256;
     using Strings for address;
 
-    EmailRecoveryFactory emailRecoveryFactory;
+    EmailRecoveryUniversalFactory emailRecoveryFactory;
     EmailRecoverySubjectHandler emailRecoveryHandler;
     EmailRecoveryManager emailRecoveryManager;
 
@@ -46,7 +47,8 @@ abstract contract OwnableValidatorRecovery_UniversalEmailRecoveryModule_Base is
     function setUp() public virtual override {
         super.setUp();
 
-        emailRecoveryFactory = new EmailRecoveryFactory(address(verifier), address(emailAuthImpl));
+        emailRecoveryFactory =
+            new EmailRecoveryUniversalFactory(address(verifier), address(emailAuthImpl));
         emailRecoveryHandler = new EmailRecoverySubjectHandler();
 
         // Deploy EmailRecoveryManager & UniversalEmailRecoveryModule

test/unit/EmailRecoveryFactory/deployEmailRecoveryModule.t.sol

@@ -5,14 +5,14 @@ import { console2 } from "forge-std/console2.sol";
 import { Create2 } from "@openzeppelin/contracts/utils/Create2.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 import { EmailRecoveryFactory } from "src/EmailRecoveryFactory.sol";
+import { EmailRecoveryUniversalFactory } from "src/EmailRecoveryUniversalFactory.sol";
 import { EmailRecoverySubjectHandler } from "src/handlers/EmailRecoverySubjectHandler.sol";
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
 
 contract EmailRecoveryFactory_deployAll_Test is UnitBase {
     function setUp() public override {
         super.setUp();
-        emailRecoveryFactory = new EmailRecoveryFactory(address(verifier), address(emailAuthImpl));
     }
 
     function test_DeployEmailRecoveryModule_Succeeds() public {

test/unit/EmailRecoveryFactory/deployUniversalEmailRecoveryModule.t.sol → test/unit/EmailRecoveryUniversalFactory/deployUniversalEmailRecoveryModule.t.sol

@@ -5,14 +5,14 @@ import { console2 } from "forge-std/console2.sol";
 import { Create2 } from "@openzeppelin/contracts/utils/Create2.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 import { EmailRecoveryFactory } from "src/EmailRecoveryFactory.sol";
+import { EmailRecoveryUniversalFactory } from "src/EmailRecoveryUniversalFactory.sol";
 import { EmailRecoverySubjectHandler } from "src/handlers/EmailRecoverySubjectHandler.sol";
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
 import { UniversalEmailRecoveryModule } from "src/modules/UniversalEmailRecoveryModule.sol";
 
 contract EmailRecoveryFactory_deployUniversalEmailRecoveryModule_Test is UnitBase {
     function setUp() public override {
         super.setUp();
-        emailRecoveryFactory = new EmailRecoveryFactory(address(verifier), address(emailAuthImpl));
     }
 
     function test_DeployUniversalEmailRecoveryModule_Succeeds() public {
@@ -22,7 +22,9 @@ contract EmailRecoveryFactory_deployUniversalEmailRecoveryModule_Test is UnitBas
 
         bytes memory subjectHandlerBytecode = type(EmailRecoverySubjectHandler).creationCode;
         address expectedSubjectHandler = Create2.computeAddress(
-            subjectHandlerSalt, keccak256(subjectHandlerBytecode), address(emailRecoveryFactory)
+            subjectHandlerSalt,
+            keccak256(subjectHandlerBytecode),
+            address(emailRecoveryUniversalFactory)
         );
 
         bytes memory recoveryManagerBytecode = abi.encodePacked(
@@ -35,18 +37,22 @@ contract EmailRecoveryFactory_deployUniversalEmailRecoveryModule_Test is UnitBas
             )
         );
         address expectedManager = Create2.computeAddress(
-            recoveryManagerSalt, keccak256(recoveryManagerBytecode), address(emailRecoveryFactory)
+            recoveryManagerSalt,
+            keccak256(recoveryManagerBytecode),
+            address(emailRecoveryUniversalFactory)
         );
 
         bytes memory recoveryModuleBytecode = abi.encodePacked(
             type(UniversalEmailRecoveryModule).creationCode, abi.encode(expectedManager)
         );
         address expectedModule = Create2.computeAddress(
-            recoveryModuleSalt, keccak256(recoveryModuleBytecode), address(emailRecoveryFactory)
+            recoveryModuleSalt,
+            keccak256(recoveryModuleBytecode),
+            address(emailRecoveryUniversalFactory)
         );
 
         (address emailRecoveryModule, address emailRecoveryManager, address subjectHandler) =
-        emailRecoveryFactory.deployUniversalEmailRecoveryModule(
+        emailRecoveryUniversalFactory.deployUniversalEmailRecoveryModule(
             subjectHandlerSalt,
             recoveryManagerSalt,
             recoveryModuleSalt,

test/unit/UnitBase.t.sol

@@ -26,6 +26,7 @@ import { EmailRecoverySubjectHandler } from "src/handlers/EmailRecoverySubjectHa
 import { UniversalEmailRecoveryModuleHarness } from "./UniversalEmailRecoveryModuleHarness.sol";
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
 import { EmailRecoveryFactory } from "src/EmailRecoveryFactory.sol";
+import { EmailRecoveryUniversalFactory } from "src/EmailRecoveryUniversalFactory.sol";
 import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { MockGroth16Verifier } from "src/test/MockGroth16Verifier.sol";
 
@@ -41,6 +42,7 @@ abstract contract UnitBase is RhinestoneModuleKit, Test {
     EmailAuth emailAuthImpl;
 
     EmailRecoveryFactory emailRecoveryFactory;
+    EmailRecoveryUniversalFactory emailRecoveryUniversalFactory;
     EmailRecoverySubjectHandler emailRecoveryHandler;
     EmailRecoveryManagerHarness emailRecoveryManager;
     UniversalEmailRecoveryModuleHarness emailRecoveryModule;
@@ -110,6 +112,8 @@ abstract contract UnitBase is RhinestoneModuleKit, Test {
         // Deploy handler, manager and module
         emailRecoveryHandler = new EmailRecoverySubjectHandler();
         emailRecoveryFactory = new EmailRecoveryFactory(address(verifier), address(emailAuthImpl));
+        emailRecoveryUniversalFactory =
+            new EmailRecoveryUniversalFactory(address(verifier), address(emailAuthImpl));
 
         emailRecoveryManager = new EmailRecoveryManagerHarness(
             address(verifier),