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

convert ERC1046 to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-26 18:30:45 -03:00
parent 8dd0739072
commit d7b7644e68
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/drafts/ERC1046/TokenMetadata.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "../../token/ERC20/IERC20.sol"; import "../../token/ERC20/IERC20.sol";
@ -9,16 +10,17 @@ import "../../token/ERC20/IERC20.sol";
* @dev tokenURI must respond with a URI that implements https://eips.ethereum.org/EIPS/eip-1047 * @dev tokenURI must respond with a URI that implements https://eips.ethereum.org/EIPS/eip-1047
* @dev TODO - update https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/contracts/token/ERC721/IERC721.sol#L17 when 1046 is finalized * @dev TODO - update https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/contracts/token/ERC721/IERC721.sol#L17 when 1046 is finalized
*/ */
contract ERC20TokenMetadata is IERC20 { contract ERC20TokenMetadata is Initializable, IERC20 {
function tokenURI() external view returns (string); function tokenURI() external view returns (string);
} }
contract ERC20WithMetadata is ERC20TokenMetadata { contract ERC20WithMetadata is Initializable, ERC20TokenMetadata {
string private _tokenURI = ""; string private _tokenURI = "";
constructor(string tokenURI) function initialize(string tokenURI)
public public
initializer
{ {
_tokenURI = tokenURI; _tokenURI = tokenURI;
} }

8
contracts/mocks/ERC20WithMetadataMock.sol
View File

@ -1,12 +1,12 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../drafts/ERC1046/TokenMetadata.sol"; import "../drafts/ERC1046/TokenMetadata.sol";
contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata { contract ERC20WithMetadataMock is Initializable, ERC20, ERC20WithMetadata {
constructor(string tokenURI) public constructor(string tokenURI) public {
ERC20WithMetadata(tokenURI) ERC20WithMetadata.initialize(tokenURI);
{
} }
} }