Upgrade solidity version to 0.5.4 (#393)

* Bump solidity version to 0.5.4 * Upgrade openzeppelin and canonical-weth and move declarations of variables of multi-return functions to work with new solc compiler * Update compile script * Add .env to gitignore * Add explicit modifiers for calldata and memory for parameters * Handle other compile errors like explicit conversions between uint and byte, contract to address, and cleaning up DappHub code * Fix explicit data locations for IssuanceLibrary * Add more call data location parameters * Fix typo in comment * Allow for unlimited contract size in development * Use leapdao solidity coverage for 0.5 solidity support * Fix specs using deep include * Remove unused variables from parameters * Refactor coreissuance to take up less bytecode and remove allowUnlimitedContractSize * modify create to creatSet * REorder checks * Add back check
SetProtocol · Feb 26, 2019 · f9c9a22 · f9c9a22
1 parent 2c01c4e
commit f9c9a22
Show file tree

Hide file tree

Showing 117 changed files with 796 additions and 752 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
           docker_layer_caching: true
       - run:
           name: Fetch solc version
-          command: docker pull ethereum/solc:0.4.25
+          command: docker pull ethereum/solc:0.5.4
       - restore_cache:
           key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
       - run:
@@ -60,7 +60,7 @@ jobs:
           docker_layer_caching: true
       - run:
           name: Fetch solc version
-          command: docker pull ethereum/solc:0.4.25
+          command: docker pull ethereum/solc:0.5.4
       - restore_cache:
           key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
       - run:

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /types/generated/*
 coverage.json
 coverage/
+.env
 
 ### Coverage artifacts (yarn coverage-setup) ###
 test/*.js*
@@ -31,4 +32,4 @@ yarn-error.log*
 blockchain/
 
 # Ouputs
-deployments/outputs.ts
+deployments/outputs.ts
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Firstly, you need to install Docker. The easiest way is to follow the Instructio
 You need to pull the docker image that you want to use by using the following command:
 
 ```
-docker pull ethereum/solc:0.4.25
+docker pull ethereum/solc:0.5.4
 ```
 
 If you wish not to set up docker, you can turn off the `docker: true` flag in truffle.js

diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 
 
 contract Migrations {

diff --git a/contracts/core/Core.sol b/contracts/core/Core.sol
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 
 import { CoreAccounting } from "./extensions/CoreAccounting.sol";
 import { CoreFactory } from "./extensions/CoreFactory.sol";

diff --git a/contracts/core/TransferProxy.sol b/contracts/core/TransferProxy.sol
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 
 import { SafeMath } from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 
@@ -92,8 +92,8 @@ contract TransferProxy is
      * @param  _to             The address to transfer to
      */
     function batchTransfer(
-        address[] _tokens,
-        uint256[] _quantities,
+        address[] calldata _tokens,
+        uint256[] calldata _quantities,
         address _from,
         address _to
     )
@@ -102,7 +102,7 @@ contract TransferProxy is
     {
         // Storing token count to local variable to save on invocation
         uint256 tokenCount = _tokens.length;
-        
+
         // Confirm and empty _tokens array is not passed
         require(
             tokenCount > 0,

diff --git a/contracts/core/Vault.sol b/contracts/core/Vault.sol
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 
 
 import { SafeMath } from "openzeppelin-solidity/contracts/math/SafeMath.sol";
@@ -74,7 +74,7 @@ contract Vault is
         // Retrieve current balance of token for the vault
         uint256 existingVaultBalance = ERC20Wrapper.balanceOf(
             _token,
-            this
+            address(this)
         );
 
         // Call specified ERC20 token contract to transfer tokens from Vault to user
@@ -87,7 +87,7 @@ contract Vault is
         // Verify transfer quantity is reflected in balance
         uint256 newVaultBalance = ERC20Wrapper.balanceOf(
             _token,
-            this
+            address(this)
         );
         // Check to make sure current balances are as expected
         require(
@@ -139,7 +139,7 @@ contract Vault is
         );
 
         // Decrement balances state variable subtracting _quantity to user's token amount
-        balances[_token][_owner] = balances[_token][_owner].sub(_quantity);            
+        balances[_token][_owner] = balances[_token][_owner].sub(_quantity);
     }
 
     /**
@@ -182,16 +182,16 @@ contract Vault is
      * @param  _quantities      The numbers of tokens to attribute to owner
      */
     function batchWithdrawTo(
-        address[] _tokens,
+        address[] calldata _tokens,
         address _owner,
-        uint256[] _quantities
+        uint256[] calldata _quantities
     )
         external
         onlyAuthorized
     {
         // Storing token count to local variable to save on invocation
         uint256 tokenCount = _tokens.length;
-        
+
         // Confirm and empty _tokens array is not passed
         require(
             tokenCount > 0,
@@ -224,9 +224,9 @@ contract Vault is
      * @param  _quantities      The numbers of tokens to attribute to owner
      */
     function batchIncrementTokenOwner(
-        address[] _tokens,
+        address[] calldata _tokens,
         address _owner,
-        uint256[] _quantities
+        uint256[] calldata _quantities
     )
         external
         onlyAuthorized
@@ -252,7 +252,7 @@ contract Vault is
                     _tokens[i],
                     _owner,
                     _quantities[i]
-                );    
+                );
             }
         }
     }
@@ -266,9 +266,9 @@ contract Vault is
      * @param  _quantities      The numbers of tokens to attribute to owner
      */
     function batchDecrementTokenOwner(
-        address[] _tokens,
+        address[] calldata _tokens,
         address _owner,
-        uint256[] _quantities
+        uint256[] calldata _quantities
     )
         external
         onlyAuthorized
@@ -308,10 +308,10 @@ contract Vault is
      * @param  _quantities       Amounts of tokens being transferred
      */
     function batchTransferBalance(
-        address[] _tokens,
+        address[] calldata _tokens,
         address _from,
         address _to,
-        uint256[] _quantities
+        uint256[] calldata _quantities
     )
         external
         onlyAuthorized

diff --git a/contracts/core/exchange-wrappers/KyberNetworkWrapper.sol b/contracts/core/exchange-wrappers/KyberNetworkWrapper.sol
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 pragma experimental "ABIEncoderV2";
 
 import { SafeMath } from "openzeppelin-solidity/contracts/math/SafeMath.sol";
@@ -119,11 +119,11 @@ contract KyberNetworkWrapper {
      * @return ExchangeWrapperLibrary.ExchangeResults  Struct containing component acquisition results
      */
     function exchange(
-        ExchangeWrapperLibrary.ExchangeData _exchangeData,
-        bytes _tradesData
+        ExchangeWrapperLibrary.ExchangeData memory _exchangeData,
+        bytes memory _tradesData
     )
         public
-        returns (ExchangeWrapperLibrary.ExchangeResults)
+        returns (ExchangeWrapperLibrary.ExchangeResults memory)
     {
         require(
             ICore(core).validModules(msg.sender),
@@ -175,7 +175,7 @@ contract KyberNetworkWrapper {
      */
     function tradeOnKyberReserve(
         address _sourceToken,
-        bytes _tradesData,
+        bytes memory _tradesData,
         uint256 _offset
     )
         private
@@ -199,7 +199,7 @@ contract KyberNetworkWrapper {
             address(this),
             destinationQuantityToTradeFor,
             trade.minimumConversionRate,
-            0
+            address(0)
         );
 
         // Ensure the destination token is allowed to be transferred by Set TransferProxy
@@ -231,7 +231,7 @@ contract KyberNetworkWrapper {
      * @return KyberTrade     KyberTrade struct
      */
     function parseKyberTrade(
-        bytes _tradesData,
+        bytes memory _tradesData,
         uint256 _offset
     )
         private
@@ -265,13 +265,13 @@ contract KyberNetworkWrapper {
         private
     {
         // Transfer any unused or remainder maker token back to the issuance order user
-        uint256 remainderMakerToken = ERC20.balanceOf(_makerToken, this);
+        uint256 remainderMakerToken = ERC20.balanceOf(_makerToken, address(this));
         if (remainderMakerToken > 0) {
             ERC20.transfer(
                 _makerToken,
                 _maker,
                 remainderMakerToken
             );
-        }        
+        }
     }
 }
diff --git a/contracts/core/exchange-wrappers/ZeroExExchangeWrapper.sol b/contracts/core/exchange-wrappers/ZeroExExchangeWrapper.sol
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 pragma experimental "ABIEncoderV2";
 
 import { SafeMath } from "openzeppelin-solidity/contracts/math/SafeMath.sol";
@@ -93,11 +93,11 @@ contract ZeroExExchangeWrapper {
      * @return ExchangeWrapperLibrary.ExchangeResults  Struct containing component acquisition results
      */
     function exchange(
-        ExchangeWrapperLibrary.ExchangeData _exchangeData,
-        bytes _ordersData
+        ExchangeWrapperLibrary.ExchangeData memory _exchangeData,
+        bytes memory _ordersData
     )
         public
-        returns (ExchangeWrapperLibrary.ExchangeResults)
+        returns (ExchangeWrapperLibrary.ExchangeResults memory)
     {
         require(
             ICore(core).validModules(msg.sender),
@@ -164,8 +164,8 @@ contract ZeroExExchangeWrapper {
      */
     function fillZeroExOrder(
         address _issuanceOrderFiller,
-        OrderHandler.OrderHeader _header,
-        ZeroExOrder.Order _order    )
+        OrderHandler.OrderHeader memory _header,
+        ZeroExOrder.Order memory _order    )
         private
         returns (address, uint256)
     {
@@ -237,13 +237,13 @@ contract ZeroExExchangeWrapper {
      * @return uint256                  Tracks how many bytes in _ordersData have been parsed
      */
     function parseOrderInformation(
-        bytes _ordersData,
+        bytes memory _ordersData,
         uint256 _offset,
         address _takerToken
     )
         private
         pure
-        returns (OrderHandler.ZeroExOrderInformation, uint256)
+        returns (OrderHandler.ZeroExOrderInformation memory, uint256)
     {
         // Parse header of current wrapper order
         OrderHandler.OrderHeader memory header = OrderHandler.parseOrderHeader(
@@ -273,6 +273,6 @@ contract ZeroExExchangeWrapper {
             order: order
         });
 
-        return (orderInformation, orderBodyStart);        
+        return (orderInformation, orderBodyStart);
     }
 }
diff --git a/contracts/core/exchange-wrappers/lib/ZeroExOrderDataHandler.sol b/contracts/core/exchange-wrappers/lib/ZeroExOrderDataHandler.sol
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-pragma solidity 0.4.25;
+pragma solidity 0.5.4;
 pragma experimental "ABIEncoderV2";
 
 import { SafeMath } from "openzeppelin-solidity/contracts/math/SafeMath.sol";
@@ -71,12 +71,12 @@ library ZeroExOrderDataHandler {
      * @return OrderHeader   Struct containing wrapper order header data
      */
     function parseOrderHeader(
-        bytes _ordersData,
+        bytes memory _ordersData,
         uint256 _offset
     )
         internal
         pure
-        returns (OrderHeader)
+        returns (OrderHeader memory)
     {
         OrderHeader memory header;
 
@@ -114,7 +114,7 @@ library ZeroExOrderDataHandler {
      * @return LibOrder.Order       0x order struct
      */
     function parseZeroExOrder(
-        bytes _ordersData,
+        bytes memory _ordersData,
         address _makerTokenAddress,
         address _takerTokenAddress,
         uint256 _offset
@@ -157,7 +157,7 @@ library ZeroExOrderDataHandler {
     )
         private
         pure
-        returns (bytes)
+        returns (bytes memory)
     {
         bytes memory result = new bytes(36);