Handle other compile errors like explicit conversions between uint an…

…d byte, contract to address, and cleaning up DappHub code

contracts/core/Vault.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(

contracts/core/exchange-wrappers/KyberNetworkWrapper.sol

@@ -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
@@ -265,7 +265,7 @@ 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,

contracts/core/interfaces/IExchangeIssueModule.sol

@@ -27,8 +27,8 @@ import { ExchangeIssueLibrary } from "../lib/ExchangeIssueLibrary.sol";
  */
 interface IExchangeIssueModule {
     function exchangeIssue(
-        ExchangeIssueLibrary.ExchangeIssueParams memory _exchangeIssueData,
-        bytes memory _orderData
+        ExchangeIssueLibrary.ExchangeIssueParams calldata _exchangeIssueData,
+        bytes calldata _orderData
     )
-        public;
+        external;
 }

contracts/core/interfaces/IRebalancingSetToken.sol

@@ -78,7 +78,7 @@ interface IRebalancingSetToken {
     function balanceOf(
         address owner
     )
-        public
+        external
         view
         returns (uint256);
 
@@ -116,7 +116,7 @@ interface IRebalancingSetToken {
      * @return           A address representing the base Set Token
      */
     function currentSet()
-        public
+        external
         view
         returns (address);
 

contracts/core/interfaces/IVault.sol

@@ -160,5 +160,6 @@ interface IVault {
         address _owner
     )
         external
+        view
         returns (uint256);
 }

contracts/core/lib/RebalancingHelperLibrary.sol

@@ -92,6 +92,7 @@ library RebalancingHelperLibrary {
         uint8 _rebalanceState
     )
         public
+        view
         returns (uint256[] memory, uint256[] memory)
     {
         // Confirm in Rebalance State
@@ -136,6 +137,7 @@ library RebalancingHelperLibrary {
         StandardStartRebalanceLibrary.BiddingParameters memory _biddingParameters
     )
         public
+        pure
         returns (uint256[] memory, uint256[] memory)
     {
         // Declare unit arrays in memory

contracts/core/lib/auction-price-libraries/IAuctionPriceCurve.sol

@@ -42,9 +42,9 @@ interface IAuctionPriceCurve {
      * @param _auctionPriceParameters   Struct containing relevant auction price parameters
      */
     function validateAuctionPriceParameters(
-        RebalancingHelperLibrary.AuctionPriceParameters memory _auctionParameters
+        RebalancingHelperLibrary.AuctionPriceParameters calldata _auctionParameters
     )
-        public
+        external
         view;
 
     /*
@@ -55,9 +55,9 @@ interface IAuctionPriceCurve {
      * @return uint256                    The auction price denominator
      */
     function getCurrentPrice(
-        RebalancingHelperLibrary.AuctionPriceParameters memory _auctionParameters
+        RebalancingHelperLibrary.AuctionPriceParameters calldata _auctionParameters
     )
-        public
+        external
         view
         returns (uint256, uint256);
 }

contracts/core/modules/RebalancingTokenIssuanceModule.sol

@@ -114,6 +114,7 @@ contract RebalancingTokenIssuanceModule is
         address _baseSetAddress
     )
         private
+        view
         returns (uint256)
     {
         // Get Base Set Details from the rebalancing Set

contracts/core/tokens/RebalancingSetTokenFactory.sol

@@ -172,17 +172,19 @@ contract RebalancingSetTokenFactory {
         );
 
         // Create a new SetToken contract
-        return new RebalancingSetToken(
-            this,
-            parameters.manager,
-            startingSet,
-            _units[0],
-            _naturalUnit,
-            parameters.proposalPeriod,
-            parameters.rebalanceInterval,
-            rebalanceComponentWhitelist,
-            _name.bytes32ToString(),
-            _symbol.bytes32ToString()
+        return address(
+            new RebalancingSetToken(
+                address(this),
+                parameters.manager,
+                startingSet,
+                _units[0],
+                _naturalUnit,
+                parameters.proposalPeriod,
+                parameters.rebalanceInterval,
+                rebalanceComponentWhitelist,
+                _name.bytes32ToString(),
+                _symbol.bytes32ToString()
+            )
         );
     }
 

contracts/core/tokens/SetToken.sol

@@ -127,7 +127,8 @@ contract SetToken is
 
             // Figure out which of the components has the minimum decimal value
             /* solium-disable-next-line security/no-low-level-calls */
-            if (currentComponent.call(bytes4(keccak256("decimals()")))) {
+            (bool success, ) = currentComponent.call(abi.encodeWithSignature("decimals()"));
+            if (success) {
                 currentDecimals = ERC20Detailed(currentComponent).decimals();
                 minDecimals = currentDecimals < minDecimals ? currentDecimals : minDecimals;
             } else {

contracts/core/tokens/SetTokenFactory.sol

@@ -84,13 +84,15 @@ contract SetTokenFactory
         );
 
         // Create a new SetToken contract
-        return new SetToken(
-            this,
-            _components,
-            _units,
-            _naturalUnit,
-            _name.bytes32ToString(),
-            _symbol.bytes32ToString()
+        return address(
+            new SetToken(
+                address(this),
+                _components,
+                _units,
+                _naturalUnit,
+                _name.bytes32ToString(),
+                _symbol.bytes32ToString()
+            )
         );
     }
 }

contracts/core/tokens/rebalancing-libraries/StandardPlaceBidLibrary.sol

@@ -56,6 +56,7 @@ library StandardPlaceBidLibrary {
         uint8 _rebalanceState
     )
         public
+        view
         returns (uint256[] memory, uint256[] memory)
     {
         // Make sure sender is a module

contracts/core/tokens/rebalancing-libraries/StandardSettleRebalanceLibrary.sol

@@ -198,7 +198,7 @@ library StandardSettleRebalanceLibrary {
             // Get amount of components in vault owned by rebalancingSetToken
             uint256 componentAmount = vaultInstance.getOwnerBalance(
                 _setDetails.setComponents[i],
-                this
+                address(this)
             );
 
             // Calculate amount of Sets that can be issued from those components, if less than amount for other

contracts/core/tokens/rebalancing-libraries/StandardStartRebalanceLibrary.sol

@@ -317,7 +317,7 @@ library StandardStartRebalanceLibrary {
         // Get remainingCurrentSets and make it divisible by currentSet natural unit
         uint256 currentSetBalance = IVault(_vaultAddress).getOwnerBalance(
             _currentSet,
-            this
+            address(this)
         );
 
         // Calculates the set's natural unit

contracts/external/DappHub/auth.sol

@@ -46,7 +46,7 @@ contract DSAuth is DSAuthEvents {
         auth
     {
         authority = authority_;
-        emit LogSetAuthority(authority);
+        emit LogSetAuthority(address(authority));
     }
 
     modifier auth {
@@ -62,7 +62,7 @@ contract DSAuth is DSAuthEvents {
         } else if (authority == DSAuthority(0)) {
             return false;
         } else {
-            return authority.canCall(src, this, sig);
+            return authority.canCall(src, address(this), sig);
         }
     }
 }

contracts/external/DappHub/feed-factory.sol

@@ -27,7 +27,7 @@ contract FeedFactory {
         PriceFeed feed = new PriceFeed();
         emit Created(msg.sender, address(feed));
         feed.setOwner(msg.sender);
-        isFeed[feed] = true;
+        isFeed[address(feed)] = true;
         return feed;
     }
 }

contracts/external/DappHub/interfaces/IMedian.sol

@@ -31,7 +31,7 @@ interface IMedian {
      * @return  Current price of asset represented in hex as bytes32
      */
     function read()
-        public
+        external
         view
         returns (bytes32);
 
@@ -41,7 +41,7 @@ interface IMedian {
      * @return  Current price of asset represented in hex as bytes32, and whether value is non-zero
      */
     function peek()
-        public
+        external
         view
         returns (bytes32, bool);
 }

contracts/external/DappHub/median.sol

@@ -34,11 +34,11 @@ contract Median is DSAuth {
 
     function read() public view returns (bytes32) {
         require(val > 0, "Invalid price feed");
-        return bytes32(val);
+        return bytes32(uint256(val));
     }
 
     function peek() public view returns (bytes32,bool) {
-        return (bytes32(val), val > 0);
+        return (bytes32(uint256(val)), val > 0);
     }
 
     function recover(uint256 val_, uint256 age_, uint8 v, bytes32 r, bytes32 s, bytes32 wat_) internal pure returns (address) {
@@ -89,7 +89,7 @@ contract Median is DSAuth {
     }
 
     function lift(address a) public auth {
-        require(a != 0x0, "No oracle 0");
+        require(a != address(0x0), "No oracle 0");
         orcl[a] = true;
     }
 

contracts/external/DappHub/note.sol

@@ -34,8 +34,13 @@ contract DSNote {
             bar := calldataload(36)
         }
 
-        emit LogNote(msg.sig, msg.sender, foo, bar, msg.value, msg.data);
+        emit LogNote(msg.sig, msg.sender, foo, bar, getValue(), msg.data);
 
         _;
     }
+
+    function getValue() internal view returns (uint256)
+    {
+        return msg.value;
+    }
 }

contracts/external/DappHub/price-feed.sol

@@ -30,13 +30,13 @@ contract PriceFeed is DSThing {
 
     function peek() external view returns (bytes32,bool)
     {
-        return (bytes32(val), now < zzz);
+        return (bytes32(uint256(val)), now < zzz);
     }
 
     function read() external view returns (bytes32)
     {
         require(now < zzz);
-        return bytes32(val);
+        return bytes32(uint256(val));
     }
 
     function poke(uint128 val_, uint32 zzz_) external note auth

contracts/lib/Bytes32.sol

@@ -24,7 +24,7 @@ library Bytes32 {
         returns (bytes memory)
     {
         uint256 i = 0;
-        while (i < 32 && uint256(data[i]) != 0) {
+        while (i < 32 && uint256(bytes32(data[i])) != 0) {
             ++i;
         }
         bytes memory result = new bytes(i);

contracts/supplementary/rebalancing-manager/BTCETHRebalancingManager.sol

@@ -361,6 +361,7 @@ contract BTCETHRebalancingManager {
         uint256 _ethPrice
     )
         private
+        view
         returns (uint256, uint256, uint256[] memory)
     {
         // Initialize set token parameters
@@ -461,7 +462,7 @@ contract BTCETHRebalancingManager {
         uint256[] memory _units
     )
         private
-        view
+        pure
         returns (uint256)
     {
         // Calculate btcDollarAmount of one Set Token (in cents)
@@ -500,7 +501,7 @@ contract BTCETHRebalancingManager {
         uint256 _tokenDecimals
     )
         private
-        view
+        pure
         returns (uint256)
     {
         // Calculate the amount of component base units are in one full set token

package.json

@@ -92,7 +92,7 @@
   },
   "dependencies": {
     "bn-chai": "^1.0.1",
-    "canonical-weth": "1.3.0",
+    "canonical-weth": "^1.3.1",
     "dotenv": "^6.2.0",
     "eth-gas-reporter": "^0.1.10",
     "expect": "^24.1.0",

yarn.lock

@@ -1698,10 +1698,10 @@ caniuse-lite@^1.0.30000844:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf"
   integrity sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg==
 
-[email protected].0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/canonical-weth/-/canonical-weth-1.3.0.tgz#4e863fe55d63f3e33595a80b335731435bd2474f"
-  integrity sha512-q1FoFo8SH7FNhemgvvkeuhO7YzztRbEcBoetTlT4Djf83ExdZKo1Wzh1rca+ncjhO6A2J0Ehl/tVG6xUkVIJcg==
+canonical-weth@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/canonical-weth/-/canonical-weth-1.3.1.tgz#8c12172ee2cd63247c5f6c75be44a6b173b97fd1"
+  integrity sha512-sDVYcU4ta2ixs9NNmOS15i5sdNJqbAPx/l86rctEK0XcAKI/PEs0IKZ2GjJ2hgTabzf4LfwopgNIznNcS3aLSQ==
 
 caseless@~0.12.0:
   version "0.12.0"