Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Reorder state changes and event emission for consistency #2719

Merged
merged 5 commits into from Jun 18, 2021
Merged

Reorder state changes and event emission for consistency #2719

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67b4723
fit L01 and part of N01
Amxx Jun 13, 2021
fe6b4f5
avoid unecessary if + sload on transfer ownership
Amxx Jun 15, 2021
79d9ba0
Update AccessControl.sol
frangio Jun 15, 2021
5a9d7ed
emit TransferOwnership event after state is set
Amxx Jun 18, 2021
01ba8b3
fix whitespace
frangio Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions contracts/access/Ownable.sol
View file
Open in desktop
Expand Up @@ -25,9 +25,7 @@ abstract contract Ownable is Context {
* @dev Initializes the contract setting the deployer as the initial owner.
*/
constructor() {
address msgSender = _msgSender();
_owner = msgSender;
emit OwnershipTransferred(address(0), msgSender);
_setOwner(_msgSender());
}

/**
Expand All @@ -53,8 +51,7 @@ abstract contract Ownable is Context {
* thereby removing any functionality that is only available to the owner.
*/
function renounceOwnership() public virtual onlyOwner {
emit OwnershipTransferred(_owner, address(0));
_owner = address(0);
_setOwner(address(0));
}

/**
Expand All @@ -63,7 +60,12 @@ abstract contract Ownable is Context {
*/
function transferOwnership(address newOwner) public virtual onlyOwner {
require(newOwner != address(0), "Ownable: new owner is the zero address");
emit OwnershipTransferred(_owner, newOwner);
_setOwner(newOwner);
}

function _setOwner(address newOwner) private {
address oldOwner = _owner;
_owner = newOwner;
emit OwnershipTransferred(oldOwner, newOwner);
}
}