diff --git a/contracts/exchange-libs/contracts/src/LibAbiEncoder.sol b/contracts/exchange-libs/contracts/src/LibAbiEncoder.sol index 5422bfeecf..b8b72ba8eb 100644 --- a/contracts/exchange-libs/contracts/src/LibAbiEncoder.sol +++ b/contracts/exchange-libs/contracts/src/LibAbiEncoder.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; pragma experimental ABIEncoderV2; import "./LibOrder.sol"; diff --git a/contracts/exchange-libs/contracts/src/LibAssetProxyErrors.sol b/contracts/exchange-libs/contracts/src/LibAssetProxyErrors.sol index 96c48b5e3b..3f6ae1f31f 100644 --- a/contracts/exchange-libs/contracts/src/LibAssetProxyErrors.sol +++ b/contracts/exchange-libs/contracts/src/LibAssetProxyErrors.sol @@ -17,7 +17,7 @@ */ // solhint-disable -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; /// @dev This contract documents the revert reasons used in the AssetProxy contracts. diff --git a/contracts/exchange-libs/contracts/src/LibConstants.sol b/contracts/exchange-libs/contracts/src/LibConstants.sol index 3efa3e1b35..2889ffd5d4 100644 --- a/contracts/exchange-libs/contracts/src/LibConstants.sol +++ b/contracts/exchange-libs/contracts/src/LibConstants.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; // solhint-disable max-line-length diff --git a/contracts/exchange-libs/contracts/src/LibEIP712.sol b/contracts/exchange-libs/contracts/src/LibEIP712.sol index 3a85ab3c0a..e8b71a5091 100644 --- a/contracts/exchange-libs/contracts/src/LibEIP712.sol +++ b/contracts/exchange-libs/contracts/src/LibEIP712.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; contract LibEIP712 { @@ -50,7 +50,7 @@ contract LibEIP712 { EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH, keccak256(bytes(EIP712_DOMAIN_NAME)), keccak256(bytes(EIP712_DOMAIN_VERSION)), - bytes32(address(this)) + uint256(address(this)) )); } diff --git a/contracts/exchange-libs/contracts/src/LibExchangeErrors.sol b/contracts/exchange-libs/contracts/src/LibExchangeErrors.sol index a160242c9b..5818cb6e21 100644 --- a/contracts/exchange-libs/contracts/src/LibExchangeErrors.sol +++ b/contracts/exchange-libs/contracts/src/LibExchangeErrors.sol @@ -17,7 +17,7 @@ */ // solhint-disable -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; /// @dev This contract documents the revert reasons used in the Exchange contract. diff --git a/contracts/exchange-libs/contracts/src/LibExchangeSelectors.sol b/contracts/exchange-libs/contracts/src/LibExchangeSelectors.sol index 71640c609b..792a564356 100644 --- a/contracts/exchange-libs/contracts/src/LibExchangeSelectors.sol +++ b/contracts/exchange-libs/contracts/src/LibExchangeSelectors.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; contract LibExchangeSelectors { diff --git a/contracts/exchange-libs/contracts/src/LibFillResults.sol b/contracts/exchange-libs/contracts/src/LibFillResults.sol index 08a1649b86..f4b9626b0b 100644 --- a/contracts/exchange-libs/contracts/src/LibFillResults.sol +++ b/contracts/exchange-libs/contracts/src/LibFillResults.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "@0x/contracts-utils/contracts/src/SafeMath.sol"; diff --git a/contracts/exchange-libs/contracts/src/LibMath.sol b/contracts/exchange-libs/contracts/src/LibMath.sol index 24ea90c6b9..2a7b388821 100644 --- a/contracts/exchange-libs/contracts/src/LibMath.sol +++ b/contracts/exchange-libs/contracts/src/LibMath.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "@0x/contracts-utils/contracts/src/SafeMath.sol"; diff --git a/contracts/exchange-libs/contracts/src/LibOrder.sol b/contracts/exchange-libs/contracts/src/LibOrder.sol index fcf5da5fb6..d23747c36e 100644 --- a/contracts/exchange-libs/contracts/src/LibOrder.sol +++ b/contracts/exchange-libs/contracts/src/LibOrder.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "./LibEIP712.sol"; diff --git a/contracts/exchange-libs/contracts/test/TestLibs.sol b/contracts/exchange-libs/contracts/test/TestLibs.sol index 751a3773ec..f17407b78a 100644 --- a/contracts/exchange-libs/contracts/test/TestLibs.sol +++ b/contracts/exchange-libs/contracts/test/TestLibs.sol @@ -16,7 +16,7 @@ */ -pragma solidity 0.4.24; +pragma solidity 0.5.3; pragma experimental ABIEncoderV2; import "../src/LibMath.sol"; diff --git a/contracts/utils/contracts/src/LibAddressArray.sol b/contracts/utils/contracts/src/LibAddressArray.sol index 892c486f14..aa3ef27dfb 100644 --- a/contracts/utils/contracts/src/LibAddressArray.sol +++ b/contracts/utils/contracts/src/LibAddressArray.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "./LibBytes.sol"; @@ -31,7 +31,7 @@ library LibAddressArray { /// @return Array of addresses: [... addressArray, addressToAppend] function append(address[] memory addressArray, address addressToAppend) internal pure - returns (address[]) + returns (address[] memory) { // Get stats on address array and free memory uint256 freeMemPtr = 0; diff --git a/contracts/utils/contracts/src/LibBytes.sol b/contracts/utils/contracts/src/LibBytes.sol index 4ee6228d54..1fa56786da 100644 --- a/contracts/utils/contracts/src/LibBytes.sol +++ b/contracts/utils/contracts/src/LibBytes.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; library LibBytes { diff --git a/contracts/utils/contracts/src/Ownable.sol b/contracts/utils/contracts/src/Ownable.sol index f67f241a4f..254986e088 100644 --- a/contracts/utils/contracts/src/Ownable.sol +++ b/contracts/utils/contracts/src/Ownable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "./interfaces/IOwnable.sol"; diff --git a/contracts/utils/contracts/src/ReentrancyGuard.sol b/contracts/utils/contracts/src/ReentrancyGuard.sol index 1a02c88a40..9574d07a12 100644 --- a/contracts/utils/contracts/src/ReentrancyGuard.sol +++ b/contracts/utils/contracts/src/ReentrancyGuard.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; contract ReentrancyGuard { diff --git a/contracts/utils/contracts/src/SafeMath.sol b/contracts/utils/contracts/src/SafeMath.sol index d7a4a603eb..82a5d5d765 100644 --- a/contracts/utils/contracts/src/SafeMath.sol +++ b/contracts/utils/contracts/src/SafeMath.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; contract SafeMath { diff --git a/contracts/utils/contracts/src/interfaces/IOwnable.sol b/contracts/utils/contracts/src/interfaces/IOwnable.sol index c0cbfddfd6..b5de687439 100644 --- a/contracts/utils/contracts/src/interfaces/IOwnable.sol +++ b/contracts/utils/contracts/src/interfaces/IOwnable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; contract IOwnable { diff --git a/contracts/utils/contracts/test/TestConstants.sol b/contracts/utils/contracts/test/TestConstants.sol index bf98bafefe..d58fe535a4 100644 --- a/contracts/utils/contracts/test/TestConstants.sol +++ b/contracts/utils/contracts/test/TestConstants.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "../src/LibBytes.sol"; diff --git a/contracts/utils/contracts/test/TestLibBytes.sol b/contracts/utils/contracts/test/TestLibBytes.sol index cd6b1456de..82ad314fb5 100644 --- a/contracts/utils/contracts/test/TestLibBytes.sol +++ b/contracts/utils/contracts/test/TestLibBytes.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity ^0.5.3; import "../src/LibBytes.sol"; @@ -244,14 +244,14 @@ contract TestLibBytes { /// @param length Length of bytes to copy from to /// @return mem Memory contents after calling memCopy. function testMemcpy( - bytes mem, + bytes memory mem, uint256 dest, uint256 source, uint256 length ) public // not external, we need input in memory pure - returns (bytes) + returns (bytes memory) { // Sanity check. Overflows are not checked. require(source + length <= mem.length); diff --git a/yarn.lock b/yarn.lock index 3360084f2a..46b21e9f5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1597,7 +1597,7 @@ version "2.2.48" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab" -"@types/node@*", "@types/node@^10.3.2": +"@types/node@*", "@types/node@10.9.4", "@types/node@^10.3.2": version "10.9.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897" @@ -13478,13 +13478,6 @@ react-copy-to-clipboard@^5.0.0: copy-to-clipboard "^3" prop-types "^15.5.8" -react-document-title@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/react-document-title/-/react-document-title-2.0.3.tgz#bbf922a0d71412fc948245e4283b2412df70f2b9" - dependencies: - prop-types "^15.5.6" - react-side-effect "^1.0.2" - react-dom@^16.3.2: version "16.4.2" resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4" @@ -13706,7 +13699,7 @@ react-scrollable-anchor@^0.6.1: jump.js "1.0.1" prop-types "^15.5.10" -react-side-effect@^1.0.2, react-side-effect@^1.1.0: +react-side-effect@^1.1.0: version "1.1.5" resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.1.5.tgz#f26059e50ed9c626d91d661b9f3c8bb38cd0ff2d" dependencies: