From c8719ce418ee9b7ce1a229d8b399105a44fe7542 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:23:14 -0300 Subject: [PATCH] fix initialize versions --- contracts/ownership/Ownable.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- contracts/token/ERC20/MintableToken.sol | 4 ++++ contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/token/ERC721/MintableERC721Token.sol | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 1c8c47321..ca01c5b0b 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -17,7 +17,7 @@ contract Ownable is Migratable { * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. */ - function initialize(address _sender) public isInitializer("Ownable", "0") { + function initialize(address _sender) public isInitializer("Ownable", "1.9.0-beta") { owner = _sender; } diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 00ddac633..5ae4efddc 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -8,7 +8,7 @@ contract DetailedERC20 is Migratable, ERC20 { string public symbol; uint8 public decimals; - function initialize(address _sender, string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "0") { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0-beta") { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index c7f73cda4..621e45c2b 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -5,7 +5,7 @@ import "./DetailedERC20.sol"; import "./MintableToken.sol"; contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { - function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "0") { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") { DetailedERC20.initialize(_sender, _name, _symbol, _decimals); Ownable.initialize(_sender); } diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index 900b17d60..db3a1d564 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -5,7 +5,7 @@ import "./DetailedERC20.sol"; import "./MintableToken.sol"; contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { - function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "0") { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "1.9.0-beta") { DetailedERC20.initialize(_sender, _name, _symbol, _decimals); _premint(_sender, _initialBalance); diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 97ddc6666..ebebd20bf 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -22,6 +22,10 @@ contract MintableToken is Migratable, Ownable, StandardToken { _; } + function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") { + Ownable.initialize(_sender); + } + /** * @dev Function to mint tokens * @param _to The address that will receive the minted tokens. diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 05d840ffb..003e1d7b7 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -20,7 +20,7 @@ contract TokenTimelock is Migratable { // timestamp when token release is enabled uint256 public releaseTime; - function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "0") { + function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "1.9.0-beta") { // solium-disable-next-line security/no-block-members require(_releaseTime > block.timestamp); token = _token; diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index ceeb19d6b..83b0e478e 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -52,7 +52,7 @@ contract TokenVesting is Migratable, Ownable { bool _revocable ) public - isInitializer("TokenVesting", "0") + isInitializer("TokenVesting", "1.9.0-beta") { Ownable.initialize(_sender); diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 24c48f953..be64b2392 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -36,7 +36,7 @@ contract ERC721Token is Migratable, ERC721, ERC721BasicToken { /** * @dev Constructor function */ - function initialize(address _sender, string _name, string _symbol) public isInitializer("ERC721Token", "0") { + function initialize(address _sender, string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0-beta") { name_ = _name; symbol_ = _symbol; } diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index 1f922e73b..04cf3f64a 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -7,7 +7,7 @@ import "../../ownership/Ownable.sol"; * @title Mintable ERC721 Token */ contract MintableERC721Token is Migratable, Ownable, ERC721Token { - function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "0") { + function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") { Ownable.initialize(_sender); ERC721Token.initialize(_sender, _name, _symbol); }