-
Notifications
You must be signed in to change notification settings - Fork 11.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
352 additions
and
64 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| pragma solidity ^0.8.20; | ||
|
|
||
| import {PackedUserOperation} from "../../../interfaces/IERC4337.sol"; | ||
| import {Math} from "./../../../utils/math/Math.sol"; | ||
| import {ERC4337Utils} from "./../../utils/ERC4337Utils.sol"; | ||
| import {Account} from "../Account.sol"; | ||
|
|
||
| abstract contract AccountMultisig is Account { | ||
| function requiredSignatures(PackedUserOperation calldata userOp) public view virtual returns (uint256); | ||
|
|
||
| function _validateSignature( | ||
| PackedUserOperation calldata userOp, | ||
| bytes32 userOpHash | ||
| ) internal virtual override returns (uint256 validationData) { | ||
| bytes[] memory signatures = abi.decode(userOp.signature, (bytes[])); | ||
|
|
||
| if (signatures.length < requiredSignatures(userOp)) { | ||
| return ERC4337Utils.SIG_VALIDATION_FAILED; | ||
| } | ||
|
|
||
| address lastSigner = address(0); | ||
| uint48 globalValidAfter = 0; | ||
| uint48 globalValidUntil = 0; | ||
|
|
||
| for (uint256 i = 0; i < signatures.length; ++i) { | ||
| (address signer, uint48 validAfter, uint48 validUntil) = _processSignature(signatures[i], userOpHash); | ||
| if (_isAuthorized(signer) && signer > lastSigner) { | ||
| lastSigner = signer; | ||
| globalValidAfter = uint48(Math.ternary(validUntil < globalValidUntil, globalValidUntil, validAfter)); | ||
| globalValidUntil = uint48( | ||
| Math.ternary(validUntil > globalValidUntil || validUntil == 0, globalValidUntil, validUntil) | ||
| ); | ||
| } else { | ||
| return ERC4337Utils.SIG_VALIDATION_FAILED; | ||
| } | ||
| } | ||
| return ERC4337Utils.packValidationData(true, globalValidAfter, globalValidUntil); | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| pragma solidity ^0.8.20; | ||
|
|
||
| import {PackedUserOperation, IEntryPoint} from "../../interfaces/IERC4337.sol"; | ||
| import {AccessControl} from "../../access/AccessControl.sol"; | ||
| import {ERC721Holder} from "../../token/ERC721/utils/ERC721Holder.sol"; | ||
| import {ERC1155Holder} from "../../token/ERC1155/utils/ERC1155Holder.sol"; | ||
| import {Address} from "../../utils/Address.sol"; | ||
| import {Account} from "../account/Account.sol"; | ||
| import {AccountMultisig} from "../account/modules/AccountMultisig.sol"; | ||
| import {AccountECDSA} from "../account/modules/AccountECDSA.sol"; | ||
| import {AccountP256} from "../account/modules/AccountP256.sol"; | ||
|
|
||
| abstract contract AdvancedAccount is AccountMultisig, AccessControl, ERC721Holder, ERC1155Holder { | ||
| bytes32 public constant SIGNER_ROLE = keccak256("SIGNER_ROLE"); | ||
|
|
||
| IEntryPoint private immutable _entryPoint; | ||
| uint256 private _requiredSignatures; | ||
|
|
||
| constructor(IEntryPoint entryPoint_, address admin_, address[] memory signers_, uint256 requiredSignatures_) { | ||
| _grantRole(DEFAULT_ADMIN_ROLE, admin_); | ||
| for (uint256 i = 0; i < signers_.length; ++i) { | ||
| _grantRole(SIGNER_ROLE, signers_[i]); | ||
| } | ||
|
|
||
| _entryPoint = entryPoint_; | ||
| _requiredSignatures = requiredSignatures_; | ||
| } | ||
|
|
||
| receive() external payable {} | ||
|
|
||
| function supportsInterface( | ||
| bytes4 interfaceId | ||
| ) public view virtual override(AccessControl, ERC1155Holder) returns (bool) { | ||
| return super.supportsInterface(interfaceId); | ||
| } | ||
|
|
||
| function entryPoint() public view virtual override returns (IEntryPoint) { | ||
| return _entryPoint; | ||
| } | ||
|
|
||
| function requiredSignatures( | ||
| PackedUserOperation calldata /*userOp*/ | ||
| ) public view virtual override returns (uint256) { | ||
| return _requiredSignatures; | ||
| } | ||
|
|
||
| function _isAuthorized(address user) internal view virtual override returns (bool) { | ||
| return hasRole(SIGNER_ROLE, user); | ||
| } | ||
|
|
||
| function execute(address target, uint256 value, bytes calldata data) public virtual onlyEntryPoint { | ||
| _call(target, value, data); | ||
| } | ||
|
|
||
| function executeBatch( | ||
| address[] calldata targets, | ||
| uint256[] calldata values, | ||
| bytes[] calldata calldatas | ||
| ) public virtual onlyEntryPoint { | ||
| if (targets.length != calldatas.length || (values.length != 0 && values.length != targets.length)) { | ||
| revert AccountInvalidBatchLength(); | ||
| } | ||
|
|
||
| for (uint256 i = 0; i < targets.length; ++i) { | ||
| _call(targets[i], (values.length == 0 ? 0 : values[i]), calldatas[i]); | ||
| } | ||
| } | ||
|
|
||
| function _call(address target, uint256 value, bytes memory data) internal { | ||
| (bool success, bytes memory returndata) = target.call{value: value}(data); | ||
| Address.verifyCallResult(success, returndata); | ||
| } | ||
| } | ||
|
|
||
| contract AdvancedAccountECDSA is AdvancedAccount, AccountECDSA { | ||
| constructor( | ||
| IEntryPoint entryPoint_, | ||
| address admin_, | ||
| address[] memory signers_, | ||
| uint256 requiredSignatures_ | ||
| ) AdvancedAccount(entryPoint_, admin_, signers_, requiredSignatures_) {} | ||
|
|
||
| function _validateSignature( | ||
| PackedUserOperation calldata userOp, | ||
| bytes32 userOpHash | ||
| ) internal virtual override(Account, AccountMultisig) returns (uint256 validationData) { | ||
| return AccountMultisig._validateSignature(userOp, userOpHash); | ||
| } | ||
| } | ||
|
|
||
| contract AdvancedAccountP256 is AdvancedAccount, AccountP256 { | ||
| constructor( | ||
| IEntryPoint entryPoint_, | ||
| address admin_, | ||
| address[] memory signers_, | ||
| uint256 requiredSignatures_ | ||
| ) AdvancedAccount(entryPoint_, admin_, signers_, requiredSignatures_) {} | ||
|
|
||
| function _validateSignature( | ||
| PackedUserOperation calldata userOp, | ||
| bytes32 userOpHash | ||
| ) internal virtual override(Account, AccountMultisig) returns (uint256 validationData) { | ||
| return AccountMultisig._validateSignature(userOp, userOpHash); | ||
| } | ||
| } |
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.