feat: move ownable to parent Exchange contract #1163
Merged
Conversation
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
To be able to switch from Ownable to AccessControl we move OwnableUpgradeable
to Exchange.sol (in any case role checking must be done in the parent contract)
- move OwnableUpgradeable from ExchangeCore and TransferExecutor to non abstract Exchange parent contract
- convert all the onlyOwner functions in ExchangeCore and TransferExecutor to internal / added calls from initializer instead of setting values.
- added the setters onlyOwner in Exchange
- remove getHashKey
- removed failing and unused mock contracts ExchangeSimple.sol and ExchangeSimple1.sol
adjisb
requested review from
mvanmeerbeck and
atkinsonholly
and removed request for
a team
atkinsonholly
approved these changes
Sep 28, 2023
mvanmeerbeck
approved these changes
Sep 28, 2023
| /// @param order to generate the hashkey | ||
| /// @dev this function is a helper for the backend | ||
| /// @return hash of order | ||
| function getHashKey(LibOrder.Order memory order) external pure returns (bytes32) { |
There was a problem hiding this comment.
getHashKey is used by the backend
Pass the from == _msgSender() all the way down into ExcangeCore
- Replace ownable by access control in Exchange - Add an admin user (instead of using deployer)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
To be able to switch from Ownable to AccessControl we move OwnableUpgradeable
to Exchange.sol (in any case role checking must be done in the parent contract)