diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol index 7d8f98d22..44e18e356 100644 --- a/contracts/access/SignatureBouncer.sol +++ b/contracts/access/SignatureBouncer.sol @@ -29,7 +29,7 @@ contract SignatureBouncer is Migratable, Ownable, RBAC { string public constant ROLE_BOUNCER = "bouncer"; function initialize(address _sender) - isInitializer("SignatureBouncer", "1.9.0-beta") + isInitializer("SignatureBouncer", "1.9.0") public { Ownable.initialize(_sender); diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 921bd0d83..f24dfcb6b 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable { bool public paused = false; - function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") public { + function initialize(address _sender) isInitializer("Pausable", "1.9.0") public { Ownable.initialize(_sender); } diff --git a/contracts/mocks/BouncerMock.sol b/contracts/mocks/BouncerMock.sol index 3bc826583..4fddd99ae 100644 --- a/contracts/mocks/BouncerMock.sol +++ b/contracts/mocks/BouncerMock.sol @@ -5,7 +5,7 @@ import "../access/SignatureBouncer.sol"; contract SignatureBouncerMock is SignatureBouncer { function initialize(address _sender) - isInitializer("SignatureBouncerMock", "1.9.0-beta") + isInitializer("SignatureBouncerMock", "1.9.0") public { SignatureBouncer.initialize(_sender); diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 64d6ea5e7..4dd804ed7 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -18,7 +18,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", "1.9.0-beta") { + function initialize(address _sender) public isInitializer("Ownable", "1.9.0") { owner = _sender; } diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index 1512b79b2..2ef1d2c7a 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -30,7 +30,7 @@ contract RBACWithAdmin is RBAC, Migratable { * @dev constructor. Sets initialAdmin as admin. */ function initialize(address initialAdmin) - isInitializer("RBACWithAdmin", "1.9.0-beta") + isInitializer("RBACWithAdmin", "1.9.0") public { addRole(initialAdmin, ROLE_ADMIN); diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index bf8eb7280..b15be74d6 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -23,7 +23,7 @@ contract SplitPayment is Migratable { * @dev Constructor */ function initialize(address[] _payees, uint256[] _shares) - isInitializer("SplitPayment", "1.9.0-beta") + isInitializer("SplitPayment", "1.9.0") public payable { diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index a4077f635..921f23c8c 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -9,7 +9,7 @@ contract DetailedERC20 is Migratable, ERC20 { string public symbol; uint8 public decimals; - function initialize(string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0-beta") { + function initialize(string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0") { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index e9fbbfd43..7ad41582c 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -12,7 +12,7 @@ contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { string _symbol, uint8 _decimals ) - isInitializer("DetailedMintableToken", "1.9.0-beta") + isInitializer("DetailedMintableToken", "1.9.0") public { DetailedERC20.initialize(_name, _symbol, _decimals); diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index 10dbc6148..a27804fac 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -13,7 +13,7 @@ contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { uint8 _decimals, uint256 _initialBalance ) - isInitializer("DetailedPremintedToken", "1.9.0-beta") + isInitializer("DetailedPremintedToken", "1.9.0") public { DetailedERC20.initialize(_name, _symbol, _decimals); diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 01fa1409e..84cb75817 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -23,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken { _; } - function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") public { + function initialize(address _sender) isInitializer("MintableToken", "1.9.0") public { Ownable.initialize(_sender); } diff --git a/contracts/token/ERC20/PausableToken.sol b/contracts/token/ERC20/PausableToken.sol index a22370885..5822d2776 100644 --- a/contracts/token/ERC20/PausableToken.sol +++ b/contracts/token/ERC20/PausableToken.sol @@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol"; **/ contract PausableToken is Migratable, StandardToken, Pausable { - function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") public { + function initialize(address _sender) isInitializer("PausableToken", "1.9.0") public { Pausable.initialize(_sender); } diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index a9ba1e1c8..8c3f65d08 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -27,7 +27,7 @@ contract TokenTimelock is Migratable { address _beneficiary, uint256 _releaseTime ) - isInitializer("TokenTimelock", "1.9.0-beta") + isInitializer("TokenTimelock", "1.9.0") public { // solium-disable-next-line security/no-block-members diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index aaded21ee..f2105ec1a 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", "1.9.0-beta") + isInitializer("TokenVesting", "1.9.0") { Ownable.initialize(_sender); diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 0c2802552..324a82d3a 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(string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0-beta") { + function initialize(string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0") { name_ = _name; symbol_ = _symbol; } diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index 9d6a14ed8..00f055f26 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -8,7 +8,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", "1.9.0-beta") public { + function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0") public { Ownable.initialize(_sender); ERC721Token.initialize(_name, _symbol); } diff --git a/zos.json b/zos.json index 389b8b6ff..7fc81ada1 100644 --- a/zos.json +++ b/zos.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-zos", - "version": "1.9.0-beta", + "version": "1.9.0", "contracts": { "DetailedMintableToken": "DetailedMintableToken", "DetailedPremintedToken": "DetailedPremintedToken",