Merge pull request #565 from keep-network/solid-ice

Solid Ice: Freeze Solidity version for mainnet release

solidity/contracts/DepositLog.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {TBTCDepositToken} from "./system/TBTCDepositToken.sol";
 

solidity/contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity >=0.4.21 <0.6.0;
+pragma solidity 0.5.17;
 
 
 contract Migrations {

solidity/contracts/deposit/Deposit.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {DepositLiquidation} from "./DepositLiquidation.sol";
 import {DepositUtils} from "./DepositUtils.sol";

solidity/contracts/deposit/DepositFunding.sol

@@ -1,9 +1,9 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
 import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
 import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
 import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
+import {SafeMath} from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import {TBTCToken} from "../system/TBTCToken.sol";
 import {DepositUtils} from "./DepositUtils.sol";
 import {DepositLiquidation} from "./DepositLiquidation.sol";

solidity/contracts/deposit/DepositLiquidation.sol

@@ -1,12 +1,12 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
 import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
 import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
+import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
+import {SafeMath} from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import {DepositStates} from "./DepositStates.sol";
 import {DepositUtils} from "./DepositUtils.sol";
 import {TBTCConstants} from "./TBTCConstants.sol";
-import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
 import {OutsourceDepositLogging} from "./OutsourceDepositLogging.sol";
 import {TBTCToken} from "../system/TBTCToken.sol";
 import {ITBTCSystem} from "../interfaces/ITBTCSystem.sol";

solidity/contracts/deposit/DepositRedemption.sol

@@ -1,18 +1,18 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
 import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
 import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
 import {ValidateSPV} from "@summa-tx/bitcoin-spv-sol/contracts/ValidateSPV.sol";
 import {CheckBitcoinSigs} from "@summa-tx/bitcoin-spv-sol/contracts/CheckBitcoinSigs.sol";
-import {DepositUtils} from "./DepositUtils.sol";
+import {IERC721} from "openzeppelin-solidity/contracts/token/ERC721/IERC721.sol";
+import {SafeMath} from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
+import {DepositUtils} from "./DepositUtils.sol";
 import {DepositStates} from "./DepositStates.sol";
 import {OutsourceDepositLogging} from "./OutsourceDepositLogging.sol";
 import {TBTCConstants} from "./TBTCConstants.sol";
 import {TBTCToken} from "../system/TBTCToken.sol";
 import {DepositLiquidation} from "./DepositLiquidation.sol";
-import {IERC721} from "openzeppelin-solidity/contracts/token/ERC721/IERC721.sol";
 
 library DepositRedemption {
 

solidity/contracts/deposit/DepositStates.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {DepositUtils} from "./DepositUtils.sol";
 

solidity/contracts/deposit/DepositUtils.sol

@@ -1,14 +1,14 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {ValidateSPV} from "@summa-tx/bitcoin-spv-sol/contracts/ValidateSPV.sol";
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
 import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
 import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
+import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
+import {IERC721} from "openzeppelin-solidity/contracts/token/ERC721/IERC721.sol";
+import {SafeMath} from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import {DepositStates} from "./DepositStates.sol";
 import {TBTCConstants} from "./TBTCConstants.sol";
 import {ITBTCSystem} from "../interfaces/ITBTCSystem.sol";
-import {IERC721} from "openzeppelin-solidity/contracts/token/ERC721/IERC721.sol";
-import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
 import {TBTCToken} from "../system/TBTCToken.sol";
 import {FeeRebateToken} from "../system/FeeRebateToken.sol";
 

solidity/contracts/deposit/OutsourceDepositLogging.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {DepositLog} from "../DepositLog.sol";
 import {DepositUtils} from "./DepositUtils.sol";

solidity/contracts/deposit/TBTCConstants.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 library TBTCConstants {
 

solidity/contracts/external/IMedianizer.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 /// @notice A medianizer price feed.
 /// @dev Based off the MakerDAO medianizer (https://github.com/makerdao/median)
@@ -7,4 +7,4 @@ interface IMedianizer {
     /// @dev May revert if caller not whitelisted.
     /// @return Price (USD) with 18 decimal places.
     function read() external view returns (uint256);
-}
+}

solidity/contracts/interfaces/IBTCETHPriceFeed.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 interface IBTCETHPriceFeed {
     /// @notice Get the current price of bitcoin in ether.

solidity/contracts/interfaces/ITBTCSystem.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 /**
  * @title Keep interface

solidity/contracts/interfaces/ITokenRecipient.sol

@@ -0,0 +1,37 @@
+pragma solidity 0.5.17;
+
+/// @title Interface of recipient contract for `approveAndCall` pattern.
+///        Implementors will be able to be used in an `approveAndCall`
+///        interaction with a supporting contract, such that a token approval
+///        can call the contract acting on that approval in a single
+///        transaction.
+///
+///        See the `FundingScript` and `RedemptionScript` contracts as examples.
+interface ITokenRecipient {
+    /// Typically called from a token contract's `approveAndCall` method, this
+    /// method will receive the original owner of the token (`_from`), the
+    /// transferred `_value` (in the case of an ERC721, the token id), the token
+    /// address (`_token`), and a blob of `_extraData` that is informally
+    /// specified by the implementor of this method as a way to communicate
+    /// additional parameters.
+    ///
+    /// Token calls to `receiveApproval` should revert if `receiveApproval`
+    /// reverts, and reverts should remove the approval.
+    ///
+    /// @param _from The original owner of the token approved for transfer.
+    /// @param _value For an ERC20, the amount approved for transfer; for an
+    ///        ERC721, the id of the token approved for transfer.
+    /// @param _token The address of the contract for the token whose transfer
+    ///        was approved.
+    /// @param _extraData An additional data blob forwarded unmodified through
+    ///        `approveAndCall`, used to allow the token owner to pass
+    ///         additional parameters and data to this method. The structure of
+    ///         the extra data is informally specified by the implementor of
+    ///         this interface.
+    function receiveApproval(
+        address _from,
+        uint256 _value,
+        address _token,
+        bytes calldata _extraData
+    ) external;
+}

solidity/contracts/price-feed/BTCETHPriceFeed.sol

@@ -1,6 +1,6 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
+import {SafeMath} from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 import "../external/IMedianizer.sol";
 import "../interfaces/IBTCETHPriceFeed.sol";
@@ -54,4 +54,4 @@ contract BTCETHPriceFeed is Ownable, IBTCETHPriceFeed {
         // Due to order-of-ops, we can move the multiplication to get some more precision.
         return btcUsd.mul(10**10).div(ethUsd);
     }
-}
+}

solidity/contracts/price-feed/MockMedianizer.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 import "../external/IMedianizer.sol";

solidity/contracts/proxy/CloneFactory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 /*
 The MIT License (MIT)

solidity/contracts/proxy/DepositFactory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import "./CloneFactory.sol";
 import "../deposit/Deposit.sol";

solidity/contracts/relay/MockRelay.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 contract MockRelay {
     uint256 current = 1;

solidity/contracts/scripts/FundingScript.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {TBTCDepositToken} from "../system/TBTCDepositToken.sol";
 import {TBTCToken} from "../system/TBTCToken.sol";
@@ -59,4 +59,4 @@ contract FundingScript {
         tbtcToken.transfer(_from, tbtcToken.balanceOf(address(this)));
         feeRebateToken.transferFrom(address(this), _from, uint256(_tokenId));
     }
-}
+}

solidity/contracts/scripts/RedemptionScript.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {TBTCDepositToken} from "../system/TBTCDepositToken.sol";
 import {TBTCToken} from "../system/TBTCToken.sol";
@@ -55,4 +55,4 @@ contract RedemptionScript {
         // TODO: there's some noisy couple bytes at the beginning of the converted string, maybe the ABI-coded length?
         require(success, string(returnData));
     }
-}
+}

solidity/contracts/system/DepositFactoryAuthority.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.10;
+pragma solidity 0.5.17;
 
 /// @title  Deposit Factory Authority
 /// @notice Contract to secure function calls to the Deposit Factory.

solidity/contracts/system/FeeRebateToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import "openzeppelin-solidity/contracts/token/ERC721/ERC721Metadata.sol";
 import "./VendingMachineAuthority.sol";
@@ -36,4 +36,4 @@ contract FeeRebateToken is ERC721Metadata, VendingMachineAuthority {
     function exists(uint256 _tokenId) public view returns (bool) {
         return _exists(_tokenId);
     }
-}
+}

solidity/contracts/system/TBTCDepositToken.sol

@@ -1,8 +1,8 @@
-pragma solidity ^0.5.10;
-
-import "openzeppelin-solidity/contracts/token/ERC721/ERC721Metadata.sol";
-import "./DepositFactoryAuthority.sol";
+pragma solidity 0.5.17;
 
+import {ERC721Metadata} from "openzeppelin-solidity/contracts/token/ERC721/ERC721Metadata.sol";
+import {DepositFactoryAuthority} from "./DepositFactoryAuthority.sol";
+import {ITokenRecipient} from "../interfaces/ITokenRecipient.sol";
 
 /// @title tBTC Deposit Token for tracking deposit ownership
 /// @notice The tBTC Deposit Token, commonly referenced as the TDT, is an
@@ -14,7 +14,7 @@ import "./DepositFactoryAuthority.sol";
 ///         TBTC tokens whose value is backed 1-to-1 by the corresponding
 ///         deposit's BTC.
 /// @dev Currently, TDTs are minted using the uint256 casting of the
-///      corresponding deposit contract's address. That is, the TDTs id is
+///      corresponding deposit contract's address. That is, the TDT's id is
 ///      convertible to the deposit's address and vice versa. TDTs are minted
 ///      automatically by the factory during each deposit's initialization. See
 ///      DepositFactory.createNewDeposit() for more info on how the TDT is minted.
@@ -45,27 +45,15 @@ contract TBTCDepositToken is ERC721Metadata, DepositFactoryAuthority {
     ///                   Set allowance for other address and notify.
     ///                   Allows `_spender` to transfer the specified TDT
     ///                   on your behalf and then ping the contract about it.
-    /// @dev              The `_spender` should implement the `tokenRecipient` interface below
-    ///                   to receive approval notifications.
-    /// @param _spender   Address of contract authorized to spend.
+    /// @dev              The `_spender` should implement the `ITokenRecipient`
+    ///                   interface below to receive approval notifications.
+    /// @param _spender   `ITokenRecipient`-conforming contract authorized to
+    ///        operate on the approved token.
     /// @param _tdtId     The TDT they can spend.
     /// @param _extraData Extra information to send to the approved contract.
-    function approveAndCall(address _spender, uint256 _tdtId, bytes memory _extraData) public returns (bool) {
-        tokenRecipient spender = tokenRecipient(_spender);
-        approve(_spender, _tdtId);
-        spender.receiveApproval(msg.sender, _tdtId, address(this), _extraData);
+    function approveAndCall(ITokenRecipient _spender, uint256 _tdtId, bytes memory _extraData) public returns (bool) {
+        approve(address(_spender), _tdtId);
+        _spender.receiveApproval(msg.sender, _tdtId, address(this), _extraData);
         return true;
     }
 }
-
-/// @title Interface of recipient contract for approveAndCall pattern.
-/// See `FundingScript` contract for an example.
-interface tokenRecipient {
-    function receiveApproval(
-        address _from,
-        uint256 _value,
-        address _token,
-        bytes calldata
-        _extraDat
-    ) external;
-}

solidity/contracts/system/TBTCSystem.sol

@@ -1,5 +1,5 @@
 /* solium-disable function-order */
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
 import {IBondedECDSAKeepVendor} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeepVendor.sol";
 import {IBondedECDSAKeepFactory} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeepFactory.sol";

solidity/contracts/system/TBTCSystemAuthority.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.10;
+pragma solidity 0.5.17;
 
 /// @title  TBTC System Authority.
 /// @notice Contract to secure function calls to the TBTC System contract.
@@ -17,4 +17,4 @@ contract TBTCSystemAuthority {
         require(msg.sender == tbtcSystemAddress, "Caller must be tbtcSystem contract");
         _;
     }
-}
+}

solidity/contracts/system/TBTCToken.sol

@@ -1,8 +1,9 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
-import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
-import "openzeppelin-solidity/contracts/token/ERC20/ERC20Detailed.sol";
-import "./VendingMachineAuthority.sol";
+import {ERC20} from "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
+import {ERC20Detailed} from "openzeppelin-solidity/contracts/token/ERC20/ERC20Detailed.sol";
+import {VendingMachineAuthority} from "./VendingMachineAuthority.sol";
+import {ITokenRecipient} from "../interfaces/ITokenRecipient.sol";
 
 /// @title  TBTC Token.
 /// @notice This is the TBTC ERC20 contract.
@@ -46,31 +47,21 @@ contract TBTCToken is ERC20Detailed, ERC20, VendingMachineAuthority {
     }
 
     /// @notice           Set allowance for other address and notify.
-    ///                   Allows `_spender` to spend no more than `_value` tokens
-    ///                   on your behalf and then ping the contract about it.
-    /// @dev              The `_spender` should implement the `tokenRecipient` interface above
-    ///                   to receive approval notifications.
+    ///                   Allows `_spender` to spend no more than `_value`
+    ///                   tokens on your behalf and then ping the contract about
+    ///                   it.
+    /// @dev              The `_spender` should implement the `ITokenRecipient`
+    ///                   interface to receive approval notifications.
     /// @param _spender   Address of contract authorized to spend.
     /// @param _value     The max amount they can spend.
     /// @param _extraData Extra information to send to the approved contract.
-    function approveAndCall(address _spender, uint256 _value, bytes memory _extraData) public returns (bool) {
-        tokenRecipient spender = tokenRecipient(_spender);
-        if (approve(_spender, _value)) {
-            spender.receiveApproval(msg.sender, _value, address(this), _extraData);
+    /// @return true if the `_spender` was successfully approved and acted on
+    ///         the approval, false (or revert) otherwise.
+    function approveAndCall(ITokenRecipient _spender, uint256 _value, bytes memory _extraData) public returns (bool) {
+        if (approve(address(_spender), _value)) {
+            _spender.receiveApproval(msg.sender, _value, address(this), _extraData);
             return true;
         }
         return false;
     }
 }
-
-/// @title Interface of recipient contract for approveAndCall pattern.
-/// See `RedemptionScript` for an example.
-interface tokenRecipient {
-    function receiveApproval(
-        address _from,
-        uint256 _value,
-        address _token,
-        bytes calldata
-        _extraDat
-    ) external;
-}

solidity/contracts/system/VendingMachine.sol

@@ -1,6 +1,6 @@
-pragma solidity ^0.5.10;
+pragma solidity 0.5.17;
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
+import {SafeMath} from "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import {TBTCDepositToken} from "./TBTCDepositToken.sol";
 import {FeeRebateToken} from "./FeeRebateToken.sol";
 import {TBTCToken} from "./TBTCToken.sol";