-
Notifications
You must be signed in to change notification settings - Fork 11.8k
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.
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
Add ERC827 Token #518
Merged
Merged
Add ERC827 Token #518
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a4b1cd6
Add SmartToken contract with tests and documentation
AugustoL a806520
change SmartToken test to work with new linter rules
AugustoL e57f4be
Rename SmartToken to ERC827
AugustoL f36f8e9
Delete SmartToken old docs
AugustoL 4ecdf31
Change order of ERC20 methods and call in transferData and transferDa…
AugustoL 7bd95b1
Overload ERC20 funcitons with new _data argument
AugustoL e911b4d
Add findMethod function in ERC827Token test
AugustoL 685d208
Add increase and decrease approval functions to ERC827 with tests
AugustoL 8854966
change throw for require in MessageHelper contract@
AugustoL 87f5916
Separate ERC827 interface in another contract
AugustoL 7ddd66f
fix increaseApproval in ERC827Token with tests
AugustoL d060d29
Merge remote-tracking branch 'upstream/master' into add-smart-token
AugustoL 2b008f4
Fix solidity linter errors
AugustoL 969466b
Add ethjs-abi dependency needed in ERC827 tests
AugustoL File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
pragma solidity ^0.4.13; | ||
|
||
|
||
import '../token/ERC827Token.sol'; | ||
|
||
|
||
// mock class using ERC827 Token | ||
contract ERC827TokenMock is ERC827Token { | ||
|
||
function ERC827TokenMock(address initialAccount, uint256 initialBalance) { | ||
balances[initialAccount] = initialBalance; | ||
totalSupply = initialBalance; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
pragma solidity ^0.4.11; | ||
|
||
contract MessageHelper { | ||
|
||
event Show(bytes32 b32, uint256 number, string text); | ||
|
||
function showMessage( | ||
bytes32 message, uint256 number, string text | ||
) returns (bool) { | ||
Show(message, number, text); | ||
return true; | ||
} | ||
|
||
function fail() { | ||
require(false); | ||
} | ||
|
||
function call(address to, bytes data) returns (bool) { | ||
if (to.call(data)) | ||
return true; | ||
else | ||
return false; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
pragma solidity ^0.4.13; | ||
|
||
import "./ERC20.sol"; | ||
|
||
/** | ||
@title ERC827 interface, an extension of ERC20 token standard | ||
|
||
Interface of a ERC827 token, following the ERC20 standard with extra | ||
methods to transfer value and data and execute calls in transfers and | ||
approvals. | ||
*/ | ||
contract ERC827 is ERC20 { | ||
|
||
function approve( | ||
address _spender, uint256 _value, bytes _data | ||
) public returns (bool); | ||
|
||
function transfer( | ||
address _to, uint256 _value, bytes _data | ||
) public returns (bool); | ||
|
||
function transferFrom( | ||
address _from, address _to, uint256 _value, bytes _data | ||
) public returns (bool); | ||
|
||
} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,126 @@ | ||
pragma solidity ^0.4.13; | ||
|
||
import "./ERC827.sol"; | ||
import "./StandardToken.sol"; | ||
|
||
/** | ||
@title ERC827, an extension of ERC20 token standard | ||
|
||
Implementation the ERC827, following the ERC20 standard with extra | ||
methods to transfer value and data and execute calls in transfers and | ||
approvals. | ||
Uses OpenZeppelin StandardToken. | ||
*/ | ||
contract ERC827Token is ERC827, StandardToken { | ||
|
||
/** | ||
@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 | ||
someone may use both the old and the new allowance by unfortunate | ||
transaction ordering. One possible solution to mitigate this race condition | ||
is to first reduce the spender's allowance to 0 and set the desired value | ||
afterwards: | ||
https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 | ||
|
||
@param _spender The address that will spend the funds. | ||
@param _value The amount of tokens to be spent. | ||
@param _data ABI-encoded contract call to call `_to` address. | ||
|
||
@return true if the call function was executed successfully | ||
*/ | ||
function approve(address _spender, uint256 _value, bytes _data) public returns (bool) { | ||
require(_spender != address(this)); | ||
|
||
super.approve(_spender, _value); | ||
|
||
require(_spender.call(_data)); | ||
|
||
return true; | ||
} | ||
|
||
/** | ||
@dev Addition to ERC20 token methods. Transfer tokens to a specified | ||
address and execute a call with the sent data on the same transaction | ||
|
||
@param _to address The address which you want to transfer to | ||
@param _value uint256 the amout of tokens to be transfered | ||
@param _data ABI-encoded contract call to call `_to` address. | ||
|
||
@return true if the call function was executed successfully | ||
*/ | ||
function transfer(address _to, uint256 _value, bytes _data) public returns (bool) { | ||
require(_to != address(this)); | ||
|
||
super.transfer(_to, _value); | ||
|
||
require(_to.call(_data)); | ||
return true; | ||
} | ||
|
||
/** | ||
@dev Addition to ERC20 token methods. Transfer tokens from one address to | ||
another and make a contract call on the same transaction | ||
|
||
@param _from The address which you want to send tokens from | ||
@param _to The address which you want to transfer to | ||
@param _value The amout of tokens to be transferred | ||
@param _data ABI-encoded contract call to call `_to` address. | ||
|
||
@return true if the call function was executed successfully | ||
*/ | ||
function transferFrom(address _from, address _to, uint256 _value, bytes _data) public returns (bool) { | ||
require(_to != address(this)); | ||
|
||
super.transferFrom(_from, _to, _value); | ||
|
||
require(_to.call(_data)); | ||
return true; | ||
} | ||
|
||
/** | ||
* @dev Addition to StandardToken methods. Increase the amount of tokens that | ||
* an owner allowed to a spender and execute a call with the sent data. | ||
* | ||
* approve should be called when allowed[_spender] == 0. To increment | ||
* allowed value is better to use this function to avoid 2 calls (and wait until | ||
* the first transaction is mined) | ||
* From MonolithDAO Token.sol | ||
* @param _spender The address which will spend the funds. | ||
* @param _addedValue The amount of tokens to increase the allowance by. | ||
* @param _data ABI-encoded contract call to call `_spender` address. | ||
*/ | ||
function increaseApproval(address _spender, uint _addedValue, bytes _data) public returns (bool) { | ||
require(_spender != address(this)); | ||
|
||
super.increaseApproval(_spender, _addedValue); | ||
|
||
require(_spender.call(_data)); | ||
|
||
return true; | ||
} | ||
|
||
/** | ||
* @dev Addition to StandardToken methods. Decrease the amount of tokens that | ||
* an owner allowed to a spender and execute a call with the sent data. | ||
* | ||
* approve should be called when allowed[_spender] == 0. To decrement | ||
* allowed value is better to use this function to avoid 2 calls (and wait until | ||
* the first transaction is mined) | ||
* From MonolithDAO Token.sol | ||
* @param _spender The address which will spend the funds. | ||
* @param _subtractedValue The amount of tokens to decrease the allowance by. | ||
* @param _data ABI-encoded contract call to call `_spender` address. | ||
*/ | ||
function decreaseApproval(address _spender, uint _subtractedValue, bytes _data) public returns (bool) { | ||
require(_spender != address(this)); | ||
|
||
super.decreaseApproval(_spender, _subtractedValue); | ||
|
||
require(_spender.call(_data)); | ||
|
||
return true; | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't believe how simple the code for this contract ended up. Congrats for the awesome work. 👏
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks to community and maintainers 🎉