fix: bug in validator module call in safe7579

rhinestonewtf · Mar 29, 2024 · e962895 · e962895
1 parent 9cd99ec
commit e962895
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/accounts/safe7579/src/SafeERC7579.sol b/accounts/safe7579/src/SafeERC7579.sol
@@ -133,7 +133,13 @@ contract SafeERC7579 is ISafeOp, IERC7579Account, AccessControl, IMSA, HookManag
         if (!_isValidatorInstalled(validator)) return _validateSignatures(userOp);
 
         // bubble up the return value of the validator module
-        validSignature = IValidator(validator).validateUserOp(userOp, userOpHash);
+        bytes memory retData = _executeReturnData({
+            safe: msg.sender,
+            target: validator,
+            value: 0,
+            callData: abi.encodeCall(IValidator.validateUserOp, (userOp, userOpHash))
+        });
+        validSignature = abi.decode(retData, (uint256));
 
         // pay prefund
         if (missingAccountFunds != 0) {