This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
ZeroEx: Merge Migrate and Ownable Features #2564
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
dorothy-zbornak
force-pushed
the
feat/contracts-zero-ex/consolidate-bootstrap-features
branch
from
10164d1
to
6a91244
Compare
dorothy-zbornak
requested review from
abandeali1,
BMillman19,
dave4506,
fragosti and
hysz
as code owners
dorothy-zbornak
commented
Apr 23, 2020
Comment on lines
+51
to
+53
| constructor() public { | ||
| _implementation = address(this); | ||
| } |
There was a problem hiding this comment.
Also switched to this pattern instead of explicitly passing in impl in bootstrap(). This is the pattern we will also follow for migrate().
moodlezoup
approved these changes
Apr 23, 2020
dorothy-zbornak
force-pushed
the
feat/contracts-zero-ex/consolidate-bootstrap-features
branch
from
6a91244
to
712958d
Compare
dorothy-zbornak
deleted the
feat/contracts-zero-ex/consolidate-bootstrap-features
branch
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
This merges the Migrate and Ownable features in ZeroEx into just Ownable.
The rationale is that Migrate was reaching into Ownable's storage, which meant they were tightly coupled, so they might as well be one feature.
getMigrationOwner()function because the original owner can just be encoded in the calldata during a migration.migrate()now accepts a third parameter: the new owner. Previously amigrate()call could not also set a new owner because it would restore the original before returning. Now it sets it tonewOwnerbefore returning.Maintenance
I also snuck in a fix to some asset-swapper tests I wrote a while back that are infrequently failing on CI.
Testing instructions
Types of changes
Checklist:
[WIP]if necessary.