Skip to content

decrease approval condition fix (greater than and equal to) #1063

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 5 commits into from
Jul 20, 2018
Merged

decrease approval condition fix (greater than and equal to) #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f5bb1b
decrease approval condition fix (greater than and equal to)
Jul 7, 2018
b00dd43
sol lint fixed
Jul 7, 2018
a51d85c
Merge branch 'master' into dec-approval-condition-fix
zaryabbkh Jul 12, 2018
ad02304
Merge branch 'master' into dec-approval-condition-fix
nventuro Jul 20, 2018
61c5f51
Improved standard token decreaseApprovalTests.
nventuro Jul 20, 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
2 changes: 1 addition & 1 deletion contracts/token/ERC20/StandardToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ contract StandardToken is ERC20, BasicToken {
returns (bool)
{
uint256 oldValue = allowed[msg.sender][_spender];
if (_subtractedValue > oldValue) {
if (_subtractedValue >= oldValue) {
allowed[msg.sender][_spender] = 0;
} else {
allowed[msg.sender][_spender] = oldValue.sub(_subtractedValue);
Expand Down
20 changes: 17 additions & 3 deletions test/token/ERC20/StandardToken.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,29 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
});

describe('when the spender had an approved amount', function () {
const approvedAmount = amount;

beforeEach(async function () {
await this.token.approve(spender, amount + 1, { from: owner });
await this.token.approve(spender, approvedAmount, { from: owner });
});

it('decreases the spender allowance subtracting the requested amount', async function () {
await this.token.decreaseApproval(spender, amount, { from: owner });
await this.token.decreaseApproval(spender, approvedAmount - 5, { from: owner });

const allowance = await this.token.allowance(owner, spender);
assert.equal(allowance, 1);
assert.equal(allowance, 5);
});

it('sets the allowance to zero when all allowance is removed', async function () {
await this.token.decreaseApproval(spender, approvedAmount, { from: owner });
const allowance = await this.token.allowance(owner, spender);
assert.equal(allowance, 0);
});

it('sets the allowance to zero when more than the full allowance is removed', async function () {
await this.token.decreaseApproval(spender, approvedAmount + 5, { from: owner });
const allowance = await this.token.allowance(owner, spender);
assert.equal(allowance, 0);
});
});
});
Expand Down