Skip to content

Use SafeERC20.forceApprove in safeIncreaseAllowance and safeDecreaseAllowance #4260

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
merged 6 commits into from
May 25, 2023
Merged

Use SafeERC20.forceApprove in safeIncreaseAllowance and safeDecreaseAllowance #4260

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3b6035
use forceApprove in safeIncreaseAllowance and safeDecreaseAllowance
Amxx May 17, 2023
f995c84
fix lint
Amxx May 18, 2023
a7dd6b4
Apply suggestions from code review
Amxx May 19, 2023
8319d86
add changeset
Amxx May 19, 2023
b46a616
Update wild-windows-trade.md
frangio May 19, 2023
7c28604
Merge branch 'next-v5.0' into next/refactor/safeIncrDecrAllowance
Amxx May 19, 2023
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
4 changes: 2 additions & 2 deletions contracts/token/ERC20/utils/SafeERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ library SafeERC20 {
*/
function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal {
uint256 oldAllowance = token.allowance(address(this), spender);
_callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, oldAllowance + value));
forceApprove(token, spender, oldAllowance + value);
}

/**
Expand All @@ -70,7 +70,7 @@ library SafeERC20 {
unchecked {
uint256 oldAllowance = token.allowance(address(this), spender);
require(oldAllowance >= value, "SafeERC20: decreased allowance below zero");
_callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, oldAllowance - value));
forceApprove(token, spender, oldAllowance - value);
}
}

Expand Down
11 changes: 7 additions & 4 deletions test/token/ERC20/utils/SafeERC20.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,19 @@ contract('SafeERC20', function (accounts) {
await this.mock.$safeApprove(this.token.address, spender, 0);
});

it('safeApprove can increase approval', async function () {
await expectRevert(this.mock.$safeIncreaseAllowance(this.token.address, spender, 10), 'USDT approval failure');
it('safeIncreaseAllowance works', async function () {
this.mock.$safeIncreaseAllowance(this.token.address, spender, 10);
expect(this.token.allowance(this.mock.address, spender, 90));
});

it('safeApprove can decrease approval', async function () {
await expectRevert(this.mock.$safeDecreaseAllowance(this.token.address, spender, 10), 'USDT approval failure');
it('safeDecreaseAllowance works', async function () {
this.mock.$safeDecreaseAllowance(this.token.address, spender, 10);
expect(this.token.allowance(this.mock.address, spender, 110));
});

it('forceApprove works', async function () {
await this.mock.$forceApprove(this.token.address, spender, 200);
expect(this.token.allowance(this.mock.address, spender, 200));
});
});
});
Expand Down