This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 465
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #933 from 0xProject/refactor/contracts/tokens
[contracts] Refactor token implementations
- Loading branch information
Showing
46 changed files
with
4,771 additions
and
834 deletions.
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
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
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
116 changes: 116 additions & 0 deletions
116
packages/contracts/src/2.0.0/test/DummyERC20Token/DummyNoReturnERC20Token.sol
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,116 @@ | ||
| /* | ||
| Copyright 2018 ZeroEx Intl. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| pragma solidity 0.4.24; | ||
|
|
||
| import "./DummyERC20Token.sol"; | ||
|
|
||
|
|
||
| // solhint-disable no-empty-blocks | ||
| contract DummyNoReturnERC20Token is | ||
| DummyERC20Token | ||
| { | ||
|
|
||
| constructor ( | ||
| string _name, | ||
| string _symbol, | ||
| uint256 _decimals, | ||
| uint256 _totalSupply | ||
| ) | ||
| public | ||
| DummyERC20Token( | ||
| _name, | ||
| _symbol, | ||
| _decimals, | ||
| _totalSupply | ||
| ) | ||
| {} | ||
|
|
||
| /// @dev send `value` token to `to` from `msg.sender` | ||
| /// @param _to The address of the recipient | ||
| /// @param _value The amount of token to be transferred | ||
| function transfer(address _to, uint256 _value) | ||
| external | ||
| returns (bool) | ||
| { | ||
| require( | ||
| balances[msg.sender] >= _value, | ||
| "ERC20_INSUFFICIENT_BALANCE" | ||
| ); | ||
| require( | ||
| balances[_to] + _value >= balances[_to], | ||
| "UINT256_OVERFLOW" | ||
| ); | ||
|
|
||
| balances[msg.sender] -= _value; | ||
| balances[_to] += _value; | ||
|
|
||
| emit Transfer( | ||
| msg.sender, | ||
| _to, | ||
| _value | ||
| ); | ||
|
|
||
| // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return no data | ||
| assembly { | ||
| return(0, 0) | ||
| } | ||
| } | ||
|
|
||
| /// @dev send `value` token to `to` from `from` on the condition it is approved by `from` | ||
| /// @param _from The address of the sender | ||
| /// @param _to The address of the recipient | ||
| /// @param _value The amount of token to be transferred | ||
| function transferFrom( | ||
| address _from, | ||
| address _to, | ||
| uint256 _value | ||
| ) | ||
| external | ||
| returns (bool) | ||
| { | ||
| require( | ||
| balances[_from] >= _value, | ||
| "ERC20_INSUFFICIENT_BALANCE" | ||
| ); | ||
| require( | ||
| allowed[_from][msg.sender] >= _value, | ||
| "ERC20_INSUFFICIENT_ALLOWANCE" | ||
| ); | ||
| require( | ||
| balances[_to] + _value >= balances[_to], | ||
| "UINT256_OVERFLOW" | ||
| ); | ||
|
|
||
| balances[_to] += _value; | ||
| balances[_from] -= _value; | ||
| allowed[_from][msg.sender] -= _value; | ||
|
|
||
| emit Transfer( | ||
| _from, | ||
| _to, | ||
| _value | ||
| ); | ||
|
|
||
| // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return no data | ||
| assembly { | ||
| return(0, 0) | ||
| } | ||
| } | ||
| } | ||
|
|
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
66 changes: 66 additions & 0 deletions
66
packages/contracts/src/2.0.0/test/DummyERC721Receiver/InvalidERC721Receiver.sol
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,66 @@ | ||
| /* | ||
| Copyright 2018 ZeroEx Intl. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| pragma solidity 0.4.24; | ||
|
|
||
| import "../../tokens/ERC721Token/IERC721Receiver.sol"; | ||
|
|
||
|
|
||
| contract InvalidERC721Receiver is | ||
| IERC721Receiver | ||
| { | ||
| // Actual function signature is `onERC721Received(address,address,uint256,bytes)` | ||
| bytes4 constant internal INVALID_ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,uint256,bytes)")); | ||
|
|
||
| event TokenReceived( | ||
| address operator, | ||
| address from, | ||
| uint256 tokenId, | ||
| bytes data | ||
| ); | ||
|
|
||
| /// @notice Handle the receipt of an NFT | ||
| /// @dev The ERC721 smart contract calls this function on the recipient | ||
| /// after a `transfer`. This function MAY throw to revert and reject the | ||
| /// transfer. Return of other than the magic value MUST result in the | ||
| /// transaction being reverted. | ||
| /// Note: the contract address is always the message sender. | ||
| /// @param _operator The address which called `safeTransferFrom` function | ||
| /// @param _from The address which previously owned the token | ||
| /// @param _tokenId The NFT identifier which is being transferred | ||
| /// @param _data Additional data with no specified format | ||
| /// @return `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))` | ||
| /// unless throwing | ||
| function onERC721Received( | ||
| address _operator, | ||
| address _from, | ||
| uint256 _tokenId, | ||
| bytes _data | ||
| ) | ||
| external | ||
| returns (bytes4) | ||
| { | ||
| emit TokenReceived( | ||
| _operator, | ||
| _from, | ||
| _tokenId, | ||
| _data | ||
| ); | ||
| return INVALID_ERC721_RECEIVED; | ||
| } | ||
| } |
Oops, something went wrong.