-
Notifications
You must be signed in to change notification settings - Fork 36
feat: add erc7484 to msaadvanced #26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
88f8847
feat: add erc7484 to msaadvanced
kopy-kat b52eb05
fix: add access control
kopy-kat b9abab7
Merge branch 'main' into feature/add-erc7484
kopy-kat 9283f79
Merge branch 'main' into feature/add-erc7484
kopy-kat 7374cb6
chore: add natspec
kopy-kat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,39 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.23; | ||
|
|
||
| import { IERC7484 } from "../interfaces/IERC7484.sol"; | ||
| import { AccountBase } from "./AccountBase.sol"; | ||
|
|
||
| /** | ||
| * @title RegistryAdapter | ||
| * @author kopy-kat | rhinestone.wtf | ||
| * @dev This contract uses ERC-7484 to check if a module is attested to and exposes a modifier to | ||
| * use it. | ||
| */ | ||
| abstract contract RegistryAdapter is AccountBase { | ||
| event ERC7484RegistryConfigured(address indexed smartAccount, address indexed registry); | ||
|
|
||
| IERC7484 internal $registry; | ||
|
|
||
| modifier withRegistry(address module, uint256 moduleTypeId) { | ||
| IERC7484 registry = $registry; | ||
| if (address(registry) != address(0)) { | ||
| registry.check(module, moduleTypeId); | ||
| } | ||
| _; | ||
| } | ||
|
|
||
| function setRegistry( | ||
kopy-kat marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| IERC7484 registry, | ||
| address[] calldata attesters, | ||
| uint8 threshold | ||
| ) | ||
| external | ||
kopy-kat marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| onlyEntryPointOrSelf | ||
| { | ||
| $registry = registry; | ||
| if (attesters.length > 0) { | ||
| registry.trustAttesters(threshold, attesters); | ||
| } | ||
| } | ||
| } | ||
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,48 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.0; | ||
|
|
||
| interface IERC7484 { | ||
| /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/ | ||
| /* Check with Registry internal attesters */ | ||
| /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/ | ||
| function check(address module) external view; | ||
|
|
||
| function checkForAccount(address smartAccount, address module) external view; | ||
|
|
||
| function check(address module, uint256 moduleType) external view; | ||
|
|
||
| function checkForAccount( | ||
| address smartAccount, | ||
| address module, | ||
| uint256 moduleType | ||
| ) | ||
| external | ||
| view; | ||
|
|
||
| /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/ | ||
| /* Check with external attester(s) */ | ||
| /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/ | ||
|
|
||
| function check(address module, address attester) external view; | ||
|
|
||
| function check(address module, uint256 moduleType, address attester) external view; | ||
|
|
||
| function checkN( | ||
| address module, | ||
| address[] calldata attesters, | ||
| uint256 threshold | ||
| ) | ||
| external | ||
| view; | ||
|
|
||
| function checkN( | ||
| address module, | ||
| uint256 moduleType, | ||
| address[] calldata attesters, | ||
| uint256 threshold | ||
| ) | ||
| external | ||
| view; | ||
|
|
||
| function trustAttesters(uint8 threshold, address[] calldata attesters) external; | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.