refactor: codesize reduction (#231)

.forge-snapshots/ModularAccount_Runtime_AccountCreation.snap

@@ -1 +1 @@
-176008
+175965

.forge-snapshots/ModularAccount_Runtime_BatchTransfers.snap

@@ -1 +1 @@
-93101
+92963

.forge-snapshots/ModularAccount_Runtime_Erc20Transfer.snap

@@ -1 +1 @@
-78526
+78372

.forge-snapshots/ModularAccount_Runtime_InstallSessionKey_Case1.snap

@@ -1 +1 @@
-423482
+422934

.forge-snapshots/ModularAccount_Runtime_NativeTransfer.snap

@@ -1 +1 @@
-54675
+54521

.forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Counter.snap

@@ -1 +1 @@
-78838
+78584

.forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Token.snap

@@ -1 +1 @@
-112223
+111897

.forge-snapshots/ModularAccount_UserOp_BatchTransfers.snap

@@ -1 +1 @@
-198437
+198297

.forge-snapshots/ModularAccount_UserOp_Erc20Transfer.snap

@@ -1 +1 @@
-185406
+185250

.forge-snapshots/ModularAccount_UserOp_InstallSessionKey_Case1.snap

@@ -1 +1 @@
-531716
+531166

.forge-snapshots/ModularAccount_UserOp_NativeTransfer.snap

@@ -1 +1 @@
-161687
+161531

.forge-snapshots/ModularAccount_UserOp_UseSessionKey_Case1_Counter.snap

@@ -1 +1 @@
-195559
+195236

.forge-snapshots/ModularAccount_UserOp_UseSessionKey_Case1_Token.snap

@@ -1 +1 @@
-226591
+226220

.forge-snapshots/ModularAccount_UserOp_deferredValidation.snap

@@ -1 +1 @@
-261264
+260935

.forge-snapshots/SemiModularAccount_Runtime_BatchTransfers.snap

@@ -1 +1 @@
-89199
+88968

.forge-snapshots/SemiModularAccount_Runtime_Erc20Transfer.snap

@@ -1 +1 @@
-74716
+74425

.forge-snapshots/SemiModularAccount_Runtime_InstallSessionKey_Case1.snap

@@ -1 +1 @@
-422162
+421505

.forge-snapshots/SemiModularAccount_Runtime_NativeTransfer.snap

@@ -1 +1 @@
-50875
+50584

.forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Counter.snap

@@ -1 +1 @@
-79254
+78934

.forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Token.snap

@@ -1 +1 @@
-112639
+112247

.forge-snapshots/SemiModularAccount_UserOp_BatchTransfers.snap

@@ -1 +1 @@
-193639
+193462

.forge-snapshots/SemiModularAccount_UserOp_Erc20Transfer.snap

@@ -1 +1 @@
-180735
+180498

.forge-snapshots/SemiModularAccount_UserOp_InstallSessionKey_Case1.snap

@@ -1 +1 @@
-529289
+528686

.forge-snapshots/SemiModularAccount_UserOp_NativeTransfer.snap

@@ -1 +1 @@
-157010
+156773

.forge-snapshots/SemiModularAccount_UserOp_UseSessionKey_Case1_Counter.snap

@@ -1 +1 @@
-195853
+195464

.forge-snapshots/SemiModularAccount_UserOp_UseSessionKey_Case1_Token.snap

@@ -1 +1 @@
-226897
+226460

.forge-snapshots/SemiModularAccount_UserOp_deferredValidation.snap

@@ -1 +1 @@
-257961
+257489

foundry.toml

@@ -29,7 +29,7 @@ depth = 10
 deny_warnings = true
 via_ir = true
 test = 'src'
-optimizer_runs = 10000
+optimizer_runs = 15000
 out = 'out-optimized'
 cache_path = 'cache-optimized'
 
@@ -59,7 +59,7 @@ depth = 32
 via_ir = true
 deny_warnings = true
 test = 'gas'
-optimizer_runs = 10000
+optimizer_runs = 15000
 out = 'out-optimized'
 cache_path = 'cache-optimized'
 ffi = true

src/account/ModularAccountBase.sol

@@ -25,6 +25,7 @@ import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/Messa
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {UUPSUpgradeable} from "solady/utils/UUPSUpgradeable.sol";
 
+import {ExecutionInstallDelegate} from "../helpers/ExecutionInstallDelegate.sol";
 import {_coalescePreValidation, _coalesceValidation} from "../helpers/ValidationResHelpers.sol";
 import {
     DensePostHookData,
@@ -89,6 +90,8 @@ abstract contract ModularAccountBase is
     uint8 internal constant _IS_GLOBAL_VALIDATION_BIT = 1;
     uint8 internal constant _HAS_DEFERRED_ACTION_BIT = 2;
 
+    address internal immutable _EXECUTION_INSTALL_DELEGATE;
+
     event DeferredActionNonceInvalidated(uint256 nonce);
 
     error CreateFailed();
@@ -115,15 +118,19 @@ abstract contract ModularAccountBase is
 
     constructor(IEntryPoint anEntryPoint) AccountBase(anEntryPoint) {
         _disableInitializers();
+
+        _EXECUTION_INSTALL_DELEGATE = address(new ExecutionInstallDelegate());
     }
 
     // EXTERNAL FUNCTIONS
 
     receive() external payable {}
 
     /// @notice Fallback function
-    /// @dev We route calls to execution functions based on incoming msg.sig
-    /// @dev If there's no module associated with this function selector, revert
+    /// @dev Routes calls to execution functions based on the incoming msg.sig. If there's no module associated
+    /// with this function selector, revert.
+    ///
+    /// @return The raw returned data from the invoked execution function.
     fallback(bytes calldata) external payable returns (bytes memory) {
         address execModule = getAccountStorage().executionStorage[msg.sig].module;
         if (execModule == address(0)) {
@@ -144,40 +151,7 @@ abstract contract ModularAccountBase is
     /// @param value The value to send to the new contract constructor
     /// @param initCode The initCode to deploy.
     /// @return createdAddr The created contract address.
-    function performCreate(uint256 value, bytes calldata initCode)
-        external
-        payable
-        virtual
-        wrapNativeFunction
-        returns (address createdAddr)
-    {
-        assembly ("memory-safe") {
-            // Load the free memory pointer.
-            let fmp := mload(0x40)
-
-            // Get the initCode length.
-            let len := initCode.length
-
-            // Copy the initCode from callata to memory at the free memory pointer.
-            calldatacopy(fmp, initCode.offset, len)
-
-            // Create the contract.
-            createdAddr := create(value, fmp, len)
-
-            if iszero(createdAddr) {
-                // If creation failed (the address returned is zero), revert with CreateFailed().
-                mstore(0x00, 0x7e16b8cd)
-                revert(0x1c, 0x04)
-            }
-        }
-    }
-
-    /// @notice Creates a contract using create2 deterministic deployment.
-    /// @param value The value to send to the new contract constructor.
-    /// @param initCode The initCode to deploy.
-    /// @param salt The salt to use for the create2 operation.
-    /// @return createdAddr The created contract address.
-    function performCreate2(uint256 value, bytes calldata initCode, bytes32 salt)
+    function performCreate(uint256 value, bytes calldata initCode, bool isCreate2, bytes32 salt)
         external
         payable
         virtual
@@ -194,8 +168,9 @@ abstract contract ModularAccountBase is
             // Copy the initCode from callata to memory at the free memory pointer.
             calldatacopy(fmp, initCode.offset, len)
 
-            // Create the contract using Create2 with the passed salt parameter.
-            createdAddr := create2(value, fmp, len, salt)
+            switch isCreate2
+            case 1 { createdAddr := create2(value, fmp, len, salt) }
+            default { createdAddr := create(value, fmp, len) }
 
             if iszero(createdAddr) {
                 // If creation failed (the address returned is zero), revert with CreateFailed().
@@ -320,7 +295,10 @@ abstract contract ModularAccountBase is
         ExecutionManifest calldata manifest,
         bytes calldata moduleInstallData
     ) external override wrapNativeFunction {
-        _installExecution(module, manifest, moduleInstallData);
+        // Access params to prevent compiler unused parameter flags.
+        (module, manifest, moduleInstallData);
+        address delegate = _EXECUTION_INSTALL_DELEGATE;
+        ExecutionLib.delegatecallBubbleOnRevertTransient(delegate);
     }
 
     /// @inheritdoc IModularAccount
@@ -330,7 +308,10 @@ abstract contract ModularAccountBase is
         ExecutionManifest calldata manifest,
         bytes calldata moduleUninstallData
     ) external override wrapNativeFunction {
-        _uninstallExecution(module, manifest, moduleUninstallData);
+        // Access params to prevent compiler unused parameter flags.
+        (module, manifest, moduleUninstallData);
+        address delegate = _EXECUTION_INSTALL_DELEGATE;
+        ExecutionLib.delegatecallBubbleOnRevertTransient(delegate);
     }
 
     /// @inheritdoc IModularAccount
@@ -797,7 +778,7 @@ abstract contract ModularAccountBase is
                 || selector == this.installValidation.selector || selector == this.uninstallValidation.selector
                 || selector == this.upgradeToAndCall.selector
                 || selector == this.invalidateDeferredValidationInstallNonce.selector
-                || selector == this.performCreate.selector || selector == this.performCreate2.selector
+                || selector == this.performCreate.selector
         ) {
             return true;
         }

src/account/ModularAccountView.sol

@@ -8,7 +8,7 @@ import {
     ValidationDataView
 } from "@erc6900/reference-implementation/interfaces/IModularAccountView.sol";
 
-import {KnownSelectorsLib} from "../libraries/KnownSelectorsLib.sol";
+import {NativeFunctionDelegate} from "../helpers/NativeFunctionDelegate.sol";
 import {MemManagementLib} from "../libraries/MemManagementLib.sol";
 import {ExecutionStorage, ValidationStorage, getAccountStorage} from "./AccountStorage.sol";
 
@@ -17,11 +17,18 @@ import {ExecutionStorage, ValidationStorage, getAccountStorage} from "./AccountS
 /// @notice This abstract contract implements the two view functions to get validation and execution data for an
 /// account.
 abstract contract ModularAccountView is IModularAccountView {
+    NativeFunctionDelegate internal immutable _NATIVE_FUNCTION_DELEGATE;
+
+    constructor() {
+        _NATIVE_FUNCTION_DELEGATE = new NativeFunctionDelegate();
+    }
+
     /// @inheritdoc IModularAccountView
     function getExecutionData(bytes4 selector) external view override returns (ExecutionDataView memory data) {
+        // return ModularAccountViewLib.getExecutionData(selector, _isNativeFunction(selector));
         ExecutionStorage storage executionStorage = getAccountStorage().executionStorage[selector];
 
-        if (KnownSelectorsLib.isNativeFunction(selector)) {
+        if (_isNativeFunction(uint32(selector))) {
             data.module = address(this);
             data.allowGlobalValidation = true;
         } else {
@@ -57,4 +64,8 @@ abstract contract ModularAccountView is IModularAccountView {
         MemManagementLib.reverseArr(selectors);
         data.selectors = selectors;
     }
+
+    function _isNativeFunction(uint32 selector) internal view virtual returns (bool) {
+        return _NATIVE_FUNCTION_DELEGATE.isNativeFunction(selector);
+    }
 }