Update Account and Paymaster to use Entrypoint v0.8.0 (#95)

Co-authored-by: ernestognw <[email protected]>

Author: Amxx

contracts/account/Account.sol

@@ -13,43 +13,10 @@ import {AccountCore} from "./AccountCore.sol";
  *
  * * {ERC721Holder} and {ERC1155Holder} to accept ERC-712 and ERC-1155 token transfers transfers.
  * * {ERC7739} for ERC-1271 signature support with ERC-7739 replay protection
- * * {ERC7821} for performing external calls in batches.
  *
  * TIP: Use {ERC7821} to enable external calls in batches.
  *
  * NOTE: To use this contract, the {ERC7739-_rawSignatureValidation} function must be
  * implemented using a specific signature verification algorithm. See {SignerECDSA}, {SignerP256} or {SignerRSA}.
  */
-abstract contract Account is AccountCore, ERC721Holder, ERC1155Holder, ERC7739 {
-    bytes32 private constant PACKED_USER_OPERATION =
-        keccak256(
-            "PackedUserOperation(address sender,uint256 nonce,bytes initCode,bytes callData,bytes32 accountGasLimits,uint256 preVerificationGas,bytes32 gasFees,bytes paymasterAndData)"
-        );
-
-    /**
-     * @dev Specialization of {AccountCore-_signableUserOpHash} that returns a typehash following EIP-712 typed data
-     * hashing for readability. This assumes the underlying signature scheme implements `signTypedData`, which will be
-     * the case when combined with {SignerECDSA} or {SignerERC7702}.
-     */
-    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)
-                    )
-                )
-            );
-    }
-}
+abstract contract Account is AccountCore, ERC721Holder, ERC1155Holder, ERC7739 {}

contracts/account/AccountCore.sol

@@ -47,7 +47,7 @@ abstract contract AccountCore is AbstractSigner, IAccount {
      * @dev Canonical entry point for the account that forwards and validates user operations.
      */
     function entryPoint() public view virtual returns (IEntryPoint) {
-        return ERC4337Utils.ENTRYPOINT_V07;
+        return ERC4337Utils.ENTRYPOINT_V08;
     }
 
     /**
@@ -95,14 +95,15 @@ abstract contract AccountCore is AbstractSigner, IAccount {
     }
 
     /**
-     * @dev Virtual function that returns the signable hash for a user operations. Some implementation may return
-     * `userOpHash` while other may prefer a signer-friendly value such as an EIP-712 hash describing the `userOp`
-     * details.
+     * @dev Virtual function that returns the signable hash for a user operations. Since v0.8.0 of the entrypoint,
+     * `userOpHash` is an EIP-712 hash that can be signed directly.
      */
     function _signableUserOpHash(
-        PackedUserOperation calldata userOp,
+        PackedUserOperation calldata /*userOp*/,
         bytes32 userOpHash
-    ) internal view virtual returns (bytes32);
+    ) internal view virtual returns (bytes32) {
+        return userOpHash;
+    }
 
     /**
      * @dev Sends the missing funds for executing the user operation to the {entrypoint}.

contracts/account/paymaster/PaymasterCore.sol

@@ -38,7 +38,7 @@ abstract contract PaymasterCore is IPaymaster {
 
     /// @dev Canonical entry point for the account that forwards and validates user operations.
     function entryPoint() public view virtual returns (IEntryPoint) {
-        return ERC4337Utils.ENTRYPOINT_V07;
+        return ERC4337Utils.ENTRYPOINT_V08;
     }
 
     /// @inheritdoc IPaymaster

contracts/mocks/account/AccountERC7579HookedMock.sol

@@ -2,40 +2,18 @@
 
 pragma solidity ^0.8.24;
 
-import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
-import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
 import {MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";
 import {AccountERC7579} from "../../account/extensions/AccountERC7579.sol";
+import {AccountERC7579Hooked} from "../../account/extensions/AccountERC7579Hooked.sol";
 
-abstract contract AccountERC7579Mock is EIP712, AccountERC7579 {
-    bytes32 internal constant _PACKED_USER_OPERATION =
-        keccak256(
-            "PackedUserOperation(address sender,uint256 nonce,bytes initCode,bytes callData,bytes32 accountGasLimits,uint256 preVerificationGas,bytes32 gasFees,bytes paymasterAndData)"
-        );
-
+abstract contract AccountERC7579Mock is AccountERC7579 {
     constructor(address validator, bytes memory initData) {
         _installModule(MODULE_TYPE_VALIDATOR, validator, initData);
     }
+}
 
-    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)
-                    )
-                )
-            );
+abstract contract AccountERC7579HookedMock is AccountERC7579Hooked {
+    constructor(address validator, bytes memory initData) {
+        _installModule(MODULE_TYPE_VALIDATOR, validator, initData);
     }
 }

contracts/mocks/account/AccountERC7579Mock.sol

@@ -10,7 +10,7 @@ function shouldBehaveLikeAccountCore() {
   describe('entryPoint', function () {
     it('should return the canonical entrypoint', async function () {
       await this.mock.deploy();
-      await expect(this.mock.entryPoint()).to.eventually.equal(entrypoint);
+      await expect(this.mock.entryPoint()).to.eventually.equal(entrypoint.v08);
     });
   });
 
@@ -32,7 +32,7 @@ function shouldBehaveLikeAccountCore() {
 
     describe('when the caller is the canonical entrypoint', function () {
       beforeEach(async function () {
-        this.mockFromEntrypoint = this.mock.connect(await impersonate(entrypoint.target));
+        this.mockFromEntrypoint = this.mock.connect(await impersonate(entrypoint.v08.target));
       });
 
       it('should return SIG_VALIDATION_SUCCESS if the signature is valid', async function () {
@@ -61,7 +61,7 @@ function shouldBehaveLikeAccountCore() {
 
         await expect(
           this.mockFromEntrypoint.validateUserOp(operation.packed, operation.hash(), value),
-        ).to.changeEtherBalances([this.mock, entrypoint], [-value, value]);
+        ).to.changeEtherBalances([this.mock, entrypoint.v08], [-value, value]);
       });
     });
   });

lib/@openzeppelin-contracts

@@ -1,5 +1,7 @@
-const { ethers } = require('hardhat');
+const { ethers, entrypoint } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+
+const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { PackedUserOperation } = require('../helpers/eip712-types');
 const { NonNativeSigner } = require('../helpers/signers');
@@ -18,23 +20,25 @@ async function fixture() {
 
   // ERC-4337 account
   const helper = new ERC4337Helper();
-  const env = await helper.wait();
   const mock = await helper.newAccount('$AccountMock', ['Account', '1']);
 
+  // ERC-4337 Entrypoint domain
+  const entrypointDomain = await getDomain(entrypoint.v08);
+
   // domain cannot be fetched using getDomain(mock) before the mock is deployed
   const domain = {
     name: 'Account',
     version: '1',
-    chainId: env.chainId,
+    chainId: entrypointDomain.chainId,
     verifyingContract: mock.address,
   };
 
   const signUserOp = async userOp =>
     signer
-      .signTypedData(domain, { PackedUserOperation }, userOp.packed)
+      .signTypedData(entrypointDomain, { PackedUserOperation }, userOp.packed)
       .then(signature => Object.assign(userOp, { signature }));
 
-  return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
+  return { helper, mock, domain, signer, target, beneficiary, other, signUserOp };
 }
 
 describe('Account', function () {