Default _signableUserOpHash to a typed userop signature

contracts/account/draft-AccountBase.sol

@@ -101,7 +101,7 @@ abstract contract AccountBase is IAccount, IAccountExecute, ERC7739Signer {
         PackedUserOperation calldata /* userOp */,
         bytes32 userOpHash
     ) internal view virtual returns (bytes32) {
-        return userOpHash.toEthSignedMessageHash();
+        return userOpHash;
     }
 
     /**

contracts/account/extensions/draft-AccountECDSA.sol

@@ -5,7 +5,6 @@ pragma solidity ^0.8.20;
 import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 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 {AccountBase} from "../draft-AccountBase.sol";
@@ -33,7 +32,10 @@ import {AccountBase} from "../draft-AccountBase.sol";
  * or during initialization (if used as a clone) may leave the account either front-runnable or unusable.
  */
 abstract contract AccountECDSA is AccountBase, ERC721Holder, ERC1155Holder {
-    using MessageHashUtils for bytes32;
+    bytes32 internal constant _PACKED_USER_OPERATION =
+        keccak256(
+            "PackedUserOperation(address sender,uint256 nonce,bytes initCode,bytes callData,bytes32 accountGasLimits,uint256 preVerificationGas,bytes32 gasFees,bytes paymasterAndData,address entrypoint)"
+        );
 
     /**
      * @dev The {signer} is already initialized.
@@ -57,6 +59,34 @@ abstract contract AccountECDSA is AccountBase, ERC721Holder, ERC1155Holder {
         return _signer;
     }
 
+    /**
+     * @dev Customize the user operation hash to sign. See {AccountBase-_signableUserOpHash}.
+     *
+     * This implementation uses the EIP-712 typed data hashing mechanism for readability.
+     */
+    function _signableUserOpHash(
+        PackedUserOperation calldata userOp,
+        bytes32 /* userOpHash */
+    ) internal view virtual override returns (bytes32) {
+        return
+            _hashTypedDataV4(
+                keccak256(
+                    abi.encode(
+                        _PACKED_USER_OPERATION,
+                        userOp.sender,
+                        userOp.nonce,
+                        keccak256(userOp.initCode),
+                        keccak256(userOp.callData),
+                        userOp.accountGasLimits,
+                        userOp.preVerificationGas,
+                        userOp.gasFees,
+                        keccak256(userOp.paymasterAndData),
+                        msg.sender
+                    )
+                )
+            );
+    }
+
     /**
      * @dev Validates the signature using the account's signer.
      */

contracts/account/extensions/draft-AccountP256.sol

@@ -5,7 +5,6 @@ pragma solidity ^0.8.20;
 import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 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 {AccountBase} from "../draft-AccountBase.sol";
@@ -33,7 +32,10 @@ import {AccountBase} from "../draft-AccountBase.sol";
  * or during initialization (if used as a clone) may leave the account either front-runnable or unusable.
  */
 abstract contract AccountP256 is AccountBase, ERC721Holder, ERC1155Holder {
-    using MessageHashUtils for bytes32;
+    bytes32 internal constant _PACKED_USER_OPERATION =
+        keccak256(
+            "PackedUserOperation(address sender,uint256 nonce,bytes initCode,bytes callData,bytes32 accountGasLimits,uint256 preVerificationGas,bytes32 gasFees,bytes paymasterAndData,address entrypoint)"
+        );
 
     /**
      * @dev The {signer} is already initialized.
@@ -59,6 +61,34 @@ abstract contract AccountP256 is AccountBase, ERC721Holder, ERC1155Holder {
         return (_qx, _qy);
     }
 
+    /**
+     * @dev Customize the user operation hash to sign. See {AccountBase-_signableUserOpHash}.
+     *
+     * This implementation uses the EIP-712 typed data hashing mechanism for readability.
+     */
+    function _signableUserOpHash(
+        PackedUserOperation calldata userOp,
+        bytes32 /* userOpHash */
+    ) internal view virtual override returns (bytes32) {
+        return
+            _hashTypedDataV4(
+                keccak256(
+                    abi.encode(
+                        _PACKED_USER_OPERATION,
+                        userOp.sender,
+                        userOp.nonce,
+                        keccak256(userOp.initCode),
+                        keccak256(userOp.callData),
+                        userOp.accountGasLimits,
+                        userOp.preVerificationGas,
+                        userOp.gasFees,
+                        keccak256(userOp.paymasterAndData),
+                        msg.sender
+                    )
+                )
+            );
+    }
+
     /**
      * @dev Validates the signature using the account's signer.
      */

contracts/account/extensions/draft-AccountRSA.sol

@@ -5,7 +5,6 @@ pragma solidity ^0.8.20;
 import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 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 {AccountBase} from "../draft-AccountBase.sol";
@@ -33,7 +32,10 @@ import {AccountBase} from "../draft-AccountBase.sol";
  * or during initialization (if used as a clone) may leave the account either front-runnable or unusable.
  */
 abstract contract AccountRSA is AccountBase, ERC721Holder, ERC1155Holder {
-    using MessageHashUtils for bytes32;
+    bytes32 internal constant _PACKED_USER_OPERATION =
+        keccak256(
+            "PackedUserOperation(address sender,uint256 nonce,bytes initCode,bytes callData,bytes32 accountGasLimits,uint256 preVerificationGas,bytes32 gasFees,bytes paymasterAndData,address entrypoint)"
+        );
 
     /**
      * @dev The {signer} is already initialized.
@@ -59,6 +61,34 @@ abstract contract AccountRSA is AccountBase, ERC721Holder, ERC1155Holder {
         return (_e, _n);
     }
 
+    /**
+     * @dev Customize the user operation hash to sign. See {AccountBase-_signableUserOpHash}.
+     *
+     * This implementation uses the EIP-712 typed data hashing mechanism for readability.
+     */
+    function _signableUserOpHash(
+        PackedUserOperation calldata userOp,
+        bytes32 /* userOpHash */
+    ) internal view virtual override returns (bytes32) {
+        return
+            _hashTypedDataV4(
+                keccak256(
+                    abi.encode(
+                        _PACKED_USER_OPERATION,
+                        userOp.sender,
+                        userOp.nonce,
+                        keccak256(userOp.initCode),
+                        keccak256(userOp.callData),
+                        userOp.accountGasLimits,
+                        userOp.preVerificationGas,
+                        userOp.gasFees,
+                        keccak256(userOp.paymasterAndData),
+                        msg.sender
+                    )
+                )
+            );
+    }
+
     /**
      * @dev Validates the signature using the account's signer.
      */

test/account/Account.behavior.js

@@ -36,7 +36,8 @@ function shouldBehaveLikeAnAccountBase() {
             ),
           ]),
         })
-        .then(op => op.sign(this.signer));
+        .then(op => this.signUserOp(op));
+
       await expect(this.mock.connect(this.other).validateUserOp(operation.packed, operation.hash(), 0))
         .to.be.revertedWithCustomError(this.mock, 'AccountUnauthorized')
         .withArgs(this.other);
@@ -59,7 +60,7 @@ function shouldBehaveLikeAnAccountBase() {
               ),
             ]),
           })
-          .then(op => op.sign(this.signer));
+          .then(op => this.signUserOp(op));
 
         expect(
           await this.mock
@@ -101,7 +102,7 @@ function shouldBehaveLikeAnAccountBase() {
               ),
             ]),
           })
-          .then(op => op.sign(this.signer));
+          .then(op => this.signUserOp(op));
 
         const prevAccountBalance = await ethers.provider.getBalance(this.mock.target);
         const prevEntrypointBalance = await ethers.provider.getBalance(this.entrypoint.target);
@@ -221,7 +222,7 @@ function shouldBehaveLikeAnAccountBaseExecutor({ deployable = true } = {}) {
             ),
           ]),
         })
-        .then(op => op.sign(this.signer));
+        .then(op => this.signUserOp(op));
 
       await expect(this.mock.connect(this.other).executeUserOp(operation.packed, operation.hash()))
         .to.be.revertedWithCustomError(this.mock, 'AccountUnauthorized')
@@ -243,7 +244,7 @@ function shouldBehaveLikeAnAccountBaseExecutor({ deployable = true } = {}) {
               ]),
             })
             .then(op => op.addInitCode())
-            .then(op => op.sign(this.signer));
+            .then(op => this.signUserOp(op));
 
           await expect(this.entrypoint.connect(this.entrypointAsSigner).handleOps([operation.packed], this.beneficiary))
             .to.emit(this.entrypoint, 'AccountDeployed')
@@ -292,7 +293,7 @@ function shouldBehaveLikeAnAccountBaseExecutor({ deployable = true } = {}) {
               ),
             ]),
           })
-          .then(op => op.sign(this.signer));
+          .then(op => this.signUserOp(op));
 
         expect(await this.mock.getNonce()).to.equal(0);
         await expect(this.entrypoint.connect(this.entrypointAsSigner).handleOps([operation.packed], this.beneficiary))

test/account/draft-AccountBase.test.js

@@ -10,8 +10,12 @@ async function fixture() {
   const signer = new NonNativeSigner({ sign: () => ({ serialized: '0x01' }) });
   const helper = new ERC4337Helper('$AccountBaseMock');
   const smartAccount = await helper.newAccount(['AccountBase', '1']);
+  const signUserOp = async userOp => {
+    userOp.signature = await signer.signMessage(userOp.hash());
+    return userOp;
+  };
 
-  return { ...helper, mock: smartAccount, signer, target, beneficiary, other };
+  return { ...helper, mock: smartAccount, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountBase', function () {

test/account/draft-AccountECDSA.test.js

@@ -7,6 +7,7 @@ const {
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
+const { PackedUserOperation } = require('../helpers/eip712');
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
@@ -20,6 +21,23 @@ async function fixture() {
     chainId: helper.chainId,
     verifyingContract: smartAccount.address,
   };
+  const signUserOp = async userOp => {
+    const types = { PackedUserOperation };
+    const packed = userOp.packed;
+    const typedOp = {
+      sender: packed.sender,
+      nonce: packed.nonce,
+      initCode: packed.initCode,
+      callData: packed.callData,
+      accountGasLimits: packed.accountGasLimits,
+      preVerificationGas: packed.preVerificationGas,
+      gasFees: packed.gasFees,
+      paymasterAndData: packed.paymasterAndData,
+      entrypoint: userOp.context.entrypoint.target,
+    };
+    userOp.signature = await signer.signTypedData(domain, types, typedOp);
+    return userOp;
+  };
 
   return {
     ...helper,
@@ -29,6 +47,7 @@ async function fixture() {
     target,
     beneficiary,
     other,
+    signUserOp,
   };
 }
 

test/account/draft-AccountP256.test.js

@@ -8,6 +8,7 @@ const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { NonNativeSigner, P256SigningKey } = require('../helpers/signers');
 const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
+const { PackedUserOperation } = require('../helpers/eip712');
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
@@ -26,8 +27,25 @@ async function fixture() {
     chainId: helper.chainId,
     verifyingContract: smartAccount.address,
   };
+  const signUserOp = async userOp => {
+    const types = { PackedUserOperation };
+    const packed = userOp.packed;
+    const typedOp = {
+      sender: packed.sender,
+      nonce: packed.nonce,
+      initCode: packed.initCode,
+      callData: packed.callData,
+      accountGasLimits: packed.accountGasLimits,
+      preVerificationGas: packed.preVerificationGas,
+      gasFees: packed.gasFees,
+      paymasterAndData: packed.paymasterAndData,
+      entrypoint: userOp.context.entrypoint.target,
+    };
+    userOp.signature = await signer.signTypedData(domain, types, typedOp);
+    return userOp;
+  };
 
-  return { ...helper, domain, mock: smartAccount, signer, target, beneficiary, other };
+  return { ...helper, domain, mock: smartAccount, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountP256', function () {

test/account/draft-AccountRSA.test.js

@@ -8,6 +8,7 @@ const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { NonNativeSigner, RSASHA256SigningKey } = require('../helpers/signers');
 const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739Signer.behavior');
+const { PackedUserOperation } = require('../helpers/eip712');
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
@@ -26,8 +27,25 @@ async function fixture() {
     chainId: helper.chainId,
     verifyingContract: smartAccount.address,
   };
+  const signUserOp = async userOp => {
+    const types = { PackedUserOperation };
+    const packed = userOp.packed;
+    const typedOp = {
+      sender: packed.sender,
+      nonce: packed.nonce,
+      initCode: packed.initCode,
+      callData: packed.callData,
+      accountGasLimits: packed.accountGasLimits,
+      preVerificationGas: packed.preVerificationGas,
+      gasFees: packed.gasFees,
+      paymasterAndData: packed.paymasterAndData,
+      entrypoint: userOp.context.entrypoint.target,
+    };
+    userOp.signature = await signer.signTypedData(domain, types, typedOp);
+    return userOp;
+  };
 
-  return { ...helper, domain, mock: smartAccount, signer, target, beneficiary, other };
+  return { ...helper, domain, mock: smartAccount, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('AccountRSA', function () {

test/helpers/eip712.js

@@ -0,0 +1,22 @@
+const { types, formatType } = require('../../lib/@openzeppelin-contracts/test/helpers/eip712');
+const { mapValues } = require('../../lib/@openzeppelin-contracts/test/helpers/iterate');
+
+module.exports = {
+  ...types,
+  ...mapValues(
+    {
+      PackedUserOperation: {
+        sender: 'address',
+        nonce: 'uint256',
+        initCode: 'bytes',
+        callData: 'bytes',
+        accountGasLimits: 'bytes32',
+        preVerificationGas: 'uint256',
+        gasFees: 'bytes32',
+        paymasterAndData: 'bytes',
+        entrypoint: 'address',
+      },
+    },
+    formatType,
+  ),
+};

test/helpers/erc4337.js

@@ -1,7 +1,6 @@
 const { setCode } = require('@nomicfoundation/hardhat-network-helpers');
 const { ethers } = require('hardhat');
 const { UserOperation: UserOperationVanilla } = require('../../lib/@openzeppelin-contracts/test/helpers/erc4337');
-const { PersonalSignHelper } = require('./erc7739');
 
 const CANONICAL_ENTRYPOINT = '0x0000000071727De22E5E9d8BAf0edAc6f37da032';
 
@@ -98,11 +97,6 @@ class UserOperation extends UserOperationVanilla {
   hash() {
     return super.hash(this.context.entrypoint.target, this.context.chainId);
   }
-
-  async sign(signer) {
-    this.signature = await signer.signMessage(ethers.getBytes(this.hash()));
-    return this;
-  }
 }
 
 module.exports = {