Bumped version of ERC1155Proxy to 0.5.5 + merged ERC20Proxy/ERC721Proxy/MultiAssetProxy dependencies into base contract files

contracts/asset-proxy/CHANGELOG.json

@@ -13,6 +13,10 @@
             {
                 "note": "Add ERC1155Proxy",
                 "pr": 1661
+            },
+            {
+                "note": "Bumped solidity version to ^0.5.5",
+                "pr": 1701
             }
         ]
     },

contracts/asset-proxy/contracts/src/ERC1155Proxy.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity 0.4.24;
+pragma solidity ^0.5.5;
 
 import "./MixinAuthorizable.sol";
 

contracts/asset-proxy/contracts/src/ERC20Proxy.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity 0.4.24;
+pragma solidity ^0.5.5;
 
 import "./MixinAuthorizable.sol";
 

contracts/asset-proxy/contracts/src/ERC721Proxy.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity 0.4.24;
+pragma solidity ^0.5.5;
 
 import "./MixinAuthorizable.sol";
 

contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 import "@0x/contracts-utils/contracts/src/Ownable.sol";
 import "./mixins/MAssetProxyDispatcher.sol";
@@ -41,7 +41,7 @@ contract MixinAssetProxyDispatcher is
 
         // Ensure that no asset proxy exists with current id.
         bytes4 assetProxyId = assetProxyContract.getProxyId();
-        address currentAssetProxy = assetProxies[assetProxyId];
+        address currentAssetProxy = address(assetProxies[assetProxyId]);
         require(
             currentAssetProxy == address(0),
             "ASSET_PROXY_ALREADY_EXISTS"
@@ -63,7 +63,7 @@ contract MixinAssetProxyDispatcher is
         view
         returns (address)
     {
-        return assetProxies[assetProxyId];
+        return address(assetProxies[assetProxyId]);
     }
 
     /// @dev Forwards arguments to assetProxy and calls `transferFrom`. Either succeeds or throws.
@@ -95,7 +95,7 @@ contract MixinAssetProxyDispatcher is
                     0xFFFFFFFF00000000000000000000000000000000000000000000000000000000
                 )
             }
-            address assetProxy = assetProxies[assetProxyId];
+            address assetProxy = address(assetProxies[assetProxyId]);
 
             // Ensure that assetProxy exists
             require(

contracts/asset-proxy/contracts/src/MixinAuthorizable.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 import "@0x/contracts-utils/contracts/src/Ownable.sol";
 import "./mixins/MAuthorizable.sol";

contracts/asset-proxy/contracts/src/MultiAssetProxy.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity 0.4.24;
+pragma solidity ^0.5.5;
 
 import "./MixinAssetProxyDispatcher.sol";
 import "./MixinAuthorizable.sol";

contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol

@@ -17,7 +17,7 @@
 */
 
 // solhint-disable
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 pragma experimental ABIEncoderV2;
 
 
@@ -36,8 +36,8 @@ interface IAssetData {
         external;
 
     function MultiAsset(
-        uint256[] amounts,
+        uint256[] calldata amounts,
-        bytes[] nestedAssetData
+        bytes[] calldata nestedAssetData
     )
         external;
     

contracts/asset-proxy/contracts/src/interfaces/IAssetProxy.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 import "./IAuthorizable.sol";
 
@@ -30,7 +30,7 @@ contract IAssetProxy is
     /// @param to Address to transfer asset to.
     /// @param amount Amount of asset to transfer.
     function transferFrom(
-        bytes assetData,
+        bytes calldata assetData,
         address from,
         address to,
         uint256 amount

contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 
 contract IAssetProxyDispatcher {

contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";
 

contracts/asset-proxy/contracts/src/mixins/MAssetProxyDispatcher.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 import "../interfaces/IAssetProxyDispatcher.sol";
 

contracts/asset-proxy/contracts/src/mixins/MAuthorizable.sol

@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.5;
 
 import "../interfaces/IAuthorizable.sol";
 

contracts/asset-proxy/package.json

@@ -71,7 +71,7 @@
         "@0x/contracts-erc20": "^1.0.9",
         "@0x/contracts-erc721": "^1.0.9",
         "@0x/contracts-erc1155": "^1.0.0",
-        "@0x/contracts-utils": "2.0.1",
+        "@0x/contracts-utils": "^2.0.8",
         "@0x/order-utils": "^7.0.2",
         "@0x/types": "^2.1.1",
         "@0x/typescript-typings": "^4.1.0",