feat: add 7702 account to deploy script

alchemyplatform · Dec 13, 2024 · d02704a · d02704a
1 parent 16e8d3e
commit d02704a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 14 deletions.
diff --git a/.env.example b/.env.example
@@ -2,7 +2,7 @@
 ENTRYPOINT=
 
 # AccountFactory's initial owner
-FACTORY_OWNER=
+ACCOUNT_FACTORY_OWNER=
 
 # Expected addresses
 
@@ -17,7 +17,7 @@ WEBAUTHN_VALIDATION_MODULE=
 MODULAR_ACCOUNT_IMPL=
 SEMI_MODULAR_ACCOUNT_7702_IMPL=
 SEMI_MODULAR_ACCOUNT_BYTECODE_IMPL=
-SEMI_MODULAR_ACCOUNT_STORAGEONLY_IMPL=
+SEMI_MODULAR_ACCOUNT_STORAGE_ONLY_IMPL=
 
 ACCOUNT_FACTORY=
 
@@ -40,7 +40,7 @@ ACCOUNT_FACTORY_SALT=
 
 # Factory staking setup
 
-# 1 ether required by bundlers
-REQUIRED_STAKE_AMOUNT=1
+# 0.1 ether required by bundlers
+REQUIRED_STAKE_AMOUNT_WEI=100000000000000000
 # 1 day required by bundlers
 UNSTAKE_DELAY_SEC=86400
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 # Foundry build and cache directories
 out/
 out-optimized/
+out-optimized-standalone/
+out-optimized-sma-storage/
 cache/
 cache-optimized/
+cache-optimized-standalone/
+cache-optimized-sma-storage/
 node_modules/
 
 # Coverage

diff --git a/script/DeployAccounts.s.sol b/script/DeployAccounts.s.sol
@@ -24,8 +24,8 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
     address public expectedSemiModularAccountBytecodeImpl;
     uint256 public semiModularAccountBytecodeImplSalt;
 
-    address public expectedSemiModularAccountStorageOnlyImpl;
-    uint256 public semiModularAccountStorageOnlyImplSalt;
+    address public expectedSemiModularAccount7702Impl;
+    uint256 public semiModularAccount7702ImplSalt;
 
     function setUp() public {
         // Load the required addresses for the deployment from env vars.
@@ -39,8 +39,8 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
         expectedSemiModularAccountBytecodeImpl = _getSemiModularAccountBytecodeImpl();
         semiModularAccountBytecodeImplSalt = _getSaltOrZero("SEMI_MODULAR_ACCOUNT_BYTECODE_IMPL");
 
-        expectedSemiModularAccountStorageOnlyImpl = _getSemiModularAccountStorageOnlyImpl();
-        semiModularAccountStorageOnlyImplSalt = _getSaltOrZero("SEMI_MODULAR_ACCOUNT_STORAGE_ONLY_IMPL");
+        expectedSemiModularAccount7702Impl = _getSemiModularAccount7702Impl();
+        semiModularAccount7702ImplSalt = _getSaltOrZero("SEMI_MODULAR_ACCOUNT_7702_IMPL");
     }
 
     function run() public onlyProfile("optimized-build") {
@@ -69,6 +69,14 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
             _wrappedDeploySemiModularAccountBytecode
         );
 
+        _safeDeploy(
+            "Semi Modular Account 7702 Impl",
+            expectedSemiModularAccount7702Impl,
+            semiModularAccount7702ImplSalt,
+            _getSemiModularAccount7702Initcode(entryPoint, ExecutionInstallDelegate(executionInstallDelegate)),
+            _wrappedDeploySemiModularAccount7702
+        );
+
         vm.stopBroadcast();
 
         console.log("******** Account Implementations Deployed *********");
@@ -86,6 +94,10 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
             _deploySemiModularAccountBytecode(salt, entryPoint, ExecutionInstallDelegate(executionInstallDelegate));
     }
 
+    function _wrappedDeploySemiModularAccount7702(bytes32 salt) internal returns (address) {
+        return _deploySemiModularAccount7702(salt, entryPoint, ExecutionInstallDelegate(executionInstallDelegate));
+    }
+
     function _ensureNonzeroArgs() internal view {
         bool shouldRevert;
 

diff --git a/script/ScriptBase.sol b/script/ScriptBase.sol
@@ -45,6 +45,10 @@ abstract contract ScriptBase is Script {
         return vm.envOr("SEMI_MODULAR_ACCOUNT_STORAGE_ONLY_IMPL", address(0));
     }
 
+    function _getSemiModularAccount7702Impl() internal view returns (address) {
+        return vm.envOr("SEMI_MODULAR_ACCOUNT_7702_IMPL", address(0));
+    }
+
     function _getExecutionInstallDelegate() internal view returns (address) {
         return vm.envOr("EXECUTION_INSTALL_DELEGATE", address(0));
     }

diff --git a/test/script/DeployAccounts.s.t.sol b/test/script/DeployAccounts.s.t.sol
@@ -8,7 +8,7 @@ import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {DeployAccountsScript} from "../../script/DeployAccounts.s.sol";
 import {ModularAccount} from "../../src/account/ModularAccount.sol";
 import {SemiModularAccountBytecode} from "../../src/account/SemiModularAccountBytecode.sol";
-import {SemiModularAccountStorageOnly} from "../../src/account/SemiModularAccountStorageOnly.sol";
+import {SemiModularAccount7702} from "../../src/account/SemiModularAccount7702.sol";
 
 contract DeployAccountsTest is Test {
     DeployAccountsScript internal _deployAccountsScript;
@@ -17,7 +17,7 @@ contract DeployAccountsTest is Test {
     address public executionInstallDelegate;
     address public modularAccountImpl;
     address public semiModularAccountBytecodeImpl;
-    address public semiModularAccountStorageOnlyImpl;
+    address public semiModularAccount7702Impl;
 
     function setUp() public {
         _deployAccountsScript = new DeployAccountsScript();
@@ -46,11 +46,11 @@ contract DeployAccountsTest is Test {
             CREATE2_FACTORY
         );
 
-        semiModularAccountStorageOnlyImpl = Create2.computeAddress(
+        semiModularAccount7702Impl = Create2.computeAddress(
             zeroSalt,
             keccak256(
                 bytes.concat(
-                    type(SemiModularAccountStorageOnly).creationCode,
+                    type(SemiModularAccount7702).creationCode,
                     abi.encode(entryPoint, executionInstallDelegate)
                 )
             ),
@@ -61,13 +61,13 @@ contract DeployAccountsTest is Test {
         vm.setEnv("EXECUTION_INSTALL_DELEGATE", vm.toString(executionInstallDelegate));
         vm.setEnv("MODULAR_ACCOUNT_IMPL", vm.toString(modularAccountImpl));
         vm.setEnv("SEMI_MODULAR_ACCOUNT_BYTECODE_IMPL", vm.toString(semiModularAccountBytecodeImpl));
-        vm.setEnv("SEMI_MODULAR_ACCOUNT_STORAGE_ONLY_IMPL", vm.toString(semiModularAccountStorageOnlyImpl));
+        vm.setEnv("SEMI_MODULAR_ACCOUNT_7702_IMPL", vm.toString(semiModularAccount7702Impl));
 
         string memory zeroSaltString = vm.toString(zeroSalt);
 
         vm.setEnv("MODULAR_ACCOUNT_IMPL_SALT", zeroSaltString);
         vm.setEnv("SEMI_MODULAR_ACCOUNT_BYTECODE_IMPL_SALT", zeroSaltString);
-        vm.setEnv("SEMI_MODULAR_ACCOUNT_STORAGE_ONLY_IMPL_SALT", zeroSaltString);
+        vm.setEnv("SEMI_MODULAR_ACCOUNT_7702_IMPL_SALT", zeroSaltString);
 
         // Spoof as though the profile is set to "optimized-build".
         vm.setEnv("FOUNDRY_PROFILE", "optimized-build");
@@ -84,5 +84,10 @@ contract DeployAccountsTest is Test {
             SemiModularAccountBytecode(payable(semiModularAccountBytecodeImpl)).accountId(),
             "alchemy.sma-bytecode.1.0.0"
         );
+
+        assertEq(
+            SemiModularAccount7702(payable(semiModularAccount7702Impl)).accountId(),
+            "alchemy.sma-7702.1.0.0"
+        );
     }
 }