Allow direct plugin calls with validation & permission hooks

src/account/UpgradeableModularAccount.sol

@@ -675,7 +675,8 @@
         // Check that the provided validation function is applicable to the selector
         if (isGlobal) {
             if (!_globalValidationAllowed(selector) || !_storage.validationData[validationFunction].isGlobal) {
-                revert UserOpValidationFunctionMissing(selector);
+                revert UserOpValidationFunctionMissing(selector); //TODO: Update this error as it can be runtime
+                    // validation too
             }
         } else {
             // Not global validation, but per-selector
@@ -711,7 +712,7 @@
      *      4. Run the pre-permissionHooks associated with this caller-sig combination, and return the
      *         post-permissionHooks to run later.
      */
     function _checkPermittedCallerAndAssociatedHooks()
         internal
         returns (PostExecToRun[] memory, PostExecToRun[] memory)
     {
@@ -727,9 +728,7 @@
         FunctionReference directCallValidationKey =
             FunctionReferenceLib.pack(msg.sender, _SELF_PERMIT_VALIDATION_FUNCTIONID);
 
-        if (!_storage.validationData[directCallValidationKey].selectors.contains(toSetValue(msg.sig))) {
-            revert ExecFromPluginNotPermitted(msg.sender, msg.sig);
-        }
+        _checkIfValidationAppliesCallData(msg.data, directCallValidationKey, false);
 
         // Direct call is allowed, run associated permission & validation hooks
 

test/account/DirectCallsFromPlugin.t.sol

@@ -133,9 +133,7 @@ contract DirectCallsFromPluginTest is AccountTestBase {
         );
     }
 
-    function _buildDirectCallDisallowedError(bytes4 selector) internal view returns (bytes memory) {
-        return abi.encodeWithSelector(
-            UpgradeableModularAccount.ExecFromPluginNotPermitted.selector, address(_plugin), selector
-        );
+    function _buildDirectCallDisallowedError(bytes4 selector) internal pure returns (bytes memory) {
+        return abi.encodeWithSelector(UpgradeableModularAccount.UserOpValidationFunctionMissing.selector, selector);
     }
 }

test/account/PermittedCallPermissions.t.sol

@@ -48,8 +48,7 @@ contract PermittedCallPermissionsTest is AccountTestBase {
     function test_permittedCall_NotAllowed() public {
         vm.expectRevert(
             abi.encodeWithSelector(
-                UpgradeableModularAccount.ExecFromPluginNotPermitted.selector,
-                address(permittedCallerPlugin),
+                UpgradeableModularAccount.UserOpValidationFunctionMissing.selector,
                 ResultCreatorPlugin.bar.selector
             )
         );