Bump Colony version to 2 #636
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
Also allow us to initialise with any version. This is required because we wish to align versions between Goerli and Mainnet
| colonyVersionResolver[1] = _resolver; | ||
| currentColonyVersion = 1; | ||
| colonyVersionResolver[_version] = _resolver; | ||
| currentColonyVersion = _version; |
There was a problem hiding this comment.
Maybe just require version > 0
contracts/IColonyNetwork.sol
Outdated
| /// @param _resolver Address of the resolver for Colony contract version 1 | ||
| function initialise(address _resolver) public; | ||
| /// @param _resolver Address of the resolver for Colony contract | ||
| /// @param _resolver Version of the Colony contract the resolver represents |
There was a problem hiding this comment.
_resolver -> _version param name in natspec
| @@ -428,7 +428,8 @@ Initialises the colony network by setting the first Colony version resolver to ` | |||
|
|
|||
| |Name|Type|Description| | |||
| |---|---|---| | |||
| |_resolver|address|Address of the resolver for Colony contract version 1 | |||
| |_resolver|address|Address of the resolver for Colony contract | |||
| |_version|uint256|Version of the Colony contract the resolver represents | |||
There was a problem hiding this comment.
It's just lovely how the docs auto-update. Again, well done @ryanchristo 👏
elenadimitrova
approved these changes
Jun 5, 2019
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.
Bumps the
version()a colony will report with the latest resolver to 2. This was already done on Goerli, just not included in the codebase. This PR also allows us to initialise ColonyNetwork with any version as the latest version. This is required because we wish to align versions between Goerli and Mainnet