up

contracts/account/draft-AccountECDSA.sol

@@ -9,13 +9,16 @@ import {ERC1155HolderLean, IERC1155Receiver} from "../token/ERC1155/utils/ERC115
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {AccountBase} from "./draft-AccountBase.sol";
 import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
 
 /**
  * @dev Account implementation using {ECDSA} signatures and {ERC7739Signer} for replay protection.
  */
 abstract contract AccountECDSA is ERC165, ERC7739Signer, ERC721Holder, ERC1155HolderLean, AccountBase {
+    using MessageHashUtils for bytes32;
+
     address private immutable _signer;
 
     /**
@@ -40,9 +43,9 @@ abstract contract AccountECDSA is ERC165, ERC7739Signer, ERC721Holder, ERC1155Ho
     function _validateUserOp(
         PackedUserOperation calldata userOp,
         bytes32 userOpHash
-    ) internal view override returns (uint256) {
+    ) internal view virtual override returns (uint256) {
         return
-            _isValidSignature(userOpHash, userOp.signature)
+            _isValidSignature(userOpHash.toEthSignedMessageHash(), userOp.signature)
                 ? ERC4337Utils.SIG_VALIDATION_SUCCESS
                 : ERC4337Utils.SIG_VALIDATION_FAILED;
     }

contracts/account/draft-AccountP256.sol

@@ -9,13 +9,16 @@ import {ERC1155HolderLean, IERC1155Receiver} from "../token/ERC1155/utils/ERC115
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {P256} from "@openzeppelin/contracts/utils/cryptography/P256.sol";
+import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {AccountBase} from "./draft-AccountBase.sol";
 import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
 
 /**
  * @dev Account implementation using {P256} signatures and {ERC7739Signer} for replay protection.
  */
 abstract contract AccountP256 is ERC165, ERC7739Signer, ERC721Holder, ERC1155HolderLean, AccountBase {
+    using MessageHashUtils for bytes32;
+
     bytes32 private immutable _qx;
     bytes32 private immutable _qy;
 
@@ -42,9 +45,9 @@ abstract contract AccountP256 is ERC165, ERC7739Signer, ERC721Holder, ERC1155Hol
     function _validateUserOp(
         PackedUserOperation calldata userOp,
         bytes32 userOpHash
-    ) internal view override returns (uint256) {
+    ) internal view virtual override returns (uint256) {
         return
-            _isValidSignature(userOpHash, userOp.signature)
+            _isValidSignature(userOpHash.toEthSignedMessageHash(), userOp.signature)
                 ? ERC4337Utils.SIG_VALIDATION_SUCCESS
                 : ERC4337Utils.SIG_VALIDATION_FAILED;
     }

contracts/account/draft-AccountRSA.sol

@@ -9,6 +9,7 @@ import {ERC1155HolderLean, IERC1155Receiver} from "../token/ERC1155/utils/ERC115
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {RSA} from "@openzeppelin/contracts/utils/cryptography/RSA.sol";
+import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {AccountBase} from "./draft-AccountBase.sol";
 import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
 
@@ -21,6 +22,8 @@ import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
  * (see {Clones-cloneDeterministicWithImmutableArgs}).
  */
 abstract contract AccountRSA is ERC165, ERC7739Signer, ERC721Holder, ERC1155HolderLean, AccountBase {
+    using MessageHashUtils for bytes32;
+
     bytes private _e;
     bytes private _n;
 
@@ -47,9 +50,9 @@ abstract contract AccountRSA is ERC165, ERC7739Signer, ERC721Holder, ERC1155Hold
     function _validateUserOp(
         PackedUserOperation calldata userOp,
         bytes32 userOpHash
-    ) internal view override returns (uint256) {
+    ) internal view virtual override returns (uint256) {
         return
-            _isValidSignature(userOpHash, userOp.signature)
+            _isValidSignature(userOpHash.toEthSignedMessageHash(), userOp.signature)
                 ? ERC4337Utils.SIG_VALIDATION_SUCCESS
                 : ERC4337Utils.SIG_VALIDATION_FAILED;
     }

test/account/Account.behavior.js

@@ -37,15 +37,7 @@ function shouldBehaveLikeAnAccountBase() {
           ]),
         })
         .then(op => op.sign(this.domain, this.signer));
-      await expect(
-        this.mock
-          .connect(this.other)
-          .validateUserOp(
-            operation.packed,
-            operation.hash(operation.context.entrypoint.target, operation.context.chainId),
-            0,
-          ),
-      )
+      await expect(this.mock.connect(this.other).validateUserOp(operation.packed, operation.hash(), 0))
         .to.be.revertedWithCustomError(this.mock, 'AccountUnauthorized')
         .withArgs(this.other);
     });
@@ -72,11 +64,7 @@ function shouldBehaveLikeAnAccountBase() {
         expect(
           await this.mock
             .connect(this.entrypointAsSigner)
-            .validateUserOp.staticCall(
-              operation.packed,
-              operation.hash(operation.context.entrypoint.target, operation.context.chainId),
-              0,
-            ),
+            .validateUserOp.staticCall(operation.packed, operation.hash(), 0),
         ).to.eq(SIG_VALIDATION_SUCCESS);
       });
 
@@ -97,11 +85,7 @@ function shouldBehaveLikeAnAccountBase() {
         expect(
           await this.mock
             .connect(this.entrypointAsSigner)
-            .validateUserOp.staticCall(
-              operation.packed,
-              operation.hash(operation.context.entrypoint.target, operation.context.chainId),
-              0,
-            ),
+            .validateUserOp.staticCall(operation.packed, operation.hash(), 0),
         ).to.eq(SIG_VALIDATION_FAILURE);
       });
 
@@ -125,11 +109,7 @@ function shouldBehaveLikeAnAccountBase() {
 
         const tx = await this.mock
           .connect(this.entrypointAsSigner)
-          .validateUserOp(
-            operation.packed,
-            operation.hash(operation.context.entrypoint.target, operation.context.chainId),
-            amount,
-          );
+          .validateUserOp(operation.packed, operation.hash(), amount);
 
         const receipt = await tx.wait();
         const callerFees = receipt.gasUsed * tx.gasPrice;
@@ -243,14 +223,7 @@ function shouldBehaveLikeAnAccountBaseExecutor({ deployable = true } = {}) {
         })
         .then(op => op.sign(this.domain, this.signer));
 
-      await expect(
-        this.mock
-          .connect(this.other)
-          .executeUserOp(
-            operation.packed,
-            operation.hash(operation.context.entrypoint.target, operation.context.chainId),
-          ),
-      )
+      await expect(this.mock.connect(this.other).executeUserOp(operation.packed, operation.hash()))
         .to.be.revertedWithCustomError(this.mock, 'AccountUnauthorized')
         .withArgs(this.other);
     });
@@ -274,12 +247,7 @@ function shouldBehaveLikeAnAccountBaseExecutor({ deployable = true } = {}) {
 
           await expect(this.entrypoint.connect(this.entrypointAsSigner).handleOps([operation.packed], this.beneficiary))
             .to.emit(this.entrypoint, 'AccountDeployed')
-            .withArgs(
-              operation.hash(operation.context.entrypoint.target, operation.context.chainId),
-              this.mock,
-              this.factory,
-              ethers.ZeroAddress,
-            )
+            .withArgs(operation.hash(), this.mock, this.factory, ethers.ZeroAddress)
             .to.emit(this.target, 'MockFunctionCalledExtra')
             .withArgs(this.mock, 17);
           expect(await this.mock.getNonce()).to.equal(1);

test/helpers/erc4337.js

@@ -95,13 +95,16 @@ class UserOperation extends UserOperationVanilla {
     return this;
   }
 
+  hash() {
+    return super.hash(this.context.entrypoint.target, this.context.chainId);
+  }
+
   async sign(domain, signer) {
     this.signature = await PersonalSignHelper.sign(
       signer.signTypedData.bind(signer),
-      this.hash(this.context.entrypoint.target, this.context.chainId),
+      ethers.getBytes(this.hash()),
       domain,
     );
-
     return this;
   }
 }

test/helpers/signers.js

@@ -20,8 +20,7 @@ class BooleanSigner {
 
 class ERC7739Signer {
   signTypedData(domain, types, contents) {
-    const encoder = ethers.TypedDataEncoder.from(types);
-    return this._signRaw(hashTypedData(domain, encoder.hash(contents)));
+    return this._signRaw(hashTypedData(domain, ethers.TypedDataEncoder.from(types).hash(contents)));
   }
 }