From cc1b7ea44de5b88e97f649471ba80a1f7dd46d1a Mon Sep 17 00:00:00 2001 From: shahafn Date: Mon, 3 Mar 2025 23:30:42 +0200 Subject: [PATCH] Adding comment on getUserOpHash() regarding 7702 --- contracts/accounts/Simple7702Account.sol | 2 +- contracts/core/EntryPoint.sol | 2 +- contracts/interfaces/IEntryPoint.sol | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/accounts/Simple7702Account.sol b/contracts/accounts/Simple7702Account.sol index 158dc418..4ea8b0cc 100644 --- a/contracts/accounts/Simple7702Account.sol +++ b/contracts/accounts/Simple7702Account.sol @@ -17,7 +17,7 @@ contract Simple7702Account is BaseAccount, IERC165, IERC1271, ERC1155Holder, ERC // temporary address of entryPoint v0.8 function entryPoint() public pure override returns (IEntryPoint) { - return IEntryPoint(0x0C1AFDED2Ba150E85D1a6b13498CD5B191E767E5); + return IEntryPoint(0xfe2259d1b0d1ec18583902fb5ddf883004b40eC9); } /** diff --git a/contracts/core/EntryPoint.sol b/contracts/core/EntryPoint.sol index 5fe35fc7..986ceb89 100644 --- a/contracts/core/EntryPoint.sol +++ b/contracts/core/EntryPoint.sol @@ -462,7 +462,7 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuardT address sender = opInfo.mUserOp.sender; if ( Eip7702Support._isEip7702InitCode(initCode) ) { if (initCode.length>20 ) { - // Already validated it is an EIP-7702 delegate (and hence, already has code) + // Already validated it is an EIP-7702 delegate (and hence, already has code) - see getUserOpHash() // Note: Can be called multiple times as long as an appropriate initCode is supplied senderCreator().initEip7702Sender{ gas: opInfo.mUserOp.verificationGasLimit diff --git a/contracts/interfaces/IEntryPoint.sol b/contracts/interfaces/IEntryPoint.sol index 419abe67..33de14f0 100644 --- a/contracts/interfaces/IEntryPoint.sol +++ b/contracts/interfaces/IEntryPoint.sol @@ -169,7 +169,7 @@ interface IEntryPoint is IStakeManager, INonceManager { /** * Generate a request Id - unique identifier for this request. - * The request ID is a hash over the content of the userOp (except the signature), the entrypoint and the chainid. + * The request ID is a hash over the content of the userOp (except the signature), entrypoint address, chainId and (optionally) 7702 delegate address * @param userOp - The user operation to generate the request ID for. * @return hash the hash of this UserOperation */