Skip to content

Add OwnershipTransferred event to Ownable contract and its derivatives #424

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

Merged
frangio merged 4 commits into from
Sep 7, 2017
+6 −0
Merged

Add OwnershipTransferred event to Ownable contract and its derivatives #424

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b59469c
fire OwnershipTransferred event when the owner of an Ownable contract…
eugene-babichenko Sep 5, 2017
6beac0f
add previousOwner field to OwnershipTransferred event
eugene-babichenko Sep 6, 2017
7a36a6c
fix calls to OwnershipTransferred
eugene-babichenko Sep 6, 2017
5035718
fixed wrong call order in Ownable.transferOwnership
eugene-babichenko Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix calls to OwnershipTransferred
  • Loading branch information
@eugene-babichenko
eugene-babichenko committed Sep 6, 2017
commit 7a36a6c92a3f958521d9da1db25f02b55b0122ef
2 changes: 1 addition & 1 deletion contracts/ownership/Claimable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ contract Claimable is Ownable {
* @dev Allows the pendingOwner address to finalize the transfer.
*/
function claimOwnership() onlyPendingOwner {
OwnershipTransferred(owner, pendingOwner);
owner = pendingOwner;
pendingOwner = 0x0;
OwnershipTransferred(owner);
}
}
2 changes: 1 addition & 1 deletion contracts/ownership/DelayedClaimable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ contract DelayedClaimable is Claimable {
*/
function claimOwnership() onlyPendingOwner {
require((block.number <= end) && (block.number >= start));
OwnershipTransferred(owner, pendingOwner);
owner = pendingOwner;
pendingOwner = 0x0;
end = 0;
OwnershipTransferred(owner);
}

}
2 changes: 1 addition & 1 deletion contracts/ownership/Ownable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ contract Ownable {
function transferOwnership(address newOwner) onlyOwner {
require(newOwner != address(0));
owner = newOwner;
OwnershipTransferred(newOwner);
OwnershipTransferred(owner, newOwner);
Copy link
Contributor

@frangio frangio Sep 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is failing to log the previous owner because it's updated in the previous line. The event should be emitted first, and then the state variable updated.

}

}