Skip to content
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

Jump to bottom

Do not reduce approval on transferFrom if current allowance is type(uint256).max #3085

Merged
merged 13 commits into from
Jan 10, 2022
Merged

Do not reduce approval on transferFrom if current allowance is type(uint256).max #3085

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6de0be4
add feature request #3084
0xclaudeshannon Jan 6, 2022
b186eb5
Update contracts/token/ERC20/ERC20.sol
Amxx Jan 7, 2022
b34920b
Add changelog note
0xclaudeshannon Jan 8, 2022
04d88dd
add documentation
0xclaudeshannon Jan 8, 2022
4b23042
test unlimitted allowance and add ERC777 unlimitted allowance
Amxx Jan 9, 2022
514ed38
reference PR in changelog
Amxx Jan 9, 2022
7f9a210
Merge branch 'master' into fix/feature-request-#3084
Amxx Jan 9, 2022
51d9fce
documentation IERC20 -> ERC20
0xclaudeshannon Jan 10, 2022
a239ce6
merge
0xclaudeshannon Jan 10, 2022
8024e72
use asciidoc note syntax
frangio Jan 10, 2022
b3cc600
use asciidoc note syntax
frangio Jan 10, 2022
54bb56e
typo
frangio Jan 10, 2022
74e9a22
typos
frangio Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions contracts/token/ERC20/ERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,11 @@ contract ERC20 is Context, IERC20, IERC20Metadata {
uint256 amount
) public virtual override returns (bool) {
uint256 currentAllowance = _allowances[sender][_msgSender()];
require(currentAllowance >= amount, "ERC20: transfer amount exceeds allowance");
unchecked {
_approve(sender, _msgSender(), currentAllowance - amount);
if (currentAllowance != 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) {
Amxx marked this conversation as resolved.
Show resolved Hide resolved
require(currentAllowance >= amount, "ERC20: transfer amount exceeds allowance");
unchecked {
_approve(sender, _msgSender(), currentAllowance - amount);
}
}

_transfer(sender, recipient, amount);
Expand Down