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
e60aee61
Commit
e60aee61
authored
Jan 15, 2018
by
Matt Condon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: solium errors - blank-line only
parent
b2e2d9ab
Show whitespace changes
Inline
Side-by-side
Showing
40 changed files
with
41 additions
and
12 deletions
+41
-12
DayLimit.sol
contracts/DayLimit.sol
+1
-0
MerkleProof.sol
contracts/MerkleProof.sol
+1
-0
ReentrancyGuard.sol
contracts/ReentrancyGuard.sol
+1
-0
CappedCrowdsale.sol
contracts/crowdsale/CappedCrowdsale.sol
+1
-0
Crowdsale.sol
contracts/crowdsale/Crowdsale.sol
+1
-0
FinalizableCrowdsale.sol
contracts/crowdsale/FinalizableCrowdsale.sol
+1
-0
RefundVault.sol
contracts/crowdsale/RefundVault.sol
+1
-0
SampleCrowdsale.sol
contracts/examples/SampleCrowdsale.sol
+2
-0
Migrations.sol
contracts/lifecycle/Migrations.sol
+1
-1
TokenDestructible.sol
contracts/lifecycle/TokenDestructible.sol
+1
-1
Math.sol
contracts/math/Math.sol
+1
-1
BurnableTokenMock.sol
contracts/mocks/BurnableTokenMock.sol
+1
-0
DayLimitMock.sol
contracts/mocks/DayLimitMock.sol
+2
-0
DetailedERC20Mock.sol
contracts/mocks/DetailedERC20Mock.sol
+1
-0
ERC23TokenMock.sol
contracts/mocks/ERC23TokenMock.sol
+1
-0
ForceEther.sol
contracts/mocks/ForceEther.sol
+1
-0
HasNoEtherTest.sol
contracts/mocks/HasNoEtherTest.sol
+1
-0
InsecureTargetBounty.sol
contracts/mocks/InsecureTargetBounty.sol
+1
-1
PausableTokenMock.sol
contracts/mocks/PausableTokenMock.sol
+1
-0
ReentrancyAttack.sol
contracts/mocks/ReentrancyAttack.sol
+1
-0
ReentrancyMock.sol
contracts/mocks/ReentrancyMock.sol
+1
-0
SafeERC20Helper.sol
contracts/mocks/SafeERC20Helper.sol
+3
-0
SecureTargetBounty.sol
contracts/mocks/SecureTargetBounty.sol
+1
-1
CanReclaimToken.sol
contracts/ownership/CanReclaimToken.sol
+1
-0
Contactable.sol
contracts/ownership/Contactable.sol
+1
-0
DelayedClaimable.sol
contracts/ownership/DelayedClaimable.sol
+0
-2
HasNoContracts.sol
contracts/ownership/HasNoContracts.sol
+1
-0
HasNoEther.sol
contracts/ownership/HasNoEther.sol
+1
-0
HasNoTokens.sol
contracts/ownership/HasNoTokens.sol
+1
-0
NoOwner.sol
contracts/ownership/NoOwner.sol
+1
-0
Ownable.sol
contracts/ownership/Ownable.sol
+0
-2
RBAC.sol
contracts/ownership/rbac/RBAC.sol
+0
-1
SplitPayment.sol
contracts/payment/SplitPayment.sol
+1
-0
BurnableToken.sol
contracts/token/BurnableToken.sol
+1
-0
CappedToken.sol
contracts/token/CappedToken.sol
+1
-0
DetailedERC20.sol
contracts/token/DetailedERC20.sol
+1
-0
PausableToken.sol
contracts/token/PausableToken.sol
+1
-1
SafeERC20.sol
contracts/token/SafeERC20.sol
+1
-0
TokenTimelock.sol
contracts/token/TokenTimelock.sol
+1
-1
TokenVesting.sol
contracts/token/TokenVesting.sol
+1
-0
No files found.
contracts/DayLimit.sol
View file @
e60aee61
pragma solidity ^0.4.18;
/**
* @title DayLimit
* @dev Base contract that enables methods to be protected by placing a linear limit (specifiable)
...
...
contracts/MerkleProof.sol
View file @
e60aee61
pragma solidity ^0.4.18;
/*
* @title MerkleProof
* @dev Merkle proof verification
...
...
contracts/ReentrancyGuard.sol
View file @
e60aee61
pragma solidity ^0.4.18;
/**
* @title Helps contracts guard agains reentrancy attacks.
* @author Remco Bloemen <remco@2π.com>
...
...
contracts/crowdsale/CappedCrowdsale.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../math/SafeMath.sol";
import "./Crowdsale.sol";
/**
* @title CappedCrowdsale
* @dev Extension of Crowdsale with a max amount of funds raised
...
...
contracts/crowdsale/Crowdsale.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../token/MintableToken.sol";
import "../math/SafeMath.sol";
/**
* @title Crowdsale
* @dev Crowdsale is a base contract for managing a token crowdsale.
...
...
contracts/crowdsale/FinalizableCrowdsale.sol
View file @
e60aee61
...
...
@@ -4,6 +4,7 @@ import "../math/SafeMath.sol";
import "../ownership/Ownable.sol";
import "./Crowdsale.sol";
/**
* @title FinalizableCrowdsale
* @dev Extension of Crowdsale where an owner can do extra work
...
...
contracts/crowdsale/RefundVault.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../math/SafeMath.sol";
import "../ownership/Ownable.sol";
/**
* @title RefundVault
* @dev This contract is used for storing funds while a crowdsale
...
...
contracts/examples/SampleCrowdsale.sol
View file @
e60aee61
...
...
@@ -4,6 +4,7 @@ import "../crowdsale/CappedCrowdsale.sol";
import "../crowdsale/RefundableCrowdsale.sol";
import "../token/MintableToken.sol";
/**
* @title SampleCrowdsaleToken
* @dev Very simple ERC20 Token that can be minted.
...
...
@@ -17,6 +18,7 @@ contract SampleCrowdsaleToken is MintableToken {
}
/**
* @title SampleCrowdsale
* @dev This is an example of a fully fledged crowdsale.
...
...
contracts/lifecycle/Migrations.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import "../ownership/Ownable.sol";
/**
* @title Migrations
* @dev This is a truffle contract, needed for truffle integration, not meant for use by Zeppelin users.
...
...
contracts/lifecycle/TokenDestructible.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import "../ownership/Ownable.sol";
import "../token/ERC20Basic.sol";
/**
* @title TokenDestructible:
* @author Remco Bloemen <remco@2π.com>
...
...
contracts/math/Math.sol
View file @
e60aee61
pragma solidity ^0.4.18;
/**
* @title Math
* @dev Assorted math operations
*/
library Math {
function max64(uint64 a, uint64 b) internal pure returns (uint64) {
return a >= b ? a : b;
...
...
contracts/mocks/BurnableTokenMock.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "../token/BurnableToken.sol";
contract BurnableTokenMock is BurnableToken {
function BurnableTokenMock(address initialAccount, uint initialBalance) public {
...
...
contracts/mocks/DayLimitMock.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit {
uint256 public totalSpending;
...
...
contracts/mocks/DetailedERC20Mock.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../token/StandardToken.sol";
import "../token/DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
}
contracts/mocks/ERC23TokenMock.sol
View file @
e60aee61
...
...
@@ -8,6 +8,7 @@ contract ERC23ContractInterface {
function tokenFallback(address _from, uint256 _value, bytes _data) external;
}
contract ERC23TokenMock is BasicToken {
function ERC23TokenMock(address initialAccount, uint256 initialBalance) public {
...
...
contracts/mocks/ForceEther.sol
View file @
e60aee61
pragma solidity ^0.4.18;
// @title Force Ether into a contract.
// @notice even
// if the contract is not payable.
...
...
contracts/mocks/HasNoEtherTest.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "../../contracts/ownership/HasNoEther.sol";
contract HasNoEtherTest is HasNoEther {
// Constructor with explicit payable — should still fail
...
...
contracts/mocks/InsecureTargetBounty.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import {Bounty, Target} from "../../contracts/Bounty.sol";
...
...
@@ -10,6 +9,7 @@ contract InsecureTargetMock is Target {
}
}
contract InsecureTargetBounty is Bounty {
function deployContract() internal returns (address) {
return new InsecureTargetMock();
...
...
contracts/mocks/PausableTokenMock.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "../token/PausableToken.sol";
// mock class using PausableToken
contract PausableTokenMock is PausableToken {
...
...
contracts/mocks/ReentrancyAttack.sol
View file @
e60aee61
pragma solidity ^0.4.18;
contract ReentrancyAttack {
function callSender(bytes4 data) public {
...
...
contracts/mocks/ReentrancyMock.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../ReentrancyGuard.sol";
import "./ReentrancyAttack.sol";
contract ReentrancyMock is ReentrancyGuard {
uint256 public counter;
...
...
contracts/mocks/SafeERC20Helper.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../token/ERC20.sol";
import "../token/SafeERC20.sol";
contract ERC20FailingMock is ERC20 {
function transfer(address, uint256) public returns (bool) {
return false;
...
...
@@ -25,6 +26,7 @@ contract ERC20FailingMock is ERC20 {
}
}
contract ERC20SucceedingMock is ERC20 {
function transfer(address, uint256) public returns (bool) {
return true;
...
...
@@ -47,6 +49,7 @@ contract ERC20SucceedingMock is ERC20 {
}
}
contract SafeERC20Helper {
using SafeERC20 for ERC20;
...
...
contracts/mocks/SecureTargetBounty.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import {Bounty, Target} from "../../contracts/Bounty.sol";
...
...
@@ -10,6 +9,7 @@ contract SecureTargetMock is Target {
}
}
contract SecureTargetBounty is Bounty {
function deployContract() internal returns (address) {
return new SecureTargetMock();
...
...
contracts/ownership/CanReclaimToken.sol
View file @
e60aee61
...
...
@@ -4,6 +4,7 @@ import "./Ownable.sol";
import "../token/ERC20Basic.sol";
import "../token/SafeERC20.sol";
/**
* @title Contracts that should be able to recover tokens
* @author SylTi
...
...
contracts/ownership/Contactable.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./Ownable.sol";
/**
* @title Contactable token
* @dev Basic version of a contactable contract, allowing the owner to provide a string with their
...
...
contracts/ownership/DelayedClaimable.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import "./Claimable.sol";
...
...
@@ -26,7 +25,6 @@ contract DelayedClaimable is Claimable {
start = _start;
}
/**
* @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within
* the specified start and end time.
...
...
contracts/ownership/HasNoContracts.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./Ownable.sol";
/**
* @title Contracts that should not own Contracts
* @author Remco Bloemen <remco@2π.com>
...
...
contracts/ownership/HasNoEther.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./Ownable.sol";
/**
* @title Contracts that should not own Ether
* @author Remco Bloemen <remco@2π.com>
...
...
contracts/ownership/HasNoTokens.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./CanReclaimToken.sol";
/**
* @title Contracts that should not own Tokens
* @author Remco Bloemen <remco@2π.com>
...
...
contracts/ownership/NoOwner.sol
View file @
e60aee61
...
...
@@ -4,6 +4,7 @@ import "./HasNoEther.sol";
import "./HasNoTokens.sol";
import "./HasNoContracts.sol";
/**
* @title Base contract for contracts that should not own things.
* @author Remco Bloemen <remco@2π.com>
...
...
contracts/ownership/Ownable.sol
View file @
e60aee61
...
...
@@ -21,7 +21,6 @@ contract Ownable {
owner = msg.sender;
}
/**
* @dev Throws if called by any account other than the owner.
*/
...
...
@@ -30,7 +29,6 @@ contract Ownable {
_;
}
/**
* @dev Allows the current owner to transfer control of the contract to a newOwner.
* @param newOwner The address to transfer ownership to.
...
...
contracts/ownership/rbac/RBAC.sol
View file @
e60aee61
...
...
@@ -111,7 +111,6 @@ contract RBAC {
removeRole(addr, roleName);
}
/**
* @dev modifier to scope access to a single role (uses msg.sender as addr)
* @param roleName the name of the role
...
...
contracts/payment/SplitPayment.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "../math/SafeMath.sol";
/**
* @title SplitPayment
* @dev Base contract that supports multiple payees claiming funds sent to this contract
...
...
contracts/token/BurnableToken.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./BasicToken.sol";
/**
* @title Burnable Token
* @dev Token that can be irreversibly burned (destroyed).
...
...
contracts/token/CappedToken.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.11;
import "./MintableToken.sol";
/**
* @title Capped token
* @dev Mintable token with a token cap.
...
...
contracts/token/DetailedERC20.sol
View file @
e60aee61
...
...
@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./ERC20.sol";
contract DetailedERC20 is ERC20 {
string public name;
string public symbol;
...
...
contracts/token/PausableToken.sol
View file @
e60aee61
...
...
@@ -3,12 +3,12 @@ pragma solidity ^0.4.18;
import "./StandardToken.sol";
import "../lifecycle/Pausable.sol";
/**
* @title Pausable token
*
* @dev StandardToken modified with pausable transfers.
**/
contract PausableToken is StandardToken, Pausable {
function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
...
...
contracts/token/SafeERC20.sol
View file @
e60aee61
...
...
@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "./ERC20Basic.sol";
import "./ERC20.sol";
/**
* @title SafeERC20
* @dev Wrappers around ERC20 operations that throw on failure.
...
...
contracts/token/TokenTimelock.sol
View file @
e60aee61
pragma solidity ^0.4.18;
import "./ERC20Basic.sol";
import "../token/SafeERC20.sol";
/**
* @title TokenTimelock
* @dev TokenTimelock is a token holder contract that will allow a
...
...
contracts/token/TokenVesting.sol
View file @
e60aee61
...
...
@@ -5,6 +5,7 @@ import "./SafeERC20.sol";
import "../ownership/Ownable.sol";
import "../math/SafeMath.sol";
/**
* @title TokenVesting
* @dev A token holder contract that can release its token balance gradually like a
...
...
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