refactor: split account deployment into its own script

etherscan can't handle ir optimization if the factory includes account creation.

foundry.toml

@@ -11,6 +11,8 @@ via_ir = true
 auto_detect_solc = false
 auto_detect_remappings = false
 deny_warnings = true
+optimizer = true
+optimizer_runs = 200
 
 [fuzz]
 runs = 1024

script/003_DeploySingleOwnerMSCAFactory.s.sol → script/003.1_DeploySingleOwnerMSCAFactory.s.sol

@@ -19,20 +19,18 @@
 pragma solidity 0.8.24;
 
 import {SingleOwnerMSCAFactory} from "../src/msca/6900/v0.7/factories/semi/SingleOwnerMSCAFactory.sol";
-import {ENTRY_POINT, PLUGIN_MANAGER_ADDRESS, SINGLE_OWNER_MSCA_FACTORY_ADDRESS} from "./000_ContractAddress.sol";
+import {SINGLE_OWNER_MSCA_ADDRESS, SINGLE_OWNER_MSCA_FACTORY_ADDRESS} from "./000_ContractAddress.sol";
 import {Script, console} from "forge-std/src/Script.sol";
 
 contract DeploySingleOwnerMSCAFactoryScript is Script {
-    address internal constant PLUGIN_MANAGER = PLUGIN_MANAGER_ADDRESS;
     address payable internal constant EXPECTED_FACTORY_ADDRESS = payable(SINGLE_OWNER_MSCA_FACTORY_ADDRESS);
 
     function run() public {
-        address entryPoint = ENTRY_POINT;
         uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY");
         vm.startBroadcast(key);
         SingleOwnerMSCAFactory factory;
         if (EXPECTED_FACTORY_ADDRESS.code.length == 0) {
-            factory = new SingleOwnerMSCAFactory{salt: 0}(entryPoint, PLUGIN_MANAGER);
+            factory = new SingleOwnerMSCAFactory{salt: 0}(SINGLE_OWNER_MSCA_ADDRESS);
             console.log("New single owner MSCA factory address: %s", address(factory));
         } else {
             factory = SingleOwnerMSCAFactory(EXPECTED_FACTORY_ADDRESS);

script/003_DeploySingleOwnerMSCA.s.sol

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 Circle Internet Group, Inc. All rights reserved.
+
+ * SPDX-License-Identifier: GPL-3.0-or-later
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+pragma solidity 0.8.24;
+
+import {SingleOwnerMSCA} from "../src/msca/6900/v0.7/account/semi/SingleOwnerMSCA.sol";
+import {PluginManager} from "../src/msca/6900/v0.7/managers/PluginManager.sol";
+import {ENTRY_POINT, PLUGIN_MANAGER_ADDRESS, SINGLE_OWNER_MSCA_ADDRESS} from "./000_ContractAddress.sol";
+import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
+import {Script, console} from "forge-std/src/Script.sol";
+
+contract DeploySingleOwnerMSCAScript is Script {
+    address payable internal constant EXPECTED_ACCOUNT_ADDRESS = payable(SINGLE_OWNER_MSCA_ADDRESS);
+
+    event AccountImplementationDeployed(
+        address indexed accountImplementation, address entryPoint, address pluginManager
+    );
+
+    function run() public {
+        address entryPoint = ENTRY_POINT;
+        uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY");
+        vm.startBroadcast(key);
+        SingleOwnerMSCA account;
+        if (EXPECTED_ACCOUNT_ADDRESS.code.length == 0) {
+            account = new SingleOwnerMSCA{salt: 0}(IEntryPoint(entryPoint), PluginManager(PLUGIN_MANAGER_ADDRESS));
+            emit AccountImplementationDeployed(address(account), entryPoint, PLUGIN_MANAGER_ADDRESS);
+            console.log("New single owner MSCA address: %s", address(account));
+        } else {
+            account = SingleOwnerMSCA(EXPECTED_ACCOUNT_ADDRESS);
+            console.log("Found existing single owner MSCA at expected address: %s", address(account));
+        }
+        vm.stopBroadcast();
+    }
+}

src/msca/6900/v0.7/factories/semi/SingleOwnerMSCAFactory.sol

@@ -20,8 +20,6 @@ pragma solidity 0.8.24;
 
 import {Create2FailedDeployment, InvalidInitializationInput} from "../../../shared/common/Errors.sol";
 import {SingleOwnerMSCA} from "../../account/semi/SingleOwnerMSCA.sol";
-import {PluginManager} from "../../managers/PluginManager.sol";
-import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
@@ -32,9 +30,8 @@ import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 contract SingleOwnerMSCAFactory {
     // logic implementation
     SingleOwnerMSCA public immutable ACCOUNT_IMPLEMENTATION;
-    IEntryPoint public immutable ENTRY_POINT;
 
-    event FactoryDeployed(address indexed factory, address accountImplementation, address entryPoint);
+    event FactoryDeployed(address indexed factory, address accountImplementation);
     event AccountCreated(address indexed proxy, address sender, bytes32 salt);
 
     /**
@@ -45,11 +42,9 @@ contract SingleOwnerMSCAFactory {
      *      during the deployment. No hooks can be injected during the account deployment, so for a future installation
      *      of more complicated plugins, please call installPlugin via a separate tx/userOp after account deployment.
      */
-    constructor(address _entryPointAddr, address _pluginManagerAddr) {
-        ENTRY_POINT = IEntryPoint(_entryPointAddr);
-        PluginManager _pluginManager = PluginManager(_pluginManagerAddr);
-        ACCOUNT_IMPLEMENTATION = new SingleOwnerMSCA(ENTRY_POINT, _pluginManager);
-        emit FactoryDeployed(address(this), address(ACCOUNT_IMPLEMENTATION), _entryPointAddr);
+    constructor(address _singleOwnerMSCAImplAddr) {
+        ACCOUNT_IMPLEMENTATION = SingleOwnerMSCA(payable(_singleOwnerMSCAImplAddr));
+        emit FactoryDeployed(address(this), address(ACCOUNT_IMPLEMENTATION));
     }
 
     /**

test/WalletMigration.t.sol

@@ -78,7 +78,8 @@ contract WalletMigrationTest is TestUtils {
         testERC1155 = new TestERC1155("getrich.com");
         testERC721 = new TestERC721("getrich", "$$$");
         testERC20 = new TestLiquidityPool("getrich", "$$$");
-        singleOwnerMSCAFactory = new SingleOwnerMSCAFactory(address(entryPoint), address(pluginManager));
+        SingleOwnerMSCA singleOwnerMSCA = new SingleOwnerMSCA(entryPoint, pluginManager);
+        singleOwnerMSCAFactory = new SingleOwnerMSCAFactory(address(singleOwnerMSCA));
         ecdsaAccountFactory = new ECDSAAccountFactory(entryPoint);
     }
 

test/gas/6900/v0.7/plugins/singleowner/SingleOwnerMSCAWithSingleOwnerPlugin.t.sol

@@ -20,11 +20,9 @@ pragma solidity 0.8.24;
 
 import {FunctionReference} from "../../../../../../src/msca/6900/v0.7/common/Structs.sol";
 
-import {
-    PluginManager,
-    SingleOwnerMSCA,
-    SingleOwnerMSCAFactory
-} from "../../../../../../src/msca/6900/v0.7/factories/semi/SingleOwnerMSCAFactory.sol";
+import {SingleOwnerMSCA} from "../../../../../../src/msca/6900/v0.7/account/semi/SingleOwnerMSCA.sol";
+import {SingleOwnerMSCAFactory} from "../../../../../../src/msca/6900/v0.7/factories/semi/SingleOwnerMSCAFactory.sol";
+import {PluginManager} from "../../../../../../src/msca/6900/v0.7/managers/PluginManager.sol";
 import {SingleOwnerPlugin} from "../../../../../../src/msca/6900/v0.7/plugins/v1_0_0/acl/SingleOwnerPlugin.sol";
 import {PluginGasProfileBaseTest, UserOperation} from "../../../../PluginGasProfileBase.t.sol";
 
@@ -56,7 +54,7 @@ contract SingleOwnerMSCAWithSingleOwnerPluginTest is PluginGasProfileBaseTest {
     function setUp() public override {
         super.setUp();
         accountAndPluginType = "SingleOwnerMSCAWithSingleOwnerPlugin";
-        factory = new SingleOwnerMSCAFactory(address(entryPoint), address(pluginManager));
+        factory = new SingleOwnerMSCAFactory(address(new SingleOwnerMSCA(entryPoint, pluginManager)));
         singleOwnerPlugin = new SingleOwnerPlugin();
         singleOwnerPluginAddr = address(singleOwnerPlugin);
     }

test/msca/6900/v0.7/SingleOwnerMSCA.t.sol

@@ -111,7 +111,7 @@ contract SingleOwnerMSCATest is TestUtils {
         testERC1155 = new TestERC1155("getrich.com");
         testERC721 = new TestERC721("getrich", "$$$");
         testLiquidityPool = new TestLiquidityPool("getrich", "$$$");
-        factory = new SingleOwnerMSCAFactory(address(entryPoint), address(pluginManager));
+        factory = new SingleOwnerMSCAFactory(address(new SingleOwnerMSCA(entryPoint, pluginManager)));
         // mock ERC1820Registry contract, could also use etch though, but I'm implementing a simplified registry
         erc1820Registry = new MockERC1820Registry();
         testERC777 = new TestERC777(erc1820Registry);

test/msca/6900/v0.7/SingleOwnerMSCAFactory.t.sol

@@ -56,7 +56,7 @@ contract SingleOwnerMSCAFactoryTest is TestUtils {
     address payable private beneficiary; // e.g. bundler
 
     function setUp() public {
-        factory = new SingleOwnerMSCAFactory(address(entryPoint), address(pluginManager));
+        factory = new SingleOwnerMSCAFactory(address(new SingleOwnerMSCA(entryPoint, pluginManager)));
         testLiquidityPool = new TestLiquidityPool("getrich", "$$$");
         beneficiary = payable(address(makeAddr("bundler")));
     }

test/msca/6900/v0.7/plugins/ColdStorageAddressBookPluginWithSemiMSCA.t.sol

@@ -95,7 +95,7 @@ contract ColdStorageAddressBookPluginWithSemiMSCATest is TestUtils {
 
     function setUp() public {
         beneficiary = payable(address(makeAddr("bundler")));
-        factory = new SingleOwnerMSCAFactory(address(entryPoint), address(pluginManager));
+        factory = new SingleOwnerMSCAFactory(address(new SingleOwnerMSCA(entryPoint, pluginManager)));
         addressBookPlugin = new ColdStorageAddressBookPlugin();
 
         (ownerAddr, eoaPrivateKey) = makeAddrAndKey("ColdStorageAddressBookPluginWithSemiMSCATest");