Skip to content

O
openzeppelin-contracts-upgradeable
Commit 16535fbb by Elie Committed by Augusto Lemble
Options

Update ERC827.sol to not use function overloading (#871) 

* Update ERC827.sol to not use function overloading

* updated tests for erc827 function name changes

* fixed broken test

* removed findMethod from erc827 tests that is no longer necessary
parent 77cc33fc
Showing with 29 additions and 104 deletions
contracts/token/ERC827/ERC827.sol
...@@ -12,9 +12,9 @@ import "../ERC20/ERC20.sol"; ...@@ -12,9 +12,9 @@ import "../ERC20/ERC20.sol";
* @dev approvals. * @dev approvals.
*/ */
contract ERC827 is ERC20 { contract ERC827 is ERC20 {
function approve(address _spender, uint256 _value, bytes _data) public returns (bool); function approveAndCall( address _spender, uint256 _value, bytes _data) public returns (bool);
function transfer(address _to, uint256 _value, bytes _data) public returns (bool); function transferAndCall( address _to, uint256 _value, bytes _data) public returns (bool);
function transferFrom( function transferFromAndCall(
address _from, address _from,
address _to, address _to,
uint256 _value, uint256 _value,
......
contracts/token/ERC827/ERC827Token.sol
...@@ -34,7 +34,7 @@ contract ERC827Token is ERC827, StandardToken { ...@@ -34,7 +34,7 @@ contract ERC827Token is ERC827, StandardToken {
* *
* @return true if the call function was executed successfully * @return true if the call function was executed successfully
*/ */
function approve(address _spender, uint256 _value, bytes _data) public returns (bool) { function approveAndCall(address _spender, uint256 _value, bytes _data) public returns (bool) {
require(_spender != address(this)); require(_spender != address(this));
super.approve(_spender, _value); super.approve(_spender, _value);
...@@ -54,7 +54,7 @@ contract ERC827Token is ERC827, StandardToken { ...@@ -54,7 +54,7 @@ contract ERC827Token is ERC827, StandardToken {
* *
* @return true if the call function was executed successfully * @return true if the call function was executed successfully
*/ */
function transfer(address _to, uint256 _value, bytes _data) public returns (bool) { function transferAndCall(address _to, uint256 _value, bytes _data) public returns (bool) {
require(_to != address(this)); require(_to != address(this));
super.transfer(_to, _value); super.transfer(_to, _value);
...@@ -74,7 +74,7 @@ contract ERC827Token is ERC827, StandardToken { ...@@ -74,7 +74,7 @@ contract ERC827Token is ERC827, StandardToken {
* *
* @return true if the call function was executed successfully * @return true if the call function was executed successfully
*/ */
function transferFrom( function transferFromAndCall(
address _from, address _from,
address _to, address _to,
uint256 _value, uint256 _value,
...@@ -103,7 +103,7 @@ contract ERC827Token is ERC827, StandardToken { ...@@ -103,7 +103,7 @@ contract ERC827Token is ERC827, StandardToken {
* @param _addedValue The amount of tokens to increase the allowance by. * @param _addedValue The amount of tokens to increase the allowance by.
* @param _data ABI-encoded contract call to call `_spender` address. * @param _data ABI-encoded contract call to call `_spender` address.
*/ */
function increaseApproval(address _spender, uint _addedValue, bytes _data) public returns (bool) { function increaseApprovalAndCall(address _spender, uint _addedValue, bytes _data) public returns (bool) {
require(_spender != address(this)); require(_spender != address(this));
super.increaseApproval(_spender, _addedValue); super.increaseApproval(_spender, _addedValue);
...@@ -126,7 +126,7 @@ contract ERC827Token is ERC827, StandardToken { ...@@ -126,7 +126,7 @@ contract ERC827Token is ERC827, StandardToken {
* @param _subtractedValue The amount of tokens to decrease the allowance by. * @param _subtractedValue The amount of tokens to decrease the allowance by.
* @param _data ABI-encoded contract call to call `_spender` address. * @param _data ABI-encoded contract call to call `_spender` address.
*/ */
function decreaseApproval(address _spender, uint _subtractedValue, bytes _data) public returns (bool) { function decreaseApprovalAndCall(address _spender, uint _subtractedValue, bytes _data) public returns (bool) {
require(_spender != address(this)); require(_spender != address(this));
super.decreaseApproval(_spender, _subtractedValue); super.decreaseApproval(_spender, _subtractedValue);
......
test/token/ERC827/ERC827Token.js
...@@ -4,8 +4,6 @@ var Message = artifacts.require('MessageHelper'); ...@@ -4,8 +4,6 @@ var Message = artifacts.require('MessageHelper');
var ERC827TokenMock = artifacts.require('ERC827TokenMock'); var ERC827TokenMock = artifacts.require('ERC827TokenMock');
var BigNumber = web3.BigNumber; var BigNumber = web3.BigNumber;
var _ = require('lodash');
var ethjsABI = require('ethjs-abi');
require('chai') require('chai')
.use(require('chai-as-promised')) .use(require('chai-as-promised'))
.use(require('chai-bignumber')(BigNumber)) .use(require('chai-bignumber')(BigNumber))
...@@ -14,15 +12,6 @@ require('chai') ...@@ -14,15 +12,6 @@ require('chai')
contract('ERC827 Token', function (accounts) { contract('ERC827 Token', function (accounts) {
let token; let token;
function findMethod (abi, name, args) {
for (var i = 0; i < abi.length; i++) {
const methodArgs = _.map(abi[i].inputs, 'type').join(',');
if ((abi[i].name === name) && (methodArgs === args)) {
return abi[i];
}
}
}
beforeEach(async function () { beforeEach(async function () {
token = await ERC827TokenMock.new(accounts[0], 100); token = await ERC827TokenMock.new(accounts[0], 100);
}); });
...@@ -94,13 +83,7 @@ contract('ERC827 Token', function (accounts) { ...@@ -94,13 +83,7 @@ contract('ERC827 Token', function (accounts) {
}); });
it('should increase by 50 then decrease by 10', async function () { it('should increase by 50 then decrease by 10', async function () {
const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256'); await token.increaseApproval(accounts[1], 50);
const increaseApprovalData = ethjsABI.encodeMethod(abiMethod,
[accounts[1], 50]
);
await token.sendTransaction(
{ from: accounts[0], data: increaseApprovalData }
);
let postIncrease = await token.allowance(accounts[0], accounts[1]); let postIncrease = await token.allowance(accounts[0], accounts[1]);
preApproved.plus(50).should.be.bignumber.equal(postIncrease); preApproved.plus(50).should.be.bignumber.equal(postIncrease);
await token.decreaseApproval(accounts[1], 10); await token.decreaseApproval(accounts[1], 10);
...@@ -135,13 +118,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -135,13 +118,8 @@ contract('ERC827 Token', function (accounts) {
const extraData = message.contract.showMessage.getData( const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done' web3.toHex(123456), 666, 'Transfer Done'
); );
const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes');
const transferData = ethjsABI.encodeMethod(abiMethod, const transaction = await token.transferAndCall(message.contract.address, 100, extraData);
[message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
{ from: accounts[0], data: transferData }
);
assert.equal(2, transaction.receipt.logs.length); assert.equal(2, transaction.receipt.logs.length);
...@@ -159,13 +137,7 @@ contract('ERC827 Token', function (accounts) { ...@@ -159,13 +137,7 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done' web3.toHex(123456), 666, 'Transfer Done'
); );
const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); const transaction = await token.approveAndCall(message.contract.address, 100, extraData);
const approveData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
{ from: accounts[0], data: approveData }
);
assert.equal(2, transaction.receipt.logs.length); assert.equal(2, transaction.receipt.logs.length);
...@@ -188,13 +160,7 @@ contract('ERC827 Token', function (accounts) { ...@@ -188,13 +160,7 @@ contract('ERC827 Token', function (accounts) {
await token.allowance(accounts[0], message.contract.address) await token.allowance(accounts[0], message.contract.address)
); );
const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256,bytes'); const transaction = await token.increaseApprovalAndCall(message.contract.address, 50, extraData);
const increaseApprovalData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 50, extraData]
);
const transaction = await token.sendTransaction(
{ from: accounts[0], data: increaseApprovalData }
);
assert.equal(2, transaction.receipt.logs.length); assert.equal(2, transaction.receipt.logs.length);
...@@ -218,13 +184,7 @@ contract('ERC827 Token', function (accounts) { ...@@ -218,13 +184,7 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done' web3.toHex(123456), 666, 'Transfer Done'
); );
const abiMethod = findMethod(token.abi, 'decreaseApproval', 'address,uint256,bytes'); const transaction = await token.decreaseApprovalAndCall(message.contract.address, 60, extraData);
const decreaseApprovalData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 60, extraData]
);
const transaction = await token.sendTransaction(
{ from: accounts[0], data: decreaseApprovalData }
);
assert.equal(2, transaction.receipt.logs.length); assert.equal(2, transaction.receipt.logs.length);
...@@ -248,13 +208,9 @@ contract('ERC827 Token', function (accounts) { ...@@ -248,13 +208,9 @@ contract('ERC827 Token', function (accounts) {
await token.allowance(accounts[0], accounts[1]) await token.allowance(accounts[0], accounts[1])
); );
const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); const transaction = await token.transferFromAndCall(accounts[0], message.contract.address, 100, extraData, {
const transferFromData = ethjsABI.encodeMethod(abiMethod, from: accounts[1],
[accounts[0], message.contract.address, 100, extraData] });
);
const transaction = await token.sendTransaction(
{ from: accounts[1], data: transferFromData }
);
assert.equal(2, transaction.receipt.logs.length); assert.equal(2, transaction.receipt.logs.length);
...@@ -268,13 +224,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -268,13 +224,8 @@ contract('ERC827 Token', function (accounts) {
const extraData = message.contract.fail.getData(); const extraData = message.contract.fail.getData();
const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); await token.approveAndCall(message.contract.address, 10, extraData)
const approveData = ethjsABI.encodeMethod(abiMethod, .should.be.rejectedWith(EVMRevert);
[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 // approval should not have gone through so allowance is still 0
new BigNumber(0).should.be.bignumber new BigNumber(0).should.be.bignumber
...@@ -286,13 +237,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -286,13 +237,8 @@ contract('ERC827 Token', function (accounts) {
const extraData = message.contract.fail.getData(); const extraData = message.contract.fail.getData();
const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); await token.transferAndCall(message.contract.address, 10, extraData)
const transferData = ethjsABI.encodeMethod(abiMethod, .should.be.rejectedWith(EVMRevert);
[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 // transfer should not have gone through, so balance is still 0
new BigNumber(0).should.be.bignumber new BigNumber(0).should.be.bignumber
...@@ -305,14 +251,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -305,14 +251,8 @@ contract('ERC827 Token', function (accounts) {
const extraData = message.contract.fail.getData(); const extraData = message.contract.fail.getData();
await token.approve(accounts[1], 10, { from: accounts[2] }); await token.approve(accounts[1], 10, { from: accounts[2] });
await token.transferFromAndCall(accounts[2], message.contract.address, 10, extraData, { from: accounts[1] })
const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); .should.be.rejectedWith(EVMRevert);
const transferFromData = ethjsABI.encodeMethod(abiMethod,
[accounts[2], message.contract.address, 10, extraData]
);
await token.sendTransaction(
{ from: accounts[1], data: transferFromData }
).should.be.rejectedWith(EVMRevert);
// transferFrom 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 new BigNumber(10).should.be.bignumber
...@@ -328,13 +268,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -328,13 +268,8 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done' web3.toHex(123456), 666, 'Transfer Done'
); );
const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); await token.approveAndCall(token.contract.address, 100, extraData, { from: accounts[0] })
const approveData = ethjsABI.encodeMethod(abiMethod, .should.be.rejectedWith(EVMRevert);
[token.contract.address, 100, extraData]
);
await token.sendTransaction(
{ from: accounts[0], data: approveData }
).should.be.rejectedWith(EVMRevert);
}); });
it('should fail transfer (with data) when using token contract address as receiver', async function () { it('should fail transfer (with data) when using token contract address as receiver', async function () {
...@@ -344,13 +279,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -344,13 +279,8 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done' web3.toHex(123456), 666, 'Transfer Done'
); );
const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); await token.transferAndCall(token.contract.address, 100, extraData)
const transferData = ethjsABI.encodeMethod(abiMethod, .should.be.rejectedWith(EVMRevert);
[token.contract.address, 100, extraData]
);
await token.sendTransaction(
{ from: accounts[0], data: transferData }
).should.be.rejectedWith(EVMRevert);
}); });
it('should fail transferFrom (with data) when using token contract address as receiver', async function () { it('should fail transferFrom (with data) when using token contract address as receiver', async function () {
...@@ -362,13 +292,8 @@ contract('ERC827 Token', function (accounts) { ...@@ -362,13 +292,8 @@ contract('ERC827 Token', function (accounts) {
await token.approve(accounts[1], 1, { from: accounts[0] }); await token.approve(accounts[1], 1, { from: accounts[0] });
const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); await token.transferFromAndCall(accounts[0], token.contract.address, 1, extraData, { from: accounts[1] })
const transferFromData = ethjsABI.encodeMethod(abiMethod, .should.be.rejectedWith(EVMRevert);
[accounts[0], token.contract.address, 1, extraData]
);
await token.sendTransaction(
{ from: accounts[1], data: transferFromData }
).should.be.rejectedWith(EVMRevert);
}); });
}); });
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment