Remove entrypoint address for EIP-712 signature of UserOperations (#45)

Author: Amxx

contracts/account/AccountCore.sol

@@ -24,7 +24,7 @@ abstract contract AccountCore is AbstractSigner, EIP712, IAccount, IAccountExecu
 
     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)"
+            "PackedUserOperation(address sender,uint256 nonce,bytes initCode,bytes callData,bytes32 accountGasLimits,uint256 preVerificationGas,bytes32 gasFees,bytes paymasterAndData)"
         );
 
     /**
@@ -119,8 +119,7 @@ abstract contract AccountCore is AbstractSigner, EIP712, IAccount, IAccountExecu
                         userOp.accountGasLimits,
                         userOp.preVerificationGas,
                         userOp.gasFees,
-                        keccak256(userOp.paymasterAndData),
-                        entryPoint()
+                        keccak256(userOp.paymasterAndData)
                     )
                 )
             );

hardhat.config.js

@@ -17,7 +17,7 @@ require('hardhat-exposed');
 require('solidity-coverage');
 require('solidity-docgen');
 require('./hardhat/remappings');
-require('@openzeppelin/contracts/hardhat/common-contracts.js');
+require('@openzeppelin/contracts/hardhat/common-contracts');
 
 module.exports = {
   solidity: {

test/account/AccountECDSA.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { PackedUserOperation } = require('../helpers/eip712-types');
@@ -31,11 +31,10 @@ async function fixture() {
     verifyingContract: mock.address,
   };
 
-  const signUserOp = async userOp => {
-    const typedOp = Object.assign(userOp.packed, { entrypoint: entrypoint.target });
-    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
-    return userOp;
-  };
+  const signUserOp = userOp =>
+    signer
+      .signTypedData(domain, { PackedUserOperation }, userOp.packed)
+      .then(signature => Object.assign(userOp, { signature }));
 
   return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
 }

test/account/AccountERC7702.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { PackedUserOperation } = require('../helpers/eip712-types');
@@ -31,11 +31,10 @@ async function fixture() {
     verifyingContract: mock.address,
   };
 
-  const signUserOp = async userOp => {
-    const typedOp = Object.assign(userOp.packed, { entrypoint: entrypoint.target });
-    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
-    return userOp;
-  };
+  const signUserOp = userOp =>
+    signer
+      .signTypedData(domain, { PackedUserOperation }, userOp.packed)
+      .then(signature => Object.assign(userOp, { signature }));
 
   return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
 }

test/account/AccountP256.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { NonNativeSigner, P256SigningKey } = require('../helpers/signers');
@@ -37,11 +37,10 @@ async function fixture() {
     verifyingContract: mock.address,
   };
 
-  const signUserOp = async userOp => {
-    const typedOp = Object.assign(userOp.packed, { entrypoint: entrypoint.target });
-    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
-    return userOp;
-  };
+  const signUserOp = userOp =>
+    signer
+      .signTypedData(domain, { PackedUserOperation }, userOp.packed)
+      .then(signature => Object.assign(userOp, { signature }));
 
   return { ...env, mock, domain, signer, target, beneficiary, other, signUserOp };
 }

test/account/AccountRSA.test.js

@@ -1,4 +1,4 @@
-const { ethers, entrypoint } = require('hardhat');
+const { ethers } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ERC4337Helper } = require('../helpers/erc4337');
 const { NonNativeSigner, RSASHA256SigningKey } = require('../helpers/signers');
@@ -37,11 +37,10 @@ async function fixture() {
     verifyingContract: mock.address,
   };
 
-  const signUserOp = async userOp => {
-    const typedOp = Object.assign(userOp.packed, { entrypoint: entrypoint.target });
-    userOp.signature = await signer.signTypedData(domain, { PackedUserOperation }, typedOp);
-    return userOp;
-  };
+  const signUserOp = userOp =>
+    signer
+      .signTypedData(domain, { PackedUserOperation }, userOp.packed)
+      .then(signature => Object.assign(userOp, { signature }));
 
   return { ...env, domain, mock, signer, target, beneficiary, other, signUserOp };
 }

test/helpers/eip712-types.js

@@ -12,7 +12,6 @@ module.exports = mapValues(
       preVerificationGas: 'uint256',
       gasFees: 'bytes32',
       paymasterAndData: 'bytes',
-      entrypoint: 'address',
     },
   },
   formatType,