Skip to content

Commit

Permalink
Fix aspect wallet compilation issue
Browse files Browse the repository at this point in the history
  • Loading branch information
dumbeng committed Sep 13, 2023
1 parent 658ec86 commit d7c125a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion contracts/samples/AspectEnabledSimpleAccount.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ contract AspectEnabledSimpleAccount is SimpleAccount {

mapping(address => bool) private _aspectWhitelist;

constructor(IEntryPoint anEntryPoint) SimpleAccount(anEntryPoint) {}

/**
* Validate user's signature and nonce.
* Subclass doesn't need to override this method. Instead,
Expand Down Expand Up @@ -71,7 +73,7 @@ contract AspectEnabledSimpleAccount is SimpleAccount {
/// implement template method of BaseAspectEnabledAccount
// solhint-disable-next-line no-unused-vars
function _validateAspectId(address aspectId)
internal override virtual returns (uint256 validationData) {
internal virtual returns (uint256 validationData) {
if (_aspectWhitelist[aspectId]) {
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/samples/AspectEnabledSimpleAccountFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ contract AspectEnabledSimpleAccountFactory {
}
ret = AspectEnabledSimpleAccount(payable(new ERC1967Proxy{salt : bytes32(salt)}(
address(accountImplementation),
abi.encodeCall(AspectEnabledSimpleAccount.initialize, (owner))
abi.encodeCall(SimpleAccount.initialize, (owner))
)));
}

Expand All @@ -46,7 +46,7 @@ contract AspectEnabledSimpleAccountFactory {
type(ERC1967Proxy).creationCode,
abi.encode(
address(accountImplementation),
abi.encodeCall(AspectEnabledSimpleAccount.initialize, (owner))
abi.encodeCall(SimpleAccount.initialize, (owner))
)
)));
}
Expand Down

0 comments on commit d7c125a

Please sign in to comment.