Call disable initializer in smart wallet factory contract constructors (#566)

* Add _disableInitializers()

* test revert: initialize implementation contract

Author: nkrishang

contracts/prebuilts/account/dynamic/DynamicAccountFactory.sol

@@ -34,7 +34,9 @@ contract DynamicAccountFactory is Initializable, BaseAccountFactory, ContractMet
             address(new DynamicAccount(IEntryPoint(ENTRYPOINT_ADDRESS), _defaultExtensions)),
             ENTRYPOINT_ADDRESS
         )
-    {}
+    {
+        _disableInitializers();
+    }
 
     /// @notice Initializes the factory contract.
     function initialize(address _defaultAdmin, string memory _contractURI) external initializer {

contracts/prebuilts/account/managed/ManagedAccountFactory.sol

@@ -36,7 +36,9 @@ contract ManagedAccountFactory is
     constructor(IEntryPoint _entrypoint, Extension[] memory _defaultExtensions)
         BaseRouter(_defaultExtensions)
         BaseAccountFactory(address(new ManagedAccount(_entrypoint)), address(_entrypoint))
-    {}
+    {
+        _disableInitializers();
+    }
 
     /// @notice Initializes the factory contract.
     function initialize(address _defaultAdmin, string memory _contractURI) external initializer {

contracts/prebuilts/account/non-upgradeable/AccountFactory.sol

@@ -31,7 +31,9 @@ contract AccountFactory is Initializable, BaseAccountFactory, ContractMetadata,
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint) BaseAccountFactory(address(new Account(_entrypoint)), address(_entrypoint)) {}
+    constructor(IEntryPoint _entrypoint) BaseAccountFactory(address(new Account(_entrypoint)), address(_entrypoint)) {
+        _disableInitializers();
+    }
 
     /// @notice Initializes the factory contract.
     function initialize(address _defaultAdmin, string memory _contractURI) external initializer {

src/test/smart-wallet/Account.t.sol

@@ -55,6 +55,8 @@ contract SimpleAccountTest is BaseTest {
 
     bytes32 private uidCache = bytes32("random uid");
 
+    address internal factoryImpl;
+
     event AccountCreated(address indexed account, address indexed accountAdmin);
 
     function _prepareSignature(IAccountPermissions.SignerPermissionRequest memory _req)
@@ -251,7 +253,7 @@ contract SimpleAccountTest is BaseTest {
         // Setup contracts
         entrypoint = new EntryPoint();
         // deploy account factory
-        address factoryImpl = address(new AccountFactory(IEntryPoint(payable(address(entrypoint)))));
+        factoryImpl = address(new AccountFactory(IEntryPoint(payable(address(entrypoint)))));
         accountFactory = AccountFactory(
             address(
                 payable(
@@ -276,6 +278,11 @@ contract SimpleAccountTest is BaseTest {
         assertEq(accountFactory.hasRole(0x00, deployer), true);
     }
 
+    function test_revert_initializeImplementation() public {
+        vm.expectRevert("Initializable: contract is already initialized");
+        AccountFactory(factoryImpl).initialize(deployer, "https://example.com");
+    }
+
     /*///////////////////////////////////////////////////////////////
                         Test: creating an account
     //////////////////////////////////////////////////////////////*/

src/test/smart-wallet/DynamicAccount.t.sol

@@ -71,6 +71,8 @@ contract DynamicAccountTest is BaseTest {
 
     bytes32 private uidCache = bytes32("random uid");
 
+    address internal factoryImpl;
+
     event AccountCreated(address indexed account, address indexed accountAdmin);
 
     function _prepareSignature(IAccountPermissions.SignerPermissionRequest memory _req)
@@ -320,7 +322,7 @@ contract DynamicAccountTest is BaseTest {
         extensions[0] = defaultExtension;
 
         // deploy account factory
-        address factoryImpl = address(new DynamicAccountFactory(extensions));
+        factoryImpl = address(new DynamicAccountFactory(extensions));
         accountFactory = DynamicAccountFactory(
             address(
                 payable(
@@ -339,6 +341,11 @@ contract DynamicAccountTest is BaseTest {
                         Test: creating an account
     //////////////////////////////////////////////////////////////*/
 
+    function test_revert_initializeImplementation() public {
+        vm.expectRevert("Initializable: contract is already initialized");
+        DynamicAccountFactory(factoryImpl).initialize(deployer, "https://example.com");
+    }
+
     /// @dev benchmark test for deployment gas cost
     function test_deploy_dynamicAccount() public {
         // Setting up default extension.
@@ -385,12 +392,12 @@ contract DynamicAccountTest is BaseTest {
         extensions[0] = defaultExtension;
 
         // deploy account factory
-        address factoryImpl = address(new DynamicAccountFactory(extensions));
+        address factoryImplementation = address(new DynamicAccountFactory(extensions));
         DynamicAccountFactory factory = DynamicAccountFactory(
             address(
                 payable(
                     new TWProxy(
-                        factoryImpl,
+                        factoryImplementation,
                         abi.encodeWithSignature("initialize(address,string)", deployer, "https://example.com")
                     )
                 )

src/test/smart-wallet/ManagedAccount.t.sol

@@ -72,6 +72,8 @@ contract ManagedAccountTest is BaseTest {
 
     bytes32 private uidCache = bytes32("random uid");
 
+    address internal factoryImpl;
+
     event AccountCreated(address indexed account, address indexed accountAdmin);
 
     function _prepareSignature(IAccountPermissions.SignerPermissionRequest memory _req)
@@ -321,7 +323,7 @@ contract ManagedAccountTest is BaseTest {
 
         // deploy account factory
         vm.prank(factoryDeployer);
-        address factoryImpl = address(new ManagedAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions));
+        factoryImpl = address(new ManagedAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions));
         accountFactory = ManagedAccountFactory(
             payable(
                 address(
@@ -336,6 +338,11 @@ contract ManagedAccountTest is BaseTest {
         numberContract = new Number();
     }
 
+    function test_revert_initializeImplementation() public {
+        vm.expectRevert("Initializable: contract is already initialized");
+        ManagedAccountFactory(payable(factoryImpl)).initialize(deployer, "https://example.com");
+    }
+
     /// @dev benchmark test for deployment gas cost
     function test_deploy_managedAccount() public {
         // Setting up default extension.
@@ -383,7 +390,7 @@ contract ManagedAccountTest is BaseTest {
 
         // deploy account factory
         vm.prank(factoryDeployer);
-        address factoryImpl = address(new ManagedAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions));
+        factoryImpl = address(new ManagedAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions));
         ManagedAccountFactory factory = ManagedAccountFactory(
             payable(
                 address(