Skip to content

Fix/ownable error - Silent transferOwnership Failure #323

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
Jul 22, 2017
Merged

Fix/ownable error - Silent transferOwnership Failure #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2e3631
Add requirement for address to not be 0 and throw error
pooleja Jul 20, 2017
6d565ef
Fix auto-formatting
pooleja Jul 20, 2017
58fdb95
Add assert to prevent regression
pooleja Jul 22, 2017
64787b1
Add semicolon to match coding standards
pooleja Jul 22, 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
5 changes: 2 additions & 3 deletions contracts/ownership/Ownable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ contract Ownable {
* @param newOwner The address to transfer ownership to.
*/
function transferOwnership(address newOwner) onlyOwner {
if (newOwner != address(0)) {
owner = newOwner;
}
require(newOwner != address(0));
owner = newOwner;
}

}
12 changes: 7 additions & 5 deletions test/Ownable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ contract('Ownable', function(accounts) {

it('should guard ownership against stuck state', async function() {
let originalOwner = await ownable.owner();
await ownable.transferOwnership(null, {from: originalOwner});
let newOwner = await ownable.owner();

assert.equal(originalOwner, newOwner);
try {
await ownable.transferOwnership(null, {from: originalOwner});
assert.fail();
} catch(error) {
assertJump(error);
}
});

});
});