chore: Clean solc warnings and fix test suite

.github/workflows/test-shared.yaml

@@ -21,4 +21,4 @@ jobs:
                       ${{ runner.os }}-yarn-
             - run: yarn
             - run: yarn compile
-            - run: yarn test:file ./test/buy-and-make/*.spec.ts ./test/meta-token/*.spec.ts ./test/nexus/*.spec.ts ./test/shared/*.spec.ts
+            - run: yarn test:file ./test/buy-and-make/*.spec.ts ./test/nexus/*.spec.ts ./test/shared/*.spec.ts

contracts/masset/MassetLogic.sol

@@ -511,7 +511,7 @@ library MassetLogic {
         uint8 _i,
         uint256 _rawInput,
         InvariantConfig memory _config
-    ) public view returns (uint256 mintAmount) {
+    ) public pure returns (uint256 mintAmount) {
         // 1. Get raw reserves
         (uint256[] memory x, uint256 sum) = _getReserves(_bAssets);
         // 2. Get value of reserves according to invariant
@@ -540,7 +540,7 @@ library MassetLogic {
         uint8[] memory _indices,
         uint256[] memory _rawInputs,
         InvariantConfig memory _config
-    ) public view returns (uint256 mintAmount) {
+    ) public pure returns (uint256 mintAmount) {
         // 1. Get raw reserves
         (uint256[] memory x, uint256 sum) = _getReserves(_bAssets);
         // 2. Get value of reserves according to invariant
@@ -580,7 +580,7 @@ library MassetLogic {
         uint256 _rawInput,
         uint256 _feeRate,
         InvariantConfig memory _config
-    ) public view returns (uint256 bAssetOutputQuantity, uint256 scaledSwapFee) {
+    ) public pure returns (uint256 bAssetOutputQuantity, uint256 scaledSwapFee) {
         // 1. Get raw reserves
         (uint256[] memory x, uint256 sum) = _getReserves(_bAssets);
         // 2. Get value of reserves according to invariant
@@ -637,7 +637,7 @@ library MassetLogic {
         uint256 _grossMassetQuantity,
         InvariantConfig memory _config,
         uint256 _feeRate
-    ) public view returns (uint256 rawOutputUnits, uint256 scaledFee) {
+    ) public pure returns (uint256 rawOutputUnits, uint256 scaledFee) {
         // 1. Get raw reserves
         (uint256[] memory x, uint256 sum) = _getReserves(_bAssets);
         // 2. Get value of reserves according to invariant
@@ -685,7 +685,7 @@ library MassetLogic {
         uint256[] memory _rawOutputs,
         InvariantConfig memory _config,
         uint256 _feeRate
-    ) public view returns (uint256 grossMasset, uint256 fee) {
+    ) public pure returns (uint256 grossMasset, uint256 fee) {
         // 1. Get raw reserves
         (uint256[] memory x, uint256 sum) = _getReserves(_bAssets);
         // 2. Get value of reserves according to invariant

contracts/rewards/BoostDirector.sol

@@ -144,7 +144,7 @@ contract BoostDirector is IBoostDirector, ImmutableModule {
         uint128 _bitmap,
         uint8 _pos,
         uint8 _id
-    ) internal returns (uint128 newMap) {
+    ) internal pure returns (uint128 newMap) {
         // bitmap          = ... 00000000 00000000 00000011 00001010
         // pos = 1, id = 1 = 00000001
         // step            = ... 00000000 00000000 00000001 00000000
@@ -166,7 +166,7 @@ contract BoostDirector is IBoostDirector, ImmutableModule {
      */
     function _indexExists(uint128 _bitmap, uint8 _target)
         internal
-        view
+        pure
         returns (
             bool isWhitelisted,
             uint8 count,

contracts/rewards/RewardsDistributionRecipient.sol

@@ -8,7 +8,7 @@ import { IRewardsDistributionRecipient } from "../interfaces/IRewardsDistributio
 /**
  * @title  RewardsDistributionRecipient
  * @author Originally: Synthetix (forked from /Synthetixio/synthetix/contracts/RewardsDistributionRecipient.sol)
- *         Changes by: Stability Labs Pty. Ltd.
+ *         Changes by: mStable
  * @notice RewardsDistributionRecipient gets notified of additional rewards by the rewardsDistributor
  * @dev    Changes: Addition of ImmutableModule and abstract `getRewardToken` func + cosmetic
  */

contracts/meta-token/MetaToken.sol → contracts/shared/MetaToken.sol

@@ -6,16 +6,10 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { ERC20Burnable } from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
 
 /**
- * @title  MetaToken
- * @author Stability Labs Pty. Ltd.
- * @dev    MetaToken is an ERC20 token, with mint privileges governed by mStable
- * governors
+ * @title  MintableToken
+ * @author mStable
  */
-contract MetaToken is ERC20, GovernedMinterRole, ERC20Burnable {
-    /**
-     * @dev MetaToken simply implements a detailed ERC20 token,
-     * and a governed list of minters
-     */
+contract MintableToken is ERC20, GovernedMinterRole, ERC20Burnable {
     constructor(address _nexus, address _initialRecipient)
         ERC20("Meta", "MTA")
         GovernedMinterRole(_nexus)
@@ -24,7 +18,6 @@ contract MetaToken is ERC20, GovernedMinterRole, ERC20Burnable {
         _mint(_initialRecipient, 100000000 * (10**18));
     }
 
-    // Forked from @openzeppelin
     /**
      * @dev See {ERC20-_mint}.
      *

contracts/z_mocks/buy-and-make/MockBPool.sol

@@ -59,5 +59,6 @@ contract MockBPool is ERC20, IBPool {
         tokenAmountOut = (tokenAmountIn * inputToOutputRatio) / 1e18;
         require(tokenAmountOut > minAmountOut, "Invalid output amount");
         IERC20(tokenOut).transfer(msg.sender, tokenAmountOut);
+        return (tokenAmountOut, 0);
     }
 }

contracts/z_mocks/feeder/ExposedFeederLogic.sol

@@ -10,7 +10,7 @@ contract ExposedFeederLogic {
         uint8 _i,
         uint256 _rawInput,
         FeederConfig memory _config
-    ) public view returns (uint256 mintAmount) {
+    ) public pure returns (uint256 mintAmount) {
         return FeederLogic.computeMint(_bAssets, _i, _rawInput, _config);
     }
 
@@ -19,7 +19,7 @@ contract ExposedFeederLogic {
         uint8[] memory _indices,
         uint256[] memory _rawInputs,
         FeederConfig memory _config
-    ) public view returns (uint256 mintAmount) {
+    ) public pure returns (uint256 mintAmount) {
         return FeederLogic.computeMintMulti(_bAssets, _indices, _rawInputs, _config);
     }
 
@@ -30,7 +30,7 @@ contract ExposedFeederLogic {
         uint256 _rawInput,
         uint256 _feeRate,
         FeederConfig memory _config
-    ) public view returns (uint256 bAssetOutputQuantity, uint256 scaledSwapFee) {
+    ) public pure returns (uint256 bAssetOutputQuantity, uint256 scaledSwapFee) {
         return FeederLogic.computeSwap(_bAssets, _i, _o, _rawInput, _feeRate, _config);
     }
 
@@ -39,7 +39,7 @@ contract ExposedFeederLogic {
         uint8 _o,
         uint256 _netMassetQuantity,
         FeederConfig memory _config
-    ) public view returns (uint256 rawOutputUnits) {
+    ) public pure returns (uint256 rawOutputUnits) {
         return FeederLogic.computeRedeem(_bAssets, _o, _netMassetQuantity, _config);
     }
 
@@ -48,7 +48,7 @@ contract ExposedFeederLogic {
         uint8[] memory _indices,
         uint256[] memory _rawOutputs,
         FeederConfig memory _config
-    ) public view returns (uint256 totalmAssets) {
+    ) public pure returns (uint256 totalmAssets) {
         return FeederLogic.computeRedeemExact(_bAssets, _indices, _rawOutputs, _config);
     }
 }

contracts/z_mocks/governance/MockBVault.sol

@@ -84,9 +84,10 @@ contract MockBVault is IBVault {
         returns (
             address[] memory tokens,
             uint256[] memory balances,
-            uint256 /*lastChangeBlock*/
+            uint256 lastChangeBlock
         )
     {
+        lastChangeBlock = 0;
         MockBPT pool = pools[poolId];
         IERC20[] memory tokenDatas = tokenData[address(pool)];
         uint256 len = tokenDatas.length;

contracts/z_mocks/masset/ExposedMassetLogic.sol

@@ -10,7 +10,7 @@ contract ExposedMassetLogic {
         uint8 _i,
         uint256 _rawInput,
         InvariantConfig memory _config
-    ) public view returns (uint256 mintAmount) {
+    ) public pure returns (uint256 mintAmount) {
         return MassetLogic.computeMint(_bAssets, _i, _rawInput, _config);
     }
 
@@ -19,7 +19,7 @@ contract ExposedMassetLogic {
         uint8[] memory _indices,
         uint256[] memory _rawInputs,
         InvariantConfig memory _config
-    ) public view returns (uint256 mintAmount) {
+    ) public pure returns (uint256 mintAmount) {
         return MassetLogic.computeMintMulti(_bAssets, _indices, _rawInputs, _config);
     }
 
@@ -30,7 +30,7 @@ contract ExposedMassetLogic {
         uint256 _rawInput,
         uint256 _feeRate,
         InvariantConfig memory _config
-    ) public view returns (uint256 bAssetOutputQuantity, uint256 scaledSwapFee) {
+    ) public pure returns (uint256 bAssetOutputQuantity, uint256 scaledSwapFee) {
         return MassetLogic.computeSwap(_bAssets, _i, _o, _rawInput, _feeRate, _config);
     }
 
@@ -40,7 +40,7 @@ contract ExposedMassetLogic {
         uint256 _netMassetQuantity,
         InvariantConfig memory _config,
         uint256 _feeRate
-    ) public view returns (uint256 rawOutputUnits, uint256 scaledFee) {
+    ) public pure returns (uint256 rawOutputUnits, uint256 scaledFee) {
         return MassetLogic.computeRedeem(_bAssets, _o, _netMassetQuantity, _config, _feeRate);
     }
 
@@ -50,13 +50,13 @@ contract ExposedMassetLogic {
         uint256[] memory _rawOutputs,
         InvariantConfig memory _config,
         uint256 _feeRate
-    ) public view returns (uint256 grossMasset, uint256 fee) {
+    ) public pure returns (uint256 grossMasset, uint256 fee) {
         return MassetLogic.computeRedeemExact(_bAssets, _indices, _rawOutputs, _config, _feeRate);
     }
 
     function getK(BassetData[] memory _bAssets, InvariantConfig memory _config)
         external
-        view
+        pure
         returns (uint256 k)
     {
         (, k) = MassetLogic.computePrice(_bAssets, _config);

contracts/z_mocks/masset/MaliciousAaveIntegration.sol

@@ -204,7 +204,7 @@ contract MaliciousAaveIntegration is IPlatformIntegration, ImmutableModule {
      * @param _bAsset     Address of the bAsset
      * @return balance    Total value of the bAsset in the platform
      */
-    function checkBalance(address _bAsset) external override returns (uint256 balance) {
+    function checkBalance(address _bAsset) external view override returns (uint256 balance) {
         // balance is always with token aToken decimals
         IAaveATokenV2 aToken = _getATokenFor(_bAsset);
         return _checkBalance(aToken) * 5;

contracts/z_mocks/masset/MockPlatformIntegration.sol

@@ -228,7 +228,7 @@ contract MockPlatformIntegration is IPlatformIntegration, ImmutableModule {
      * @param _bAsset     Address of the bAsset
      * @return balance    Total value of the bAsset in the platform
      */
-    function checkBalance(address _bAsset) external override returns (uint256 balance) {
+    function checkBalance(address _bAsset) external view override returns (uint256 balance) {
         // balance is always with token aToken decimals
         IAaveATokenV2 aToken = _getATokenFor(_bAsset);
         return _checkBalance(aToken);

contracts/z_mocks/rewards/MockRewardsDistributionRecipient.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 pragma solidity 0.8.6;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

contracts/z_mocks/shared/MockAaveIncentivesController.sol

@@ -20,16 +20,16 @@ contract MockAaveIncentivesController is IAaveIncentivesController {
         return 1e20;
     }
 
-    function getRewardsBalance(address[] calldata assets, address user)
-        external
-        view
-        override
-        returns (uint256)
-    {
+    function getRewardsBalance(
+        address[] calldata, /*assets*/
+        address /*user*/
+    ) external pure override returns (uint256) {
         return 1e20;
     }
 
-    function getUserUnclaimedRewards(address user) external view override returns (uint256) {
+    function getUserUnclaimedRewards(
+        address /*user*/
+    ) external pure override returns (uint256) {
         return 1e20;
     }
 }

contracts/z_mocks/shared/MockStakedAave.sol

@@ -35,7 +35,10 @@ contract MockStakedAave is IStakedAave, ERC20 {
         _mint(to, amount);
     }
 
-    function redeem(address to, uint256 amount) external override {
+    function redeem(
+        address to,
+        uint256 /*amount*/
+    ) external override {
         require(
             block.timestamp > stakersCooldowns[msg.sender] + COOLDOWN_SECONDS,
             "INSUFFICIENT_COOLDOWN"

contracts/z_mocks/shared/MockUniswap.sol

@@ -51,20 +51,18 @@ contract MockUniswap is IUniswapV2Router02 {
     }
 
     function swapExactETHForTokens(
-        uint256 amountOutMin,
-        address[] calldata path,
-        address to,
-        uint256 deadline
+        uint256, /*amountOutMin*/
+        address[] calldata, /*path*/
+        address, /*to*/
+        uint256 /*deadline*/
     ) external payable override returns (uint256[] memory amounts) {
         return new uint256[](0);
     }
 
-    function getAmountsOut(uint256 amountIn, address[] calldata path)
-        external
-        view
-        override
-        returns (uint256[] memory amounts)
-    {
+    function getAmountsOut(
+        uint256, /*amountIn*/
+        address[] calldata /*path*/
+    ) external pure override returns (uint256[] memory amounts) {
         return new uint256[](0);
     }
 }

contracts/z_mocks/shared/MockUniswapV3.sol

@@ -123,7 +123,7 @@ contract MockUniswapV3 is IUniswapV3SwapRouter, IUniswapV3Quoter {
         address tokenOut,
         uint24 fee,
         uint256 amountIn,
-        uint160 sqrtPriceLimitX96
+        uint160 /*sqrtPriceLimitX96*/
     ) external view override returns (uint256 amountOut) {
         uint256 rate = rates[tokenIn][tokenOut];
         amountOut = amountIn * rate * ((FEE_SCALE - fee) / FEE_SCALE);
@@ -147,8 +147,8 @@ contract MockUniswapV3 is IUniswapV3SwapRouter, IUniswapV3Quoter {
         address tokenOut,
         uint24 fee,
         uint256 amountOut,
-        uint160 sqrtPriceLimitX96
-    ) external override returns (uint256 amountIn) {
+        uint160 /*sqrtPriceLimitX96*/
+    ) external view override returns (uint256 amountIn) {
         uint256 rate = rates[tokenIn][tokenOut];
         amountIn = (amountOut * RATE_SCALE * FEE_SCALE) / (rate * (FEE_SCALE - fee));
     }

package.json

@@ -99,7 +99,7 @@
         "ethers-multicall": "^0.2.0",
         "graphql": "^15.5.0",
         "graphql-request": "^3.5.0",
-        "hardhat": "^2.6.0",
+        "hardhat": "^2.6.4",
         "hardhat-gas-reporter": "^1.0.1",
         "solidity-coverage": "0.7.16",
         "ts-node": "^10.2.0",