Merge pull request #131 from floor-licker/pragma-safeMath-refactor

Update Solidity to v0.8.0 and Refactor Contracts to Remove SafeMath

src/aave/contracts/FlashloanReceiverBase.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "./IFlashLoanReceiver.sol";
 

src/aave/contracts/IFlashLoanReceiver.sol

@@ -1,7 +1,6 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/math/SafeMath.sol";
 
 import "./ILendingPoolAddressesProvider.sol";
 

src/aave/contracts/ILendingPool.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface ILendingPool {
   function addressesProvider () external view returns ( address );

src/aave/contracts/ILendingPoolAddressesProvider.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 /**
 @title ILendingPoolAddressesProvider interface

src/balancer/contracts/BFactory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "./BPool.sol";
 

src/balancer/contracts/BPool.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface BPool {
 

src/balancer/contracts/ExchangeProxy.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 
 interface ExchangeProxy {

src/compound/contracts/ICEther.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 contract ICEther {
     function mint() external payable;

src/compound/contracts/ICToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface ICToken {
     function mint(uint mintAmount) external returns (uint);

src/compound/contracts/ICompoundPriceOracle.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 contract ICompoundPriceOracle {
     function getUnderlyingPrice(address cToken) external view returns (uint256);

src/compound/contracts/IComptroller.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface IComptroller {
     /**

src/curvefi/contracts/ICurveFiCurve.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 contract ICurveFiCurve {
     function get_virtual_price() external returns (uint256 out);

src/curvefi/contracts/ICurveFiPoolToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 contract ICurveFiPoolToken {
     function set_minter(address _minter) external;

src/curvefi/contracts/ICurveFiZap.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 
 contract ICurveFiZap {

src/dydx/contracts/DydxFlashloanBase.sol

@@ -1,7 +1,6 @@
-pragma solidity ^0.5.7;
+pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
-import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import "./ISoloMargin.sol";
@@ -40,7 +39,7 @@ contract DydxFlashloanBase {
     {
         // Needs to be overcollateralize
         // Needs to provide +2 wei to be safe
-        return amount.add(2);
+        return amount + 2;
     }
 
     function _getAccountInfo() internal view returns (Account.Info memory) {

src/dydx/contracts/ICallee.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.7;
+pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
 import { Account } from "./ISoloMargin.sol";

src/dydx/contracts/ISoloMargin.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.7;
+pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
 

src/kyber/contracts/KyberNetworkProxy.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 // Note: Kyber uses it owns ERC20 interface
 // See: https://github.com/KyberNetwork/smart-contracts/blob/master/contracts/ERC20Interface.sol

src/maker/contracts/DssProxyActionsBase.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "./IDssProxyActions.sol";
 

src/maker/contracts/IDssProxyActions.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 
 contract GemLike {

src/mstable/contracts/Masset.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface Masset {
 

src/mstable/contracts/StakingRewardsWithPlatformToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

src/onesplit/contracts/IOneSplit.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

src/uniswap/contracts/IUniswapExchange.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface IUniswapExchange {
     // Address of ERC20 token sold on this exchange

src/uniswap/contracts/IUniswapFactory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 interface IUniswapFactory {
     // Create Exchange

tests/aave.test.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
 import "@studydefi/money-legos/aave/contracts/ILendingPool.sol";

tests/compound.test.sol

@@ -1,11 +1,10 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "@studydefi/money-legos/compound/contracts/IComptroller.sol";
 import "@studydefi/money-legos/compound/contracts/ICEther.sol";
 import "@studydefi/money-legos/compound/contracts/ICToken.sol";
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/math/SafeMath.sol";
 
 contract CompoundManager {
     using SafeMath for uint256;
@@ -76,7 +75,7 @@ contract CompoundManager {
         ) = ICToken(cToken).getAccountSnapshot(owner);
 
         // Source: balanceOfUnderlying from any ctoken
-        return cTokenBalance.mul(exchangeRateMantissa).div(1e18);
+        return cTokenBalance * exchangeRateMantissa / 1e18;
     }
 
     function enterMarkets(
@@ -191,4 +190,4 @@ contract CompoundManager {
             "cmpnd-mgr-ctoken-redeem-underlying-failed"
         );
     }
-}
+}

tests/kyber.test.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 import "@studydefi/money-legos/kyber/contracts/KyberNetworkProxy.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";