Skip to content

A bunch of small fixes #448

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 3 commits into from
Sep 18, 2017
Merged

A bunch of small fixes #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83918ca
change approve() to conform to ERC20. Fix #438
SylTi Sep 15, 2017
4a1ff91
replace var by uint256 in StandardToken. Fix #432
SylTi Sep 15, 2017
1203a24
add whenNotPaused modifier to all of PausableToken functions that mod…
SylTi Sep 15, 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
16 changes: 14 additions & 2 deletions contracts/token/PausableToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,23 @@ import '../lifecycle/Pausable.sol';

contract PausableToken is StandardToken, Pausable {

function transfer(address _to, uint256 _value) whenNotPaused public returns (bool) {
function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
return super.transfer(_to, _value);
}

function transferFrom(address _from, address _to, uint256 _value) whenNotPaused public returns (bool) {
function transferFrom(address _from, address _to, uint256 _value) public whenNotPaused returns (bool) {
return super.transferFrom(_from, _to, _value);
}

function approve(address _spender, uint256 _value) public whenNotPaused returns (bool) {
return super.approve(_spender, _value);
}

function increaseApproval(address _spender, uint _addedValue) public whenNotPaused returns (bool success) {
return super.increaseApproval(_spender, _addedValue);
}

function decreaseApproval(address _spender, uint _subtractedValue) public whenNotPaused returns (bool success) {
return super.decreaseApproval(_spender, _subtractedValue);
}
}
4 changes: 2 additions & 2 deletions contracts/token/StandardToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ contract StandardToken is ERC20, BasicToken {
function transferFrom(address _from, address _to, uint256 _value) public returns (bool) {
require(_to != address(0));

var _allowance = allowed[_from][msg.sender];
uint256 _allowance = allowed[_from][msg.sender];

// Check is not needed because sub(_allowance, _value) will already throw if this condition is not met
// require (_value <= _allowance);
Expand All @@ -49,7 +49,7 @@ contract StandardToken is ERC20, BasicToken {
// allowance to zero by calling `approve(_spender, 0)` if it is not
// already 0 to mitigate the race condition described here:
// https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729
require((_value == 0) || (allowed[msg.sender][_spender] == 0));
// require((_value == 0) || (allowed[msg.sender][_spender] == 0));

allowed[msg.sender][_spender] = _value;
Approval(msg.sender, _spender, _value);
Expand Down