AA-521 EntryPoint support for eip-7702 #529
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| module.exports = { | ||
| skipFiles: [ | ||
| "test", | ||
| "utils/Exec.sol", | ||
| "samples" | ||
| ], | ||
| configureYulOptimizer: true, | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| pragma solidity ^0.8; | ||
| // SPDX-License-Identifier: MIT | ||
| // solhint-disable no-inline-assembly | ||
|
|
||
| import "../interfaces/PackedUserOperation.sol"; | ||
| import "../core/UserOperationLib.sol"; | ||
|
|
||
| library Eip7702Support { | ||
|
|
||
| // EIP-7702 code prefix before delegate address. | ||
| bytes3 internal constant EIP7702_PREFIX = 0xef0100; | ||
|
|
||
| // EIP-7702 initCode marker, to specify this account is EIP-7702. | ||
| bytes2 internal constant INITCODE_EIP7702_MARKER = 0x7702; | ||
|
|
||
| using UserOperationLib for PackedUserOperation; | ||
|
|
||
| //get alternate InitCodeHash (just for UserOp hash) when using EIP-7702 | ||
| function _getEip7702InitCodeHashOverride(PackedUserOperation calldata userOp) internal view returns (bytes32) { | ||
| bytes calldata initCode = userOp.initCode; | ||
| if (!_isEip7702InitCode(initCode)) { | ||
| return 0; | ||
| } | ||
| address delegate = _getEip7702Delegate(userOp.getSender()); | ||
| if (initCode.length <= 20) | ||
| return keccak256(abi.encodePacked(delegate)); | ||
| else | ||
| return keccak256(abi.encodePacked(delegate, initCode[20 :])); | ||
| } | ||
|
|
||
| // check if this initCode is EIP-7702: starts with INITCODE_EIP7702_MARKER. | ||
| function _isEip7702InitCode(bytes calldata initCode) internal pure returns (bool) { | ||
|
|
||
| if (initCode.length < 2) { | ||
| return false; | ||
| } | ||
| bytes20 initCodeStart; | ||
| // non-empty calldata bytes are always zero-padded to 32-bytes, so can be safely casted to "bytes20" | ||
| assembly ("memory-safe") { | ||
| initCodeStart := calldataload(initCode.offset) | ||
| } | ||
| // make sure first 20 bytes of initCode are "0x7702" (padded with zeros) | ||
| return initCodeStart == bytes20(INITCODE_EIP7702_MARKER); | ||
| } | ||
|
|
||
| /** | ||
| * get the EIP-7702 delegate from contract code. | ||
| * must only be used if _isEip7702InitCode(initCode) is true. | ||
| */ | ||
| function _getEip7702Delegate(address sender) internal view returns (address) { | ||
|
|
||
| bytes32 senderCode; | ||
|
|
||
| assembly ("memory-safe") { | ||
| extcodecopy(sender, 0, 0, 23) | ||
| senderCode := mload(0) | ||
| } | ||
| // To be a valid EIP-7702 delegate, the first 3 bytes are EIP7702_PREFIX | ||
| // followed by the delegate address | ||
| if (bytes3(senderCode) != EIP7702_PREFIX) { | ||
| // instead of just "not an EIP-7702 delegate", if some info. | ||
| require(sender.code.length > 0, "sender has no code"); | ||
| revert("not an EIP-7702 delegate"); | ||
| } | ||
| return address(bytes20(senderCode << 24)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| pragma solidity ^0.8.23; | ||
| // SPDX-License-Identifier: MIT | ||
| import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; | ||
| import "../core/BaseAccount.sol"; | ||
| import "../core/Eip7702Support.sol"; | ||
|
|
||
| contract TestEip7702DelegateAccount is BaseAccount { | ||
|
|
||
| IEntryPoint private immutable _entryPoint; | ||
| bool public testInitCalled; | ||
|
|
||
| constructor(IEntryPoint anEntryPoint) { | ||
| _entryPoint = anEntryPoint; | ||
| } | ||
|
|
||
| function testInit() public { | ||
| testInitCalled = true; | ||
| } | ||
|
|
||
| function entryPoint() public view override virtual returns (IEntryPoint) { | ||
| return _entryPoint; | ||
| } | ||
|
|
||
| // Require the function call went through EntryPoint or owner | ||
| function _requireFromEntryPointOrOwner() internal view { | ||
| require(msg.sender == address(this) || msg.sender == address(entryPoint()), "account: not Owner or EntryPoint"); | ||
| } | ||
|
|
||
| /** | ||
| * execute a transaction (called directly from owner, or by entryPoint) | ||
| * @param dest destination address to call | ||
| * @param value the value to pass in this call | ||
| * @param func the calldata to pass in this call | ||
| */ | ||
| function execute(address dest, uint256 value, bytes calldata func) external { | ||
| _requireFromEntryPointOrOwner(); | ||
| (bool success,) = dest.call{value: value}(func); | ||
| require(success, "call failed"); | ||
| } | ||
|
|
||
| function _validateSignature( | ||
| PackedUserOperation calldata userOp, | ||
| bytes32 userOpHash | ||
| ) internal virtual override returns (uint256 validationData) { | ||
| if (userOp.initCode.length > 20) { | ||
| require(testInitCalled, "testInit not called"); | ||
| } | ||
| if (ECDSA.recover(userOpHash, userOp.signature) == address(this)) { | ||
| return 0; | ||
| } | ||
| return 1; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This means that EIP-7702 accounts can get two validation phase calls instead of one whenever they want, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. eip-7702 account is never "new" (from the EntryPoint's view) - it is always "already created".
So we always allow an eip-7702 account to run "initialization" code - as many times as it wishes.
The alternative was to require it to put this initialization data into the "callCode", use it from "validate" and then ignore it during execution.