-
Notifications
You must be signed in to change notification settings - Fork 11.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
starting rewrite account common as ERC7579
- Loading branch information
Showing
21 changed files
with
1,355 additions
and
109 deletions.
There are no files selected for viewing
This file contains 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 was deleted.
Oops, something went wrong.
This file contains 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,200 @@ | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| pragma solidity ^0.8.20; | ||
|
|
||
| import {Account} from "./Account.sol"; | ||
| import {Address} from "../../utils/Address.sol"; | ||
| import {ERC1155Holder} from "../../token/ERC1155/utils/ERC1155Holder.sol"; | ||
| import {ERC721Holder} from "../../token/ERC721/utils/ERC721Holder.sol"; | ||
| import {IEntryPoint} from "../../interfaces/IERC4337.sol"; | ||
| import {IERC1271} from "../../interfaces/IERC1271.sol"; | ||
| import {IERC165, ERC165} from "../../utils/introspection/ERC165.sol"; | ||
| import {IERC7579Execution, IERC7579AccountConfig, IERC7579ModuleConfig, Execution} from "../../interfaces/IERC7579Account.sol"; | ||
| import {ERC7579Utils, Mode, CallType, ExecType} from "../utils/ERC7579Utils.sol"; | ||
|
|
||
| abstract contract ERC7579Account is | ||
| IERC165, // required by erc-7579 | ||
| IERC1271, // required by erc-7579 | ||
| IERC7579Execution, // required by erc-7579 | ||
| IERC7579AccountConfig, // required by erc-7579 | ||
| IERC7579ModuleConfig, // required by erc-7579 | ||
| Account, | ||
| ERC165, | ||
| ERC721Holder, | ||
| ERC1155Holder | ||
| { | ||
| using ERC7579Utils for *; | ||
|
|
||
| IEntryPoint private immutable _entryPoint; | ||
|
|
||
| event ERC7579TryExecuteUnsuccessful(uint256 batchExecutionindex, bytes result); | ||
| error ERC7579UnsupportedCallType(CallType); | ||
| error ERC7579UnsupportedExecType(ExecType); | ||
|
|
||
| modifier onlyExecutorModule() { | ||
| // TODO | ||
| _; | ||
| } | ||
|
|
||
| constructor(IEntryPoint entryPoint_) { | ||
| _entryPoint = entryPoint_; | ||
| } | ||
|
|
||
| receive() external payable {} | ||
|
|
||
| function entryPoint() public view virtual override returns (IEntryPoint) { | ||
| return _entryPoint; | ||
| } | ||
|
|
||
| /// @inheritdoc IERC165 | ||
| function supportsInterface( | ||
| bytes4 interfaceId | ||
| ) public view virtual override(IERC165, ERC165, ERC1155Holder) returns (bool) { | ||
| // TODO: more? | ||
| return super.supportsInterface(interfaceId); | ||
| } | ||
|
|
||
| /// @inheritdoc IERC1271 | ||
| function isValidSignature(bytes32 hash, bytes calldata signature) public view returns (bytes4 magicValue) { | ||
| (bool valid, , uint48 validAfter, uint48 validUntil) = _processSignature(hash, signature); | ||
| return | ||
| (valid && validAfter < block.timestamp && (validUntil == 0 || validUntil > block.timestamp)) | ||
| ? IERC1271.isValidSignature.selector | ||
| : bytes4(0); | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579Execution | ||
| function execute(bytes32 mode, bytes calldata executionCalldata) public virtual onlyEntryPoint { | ||
| _execute(Mode.wrap(mode), executionCalldata); | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579Execution | ||
| function executeFromExecutor( | ||
| bytes32 mode, | ||
| bytes calldata executionCalldata | ||
| ) public virtual onlyExecutorModule returns (bytes[] memory) { | ||
| return _execute(Mode.wrap(mode), executionCalldata); | ||
| } | ||
|
|
||
| function _execute( | ||
| Mode mode, | ||
| bytes calldata executionCalldata | ||
| ) internal virtual returns (bytes[] memory returnData) { | ||
| // TODO: ModeSelector? ModePayload? | ||
| (CallType callType, ExecType execType, , ) = mode.decodeMode(); | ||
|
|
||
| if (callType == ERC7579Utils.CALLTYPE_SINGLE) { | ||
| (address target, uint256 value, bytes calldata callData) = executionCalldata.decodeSingle(); | ||
| returnData = new bytes[](1); | ||
| returnData[0] = _execute(0, execType, target, value, callData); | ||
| } else if (callType == ERC7579Utils.CALLTYPE_BATCH) { | ||
| Execution[] calldata executionBatch = executionCalldata.decodeBatch(); | ||
| returnData = new bytes[](executionBatch.length); | ||
| for (uint256 i = 0; i < executionBatch.length; ++i) { | ||
| returnData[i] = _execute( | ||
| i, | ||
| execType, | ||
| executionBatch[i].target, | ||
| executionBatch[i].value, | ||
| executionBatch[i].callData | ||
| ); | ||
| } | ||
| } else if (callType == ERC7579Utils.CALLTYPE_DELEGATECALL) { | ||
| (address target, bytes calldata callData) = executionCalldata.decodeDelegate(); | ||
| returnData = new bytes[](1); | ||
| returnData[0] = _executeDelegate(0, execType, target, callData); | ||
| } else { | ||
| revert ERC7579UnsupportedCallType(callType); | ||
| } | ||
| } | ||
|
|
||
| function _execute( | ||
| uint256 index, | ||
| ExecType execType, | ||
| address target, | ||
| uint256 value, | ||
| bytes memory data | ||
| ) private returns (bytes memory) { | ||
| if (execType == ERC7579Utils.EXECTYPE_DEFAULT) { | ||
| (bool success, bytes memory returndata) = target.call{value: value}(data); | ||
| Address.verifyCallResult(success, returndata); | ||
| return returndata; | ||
| } else if (execType == ERC7579Utils.EXECTYPE_TRY) { | ||
| (bool success, bytes memory returndata) = target.call{value: value}(data); | ||
| if (!success) emit ERC7579TryExecuteUnsuccessful(index, returndata); | ||
| return returndata; | ||
| } else { | ||
| revert ERC7579UnsupportedExecType(execType); | ||
| } | ||
| } | ||
|
|
||
| function _executeDelegate( | ||
| uint256 index, | ||
| ExecType execType, | ||
| address target, | ||
| bytes memory data | ||
| ) private returns (bytes memory) { | ||
| if (execType == ERC7579Utils.EXECTYPE_DEFAULT) { | ||
| (bool success, bytes memory returndata) = target.delegatecall(data); | ||
| Address.verifyCallResult(success, returndata); | ||
| return returndata; | ||
| } else if (execType == ERC7579Utils.EXECTYPE_TRY) { | ||
| (bool success, bytes memory returndata) = target.delegatecall(data); | ||
| if (!success) emit ERC7579TryExecuteUnsuccessful(index, returndata); | ||
| return returndata; | ||
| } else { | ||
| revert ERC7579UnsupportedExecType(execType); | ||
| } | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579AccountConfig | ||
| function accountId() public view virtual returns (string memory) { | ||
| //vendorname.accountname.semver | ||
| return "@openzeppelin/contracts.erc7579account.v0-beta"; | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579AccountConfig | ||
| function supportsExecutionMode(bytes32 encodedMode) public view virtual returns (bool) { | ||
| (CallType callType, , , ) = Mode.wrap(encodedMode).decodeMode(); | ||
| return | ||
| callType == ERC7579Utils.CALLTYPE_SINGLE || | ||
| callType == ERC7579Utils.CALLTYPE_BATCH || | ||
| callType == ERC7579Utils.CALLTYPE_DELEGATECALL; | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579AccountConfig | ||
| function supportsModule(uint256 moduleTypeId) public view virtual returns (bool) { | ||
| // TODO: update when module support is added | ||
| moduleTypeId; | ||
| return false; | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579ModuleConfig | ||
| function installModule(uint256 moduleTypeId, address module, bytes calldata initData) public pure { | ||
| moduleTypeId; | ||
| module; | ||
| initData; | ||
| revert("not-implemented-yet"); | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579ModuleConfig | ||
| function uninstallModule(uint256 moduleTypeId, address module, bytes calldata deInitData) public pure { | ||
| moduleTypeId; | ||
| module; | ||
| deInitData; | ||
| revert("not-implemented-yet"); | ||
| } | ||
|
|
||
| /// @inheritdoc IERC7579ModuleConfig | ||
| function isModuleInstalled( | ||
| uint256 moduleTypeId, | ||
| address module, | ||
| bytes calldata additionalContext | ||
| ) public view returns (bool) { | ||
| moduleTypeId; | ||
| module; | ||
| additionalContext; | ||
| address(this); | ||
| revert("not-implemented-yet"); | ||
| } | ||
| } |
This file contains 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 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 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 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 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.