Remove signed hash fn

contracts/account/draft-AccountBase.sol

@@ -54,21 +54,6 @@ abstract contract AccountBase is IAccount, IAccountExecute {
         return entryPoint().getNonce(address(this), key);
     }
 
-    /**
-     * @dev Returns the digest the offchain signer signed instead of the opaque `userOpHash`.
-     *
-     * Given the `userOpHash` calculation is defined by ERC-4337, offchain signers
-     * may need to sign again this hash by rehashing it with other schemes.
-     *
-     * Returns the `userOpHash` by default.
-     */
-    function _userOpSignedHash(
-        PackedUserOperation calldata /* userOp */,
-        bytes32 userOpHash
-    ) internal view virtual returns (bytes32) {
-        return userOpHash;
-    }
-
     /**
      * @inheritdoc IAccount
      */
@@ -77,7 +62,7 @@ abstract contract AccountBase is IAccount, IAccountExecute {
         bytes32 userOpHash,
         uint256 missingAccountFunds
     ) public virtual onlyEntryPoint returns (uint256) {
-        uint256 validationData = _validateUserOp(userOp, _userOpSignedHash(userOp, userOpHash));
+        uint256 validationData = _validateUserOp(userOp, userOpHash);
         _payPrefund(missingAccountFunds);
         return validationData;
     }
@@ -94,15 +79,18 @@ abstract contract AccountBase is IAccount, IAccountExecute {
     }
 
     /**
-     * @dev Validation logic for {validateUserOp}. The `userOpSignedHash` is the digest from {_userOpSignedHash}.
+     * @dev Validation logic for {validateUserOp}.
+     *
+     * Given the `userOpHash` calculation is defined by ERC-4337, offchain signers
+     * may need to sign this hash by wrapping it in other schemes (e.g. ERC-191)
      *
      * IMPORTANT: Implementing a mechanism to validate user operations is a security-sensitive operation
      * as it may allow an attacker to bypass the account's security measures. Check out {AccountECDSA},
      * {AccountP256}, or {AccountRSA} for digital signature validation implementations.
      */
     function _validateUserOp(
         PackedUserOperation calldata userOp,
-        bytes32 userOpSignedHash
+        bytes32 userOpHash
     ) internal virtual returns (uint256 validationData);
 
     /**

contracts/account/draft-AccountECDSA.sol

@@ -8,18 +8,18 @@ import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
 import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
-import {AccountSignerDomain} from "./extensions/draft-AccountSignerDomain.sol";
+import {AccountERC7739} from "./extensions/draft-AccountERC7739.sol";
 
 /**
- * @dev Account implementation using {ECDSA} signatures and {AccountSignerDomain} for replay protection.
+ * @dev Account implementation using {ECDSA} signatures and {AccountERC7739} for replay protection.
  *
  * An {_initializeSigner} function is provided to set the account's signer address. Doing so it's
  * easier for a factory, whose likely to use initializable clones of this contract.
  *
  * IMPORTANT: Avoiding to call {_initializeSigner} either during construction (if used standalone)
  * or during initialization (if used as a clone) may leave the account unusable.
  */
-abstract contract AccountECDSA is AccountSignerDomain, ERC721Holder, ERC1155Holder {
+abstract contract AccountECDSA is AccountERC7739, ERC721Holder, ERC1155Holder {
     using MessageHashUtils for bytes32;
 
     /**
@@ -47,11 +47,11 @@ abstract contract AccountECDSA is AccountSignerDomain, ERC721Holder, ERC1155Hold
     /**
      * @dev Returns the ERC-191 signed `userOpHash` hashed with keccak256 using `personal_sign`.
      */
-    function _userOpSignedHash(
-        PackedUserOperation calldata /* userOp */,
+    function _validateUserOp(
+        PackedUserOperation calldata userOp,
         bytes32 userOpHash
-    ) internal view virtual override returns (bytes32) {
-        return userOpHash.toEthSignedMessageHash();
+    ) internal view virtual override returns (uint256) {
+        return super._validateUserOp(userOp, userOpHash.toEthSignedMessageHash());
     }
 
     /**

contracts/account/draft-AccountP256.sol

@@ -8,18 +8,18 @@ import {P256} from "@openzeppelin/contracts/utils/cryptography/P256.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
 import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
-import {AccountSignerDomain} from "./extensions/draft-AccountSignerDomain.sol";
+import {AccountERC7739} from "./extensions/draft-AccountERC7739.sol";
 
 /**
- * @dev Account implementation using {P256} signatures and {AccountSignerDomain} for replay protection.
+ * @dev Account implementation using {P256} signatures and {AccountERC7739} for replay protection.
  *
  * An {_initializeSigner} function is provided to set the account's signer address. Doing so it's
  * easier for a factory, whose likely to use initializable clones of this contract.
  *
  * IMPORTANT: Avoiding to call {_initializeSigner} either during construction (if used standalone)
  * or during initialization (if used as a clone) may leave the account unusable.
  */
-abstract contract AccountP256 is AccountSignerDomain, ERC721Holder, ERC1155Holder {
+abstract contract AccountP256 is AccountERC7739, ERC721Holder, ERC1155Holder {
     using MessageHashUtils for bytes32;
 
     /**
@@ -49,11 +49,11 @@ abstract contract AccountP256 is AccountSignerDomain, ERC721Holder, ERC1155Holde
     /**
      * @dev Returns the ERC-191 signed `userOpHash` hashed with keccak256 using `personal_sign`.
      */
-    function _userOpSignedHash(
-        PackedUserOperation calldata /* userOp */,
+    function _validateUserOp(
+        PackedUserOperation calldata userOp,
         bytes32 userOpHash
-    ) internal view virtual override returns (bytes32) {
-        return userOpHash.toEthSignedMessageHash();
+    ) internal view virtual override returns (uint256) {
+        return super._validateUserOp(userOp, userOpHash.toEthSignedMessageHash());
     }
 
     /**

contracts/account/draft-AccountRSA.sol

@@ -8,18 +8,18 @@ import {RSA} from "@openzeppelin/contracts/utils/cryptography/RSA.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
 import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
-import {AccountSignerDomain} from "./extensions/draft-AccountSignerDomain.sol";
+import {AccountERC7739} from "./extensions/draft-AccountERC7739.sol";
 
 /**
- * @dev Account implementation using {RSA} signatures and {AccountSignerDomain} for replay protection.
+ * @dev Account implementation using {RSA} signatures and {AccountERC7739} for replay protection.
  *
  * An {_initializeSigner} function is provided to set the account's signer address. Doing so it's
  * easier for a factory, whose likely to use initializable clones of this contract.
  *
  * IMPORTANT: Avoiding to call {_initializeSigner} either during construction (if used standalone)
  * or during initialization (if used as a clone) may leave the account unusable.
  */
-abstract contract AccountRSA is AccountSignerDomain, ERC721Holder, ERC1155Holder {
+abstract contract AccountRSA is AccountERC7739, ERC721Holder, ERC1155Holder {
     using MessageHashUtils for bytes32;
 
     /**
@@ -49,11 +49,11 @@ abstract contract AccountRSA is AccountSignerDomain, ERC721Holder, ERC1155Holder
     /**
      * @dev Returns the ERC-191 signed `userOpHash` hashed with keccak256 using `personal_sign`.
      */
-    function _userOpSignedHash(
-        PackedUserOperation calldata /* userOp */,
+    function _validateUserOp(
+        PackedUserOperation calldata userOp,
         bytes32 userOpHash
-    ) internal view virtual override returns (bytes32) {
-        return userOpHash.toEthSignedMessageHash();
+    ) internal view virtual override returns (uint256) {
+        return super._validateUserOp(userOp, userOpHash.toEthSignedMessageHash());
     }
 
     /**

contracts/account/extensions/draft-AccountSignerDomain.sol → contracts/account/extensions/draft-AccountERC7739.sol

@@ -12,20 +12,18 @@ import {AccountBase} from "../draft-AccountBase.sol";
 /**
  * @dev An ERC-4337 account implementation that validates domain-specific signatures following ERC-7739.
  */
-abstract contract AccountSignerDomain is ERC165, IERC5267, ERC7739Signer, AccountBase {
+abstract contract AccountERC7739 is ERC165, IERC5267, ERC7739Signer, AccountBase {
     /**
      * @dev Internal version of {validateUserOp} that relies on {_validateSignature}.
      *
-     * The `userOpSignedHash` is the digest from {_userOpSignedHash}.
-     *
      * NOTE: To override the signature functionality, try overriding {_validateSignature} instead.
      */
     function _validateUserOp(
         PackedUserOperation calldata userOp,
-        bytes32 userOpSignedHash
+        bytes32 userOpHash
     ) internal view virtual override returns (uint256) {
         return
-            _isValidSignature(userOpSignedHash, userOp.signature)
+            _isValidSignature(userOpHash, userOp.signature)
                 ? ERC4337Utils.SIG_VALIDATION_SUCCESS
                 : ERC4337Utils.SIG_VALIDATION_FAILED;
     }

contracts/mocks/docs/account/MyAccountCustom.sol

@@ -23,13 +23,13 @@ contract MyAccountCustom is ERC7739Signer, AccountBase, Initializable {
         // Custom initialization logic
     }
 
-    /// @dev Receives an `userOpSignedHash` to validate. See {_userOpSignedHash}.
+    /// @inheritdoc AccountBase
     function _validateUserOp(
         PackedUserOperation calldata userOp,
-        bytes32 userOpSignedHash
+        bytes32 userOpHash
     ) internal view virtual override returns (uint256) {
         return
-            _isValidSignature(userOpSignedHash, userOp.signature)
+            _isValidSignature(userOpHash, userOp.signature)
                 ? ERC4337Utils.SIG_VALIDATION_SUCCESS
                 : ERC4337Utils.SIG_VALIDATION_FAILED;
     }