chore: simplify

erc6900 · Jun 17, 2024 · 54a2f70 · 54a2f70
1 parent 827f4d0
commit 54a2f70
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/account/UpgradeableModularAccount.sol b/src/account/UpgradeableModularAccount.sol
@@ -169,14 +169,14 @@ contract UpgradeableModularAccount is
 
         FunctionReference userOpValidationFunction = FunctionReference.wrap(bytes21(userOp.signature[:21]));
 
-        PostExecToRun[] memory postExecHooks = _doPreHooks(
-            getAccountStorage().selectorData[bytes4(userOp.callData[4:8])].executionHooks, abi.encode(userOp), true
-        );
-
         PostExecToRun[] memory postPermissionHooks = _doPreHooks(
             getAccountStorage().validationData[userOpValidationFunction].permissionHooks, abi.encode(userOp), true
         );
 
+        PostExecToRun[] memory postExecHooks = _doPreHooks(
+            getAccountStorage().selectorData[bytes4(userOp.callData[4:8])].executionHooks, abi.encode(userOp), true
+        );
+
         (bool success, bytes memory result) = address(this).call(userOp.callData[4:]);
 
         if (!success) {
@@ -563,13 +563,12 @@ contract UpgradeableModularAccount is
 
         // Run the pre hooks and copy their return data to the post hooks array, if an associated post-exec hook
         // exists.
-        bool callNotToExecuteUserOp = msg.sig != this.executeUserOp.selector;
         for (uint256 i = 0; i < hooksLength; ++i) {
             bytes32 key = executionHooks.at(i);
             (FunctionReference hookFunction, bool isPreHook, bool isPostHook, bool requireUOContext) =
                 toExecutionHook(key);
 
-            if (requireUOContext && callNotToExecuteUserOp) {
+            if (!isPackedUO && requireUOContext) {
                 revert RequireUserOperationContext();
             }