v0.0.7 - Upgrade to Solidity v0.5.0 (#22)

* (WIP) Upgrade to Solidity v0.5.0 (#21)

* (refactor) Changed codebase to Solidity v0.5.0

* Style changes
* Added `memory` everywhere to bytes and strings
* `target.call(data)` now returns a tuple

* Adding note about compiler support in the README + typo fix

* Replaced the ThrowProxy pattern for a better v0.5.x one

ThrowProxy was giving problems while testing with the JS-VM with the Constantinople hard-fork. So I changed the tests to stop using that pattern and use function selectors since that's now a thing.

It is cleaner now.

* Update package-lock.json

* Bump version to v0.0.7

* Bump version in package-lock.json

* Update dependency versions

* Fix typo in package-lock.json

README.md

@@ -8,6 +8,15 @@ The library lets you concatenate, slice and type cast bytes arrays both in memor
 
 Given this library has an all-internal collection of methods it doesn't make sense having it reside in the mainnet. Instead it will only be available in EPM as an installable package.
 
+_Note_: Since version `v0.0.7` the library will only compile on Solidity versions `>0.4.22` so, if you need `v0.4.x` support for your project just use `v0.0.6` of the library with:
+```
+$ truffle install bytes@0.0.6
+```
+or
+```
+$ npm install solidity-bytes-utils@0.0.6
+```
+
 ## Usage
 
 You can use the library here present by direct download and importing with:
@@ -61,7 +70,6 @@ Contributions are more than welcome in any way shape or form! 😄
 
 TODOs:
 * Two storage bytes arrays concatenation
-* Two storage bytes arrays concatenation
 * Slicing directly from storage
 * Implement inline assembly functions for better readability
 

contracts/AssertBytes.sol

@@ -6,7 +6,7 @@
  *      This library is compliant with the test event convention that the Truffle suite uses.
  */
 
- pragma solidity ^0.4.21;
+ pragma solidity ^0.5.0;
 
 
 library AssertBytes {
@@ -69,15 +69,15 @@ library AssertBytes {
         return returnBool;
     }
 
-    function equal(bytes memory _a, bytes memory _b, string message) internal returns (bool) {
+    function equal(bytes memory _a, bytes memory _b, string memory message) internal returns (bool) {
         bool returnBool = _equal(_a, _b);
 
         _report(returnBool, message);
 
         return returnBool;
     }
 
-    function notEqual(bytes memory _a, bytes memory _b, string message) internal returns (bool) {
+    function notEqual(bytes memory _a, bytes memory _b, string memory message) internal returns (bool) {
         bool returnBool = _equal(_a, _b);
 
         _report(!returnBool, message);
@@ -162,15 +162,15 @@ library AssertBytes {
         return returnBool;
     }
 
-    function equalStorage(bytes storage _a, bytes memory _b, string message) internal returns (bool) {
+    function equalStorage(bytes storage _a, bytes memory _b, string memory message) internal returns (bool) {
         bool returnBool = _equalStorage(_a, _b);
 
         _report(returnBool, message);
 
         return returnBool;
     }
 
-    function notEqualStorage(bytes storage _a, bytes memory _b, string message) internal returns (bool) {
+    function notEqualStorage(bytes storage _a, bytes memory _b, string memory message) internal returns (bool) {
         bool returnBool = _equalStorage(_a, _b);
 
         _report(!returnBool, message);
@@ -191,10 +191,10 @@ library AssertBytes {
             message (string) - The message that is sent if the assertion fails.
     */
 
-    function _report(bool result, string message) internal {
+    function _report(bool result, string memory message) internal {
         if (result)
             emit TestEvent(true, "");
         else
             emit TestEvent(false, message);
     }
-}
+}

contracts/BytesLib.sol

@@ -6,11 +6,18 @@
  *      The library lets you concatenate, slice and type cast bytes arrays both in memory and storage.
  */
 
-pragma solidity ^0.4.19;
+pragma solidity ^0.5.0;
 
 
 library BytesLib {
-    function concat(bytes memory _preBytes, bytes memory _postBytes) internal pure returns (bytes) {
+    function concat(
+        bytes memory _preBytes,
+        bytes memory _postBytes
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
         bytes memory tempBytes;
 
         assembly {
@@ -218,7 +225,15 @@ library BytesLib {
         }
     }
 
-    function slice(bytes _bytes, uint _start, uint _length) internal  pure returns (bytes) {
+    function slice(
+        bytes memory _bytes,
+        uint _start,
+        uint _length
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
         require(_bytes.length >= (_start + _length));
 
         bytes memory tempBytes;
@@ -275,7 +290,7 @@ library BytesLib {
         return tempBytes;
     }
 
-    function toAddress(bytes _bytes, uint _start) internal  pure returns (address) {
+    function toAddress(bytes memory _bytes, uint _start) internal  pure returns (address) {
         require(_bytes.length >= (_start + 20));
         address tempAddress;
 
@@ -286,7 +301,7 @@ library BytesLib {
         return tempAddress;
     }
 
-    function toUint8(bytes _bytes, uint _start) internal  pure returns (uint8) {
+    function toUint8(bytes memory _bytes, uint _start) internal  pure returns (uint8) {
         require(_bytes.length >= (_start + 1));
         uint8 tempUint;
 
@@ -297,7 +312,7 @@ library BytesLib {
         return tempUint;
     }
 
-    function toUint16(bytes _bytes, uint _start) internal  pure returns (uint16) {
+    function toUint16(bytes memory _bytes, uint _start) internal  pure returns (uint16) {
         require(_bytes.length >= (_start + 2));
         uint16 tempUint;
 
@@ -308,7 +323,7 @@ library BytesLib {
         return tempUint;
     }
 
-    function toUint32(bytes _bytes, uint _start) internal  pure returns (uint32) {
+    function toUint32(bytes memory _bytes, uint _start) internal  pure returns (uint32) {
         require(_bytes.length >= (_start + 4));
         uint32 tempUint;
 
@@ -319,7 +334,7 @@ library BytesLib {
         return tempUint;
     }
 
-    function toUint(bytes _bytes, uint _start) internal  pure returns (uint256) {
+    function toUint(bytes memory _bytes, uint _start) internal  pure returns (uint256) {
         require(_bytes.length >= (_start + 32));
         uint256 tempUint;
 
@@ -330,7 +345,7 @@ library BytesLib {
         return tempUint;
     }
 
-    function toBytes32(bytes _bytes, uint _start) internal  pure returns (bytes32) {
+    function toBytes32(bytes memory _bytes, uint _start) internal  pure returns (bytes32) {
         require(_bytes.length >= (_start + 32));
         bytes32 tempBytes32;
 
@@ -384,7 +399,14 @@ library BytesLib {
         return success;
     }
 
-    function equalStorage(bytes storage _preBytes, bytes memory _postBytes) internal view returns (bool) {
+    function equalStorage(
+        bytes storage _preBytes,
+        bytes memory _postBytes
+    )
+        internal
+        view
+        returns (bool)
+    {
         bool success = true;
 
         assembly {

contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.4;
+pragma solidity ^0.5.0;
 
 contract Migrations {
   address public owner;
@@ -8,7 +8,7 @@ contract Migrations {
     if (msg.sender == owner) _;
   }
 
-  function Migrations() public {
+  constructor () public {
     owner = msg.sender;
   }
 

ethpm.json

@@ -1,6 +1,6 @@
 {
   "package_name": "bytes",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Solidity bytes tightly packed arrays utility library.",
   "authors": [
     "Gonçalo Sá <goncalo.sa@consensys.net>"