chore: update

erc6900 · Jun 27, 2024 · 2fd5421 · 2fd5421
1 parent dec05cd
commit 2fd5421
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/account/PluginManager2.sol b/src/account/PluginManager2.sol
@@ -60,7 +60,6 @@ abstract contract PluginManager2 {
 
             for (uint256 i = 0; i < permissionFunctions.length; ++i) {
                 ExecutionHook memory permissionFunction = permissionFunctions[i];
-                permissionFunction.requireUOContext = true;
 
                 if (
                     !_storage.validationData[validationFunction].permissionHooks.add(toSetValue(permissionFunction))

diff --git a/src/account/UpgradeableModularAccount.sol b/src/account/UpgradeableModularAccount.sol
@@ -540,17 +540,9 @@ contract UpgradeableModularAccount is
             if (isPreHook) {
                 bytes memory preExecHookReturnData;
 
+                // isPackedUO implies it is a permission hook
                 if (isPackedUO) {
-                    if (false) {
-                        /**
-                         * TODO
-                         */
-                        preExecHookReturnData = _runPreExecHook(hookFunction, data);
-                    } else {
-                        PackedUserOperation memory uo = abi.decode(data, (PackedUserOperation));
-                        preExecHookReturnData =
-                            _runPreExecHook(hookFunction, abi.encodePacked(msg.sender, msg.value, uo.callData));
-                    }
+                    preExecHookReturnData = _runPreExecHook(hookFunction, data);
                 } else {
                     preExecHookReturnData =
                         _runPreExecHook(hookFunction, abi.encodePacked(msg.sender, msg.value, data));