NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1647 from nventuro/safeerc20-bugfix

Browse Source 
Fix SafeERC20.safeApprove bug

(cherry picked from commit 3111291b4a)
This commit is contained in:
Nicolás Venturo
2019-02-26 12:39:02 -03:00
parent 8617c4b4c8
commit de90f4458a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/mocks/SafeERC20Helper.sol
View File

@ -24,7 +24,7 @@ contract ERC20FailingMock {
} }
contract ERC20SucceedingMock { contract ERC20SucceedingMock {
uint256 private _allowance; mapping (address => uint256) private _allowances;
function transfer(address, uint256) public returns (bool) { function transfer(address, uint256) public returns (bool) {
return true; return true;
@ -39,11 +39,11 @@ contract ERC20SucceedingMock {
} }
function setAllowance(uint256 allowance_) public { function setAllowance(uint256 allowance_) public {
_allowance = allowance_; _allowances[msg.sender] = allowance_;
} }
function allowance(address, address) public view returns (uint256) { function allowance(address owner, address) public view returns (uint256) {
return _allowance; return _allowances[owner];
} }
} }

2
contracts/token/ERC20/SafeERC20.sol
View File

@ -24,7 +24,7 @@ library SafeERC20 {
// safeApprove should only be called when setting an initial allowance, // safeApprove should only be called when setting an initial allowance,
// or when resetting it to zero. To increase and decrease it, use // or when resetting it to zero. To increase and decrease it, use
// 'safeIncreaseAllowance' and 'safeDecreaseAllowance' // 'safeIncreaseAllowance' and 'safeDecreaseAllowance'
require((value == 0) || (token.allowance(msg.sender, spender) == 0)); require((value == 0) || (token.allowance(address(this), spender) == 0));
require(token.approve(spender, value)); require(token.approve(spender, value));
} }