Solium (solidity linter)

.soliumignore

@@ -0,0 +1,2 @@
+node_modules
+contracts/contracts/Migrations.sol

.soliumrc.json

@@ -0,0 +1,23 @@
+{
+  "extends": "solium:recommended",
+  "plugins": [
+    "security"
+  ],
+  "rules": {
+    "security/no-inline-assembly": "off",
+    "security/no-tx-origin": "off",
+    "security/no-block-members": "off",
+    "security/no-low-level-calls": "off",
+    "security/no-send": "off",
+    "max-len": "off",
+    "no-empty-blocks": "off",
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "indentation": [
+      "error",
+      4
+    ]
+  }
+}

contracts/contracts/identity/ClaimHolder.sol

@@ -1,9 +1,10 @@
 pragma solidity ^0.4.24;
 
-import './ERC735.sol';
-import './KeyHolder.sol';
+import "./ERC735.sol";
+import "./KeyHolder.sol";
 import "./ClaimHolderLibrary.sol";
 
+
 contract ClaimHolder is KeyHolder, ERC735 {
 
     ClaimHolderLibrary.Claims claims;
@@ -57,7 +58,7 @@ contract ClaimHolder is KeyHolder, ERC735 {
 
     function getClaim(bytes32 _claimId)
         public
-        constant
+        view
         returns(
             uint256 topic,
             uint256 scheme,
@@ -72,7 +73,7 @@ contract ClaimHolder is KeyHolder, ERC735 {
 
     function getClaimIdsByTopic(uint256 _topic)
         public
-        constant
+        view
         returns(bytes32[] claimIds)
     {
         return claims.byTopic[_topic];

contracts/contracts/identity/ClaimHolderLibrary.sol

@@ -1,154 +1,155 @@
 pragma solidity ^0.4.24;
 
-import './KeyHolderLibrary.sol';
+import "./KeyHolderLibrary.sol";
+
 
 library ClaimHolderLibrary {
-  event ClaimAdded(bytes32 indexed claimId, uint256 indexed topic, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
-  event ClaimRemoved(bytes32 indexed claimId, uint256 indexed topic, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
-
-  struct Claim {
-      uint256 topic;
-      uint256 scheme;
-      address issuer; // msg.sender
-      bytes signature; // this.address + topic + data
-      bytes data;
-      string uri;
-  }
-
-  struct Claims {
-      mapping (bytes32 => Claim) byId;
-      mapping (uint256 => bytes32[]) byTopic;
-  }
-
-  function addClaim(
-      KeyHolderLibrary.KeyHolderData storage _keyHolderData,
-      Claims storage _claims,
-      uint256 _topic,
-      uint256 _scheme,
-      address _issuer,
-      bytes _signature,
-      bytes _data,
-      string _uri
-  )
-      public
-      returns (bytes32 claimRequestId)
-  {
-      if (msg.sender != address(this)) {
-        require(KeyHolderLibrary.keyHasPurpose( _keyHolderData, keccak256(abi.encodePacked(msg.sender)), 3), "Sender does not have claim signer key");
-      }
-
-      bytes32 claimId = keccak256(abi.encodePacked(_issuer, _topic));
-
-      if (_claims.byId[claimId].issuer != _issuer) {
-          _claims.byTopic[_topic].push(claimId);
-      }
-
-      _claims.byId[claimId].topic = _topic;
-      _claims.byId[claimId].scheme = _scheme;
-      _claims.byId[claimId].issuer = _issuer;
-      _claims.byId[claimId].signature = _signature;
-      _claims.byId[claimId].data = _data;
-      _claims.byId[claimId].uri = _uri;
-
-      emit ClaimAdded(
-          claimId,
-          _topic,
-          _scheme,
-          _issuer,
-          _signature,
-          _data,
-          _uri
-      );
-
-      return claimId;
-  }
-
-  function addClaims(
-      KeyHolderLibrary.KeyHolderData storage _keyHolderData,
-      Claims storage _claims,
-      uint256[] _topic,
-      address[] _issuer,
-      bytes _signature,
-      bytes _data,
-      uint256[] _offsets
-  )
-      public
-  {
-      uint offset = 0;
-      for (uint8 i = 0; i < _topic.length; i++) {
-          addClaim(
-            _keyHolderData,
-            _claims,
-            _topic[i],
-            1,
-            _issuer[i],
-            getBytes(_signature, (i * 65), 65),
-            getBytes(_data, offset, _offsets[i]),
-            ""
-          );
-          offset += _offsets[i];
-      }
-  }
-
-  function removeClaim(
-      KeyHolderLibrary.KeyHolderData storage _keyHolderData,
-      Claims storage _claims,
-      bytes32 _claimId
-  )
-      public
-      returns (bool success)
-  {
-      if (msg.sender != address(this)) {
-        require(KeyHolderLibrary.keyHasPurpose(_keyHolderData, keccak256(abi.encodePacked(msg.sender)), 1), "Sender does not have management key");
-      }
-
-      emit ClaimRemoved(
-          _claimId,
-          _claims.byId[_claimId].topic,
-          _claims.byId[_claimId].scheme,
-          _claims.byId[_claimId].issuer,
-          _claims.byId[_claimId].signature,
-          _claims.byId[_claimId].data,
-          _claims.byId[_claimId].uri
-      );
-
-      delete _claims.byId[_claimId];
-      return true;
-  }
-
-  function getClaim(Claims storage _claims, bytes32 _claimId)
-      public
-      constant
-      returns(
+    event ClaimAdded(bytes32 indexed claimId, uint256 indexed topic, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
+    event ClaimRemoved(bytes32 indexed claimId, uint256 indexed topic, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
+
+    struct Claim {
+        uint256 topic;
+        uint256 scheme;
+        address issuer; // msg.sender
+        bytes signature; // this.address + topic + data
+        bytes data;
+        string uri;
+    }
+
+    struct Claims {
+        mapping (bytes32 => Claim) byId;
+        mapping (uint256 => bytes32[]) byTopic;
+    }
+
+    function addClaim(
+        KeyHolderLibrary.KeyHolderData storage _keyHolderData,
+        Claims storage _claims,
+        uint256 _topic,
+        uint256 _scheme,
+        address _issuer,
+        bytes _signature,
+        bytes _data,
+        string _uri
+    )
+        public
+        returns (bytes32 claimRequestId)
+    {
+        if (msg.sender != address(this)) {
+            require(KeyHolderLibrary.keyHasPurpose(_keyHolderData, keccak256(abi.encodePacked(msg.sender)), 3), "Sender does not have claim signer key");
+        }
+
+        bytes32 claimId = keccak256(abi.encodePacked(_issuer, _topic));
+
+        if (_claims.byId[claimId].issuer != _issuer) {
+            _claims.byTopic[_topic].push(claimId);
+        }
+
+        _claims.byId[claimId].topic = _topic;
+        _claims.byId[claimId].scheme = _scheme;
+        _claims.byId[claimId].issuer = _issuer;
+        _claims.byId[claimId].signature = _signature;
+        _claims.byId[claimId].data = _data;
+        _claims.byId[claimId].uri = _uri;
+
+        emit ClaimAdded(
+            claimId,
+            _topic,
+            _scheme,
+            _issuer,
+            _signature,
+            _data,
+            _uri
+        );
+
+        return claimId;
+    }
+
+    function addClaims(
+        KeyHolderLibrary.KeyHolderData storage _keyHolderData,
+        Claims storage _claims,
+        uint256[] _topic,
+        address[] _issuer,
+        bytes _signature,
+        bytes _data,
+        uint256[] _offsets
+    )
+        public
+    {
+        uint offset = 0;
+        for (uint8 i = 0; i < _topic.length; i++) {
+            addClaim(
+                _keyHolderData,
+                _claims,
+                _topic[i],
+                1,
+                _issuer[i],
+                getBytes(_signature, (i * 65), 65),
+                getBytes(_data, offset, _offsets[i]),
+                ""
+            );
+            offset += _offsets[i];
+        }
+    }
+
+    function removeClaim(
+        KeyHolderLibrary.KeyHolderData storage _keyHolderData,
+        Claims storage _claims,
+        bytes32 _claimId
+    )
+        public
+        returns (bool success)
+    {
+        if (msg.sender != address(this)) {
+            require(KeyHolderLibrary.keyHasPurpose(_keyHolderData, keccak256(abi.encodePacked(msg.sender)), 1), "Sender does not have management key");
+        }
+
+        emit ClaimRemoved(
+            _claimId,
+            _claims.byId[_claimId].topic,
+            _claims.byId[_claimId].scheme,
+            _claims.byId[_claimId].issuer,
+            _claims.byId[_claimId].signature,
+            _claims.byId[_claimId].data,
+            _claims.byId[_claimId].uri
+        );
+
+        delete _claims.byId[_claimId];
+        return true;
+    }
+
+    function getClaim(Claims storage _claims, bytes32 _claimId)
+        public
+        view
+        returns(
           uint256 topic,
           uint256 scheme,
           address issuer,
           bytes signature,
           bytes data,
           string uri
-      )
-  {
-      return (
-          _claims.byId[_claimId].topic,
-          _claims.byId[_claimId].scheme,
-          _claims.byId[_claimId].issuer,
-          _claims.byId[_claimId].signature,
-          _claims.byId[_claimId].data,
-          _claims.byId[_claimId].uri
-      );
-  }
-
-  function getBytes(bytes _str, uint256 _offset, uint256 _length)
-      internal
-      pure
-      returns (bytes)
-  {
-      bytes memory sig = new bytes(_length);
-      uint256 j = 0;
-      for (uint256 k = _offset; k< _offset + _length; k++) {
-        sig[j] = _str[k];
-        j++;
-      }
-      return sig;
-  }
+        )
+    {
+        return (
+            _claims.byId[_claimId].topic,
+            _claims.byId[_claimId].scheme,
+            _claims.byId[_claimId].issuer,
+            _claims.byId[_claimId].signature,
+            _claims.byId[_claimId].data,
+            _claims.byId[_claimId].uri
+        );
+    }
+
+    function getBytes(bytes _str, uint256 _offset, uint256 _length)
+        internal
+        pure
+        returns (bytes)
+    {
+        bytes memory sig = new bytes(_length);
+        uint256 j = 0;
+        for (uint256 k = _offset; k < _offset + _length; k++) {
+            sig[j] = _str[k];
+            j++;
+        }
+        return sig;
+    }
 }

contracts/contracts/identity/ClaimHolderPresigned.sol

@@ -1,13 +1,14 @@
 pragma solidity ^0.4.24;
 
-import './ClaimHolderRegistered.sol';
+import "./ClaimHolderRegistered.sol";
 
 /**
  * NOTE: This contract exists as a convenience for deploying an identity with
  * some 'pre-signed' claims. If you don't care about that, just use ClaimHolder
  * instead.
  */
 
+
 contract ClaimHolderPresigned is ClaimHolderRegistered {
 
     constructor(