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

Overload ERC20 funcitons with new _data argument

Browse Source
This commit is contained in:
AugustoL
2018-01-11 16:33:33 -03:00
parent 4ecdf312df
commit 7bd95b1e31
2 changed files with 148 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/token/ERC827.sol
View File

@ -13,7 +13,7 @@ import "./StandardToken.sol";
contract ERC827 is StandardToken {
/**
@dev `approveData` is an addition to ERC20 token methods. It allows to
@dev Addition to ERC20 token methods. It allows to
approve the transfer of value and execute a call with the sent data.
Beware that changing an allowance with this method brings the risk that
@ -29,7 +29,7 @@ contract ERC827 is StandardToken {
@return true if the call function was executed successfully
*/
function approveData(address _spender, uint256 _value, bytes _data) public returns (bool) {
function approve(address _spender, uint256 _value, bytes _data) public returns (bool) {
require(_spender != address(this));
super.approve(_spender, _value);
@ -49,7 +49,7 @@ contract ERC827 is StandardToken {
@return true if the call function was executed successfully
*/
function transferData(address _to, uint256 _value, bytes _data) public returns (bool) {
function transfer(address _to, uint256 _value, bytes _data) public returns (bool) {
require(_to != address(this));
super.transfer(_to, _value);
@ -69,7 +69,7 @@ contract ERC827 is StandardToken {
@return true if the call function was executed successfully
*/
function transferDataFrom(address _from, address _to, uint256 _value, bytes _data) public returns (bool) {
function transferFrom(address _from, address _to, uint256 _value, bytes _data) public returns (bool) {
require(_to != address(this));
super.transferFrom(_from, _to, _value);

160
test/ERC827Token.js
View File

@ -4,7 +4,7 @@ var Message = artifacts.require('./mock/MessageHelper.sol');
var ERC827TokenMock = artifacts.require('./mock/ERC827TokenMock.sol');
var BigNumber = web3.BigNumber;
var ethjsABI = require('ethjs-abi');
require('chai')
.use(require('chai-as-promised'))
.use(require('chai-bignumber')(BigNumber))
@ -110,33 +110,21 @@ contract('ERC827 Token', function (accounts) {
.should.be.rejectedWith(EVMRevert);
});
it('should return correct balances after approve and show the event on receiver contract', async function () {
let message = await Message.new();
describe('Test ERC827 methods', function () {
let data = message.contract.showMessage.getData(
it('should return correct balances after transfer (with data) and show the event on receiver contract', async function () {
const message = await Message.new();
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
let transaction = await token.approveData(
message.contract.address, 100, data, { from: accounts[0] }
// Use method #8 tranfer of the abi to encode the data tx
const transferData = ethjsABI.encodeMethod(token.abi[8],
[message.contract.address, 100, extraData]
);
assert.equal(2, transaction.receipt.logs.length);
new BigNumber(100).should.be.bignumber.equal(
await token.allowance(accounts[0], message.contract.address)
);
});
it('should return correct balances after transferData and show the event on receiver contract', async function () {
let message = await Message.new();
let data = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
let transaction = await token.transferData(
message.contract.address, 100, data, { from: accounts[0] }
const transaction = await token.sendTransaction(
{ from: accounts[0], data: transferData }
);
assert.equal(2, transaction.receipt.logs.length);
@ -146,15 +134,19 @@ contract('ERC827 Token', function (accounts) {
);
});
it('should return correct allowance after approveData and show the event on receiver contract', async function () {
let message = await Message.new();
it('should return correct allowance after approve (with data) and show the event on receiver contract', async function () {
const message = await Message.new();
let data = message.contract.showMessage.getData(
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
let transaction = await token.approveData(
message.contract.address, 100, data, { from: accounts[0] }
// Use method #3 approve of the abi to encode the data tx
const approveData = ethjsABI.encodeMethod(token.abi[3],
[message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
{ from: accounts[0], data: approveData }
);
assert.equal(2, transaction.receipt.logs.length);
@ -164,10 +156,10 @@ contract('ERC827 Token', function (accounts) {
);
});
it('should return correct balances after transferFrom and show the event on receiver contract', async function () {
let message = await Message.new();
it('should return correct balances after transferFrom (with data) and show the event on receiver contract', async function () {
const message = await Message.new();
let data = message.contract.showMessage.getData(
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
@ -177,8 +169,12 @@ contract('ERC827 Token', function (accounts) {
await token.allowance(accounts[0], accounts[1])
);
let transaction = await token.transferDataFrom(
accounts[0], message.contract.address, 100, data, { from: accounts[1] }
// Use method #7 transferFrom of the abi to encode the data tx
const transferFromData = ethjsABI.encodeMethod(token.abi[7],
[accounts[0], message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
{ from: accounts[1], data: transferFromData }
);
assert.equal(2, transaction.receipt.logs.length);
@ -188,14 +184,17 @@ contract('ERC827 Token', function (accounts) {
);
});
it('should fail inside approveData', async function () {
let message = await Message.new();
it('should fail inside approve (with data)', async function () {
const message = await Message.new();
let data = message.contract.fail.getData();
const extraData = message.contract.fail.getData();
await token.approveData(
message.contract.address, 10, data,
{ from: accounts[1] }
// Use method #3 approve of the abi to encode the data tx
const approveData = ethjsABI.encodeMethod(token.abi[3],
[message.contract.address, 10, extraData]
);
await token.sendTransaction(
{ from: accounts[0], data: approveData }
).should.be.rejectedWith(EVMRevert);
// approval should not have gone through so allowance is still 0
@ -203,14 +202,17 @@ contract('ERC827 Token', function (accounts) {
.equal(await token.allowance(accounts[1], message.contract.address));
});
it('should fail inside transferData', async function () {
let message = await Message.new();
it('should fail inside transfer (with data)', async function () {
const message = await Message.new();
let data = message.contract.fail.getData();
const extraData = message.contract.fail.getData();
await token.transferData(
message.contract.address, 10, data,
{ from: accounts[0] }
// Use method #8 tranfer of the abi to encode the data tx
const transferData = ethjsABI.encodeMethod(token.abi[8],
[message.contract.address, 10, extraData]
);
await token.sendTransaction(
{ from: accounts[0], data: transferData }
).should.be.rejectedWith(EVMRevert);
// transfer should not have gone through, so balance is still 0
@ -218,44 +220,76 @@ contract('ERC827 Token', function (accounts) {
.equal(await token.balanceOf(message.contract.address));
});
it('should fail inside transferDataFrom', async function () {
let message = await Message.new();
it('should fail inside transferFrom (with data)', async function () {
const message = await Message.new();
let data = message.contract.fail.getData();
const extraData = message.contract.fail.getData();
await token.approve(accounts[1], 10, { from: accounts[2] });
await token.transferDataFrom(
accounts[2], message.contract.address, 10, data,
{ from: accounts[1] }
// Use method #7 tranferFrom of the abi to encode the data tx
const transferFromData = ethjsABI.encodeMethod(token.abi[7],
[accounts[2], message.contract.address, 10, extraData]
);
await token.sendTransaction(
{ from: accounts[1], data: transferFromData }
).should.be.rejectedWith(EVMRevert);
// transferDataFrom should have failed so balance is still 0 but allowance is 10
// transferFrom should have failed so balance is still 0 but allowance is 10
new BigNumber(10).should.be.bignumber
.equal(await token.allowance(accounts[2], accounts[1]));
new BigNumber(0).should.be.bignumber
.equal(await token.balanceOf(message.contract.address));
});
it('should fail approveData when using token contract address as receiver', async function () {
let data = token.contract.approve.getData(accounts[5], 66);
it('should fail approve (with data) when using token contract address as receiver', async function () {
const message = await Message.new();
await token.approveData(
token.contract.address, 100, data,
{ from: accounts[0] }
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
// Use method #3 approve of the abi to encode the data tx
const approveData = ethjsABI.encodeMethod(token.abi[3],
[token.contract.address, 100, extraData]
);
await token.sendTransaction(
{ from: accounts[0], data: approveData }
).should.be.rejectedWith(EVMRevert);
});
it('should fail transferData when using token contract address as receiver', async function () {
await token.transferData(
token.contract.address, 100, web3.toHex(0), { from: accounts[0] }
it('should fail transfer (with data) when using token contract address as receiver', async function () {
const message = await Message.new();
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
// Use method #8 tranfer of the abi to encode the data tx
const transferData = ethjsABI.encodeMethod(token.abi[8],
[token.contract.address, 100, extraData]
);
await token.sendTransaction(
{ from: accounts[0], data: transferData }
).should.be.rejectedWith(EVMRevert);
});
it('should fail transferDataFrom when using token contract address as receiver', async function () {
it('should fail transferFrom (with data) when using token contract address as receiver', async function () {
const message = await Message.new();
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
await token.approve(accounts[1], 1, { from: accounts[0] });
await token.transferDataFrom(
accounts[0], token.contract.address, 1, web3.toHex(0), { from: accounts[1] }
// Use method #7 tranferFrom of the abi to encode the data tx
const transferFromData = ethjsABI.encodeMethod(token.abi[7],
[accounts[0], token.contract.address, 1, extraData]
);
await token.sendTransaction(
{ from: accounts[1], data: transferFromData }
).should.be.rejectedWith(EVMRevert);
});
});
});