Commit c8719ce4 by Francisco Giordano

fix initialize versions

parent 39fe05df
...@@ -17,7 +17,7 @@ contract Ownable is Migratable { ...@@ -17,7 +17,7 @@ contract Ownable is Migratable {
* @dev The Ownable constructor sets the original `owner` of the contract to the sender * @dev The Ownable constructor sets the original `owner` of the contract to the sender
* account. * account.
*/ */
function initialize(address _sender) public isInitializer("Ownable", "0") { function initialize(address _sender) public isInitializer("Ownable", "1.9.0-beta") {
owner = _sender; owner = _sender;
} }
......
...@@ -8,7 +8,7 @@ contract DetailedERC20 is Migratable, ERC20 { ...@@ -8,7 +8,7 @@ contract DetailedERC20 is Migratable, ERC20 {
string public symbol; string public symbol;
uint8 public decimals; 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; name = _name;
symbol = _symbol; symbol = _symbol;
decimals = _decimals; decimals = _decimals;
......
...@@ -5,7 +5,7 @@ import "./DetailedERC20.sol"; ...@@ -5,7 +5,7 @@ import "./DetailedERC20.sol";
import "./MintableToken.sol"; import "./MintableToken.sol";
contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { 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); DetailedERC20.initialize(_sender, _name, _symbol, _decimals);
Ownable.initialize(_sender); Ownable.initialize(_sender);
} }
......
...@@ -5,7 +5,7 @@ import "./DetailedERC20.sol"; ...@@ -5,7 +5,7 @@ import "./DetailedERC20.sol";
import "./MintableToken.sol"; import "./MintableToken.sol";
contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { 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); DetailedERC20.initialize(_sender, _name, _symbol, _decimals);
_premint(_sender, _initialBalance); _premint(_sender, _initialBalance);
......
...@@ -22,6 +22,10 @@ contract MintableToken is Migratable, Ownable, StandardToken { ...@@ -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 * @dev Function to mint tokens
* @param _to The address that will receive the minted tokens. * @param _to The address that will receive the minted tokens.
......
...@@ -20,7 +20,7 @@ contract TokenTimelock is Migratable { ...@@ -20,7 +20,7 @@ contract TokenTimelock is Migratable {
// timestamp when token release is enabled // timestamp when token release is enabled
uint256 public releaseTime; 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 // solium-disable-next-line security/no-block-members
require(_releaseTime > block.timestamp); require(_releaseTime > block.timestamp);
token = _token; token = _token;
......
...@@ -52,7 +52,7 @@ contract TokenVesting is Migratable, Ownable { ...@@ -52,7 +52,7 @@ contract TokenVesting is Migratable, Ownable {
bool _revocable bool _revocable
) )
public public
isInitializer("TokenVesting", "0") isInitializer("TokenVesting", "1.9.0-beta")
{ {
Ownable.initialize(_sender); Ownable.initialize(_sender);
......
...@@ -36,7 +36,7 @@ contract ERC721Token is Migratable, ERC721, ERC721BasicToken { ...@@ -36,7 +36,7 @@ contract ERC721Token is Migratable, ERC721, ERC721BasicToken {
/** /**
* @dev Constructor function * @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; name_ = _name;
symbol_ = _symbol; symbol_ = _symbol;
} }
......
...@@ -7,7 +7,7 @@ import "../../ownership/Ownable.sol"; ...@@ -7,7 +7,7 @@ import "../../ownership/Ownable.sol";
* @title Mintable ERC721 Token * @title Mintable ERC721 Token
*/ */
contract MintableERC721Token is Migratable, Ownable, ERC721Token { 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); Ownable.initialize(_sender);
ERC721Token.initialize(_sender, _name, _symbol); ERC721Token.initialize(_sender, _name, _symbol);
} }
......
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