Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: solium errors - blank-line only
  • Loading branch information
shrugs committed Jan 15, 2018
commit e60aee61f20d25bffa0a1f651247810a8bc8a660
1 change: 1 addition & 0 deletions contracts/DayLimit.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity ^0.4.18;


/**
* @title DayLimit
* @dev Base contract that enables methods to be protected by placing a linear limit (specifiable)
Expand Down
1 change: 1 addition & 0 deletions contracts/MerkleProof.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity ^0.4.18;


/*
* @title MerkleProof
* @dev Merkle proof verification
Expand Down
1 change: 1 addition & 0 deletions contracts/ReentrancyGuard.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity ^0.4.18;


/**
* @title Helps contracts guard agains reentrancy attacks.
* @author Remco Bloemen <remco@2Ο€.com>
Expand Down
1 change: 1 addition & 0 deletions contracts/crowdsale/CappedCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions contracts/crowdsale/Crowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions contracts/crowdsale/FinalizableCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions contracts/crowdsale/RefundVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions contracts/examples/SampleCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -17,6 +18,7 @@ contract SampleCrowdsaleToken is MintableToken {

}


/**
* @title SampleCrowdsale
* @dev This is an example of a fully fledged crowdsale.
Expand Down
2 changes: 1 addition & 1 deletion contracts/lifecycle/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/lifecycle/TokenDestructible.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pragma solidity ^0.4.18;


import "../ownership/Ownable.sol";
import "../token/ERC20Basic.sol";


/**
* @title TokenDestructible:
* @author Remco Bloemen <remco@2Ο€.com>
Expand Down
2 changes: 1 addition & 1 deletion contracts/math/Math.sol
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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;
Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/BurnableTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.4.18;

import "../token/BurnableToken.sol";


contract BurnableTokenMock is BurnableToken {

function BurnableTokenMock(address initialAccount, uint initialBalance) public {
Expand Down
2 changes: 2 additions & 0 deletions contracts/mocks/DayLimitMock.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
pragma solidity ^0.4.18;

import "../../contracts/DayLimit.sol";


contract DayLimitMock is DayLimit {
uint256 public totalSpending;

Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/DetailedERC20Mock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
}
1 change: 1 addition & 0 deletions contracts/mocks/ERC23TokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/ForceEther.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity ^0.4.18;


// @title Force Ether into a contract.
// @notice even
// if the contract is not payable.
Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/HasNoEtherTest.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/InsecureTargetBounty.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pragma solidity ^0.4.18;


import {Bounty, Target} from "../../contracts/Bounty.sol";


Expand All @@ -10,6 +9,7 @@ contract InsecureTargetMock is Target {
}
}


contract InsecureTargetBounty is Bounty {
function deployContract() internal returns (address) {
return new InsecureTargetMock();
Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/PausableTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.4.18;

import "../token/PausableToken.sol";


// mock class using PausableToken
contract PausableTokenMock is PausableToken {

Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/ReentrancyAttack.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity ^0.4.18;


contract ReentrancyAttack {

function callSender(bytes4 data) public {
Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/ReentrancyMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "../ReentrancyGuard.sol";
import "./ReentrancyAttack.sol";


contract ReentrancyMock is ReentrancyGuard {

uint256 public counter;
Expand Down
3 changes: 3 additions & 0 deletions contracts/mocks/SafeERC20Helper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,6 +26,7 @@ contract ERC20FailingMock is ERC20 {
}
}


contract ERC20SucceedingMock is ERC20 {
function transfer(address, uint256) public returns (bool) {
return true;
Expand All @@ -47,6 +49,7 @@ contract ERC20SucceedingMock is ERC20 {
}
}


contract SafeERC20Helper {
using SafeERC20 for ERC20;

Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/SecureTargetBounty.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pragma solidity ^0.4.18;


import {Bounty, Target} from "../../contracts/Bounty.sol";


Expand All @@ -10,6 +9,7 @@ contract SecureTargetMock is Target {
}
}


contract SecureTargetBounty is Bounty {
function deployContract() internal returns (address) {
return new SecureTargetMock();
Expand Down
1 change: 1 addition & 0 deletions contracts/ownership/CanReclaimToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions contracts/ownership/Contactable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions contracts/ownership/DelayedClaimable.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pragma solidity ^0.4.18;


import "./Claimable.sol";


Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions contracts/ownership/HasNoContracts.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions contracts/ownership/HasNoEther.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions contracts/ownership/HasNoTokens.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions contracts/ownership/NoOwner.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions contracts/ownership/Ownable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ contract Ownable {
owner = msg.sender;
}


/**
* @dev Throws if called by any account other than the owner.
*/
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion contracts/ownership/rbac/RBAC.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions contracts/payment/SplitPayment.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions contracts/token/BurnableToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.4.18;

import "./BasicToken.sol";


/**
* @title Burnable Token
* @dev Token that can be irreversibly burned (destroyed).
Expand Down
1 change: 1 addition & 0 deletions contracts/token/CappedToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.4.11;

import "./MintableToken.sol";


/**
* @title Capped token
* @dev Mintable token with a token cap.
Expand Down
1 change: 1 addition & 0 deletions contracts/token/DetailedERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.4.18;

import "./ERC20.sol";


contract DetailedERC20 is ERC20 {
string public name;
string public symbol;
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/PausableToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions contracts/token/SafeERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/TokenTimelock.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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
Expand Down
1 change: 1 addition & 0 deletions contracts/token/TokenVesting.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down