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
700b8118
Commit
700b8118
authored
May 18, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter errors and warnings
parent
16f04b13
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
47 additions
and
14 deletions
+47
-14
Pausable.sol
contracts/lifecycle/Pausable.sol
+1
-1
SafeERC20Helper.sol
contracts/mocks/SafeERC20Helper.sol
+4
-4
Ownable.sol
contracts/ownership/Ownable.sol
+2
-1
DetailedERC20.sol
contracts/token/ERC20/DetailedERC20.sol
+2
-1
DetailedMintableToken.sol
contracts/token/ERC20/DetailedMintableToken.sol
+10
-1
DetailedPremintedToken.sol
contracts/token/ERC20/DetailedPremintedToken.sol
+11
-1
MintableToken.sol
contracts/token/ERC20/MintableToken.sol
+2
-1
PausableToken.sol
contracts/token/ERC20/PausableToken.sol
+1
-1
StandardBurnableToken.sol
contracts/token/ERC20/StandardBurnableToken.sol
+1
-0
TokenTimelock.sol
contracts/token/ERC20/TokenTimelock.sol
+10
-1
TokenVesting.sol
contracts/token/ERC20/TokenVesting.sol
+1
-1
MintableERC721Token.sol
contracts/token/ERC721/MintableERC721Token.sol
+2
-1
No files found.
contracts/lifecycle/Pausable.sol
View file @
700b8118
...
...
@@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable {
bool public paused = false;
function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") {
function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta")
public
{
Ownable.initialize(_sender);
}
...
...
contracts/mocks/SafeERC20Helper.sol
View file @
700b8118
...
...
@@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 {
return false;
}
function balanceOf(address) public
constant
returns (uint256) {
function balanceOf(address) public
view
returns (uint256) {
return 0;
}
function allowance(address, address) public
constant
returns (uint256) {
function allowance(address, address) public
view
returns (uint256) {
return 0;
}
}
...
...
@@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 {
return true;
}
function balanceOf(address) public
constant
returns (uint256) {
function balanceOf(address) public
view
returns (uint256) {
return 0;
}
function allowance(address, address) public
constant
returns (uint256) {
function allowance(address, address) public
view
returns (uint256) {
return 0;
}
}
...
...
contracts/ownership/Ownable.sol
View file @
700b8118
pragma solidity ^0.4.21;
import 'zos-lib/contracts/migrations/Migratable.sol';
import "zos-lib/contracts/migrations/Migratable.sol";
/**
* @title Ownable
...
...
contracts/token/ERC20/DetailedERC20.sol
View file @
700b8118
pragma solidity ^0.4.21;
import "./ERC20.sol";
import 'zos-lib/contracts/migrations/Migratable.sol';
import "zos-lib/contracts/migrations/Migratable.sol";
contract DetailedERC20 is Migratable, ERC20 {
string public name;
...
...
contracts/token/ERC20/DetailedMintableToken.sol
View file @
700b8118
...
...
@@ -4,8 +4,17 @@ import "zos-lib/contracts/migrations/Migratable.sol";
import "./DetailedERC20.sol";
import "./MintableToken.sol";
contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken {
function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") {
function initialize(
address _sender,
string _name,
string _symbol,
uint8 _decimals
)
isInitializer("DetailedMintableToken", "1.9.0-beta")
public
{
DetailedERC20.initialize(_name, _symbol, _decimals);
MintableToken.initialize(_sender);
}
...
...
contracts/token/ERC20/DetailedPremintedToken.sol
View file @
700b8118
...
...
@@ -4,8 +4,18 @@ import "zos-lib/contracts/migrations/Migratable.sol";
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", "1.9.0-beta") {
function initialize(
address _sender,
string _name,
string _symbol,
uint8 _decimals,
uint256 _initialBalance
)
isInitializer("DetailedPremintedToken", "1.9.0-beta")
public
{
DetailedERC20.initialize(_name, _symbol, _decimals);
_premint(_sender, _initialBalance);
...
...
contracts/token/ERC20/MintableToken.sol
View file @
700b8118
...
...
@@ -4,6 +4,7 @@ import "./StandardToken.sol";
import "../../ownership/Ownable.sol";
import "zos-lib/contracts/migrations/Migratable.sol";
/**
* @title Mintable token
* @dev Simple ERC20 Token example, with mintable token creation
...
...
@@ -22,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken {
_;
}
function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") {
function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta")
public
{
Ownable.initialize(_sender);
}
...
...
contracts/token/ERC20/PausableToken.sol
View file @
700b8118
...
...
@@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol";
**/
contract PausableToken is Migratable, StandardToken, Pausable {
function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") {
function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta")
public
{
Pausable.initialize(_sender);
}
...
...
contracts/token/ERC20/StandardBurnableToken.sol
View file @
700b8118
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "./BurnableToken.sol";
import "./StandardToken.sol";
/**
* @title Standard Burnable Token
* @dev Adds burnFrom method to ERC20 implementations
...
...
contracts/token/ERC20/TokenTimelock.sol
View file @
700b8118
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.21;
import "./SafeERC20.sol";
import "zos-lib/contracts/migrations/Migratable.sol";
/**
* @title TokenTimelock
* @dev TokenTimelock is a token holder contract that will allow a
...
...
@@ -20,7 +21,15 @@ 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", "1.9.0-beta") {
function initialize(
address _sender,
ERC20Basic _token,
address _beneficiary,
uint256 _releaseTime
)
isInitializer("TokenTimelock", "1.9.0-beta")
public
{
// solium-disable-next-line security/no-block-members
require(_releaseTime > block.timestamp);
token = _token;
...
...
contracts/token/ERC20/TokenVesting.sol
View file @
700b8118
...
...
@@ -6,7 +6,7 @@ import "./ERC20Basic.sol";
import "./SafeERC20.sol";
import "../../ownership/Ownable.sol";
import "../../math/SafeMath.sol";
import
'zos-lib/contracts/migrations/Migratable.sol'
;
import
"zos-lib/contracts/migrations/Migratable.sol"
;
/**
...
...
contracts/token/ERC721/MintableERC721Token.sol
View file @
700b8118
...
...
@@ -3,11 +3,12 @@ pragma solidity ^0.4.21;
import "./ERC721Token.sol";
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") {
function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta")
public
{
Ownable.initialize(_sender);
ERC721Token.initialize(_name, _symbol);
}
...
...
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