Skip to content

Fix decrease allowance and add non-zero address precondition to approve #1293

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 8 commits into from
Sep 7, 2018
Merged

Fix decrease allowance and add non-zero address precondition to approve #1293

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f306cc8
rename {increase,decrease}Approval to {increase,decrease}Allowance
frangio Sep 6, 2018
2470b65
add non-zero spender check to approve and {increase,decrease}Allowance
frangio Sep 6, 2018
79fb00c
Updated tests to reflect the new behavior.
nventuro Sep 7, 2018
00f124e
fix wrong test description
frangio Sep 7, 2018
267c384
fix old function names
frangio Sep 7, 2018
f7d18fe
Fixed linter error.
nventuro Sep 7, 2018
5d87d9a
Merge branch 'master' into fix-increase-decrease-allowance
frangio Sep 7, 2018
f98cdfa
Fixed typo.
nventuro Sep 7, 2018
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
add non-zero spender check to approve and {increase,decrease}Allowance
  • Loading branch information
@frangio
frangio committed Sep 6, 2018
commit 2470b65a7b0c5865bbad54b9ee789f5d462e6ea2
6 changes: 6 additions & 0 deletions contracts/token/ERC20/ERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ contract ERC20 is IERC20 {
* @param _value The amount of tokens to be spent.
*/
function approve(address _spender, uint256 _value) public returns (bool) {
require(_spender != address(0));

allowed_[msg.sender][_spender] = _value;
emit Approval(msg.sender, _spender, _value);
return true;
Expand Down Expand Up @@ -124,6 +126,8 @@ contract ERC20 is IERC20 {
public
returns (bool)
{
require(_spender != address(0));

allowed_[msg.sender][_spender] = (
allowed_[msg.sender][_spender].add(_addedValue));
emit Approval(msg.sender, _spender, allowed_[msg.sender][_spender]);
Expand All @@ -146,6 +150,8 @@ contract ERC20 is IERC20 {
public
returns (bool)
{
require(_spender != address(0));

allowed_[msg.sender][_spender] = (
allowed_[msg.sender][_spender].sub(_subtractedValue));
emit Approval(msg.sender, _spender, allowed_[msg.sender][_spender]);
Expand Down