Skip to content

Add ERC827 Token #518

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
AugustoL merged 14 commits into from
Jan 17, 2018
Merged

Add ERC827 Token #518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a4b1cd6
Add SmartToken contract with tests and documentation
AugustoL Oct 26, 2017
a806520
change SmartToken test to work with new linter rules
AugustoL Jan 4, 2018
e57f4be
Rename SmartToken to ERC827
AugustoL Jan 11, 2018
f36f8e9
Delete SmartToken old docs
AugustoL Jan 11, 2018
4ecdf31
Change order of ERC20 methods and call in transferData and transferDa…
AugustoL Jan 11, 2018
7bd95b1
Overload ERC20 funcitons with new _data argument
AugustoL Jan 11, 2018
e911b4d
Add findMethod function in ERC827Token test
AugustoL Jan 12, 2018
685d208
Add increase and decrease approval functions to ERC827 with tests
AugustoL Jan 15, 2018
8854966
change throw for require in MessageHelper contract@
AugustoL Jan 16, 2018
87f5916
Separate ERC827 interface in another contract
AugustoL Jan 16, 2018
7ddd66f
fix increaseApproval in ERC827Token with tests
AugustoL Jan 16, 2018
d060d29
Merge remote-tracking branch 'upstream/master' into add-smart-token
AugustoL Jan 17, 2018
2b008f4
Fix solidity linter errors
AugustoL Jan 17, 2018
969466b
Add ethjs-abi dependency needed in ERC827 tests
AugustoL Jan 17, 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
fix increaseApproval in ERC827Token with tests
  • Loading branch information
@AugustoL
AugustoL committed Jan 16, 2018
commit 7ddd66fb744c55ee8b7cc251b2ac0c141fa34c5c
2 changes: 1 addition & 1 deletion contracts/token/ERC827Token.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ contract ERC827Token is ERC827, StandardToken {
function increaseApproval(address _spender, uint _addedValue, bytes _data) public returns (bool) {
require(_spender != address(this));

super.approve(_spender, _addedValue);
super.increaseApproval(_spender, _addedValue);

require(_spender.call(_data));

Expand Down
11 changes: 10 additions & 1 deletion test/ERC827Token.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done'
);

await token.approve(message.contract.address, 10);
new BigNumber(10).should.be.bignumber.equal(
await token.allowance(accounts[0], message.contract.address)
);

const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256,bytes');
const increaseApprovalData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 50, extraData]
Expand All @@ -193,7 +198,7 @@ contract('ERC827 Token', function (accounts) {

assert.equal(2, transaction.receipt.logs.length);

new BigNumber(50).should.be.bignumber.equal(
new BigNumber(60).should.be.bignumber.equal(
await token.allowance(accounts[0], message.contract.address)
);
});
Expand All @@ -205,6 +210,10 @@ contract('ERC827 Token', function (accounts) {

await token.approve(message.contract.address, 100);

new BigNumber(100).should.be.bignumber.equal(
await token.allowance(accounts[0], message.contract.address)
);

const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
Expand Down