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
b5039186
Commit
b5039186
authored
Nov 23, 2017
by
Alejandro Santander
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes to remove warnings
parent
0eaa5f50
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
23 additions
and
20 deletions
+23
-20
Bounty.sol
contracts/Bounty.sol
+1
-1
DayLimit.sol
contracts/DayLimit.sol
+1
-1
LimitBalance.sol
contracts/LimitBalance.sol
+1
-1
MerkleProof.sol
contracts/MerkleProof.sol
+1
-1
CappedCrowdsale.sol
contracts/crowdsale/CappedCrowdsale.sol
+1
-1
Crowdsale.sol
contracts/crowdsale/Crowdsale.sol
+2
-2
RefundVault.sol
contracts/crowdsale/RefundVault.sol
+1
-1
RefundableCrowdsale.sol
contracts/crowdsale/RefundableCrowdsale.sol
+1
-1
SampleCrowdsale.sol
contracts/examples/SampleCrowdsale.sol
+1
-1
SimpleToken.sol
contracts/examples/SimpleToken.sol
+1
-1
Destructible.sol
contracts/lifecycle/Destructible.sol
+1
-1
TokenDestructible.sol
contracts/lifecycle/TokenDestructible.sol
+1
-1
HasNoEther.sol
contracts/ownership/HasNoEther.sol
+1
-1
HasNoTokens.sol
contracts/ownership/HasNoTokens.sol
+3
-0
Ownable.sol
contracts/ownership/Ownable.sol
+1
-1
SplitPayment.sol
contracts/payment/SplitPayment.sol
+1
-1
CappedToken.sol
contracts/token/CappedToken.sol
+1
-1
DetailedERC20.sol
contracts/token/DetailedERC20.sol
+1
-1
TokenTimelock.sol
contracts/token/TokenTimelock.sol
+1
-1
TokenVesting.sol
contracts/token/TokenVesting.sol
+1
-1
No files found.
contracts/Bounty.sol
View file @
b5039186
...
@@ -18,7 +18,7 @@ contract Bounty is PullPayment, Destructible {
...
@@ -18,7 +18,7 @@ contract Bounty is PullPayment, Destructible {
/**
/**
* @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
* @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
*/
*/
function() payable {
function() p
ublic p
ayable {
require(!claimed);
require(!claimed);
}
}
...
...
contracts/DayLimit.sol
View file @
b5039186
...
@@ -15,7 +15,7 @@ contract DayLimit {
...
@@ -15,7 +15,7 @@ contract DayLimit {
* @dev Constructor that sets the passed value as a dailyLimit.
* @dev Constructor that sets the passed value as a dailyLimit.
* @param _limit uint256 to represent the daily limit.
* @param _limit uint256 to represent the daily limit.
*/
*/
function DayLimit(uint256 _limit) {
function DayLimit(uint256 _limit)
public
{
dailyLimit = _limit;
dailyLimit = _limit;
lastDay = today();
lastDay = today();
}
}
...
...
contracts/LimitBalance.sol
View file @
b5039186
...
@@ -15,7 +15,7 @@ contract LimitBalance {
...
@@ -15,7 +15,7 @@ contract LimitBalance {
* @dev Constructor that sets the passed value as a limit.
* @dev Constructor that sets the passed value as a limit.
* @param _limit uint256 to represent the limit.
* @param _limit uint256 to represent the limit.
*/
*/
function LimitBalance(uint256 _limit) {
function LimitBalance(uint256 _limit)
public
{
limit = _limit;
limit = _limit;
}
}
...
...
contracts/MerkleProof.sol
View file @
b5039186
...
@@ -13,7 +13,7 @@ library MerkleProof {
...
@@ -13,7 +13,7 @@ library MerkleProof {
* @param _root Merkle root
* @param _root Merkle root
* @param _leaf Leaf of Merkle tree
* @param _leaf Leaf of Merkle tree
*/
*/
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) pure returns (bool) {
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) pu
blic pu
re returns (bool) {
// Check if proof length is a multiple of 32
// Check if proof length is a multiple of 32
if (_proof.length % 32 != 0) return false;
if (_proof.length % 32 != 0) return false;
...
...
contracts/crowdsale/CappedCrowdsale.sol
View file @
b5039186
...
@@ -12,7 +12,7 @@ contract CappedCrowdsale is Crowdsale {
...
@@ -12,7 +12,7 @@ contract CappedCrowdsale is Crowdsale {
uint256 public cap;
uint256 public cap;
function CappedCrowdsale(uint256 _cap) {
function CappedCrowdsale(uint256 _cap)
public
{
require(_cap > 0);
require(_cap > 0);
cap = _cap;
cap = _cap;
}
}
...
...
contracts/crowdsale/Crowdsale.sol
View file @
b5039186
...
@@ -40,7 +40,7 @@ contract Crowdsale {
...
@@ -40,7 +40,7 @@ contract Crowdsale {
event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);
event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);
function Crowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet) {
function Crowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet)
public
{
require(_startTime >= now);
require(_startTime >= now);
require(_endTime >= _startTime);
require(_endTime >= _startTime);
require(_rate > 0);
require(_rate > 0);
...
@@ -61,7 +61,7 @@ contract Crowdsale {
...
@@ -61,7 +61,7 @@ contract Crowdsale {
// fallback function can be used to buy tokens
// fallback function can be used to buy tokens
function () payable {
function () p
ublic p
ayable {
buyTokens(msg.sender);
buyTokens(msg.sender);
}
}
...
...
contracts/crowdsale/RefundVault.sol
View file @
b5039186
...
@@ -22,7 +22,7 @@ contract RefundVault is Ownable {
...
@@ -22,7 +22,7 @@ contract RefundVault is Ownable {
event RefundsEnabled();
event RefundsEnabled();
event Refunded(address indexed beneficiary, uint256 weiAmount);
event Refunded(address indexed beneficiary, uint256 weiAmount);
function RefundVault(address _wallet) {
function RefundVault(address _wallet)
public
{
require(_wallet != address(0));
require(_wallet != address(0));
wallet = _wallet;
wallet = _wallet;
state = State.Active;
state = State.Active;
...
...
contracts/crowdsale/RefundableCrowdsale.sol
View file @
b5039186
...
@@ -21,7 +21,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
...
@@ -21,7 +21,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
// refund vault used to hold funds while crowdsale is running
// refund vault used to hold funds while crowdsale is running
RefundVault public vault;
RefundVault public vault;
function RefundableCrowdsale(uint256 _goal) {
function RefundableCrowdsale(uint256 _goal)
public
{
require(_goal > 0);
require(_goal > 0);
vault = new RefundVault(wallet);
vault = new RefundVault(wallet);
goal = _goal;
goal = _goal;
...
...
contracts/examples/SampleCrowdsale.sol
View file @
b5039186
...
@@ -30,7 +30,7 @@ contract SampleCrowdsaleToken is MintableToken {
...
@@ -30,7 +30,7 @@ contract SampleCrowdsaleToken is MintableToken {
*/
*/
contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {
contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {
function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet)
function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet)
public
CappedCrowdsale(_cap)
CappedCrowdsale(_cap)
FinalizableCrowdsale()
FinalizableCrowdsale()
RefundableCrowdsale(_goal)
RefundableCrowdsale(_goal)
...
...
contracts/examples/SimpleToken.sol
View file @
b5039186
...
@@ -21,7 +21,7 @@ contract SimpleToken is StandardToken {
...
@@ -21,7 +21,7 @@ contract SimpleToken is StandardToken {
/**
/**
* @dev Constructor that gives msg.sender all of existing tokens.
* @dev Constructor that gives msg.sender all of existing tokens.
*/
*/
function SimpleToken() {
function SimpleToken()
public
{
totalSupply = INITIAL_SUPPLY;
totalSupply = INITIAL_SUPPLY;
balances[msg.sender] = INITIAL_SUPPLY;
balances[msg.sender] = INITIAL_SUPPLY;
}
}
...
...
contracts/lifecycle/Destructible.sol
View file @
b5039186
...
@@ -10,7 +10,7 @@ import "../ownership/Ownable.sol";
...
@@ -10,7 +10,7 @@ import "../ownership/Ownable.sol";
*/
*/
contract Destructible is Ownable {
contract Destructible is Ownable {
function Destructible() payable { }
function Destructible() p
ublic p
ayable { }
/**
/**
* @dev Transfers the current balance to the owner and terminates the contract.
* @dev Transfers the current balance to the owner and terminates the contract.
...
...
contracts/lifecycle/TokenDestructible.sol
View file @
b5039186
...
@@ -12,7 +12,7 @@ import "../token/ERC20Basic.sol";
...
@@ -12,7 +12,7 @@ import "../token/ERC20Basic.sol";
*/
*/
contract TokenDestructible is Ownable {
contract TokenDestructible is Ownable {
function TokenDestructible() payable { }
function TokenDestructible() p
ublic p
ayable { }
/**
/**
* @notice Terminate contract and refund to owner
* @notice Terminate contract and refund to owner
...
...
contracts/ownership/HasNoEther.sol
View file @
b5039186
...
@@ -21,7 +21,7 @@ contract HasNoEther is Ownable {
...
@@ -21,7 +21,7 @@ contract HasNoEther is Ownable {
* constructor. By doing it this way we prevent a payable constructor from working. Alternatively
* constructor. By doing it this way we prevent a payable constructor from working. Alternatively
* we could use assembly to access msg.value.
* we could use assembly to access msg.value.
*/
*/
function HasNoEther() payable {
function HasNoEther() p
ublic p
ayable {
require(msg.value == 0);
require(msg.value == 0);
}
}
...
...
contracts/ownership/HasNoTokens.sol
View file @
b5039186
...
@@ -18,6 +18,9 @@ contract HasNoTokens is CanReclaimToken {
...
@@ -18,6 +18,9 @@ contract HasNoTokens is CanReclaimToken {
* @param data_ Bytes The data passed from the caller.
* @param data_ Bytes The data passed from the caller.
*/
*/
function tokenFallback(address from_, uint256 value_, bytes data_) external {
function tokenFallback(address from_, uint256 value_, bytes data_) external {
from_;
value_;
data_;
revert();
revert();
}
}
...
...
contracts/ownership/Ownable.sol
View file @
b5039186
...
@@ -17,7 +17,7 @@ contract Ownable {
...
@@ -17,7 +17,7 @@ contract Ownable {
* @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 Ownable() {
function Ownable()
public
{
owner = msg.sender;
owner = msg.sender;
}
}
...
...
contracts/payment/SplitPayment.sol
View file @
b5039186
...
@@ -20,7 +20,7 @@ contract SplitPayment {
...
@@ -20,7 +20,7 @@ contract SplitPayment {
/**
/**
* @dev Constructor
* @dev Constructor
*/
*/
function SplitPayment(address[] _payees, uint256[] _shares) {
function SplitPayment(address[] _payees, uint256[] _shares)
public
{
require(_payees.length == _shares.length);
require(_payees.length == _shares.length);
for (uint256 i = 0; i < _payees.length; i++) {
for (uint256 i = 0; i < _payees.length; i++) {
...
...
contracts/token/CappedToken.sol
View file @
b5039186
...
@@ -11,7 +11,7 @@ contract CappedToken is MintableToken {
...
@@ -11,7 +11,7 @@ contract CappedToken is MintableToken {
uint256 public cap;
uint256 public cap;
function CappedToken(uint256 _cap) {
function CappedToken(uint256 _cap)
public
{
require(_cap > 0);
require(_cap > 0);
cap = _cap;
cap = _cap;
}
}
...
...
contracts/token/DetailedERC20.sol
View file @
b5039186
...
@@ -7,7 +7,7 @@ contract DetailedERC20 is ERC20 {
...
@@ -7,7 +7,7 @@ contract DetailedERC20 is ERC20 {
string public symbol;
string public symbol;
uint8 public decimals;
uint8 public decimals;
function DetailedERC20(string _name, string _symbol, uint8 _decimals) {
function DetailedERC20(string _name, string _symbol, uint8 _decimals)
public
{
name = _name;
name = _name;
symbol = _symbol;
symbol = _symbol;
decimals = _decimals;
decimals = _decimals;
...
...
contracts/token/TokenTimelock.sol
View file @
b5039186
...
@@ -21,7 +21,7 @@ contract TokenTimelock {
...
@@ -21,7 +21,7 @@ contract TokenTimelock {
// timestamp when token release is enabled
// timestamp when token release is enabled
uint64 public releaseTime;
uint64 public releaseTime;
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint64 _releaseTime) {
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint64 _releaseTime)
public
{
require(_releaseTime > now);
require(_releaseTime > now);
token = _token;
token = _token;
beneficiary = _beneficiary;
beneficiary = _beneficiary;
...
...
contracts/token/TokenVesting.sol
View file @
b5039186
...
@@ -39,7 +39,7 @@ contract TokenVesting is Ownable {
...
@@ -39,7 +39,7 @@ contract TokenVesting is Ownable {
* @param _duration duration in seconds of the period in which the tokens will vest
* @param _duration duration in seconds of the period in which the tokens will vest
* @param _revocable whether the vesting is revocable or not
* @param _revocable whether the vesting is revocable or not
*/
*/
function TokenVesting(address _beneficiary, uint256 _start, uint256 _cliff, uint256 _duration, bool _revocable) {
function TokenVesting(address _beneficiary, uint256 _start, uint256 _cliff, uint256 _duration, bool _revocable)
public
{
require(_beneficiary != address(0));
require(_beneficiary != address(0));
require(_cliff <= _duration);
require(_cliff <= _duration);
...
...
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