feat: remove ContextUpgradeable from ExchangeCore #1164
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
Pass the from == _msgSender() all the way down into ExcangeCore
adjisb
requested review from
mvanmeerbeck and
atkinsonholly
and removed request for
a team
| @@ -295,56 +270,62 @@ abstract contract ExchangeCore is Initializable, ContextUpgradeable, TransferExe | |||
| uint256 takeBuyAmount = newFill.rightValue; | |||
| uint256 makeBuyAmount = newFill.leftValue; | |||
|
|
|||
| if (((_msgSender() != msg.sender) && !nativeMeta) || ((_msgSender() == msg.sender) && !nativeOrder)) { | |||
| // TODO: this force me to pass from, do we want it ? | |||
There was a problem hiding this comment.
I think we do. @mvanmeerbeck ?
There was a problem hiding this comment.
all of that is for native eth, which we're removing so, lets just ignore
atkinsonholly
approved these changes
Sep 27, 2023
mvanmeerbeck
approved these changes
Sep 28, 2023
| { | ||
| bytes32 leftOrderKeyHash = LibOrder.hashKey(orderLeft); | ||
| bytes32 rightOrderKeyHash = LibOrder.hashKey(orderRight); | ||
|
|
||
| address msgSender = _msgSender(); | ||
| // TODO: this force me to pass from, do we want it ? |
There was a problem hiding this comment.
I think this case has been introduced when rarible added directPurchase & directAcceptBid.
I think we should enforce maker != address(0)
| @@ -478,8 +461,9 @@ abstract contract ExchangeCore is Initializable, ContextUpgradeable, TransferExe | |||
| } | |||
| } | |||
|
|
|||
| // TODO: can we move this out so we don't need to pass from ? | |||
There was a problem hiding this comment.
No, this event should be emitted in the same function as the change of the variable fills
- Replace ownable by access control in Exchange - Add an admin user (instead of using deployer)
mvanmeerbeck
merged commit b283be4
into
feat/move-ownable-to-parent
3 of 5 checks passed
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
Pass the from == _msgSender() all the way down into ExcangeCore