diff --git a/.soliumrc.json b/.soliumrc.json index c065f3f79be..681b33f27ff 100644 --- a/.soliumrc.json +++ b/.soliumrc.json @@ -5,6 +5,8 @@ "quotes": ["error", "double"], "indentation": ["error", 2], "arg-overflow": ["warning", 3], - "security/enforce-explicit-visibility": ["error"] + "security/enforce-explicit-visibility": ["error"], + "security/no-block-members": ["warning"], + "security/no-inline-assembly": ["warning"] } } diff --git a/contracts/MerkleProof.sol b/contracts/MerkleProof.sol index 78c33d6b95f..e0e2ce88b7b 100644 --- a/contracts/MerkleProof.sol +++ b/contracts/MerkleProof.sol @@ -16,7 +16,9 @@ library MerkleProof { */ function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) { // Check if proof length is a multiple of 32 - if (_proof.length % 32 != 0) return false; + if (_proof.length % 32 != 0) { + return false; + } bytes32 proofElement; bytes32 computedHash = _leaf; diff --git a/contracts/lifecycle/TokenDestructible.sol b/contracts/lifecycle/TokenDestructible.sol index fa13c9241c8..0bca30e7b82 100644 --- a/contracts/lifecycle/TokenDestructible.sol +++ b/contracts/lifecycle/TokenDestructible.sol @@ -24,7 +24,7 @@ contract TokenDestructible is Ownable { function destroy(address[] tokens) onlyOwner public { // Transfer tokens to owner - for(uint256 i = 0; i < tokens.length; i++) { + for (uint256 i = 0; i < tokens.length; i++) { ERC20Basic token = ERC20Basic(tokens[i]); uint256 balance = token.balanceOf(this); token.transfer(owner, balance); diff --git a/contracts/mocks/ERC23TokenMock.sol b/contracts/mocks/ERC23TokenMock.sol index 8c826c2b09f..d785a72d987 100644 --- a/contracts/mocks/ERC23TokenMock.sol +++ b/contracts/mocks/ERC23TokenMock.sol @@ -25,7 +25,7 @@ contract ERC23TokenMock is BasicToken { assembly { is_contract := not(iszero(extcodesize(_to))) } - if(is_contract) { + if (is_contract) { ERC23ContractInterface receiver = ERC23ContractInterface(_to); receiver.tokenFallback(msg.sender, _value, _data); } diff --git a/contracts/mocks/ForceEther.sol b/contracts/mocks/ForceEther.sol index 9ab4a887b68..fd127da8489 100644 --- a/contracts/mocks/ForceEther.sol +++ b/contracts/mocks/ForceEther.sol @@ -6,7 +6,7 @@ pragma solidity ^0.4.18; // if the contract is not payable. // @notice To use, construct the contract with the target as argument. // @author Remco Bloemen -contract ForceEther { +contract ForceEther { function ForceEther() public payable { } diff --git a/contracts/mocks/InsecureTargetBounty.sol b/contracts/mocks/InsecureTargetBounty.sol index 5907aa1e12a..5344fc2f2e8 100644 --- a/contracts/mocks/InsecureTargetBounty.sol +++ b/contracts/mocks/InsecureTargetBounty.sol @@ -4,7 +4,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol"; contract InsecureTargetMock is Target { - function checkInvariant() public returns(bool){ + function checkInvariant() public returns(bool) { return false; } } diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol index 3708395b9ca..55320761b6d 100644 --- a/contracts/mocks/ReentrancyMock.sol +++ b/contracts/mocks/ReentrancyMock.sol @@ -17,7 +17,7 @@ contract ReentrancyMock is ReentrancyGuard { } function countLocalRecursive(uint256 n) public nonReentrant { - if(n > 0) { + if (n > 0) { count(); countLocalRecursive(n - 1); } @@ -25,7 +25,7 @@ contract ReentrancyMock is ReentrancyGuard { function countThisRecursive(uint256 n) public nonReentrant { bytes4 func = bytes4(keccak256("countThisRecursive(uint256)")); - if(n > 0) { + if (n > 0) { count(); bool result = this.call(func, n - 1); require(result == true); diff --git a/contracts/ownership/Contactable.sol b/contracts/ownership/Contactable.sol index 4aa1e13a3e9..882777b15d2 100644 --- a/contracts/ownership/Contactable.sol +++ b/contracts/ownership/Contactable.sol @@ -8,7 +8,7 @@ import "./Ownable.sol"; * @dev Basic version of a contactable contract, allowing the owner to provide a string with their * contact information. */ -contract Contactable is Ownable{ +contract Contactable is Ownable { string public contactInformation;