Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
b732b641
Commit
b732b641
authored
May 22, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bump to 1.9.0
parent
998b5f43
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
16 additions
and
16 deletions
+16
-16
SignatureBouncer.sol
contracts/access/SignatureBouncer.sol
+1
-1
Pausable.sol
contracts/lifecycle/Pausable.sol
+1
-1
BouncerMock.sol
contracts/mocks/BouncerMock.sol
+1
-1
Ownable.sol
contracts/ownership/Ownable.sol
+1
-1
RBACWithAdmin.sol
contracts/ownership/rbac/RBACWithAdmin.sol
+1
-1
SplitPayment.sol
contracts/payment/SplitPayment.sol
+1
-1
DetailedERC20.sol
contracts/token/ERC20/DetailedERC20.sol
+1
-1
DetailedMintableToken.sol
contracts/token/ERC20/DetailedMintableToken.sol
+1
-1
DetailedPremintedToken.sol
contracts/token/ERC20/DetailedPremintedToken.sol
+1
-1
MintableToken.sol
contracts/token/ERC20/MintableToken.sol
+1
-1
PausableToken.sol
contracts/token/ERC20/PausableToken.sol
+1
-1
TokenTimelock.sol
contracts/token/ERC20/TokenTimelock.sol
+1
-1
TokenVesting.sol
contracts/token/ERC20/TokenVesting.sol
+1
-1
ERC721Token.sol
contracts/token/ERC721/ERC721Token.sol
+1
-1
MintableERC721Token.sol
contracts/token/ERC721/MintableERC721Token.sol
+1
-1
zos.json
zos.json
+1
-1
No files found.
contracts/access/SignatureBouncer.sol
View file @
b732b641
...
@@ -29,7 +29,7 @@ contract SignatureBouncer is Migratable, Ownable, RBAC {
...
@@ -29,7 +29,7 @@ contract SignatureBouncer is Migratable, Ownable, RBAC {
string public constant ROLE_BOUNCER = "bouncer";
string public constant ROLE_BOUNCER = "bouncer";
function initialize(address _sender)
function initialize(address _sender)
isInitializer("SignatureBouncer", "1.9.0
-beta
")
isInitializer("SignatureBouncer", "1.9.0")
public
public
{
{
Ownable.initialize(_sender);
Ownable.initialize(_sender);
...
...
contracts/lifecycle/Pausable.sol
View file @
b732b641
...
@@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable {
...
@@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable {
bool public paused = false;
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);
Ownable.initialize(_sender);
}
}
...
...
contracts/mocks/BouncerMock.sol
View file @
b732b641
...
@@ -5,7 +5,7 @@ import "../access/SignatureBouncer.sol";
...
@@ -5,7 +5,7 @@ import "../access/SignatureBouncer.sol";
contract SignatureBouncerMock is SignatureBouncer {
contract SignatureBouncerMock is SignatureBouncer {
function initialize(address _sender)
function initialize(address _sender)
isInitializer("SignatureBouncerMock", "1.9.0
-beta
")
isInitializer("SignatureBouncerMock", "1.9.0")
public
public
{
{
SignatureBouncer.initialize(_sender);
SignatureBouncer.initialize(_sender);
...
...
contracts/ownership/Ownable.sol
View file @
b732b641
...
@@ -18,7 +18,7 @@ contract Ownable is Migratable {
...
@@ -18,7 +18,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", "1.9.0
-beta
") {
function initialize(address _sender) public isInitializer("Ownable", "1.9.0") {
owner = _sender;
owner = _sender;
}
}
...
...
contracts/ownership/rbac/RBACWithAdmin.sol
View file @
b732b641
...
@@ -30,7 +30,7 @@ contract RBACWithAdmin is RBAC, Migratable {
...
@@ -30,7 +30,7 @@ contract RBACWithAdmin is RBAC, Migratable {
* @dev constructor. Sets initialAdmin as admin.
* @dev constructor. Sets initialAdmin as admin.
*/
*/
function initialize(address initialAdmin)
function initialize(address initialAdmin)
isInitializer("RBACWithAdmin", "1.9.0
-beta
")
isInitializer("RBACWithAdmin", "1.9.0")
public
public
{
{
addRole(initialAdmin, ROLE_ADMIN);
addRole(initialAdmin, ROLE_ADMIN);
...
...
contracts/payment/SplitPayment.sol
View file @
b732b641
...
@@ -23,7 +23,7 @@ contract SplitPayment is Migratable {
...
@@ -23,7 +23,7 @@ contract SplitPayment is Migratable {
* @dev Constructor
* @dev Constructor
*/
*/
function initialize(address[] _payees, uint256[] _shares)
function initialize(address[] _payees, uint256[] _shares)
isInitializer("SplitPayment", "1.9.0
-beta
")
isInitializer("SplitPayment", "1.9.0")
public
public
payable
payable
{
{
...
...
contracts/token/ERC20/DetailedERC20.sol
View file @
b732b641
...
@@ -9,7 +9,7 @@ contract DetailedERC20 is Migratable, ERC20 {
...
@@ -9,7 +9,7 @@ contract DetailedERC20 is Migratable, ERC20 {
string public symbol;
string public symbol;
uint8 public decimals;
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;
name = _name;
symbol = _symbol;
symbol = _symbol;
decimals = _decimals;
decimals = _decimals;
...
...
contracts/token/ERC20/DetailedMintableToken.sol
View file @
b732b641
...
@@ -12,7 +12,7 @@ contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken {
...
@@ -12,7 +12,7 @@ contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken {
string _symbol,
string _symbol,
uint8 _decimals
uint8 _decimals
)
)
isInitializer("DetailedMintableToken", "1.9.0
-beta
")
isInitializer("DetailedMintableToken", "1.9.0")
public
public
{
{
DetailedERC20.initialize(_name, _symbol, _decimals);
DetailedERC20.initialize(_name, _symbol, _decimals);
...
...
contracts/token/ERC20/DetailedPremintedToken.sol
View file @
b732b641
...
@@ -13,7 +13,7 @@ contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken {
...
@@ -13,7 +13,7 @@ contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken {
uint8 _decimals,
uint8 _decimals,
uint256 _initialBalance
uint256 _initialBalance
)
)
isInitializer("DetailedPremintedToken", "1.9.0
-beta
")
isInitializer("DetailedPremintedToken", "1.9.0")
public
public
{
{
DetailedERC20.initialize(_name, _symbol, _decimals);
DetailedERC20.initialize(_name, _symbol, _decimals);
...
...
contracts/token/ERC20/MintableToken.sol
View file @
b732b641
...
@@ -23,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken {
...
@@ -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);
Ownable.initialize(_sender);
}
}
...
...
contracts/token/ERC20/PausableToken.sol
View file @
b732b641
...
@@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol";
...
@@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol";
**/
**/
contract PausableToken is Migratable, StandardToken, Pausable {
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);
Pausable.initialize(_sender);
}
}
...
...
contracts/token/ERC20/TokenTimelock.sol
View file @
b732b641
...
@@ -27,7 +27,7 @@ contract TokenTimelock is Migratable {
...
@@ -27,7 +27,7 @@ contract TokenTimelock is Migratable {
address _beneficiary,
address _beneficiary,
uint256 _releaseTime
uint256 _releaseTime
)
)
isInitializer("TokenTimelock", "1.9.0
-beta
")
isInitializer("TokenTimelock", "1.9.0")
public
public
{
{
// solium-disable-next-line security/no-block-members
// solium-disable-next-line security/no-block-members
...
...
contracts/token/ERC20/TokenVesting.sol
View file @
b732b641
...
@@ -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", "1.9.0
-beta
")
isInitializer("TokenVesting", "1.9.0")
{
{
Ownable.initialize(_sender);
Ownable.initialize(_sender);
...
...
contracts/token/ERC721/ERC721Token.sol
View file @
b732b641
...
@@ -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(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;
name_ = _name;
symbol_ = _symbol;
symbol_ = _symbol;
}
}
...
...
contracts/token/ERC721/MintableERC721Token.sol
View file @
b732b641
...
@@ -8,7 +8,7 @@ import "../../ownership/Ownable.sol";
...
@@ -8,7 +8,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", "1.9.0
-beta
") public {
function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0") public {
Ownable.initialize(_sender);
Ownable.initialize(_sender);
ERC721Token.initialize(_name, _symbol);
ERC721Token.initialize(_name, _symbol);
}
}
...
...
zos.json
View file @
b732b641
{
{
"name"
:
"openzeppelin-zos"
,
"name"
:
"openzeppelin-zos"
,
"version"
:
"1.9.0
-beta
"
,
"version"
:
"1.9.0"
,
"contracts"
:
{
"contracts"
:
{
"DetailedMintableToken"
:
"DetailedMintableToken"
,
"DetailedMintableToken"
:
"DetailedMintableToken"
,
"DetailedPremintedToken"
:
"DetailedPremintedToken"
,
"DetailedPremintedToken"
:
"DetailedPremintedToken"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment