Add UniswapV3 strategy

.github/workflows/PR-CI.yml

@@ -33,6 +33,9 @@ jobs:
         with:
           version: nightly
 
+      - name: Check Solhint
+        run: npm run lint-contract
+
       - name: Check formatting
         run: npm run prettier-check
 

.solhint.json

@@ -2,14 +2,15 @@
   "extends": "solhint:recommended",
 
   "rules": {
-    "compiler-version": "off",
+    "compiler-version": ["error", "0.8.16"],
     "ordering": "error",
     "avoid-throw": "off",
     "avoid-suicide": "error",
     "avoid-sha3": "warn",
     "not-rely-on-time": "off",
-    "no-console": "warn",
+    "no-console": "error",
     "func-named-parameters": ["warn", 4],
-    "func-visibility": ["warn", { "ignoreConstructors": true }]
+    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "one-contract-per-file": "off"
   }
 }

contracts/oracle/BaseUniOracle.sol

@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.6.12;
-pragma experimental ABIEncoderV2;
+pragma solidity 0.8.16;
 
-import {ERC20} from "@openzeppelin/contracts_v3.4.2/token/ERC20/ERC20.sol";
-import {Ownable} from "@openzeppelin/contracts_v3.4.2/access/Ownable.sol";
-import {SafeMath} from "@openzeppelin/contracts_v3.4.2/math/SafeMath.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IUniswapV3Factory} from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Factory.sol";
-import {OracleLibrary} from "@uniswap/v3-periphery/contracts/libraries/OracleLibrary.sol";
+import {IUniswapUtils} from "../strategies/uniswap/interfaces/IUniswapUtils.sol";
 
 interface IMasterPriceOracle {
     /// @notice Validates if price feed exists for a `_token`
@@ -25,9 +23,9 @@ interface IMasterPriceOracle {
 /// @author Sperax Foundation
 /// @notice Has all the base functionalities, variables etc to be implemented by child contracts
 abstract contract BaseUniOracle is Ownable {
-    using SafeMath for uint256;
-
     address public constant UNISWAP_FACTORY = 0x1F98431c8aD98523631AE4a59f267346ea31F984;
+    // TODO RECHECK!!!
+    address public constant UNISWAP_UTILS = 0xd2Aa19D3B7f8cdb1ea5B782c5647542055af415e;
 
     address public masterOracle; // Address of the master price oracle
     address public pool; // Address of the uniswap pool for the token and quoteToken
@@ -36,9 +34,13 @@ abstract contract BaseUniOracle is Ownable {
     uint128 public quoteTokenPrecision; // QuoteToken price precision
 
     event MasterOracleUpdated(address newOracle);
-
     event UniMAPriceDataChanged(address quoteToken, uint24 feeTier, uint32 maPeriod);
 
+    // Custom Errors
+    error QuoteTokenFeedMissing();
+    error FeedUnavailable();
+    error InvalidAddress();
+
     /// @notice A function to get price
     /// @return (uint256, uint256) Returns price and price precision
     function getPrice() external view virtual returns (uint256, uint256);
@@ -48,7 +50,9 @@ abstract contract BaseUniOracle is Ownable {
     function updateMasterOracle(address _newOracle) public onlyOwner {
         _isNonZeroAddr(_newOracle);
         masterOracle = _newOracle;
-        require(IMasterPriceOracle(_newOracle).priceFeedExists(quoteToken), "Quote token feed missing");
+        if (!IMasterPriceOracle(_newOracle).priceFeedExists(quoteToken)) {
+            revert QuoteTokenFeedMissing();
+        }
         emit MasterOracleUpdated(_newOracle);
     }
 
@@ -62,10 +66,14 @@ abstract contract BaseUniOracle is Ownable {
         onlyOwner
     {
         address uniOraclePool = IUniswapV3Factory(UNISWAP_FACTORY).getPool(_token, _quoteToken, _feeTier);
-        require(uniOraclePool != address(0), "Feed unavailable");
+        if (uniOraclePool == address(0)) {
+            revert FeedUnavailable();
+        }
 
         // Validate if the oracle has a price feed for the _quoteToken
-        require(IMasterPriceOracle(masterOracle).priceFeedExists(_quoteToken), "Quote token feed missing");
+        if (!IMasterPriceOracle(masterOracle).priceFeedExists(_quoteToken)) {
+            revert QuoteTokenFeedMissing();
+        }
 
         pool = uniOraclePool;
         quoteToken = _quoteToken;
@@ -88,16 +96,18 @@ abstract contract BaseUniOracle is Ownable {
     /// @dev tokenBPerTokenA has the same precision as tokenB
     function _getUniMAPrice(address _tokenA, uint128 _tokenAPrecision) internal view returns (uint256) {
         // get MA tick
-        uint32 oldestObservationSecondsAgo = OracleLibrary.getOldestObservationSecondsAgo(pool);
+        uint32 oldestObservationSecondsAgo = IUniswapUtils(UNISWAP_UTILS).getOldestObservationSecondsAgo(pool);
         uint32 period = maPeriod < oldestObservationSecondsAgo ? maPeriod : oldestObservationSecondsAgo;
-        (int24 timeWeightedAverageTick,) = OracleLibrary.consult(pool, period);
+        (int24 timeWeightedAverageTick,) = IUniswapUtils(UNISWAP_UTILS).consult(pool, period);
         // get MA price from MA tick
         uint256 tokenBPerTokenA =
-            OracleLibrary.getQuoteAtTick(timeWeightedAverageTick, _tokenAPrecision, _tokenA, quoteToken);
+            IUniswapUtils(UNISWAP_UTILS).getQuoteAtTick(timeWeightedAverageTick, _tokenAPrecision, _tokenA, quoteToken);
         return tokenBPerTokenA;
     }
 
     function _isNonZeroAddr(address _addr) internal pure {
-        require(_addr != address(0), "Invalid Address");
+        if (_addr == address(0)) {
+            revert InvalidAddress();
+        }
     }
 }

contracts/oracle/SPAOracle.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.6.12;
+pragma solidity 0.8.16;
 pragma experimental ABIEncoderV2;
 
 import {BaseUniOracle} from "./BaseUniOracle.sol";
@@ -24,9 +24,12 @@ contract SPAOracle is BaseUniOracle {
 
     event DIAParamsUpdated(uint256 weightDIA, uint128 diaMaxTimeThreshold);
 
-    constructor(address _masterOracle, address _quoteToken, uint24 _feeTier, uint32 _maPeriod, uint256 _weightDIA)
-        public
-    {
+    // Custom Errors
+    error PriceTooOld();
+    error InvalidWeight();
+    error InvalidTime();
+
+    constructor(address _masterOracle, address _quoteToken, uint24 _feeTier, uint32 _maPeriod, uint256 _weightDIA) {
         _isNonZeroAddr(_masterOracle);
         masterOracle = _masterOracle;
         setUniMAPriceData(SPA, _quoteToken, _feeTier, _maPeriod);
@@ -40,15 +43,17 @@ contract SPAOracle is BaseUniOracle {
     function getPrice() external view override returns (uint256, uint256) {
         uint256 weightUNI = MAX_WEIGHT - weightDIA;
         // calculate weighted UNI USDsPerSPA
-        uint256 weightedSPAUniPrice = weightUNI.mul(_getSPAUniPrice());
+        uint256 weightedSPAUniPrice = weightUNI * _getSPAUniPrice();
 
         // calculate weighted DIA USDsPerSPA
         (uint128 spaDiaPrice, uint128 lastUpdated) = IDiaOracle(DIA_ORACLE).getValue("SPA/USD");
 
-        require(block.timestamp - lastUpdated <= diaMaxTimeThreshold, "Price too old");
+        if (block.timestamp - lastUpdated > diaMaxTimeThreshold) {
+            revert PriceTooOld();
+        }
 
-        uint256 weightedSPADiaPrice = weightDIA.mul(spaDiaPrice);
-        uint256 spaPrice = weightedSPAUniPrice.add(weightedSPADiaPrice).div(MAX_WEIGHT);
+        uint256 weightedSPADiaPrice = weightDIA * spaDiaPrice;
+        uint256 spaPrice = (weightedSPAUniPrice + weightedSPADiaPrice) / MAX_WEIGHT;
         return (spaPrice, SPA_PRICE_PRECISION);
     }
 
@@ -60,8 +65,14 @@ contract SPAOracle is BaseUniOracle {
     /// @param _weightDIA weight for DIA price feed
     /// @param _maxTime max age of price feed from DIA
     function updateDIAParams(uint256 _weightDIA, uint128 _maxTime) public onlyOwner {
-        require(_weightDIA <= MAX_WEIGHT, "Invalid weight");
-        require(_maxTime > 120, "Invalid time"); // 120 is the update frequency
+        if (_weightDIA > MAX_WEIGHT) {
+            revert InvalidWeight();
+        }
+        // 120 is the update frequency
+        if (_maxTime <= 120) {
+            revert InvalidTime();
+        }
+
         weightDIA = _weightDIA;
         diaMaxTimeThreshold = _maxTime;
         emit DIAParamsUpdated(_weightDIA, _maxTime);
@@ -72,8 +83,7 @@ contract SPAOracle is BaseUniOracle {
     function _getSPAUniPrice() private view returns (uint256) {
         uint256 quoteTokenAmtPerSPA = _getUniMAPrice(SPA, SPA_PRECISION);
         (uint256 quoteTokenPrice, uint256 quoteTokenPricePrecision) = _getQuoteTokenPrice();
-        return quoteTokenPrice.mul(quoteTokenAmtPerSPA).mul(SPA_PRICE_PRECISION).div(quoteTokenPrecision).div(
-            quoteTokenPricePrecision
-        );
+        return ((quoteTokenPrice * quoteTokenAmtPerSPA * SPA_PRICE_PRECISION) / quoteTokenPrecision)
+            / quoteTokenPricePrecision;
     }
 }

contracts/oracle/USDsOracle.sol

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.6.12;
-pragma experimental ABIEncoderV2;
+pragma solidity 0.8.16;
 
 import {BaseUniOracle} from "./BaseUniOracle.sol";
 
@@ -12,7 +11,7 @@ contract USDsOracle is BaseUniOracle {
     uint128 private constant USDS_PRECISION = 1e18;
     uint128 private constant USDS_PRICE_PRECISION = 1e8;
 
-    constructor(address _masterOracle, address _quoteToken, uint24 _feeTier, uint32 _maPeriod) public {
+    constructor(address _masterOracle, address _quoteToken, uint24 _feeTier, uint32 _maPeriod) {
         _isNonZeroAddr(_masterOracle);
         masterOracle = _masterOracle;
         setUniMAPriceData(USDS, _quoteToken, _feeTier, _maPeriod);
@@ -23,8 +22,8 @@ contract USDsOracle is BaseUniOracle {
     function getPrice() external view override returns (uint256, uint256) {
         uint256 quoteTokenAmtPerUSDs = _getUniMAPrice(USDS, USDS_PRECISION);
         (uint256 quoteTokenPrice, uint256 quoteTokenPricePrecision) = _getQuoteTokenPrice();
-        uint256 usdsPrice = quoteTokenPrice.mul(quoteTokenAmtPerUSDs).mul(USDS_PRICE_PRECISION).div(quoteTokenPrecision)
-            .div(quoteTokenPricePrecision);
+        uint256 usdsPrice = ((quoteTokenPrice * quoteTokenAmtPerUSDs * USDS_PRICE_PRECISION) / quoteTokenPrecision)
+            / quoteTokenPricePrecision;
         return (usdsPrice, USDS_PRICE_PRECISION);
     }
 }

contracts/strategies/aave/AaveStrategy.sol

@@ -16,6 +16,8 @@ contract AaveStrategy is InitializableAbstractStrategy {
     IAaveLendingPool public aavePool;
     mapping(address => uint256) public allocatedAmount; // Tracks the allocated amount of an asset.
 
+    error NoRewardIncentive();
+
     /// @notice Initializer for setting up strategy internal state. This overrides the
     /// InitializableAbstractStrategy initializer as AAVE needs several extra
     /// addresses for the rewards program.
@@ -101,8 +103,8 @@ contract AaveStrategy is InitializableAbstractStrategy {
 
     /// @inheritdoc InitializableAbstractStrategy
     function collectReward() external pure override {
-        revert("No reward incentive for AAVE");
         // No reward token for Aave
+        revert NoRewardIncentive();
     }
 
     /// @inheritdoc InitializableAbstractStrategy
@@ -125,6 +127,7 @@ contract AaveStrategy is InitializableAbstractStrategy {
     }
 
     /// @inheritdoc InitializableAbstractStrategy
+    // TODO can be made external. Same for others.
     function checkAvailableBalance(address _asset) public view override returns (uint256) {
         uint256 availableLiquidity = IERC20(_asset).balanceOf(_getPTokenFor(_asset));
         uint256 allocatedValue = allocatedAmount[_asset];