chore: rename to reinvestmentController, math utils tests (#637)

* fix: cleanup, math utils tests

* fix: rename reinvestmentStrategy -> reinvestmentController

* feat: position manager event naming consistency

Author: DhairyaSethi

Makefile

@@ -19,7 +19,7 @@ git-diff :
 gas-report :; forge test --mp 'tests/gas/**'
 
 # Coverage
-coverage-base :; forge coverage --fuzz-runs 50 --report lcov --no-match-coverage "(scripts|tests|deployments|mocks|dependencies)"
+coverage-base :; forge coverage --fuzz-runs 50 --report lcov --no-match-coverage "(scripts|tests|deployments|mocks|dependencies|UnitPriceFeed)"
 coverage-clean :; lcov --rc derive_function_end_line=0 --remove ./lcov.info -o ./lcov.info.p --ignore-errors inconsistent
 coverage-report :; genhtml ./lcov.info.p -o report --branch-coverage --rc derive_function_end_line=0 
 coverage-badge :; coverage=$$(awk -F '[<>]' '/headerCovTableEntryHi/{print $3}' ./report/index.html | sed 's/[^0-9.]//g' | head -n 1); \

src/contracts/Hub.sol

@@ -84,7 +84,7 @@ contract Hub is IHub, AccessManaged {
       decimals: decimals,
       drawnRate: drawnRate.toUint96(),
       irStrategy: irStrategy,
-      reinvestmentStrategy: address(0),
+      reinvestmentController: address(0),
       feeReceiver: feeReceiver,
       liquidityFee: 0
     });
@@ -96,7 +96,7 @@ contract Hub is IHub, AccessManaged {
         feeReceiver: feeReceiver,
         liquidityFee: 0,
         irStrategy: irStrategy,
-        reinvestmentStrategy: address(0)
+        reinvestmentController: address(0)
       })
     );
     emit AssetUpdate(assetId, drawnIndex, drawnRate, lastUpdateTimestamp);
@@ -117,14 +117,14 @@ contract Hub is IHub, AccessManaged {
     require(config.feeReceiver != address(0), InvalidFeeReceiver());
     require(config.irStrategy != address(0), InvalidIrStrategy());
     require(
-      config.reinvestmentStrategy != address(0) || asset.swept == 0,
-      InvalidReinvestmentStrategy()
+      config.reinvestmentController != address(0) || asset.swept == 0,
+      InvalidReinvestmentController()
     );
 
     asset.feeReceiver = config.feeReceiver;
     asset.liquidityFee = config.liquidityFee;
     asset.irStrategy = config.irStrategy;
-    asset.reinvestmentStrategy = config.reinvestmentStrategy;
+    asset.reinvestmentController = config.reinvestmentController;
 
     asset.updateDrawnRate(assetId);
 
@@ -361,7 +361,7 @@ contract Hub is IHub, AccessManaged {
     asset.swept += amount.toUint128();
     asset.updateDrawnRate(assetId);
 
-    IERC20(asset.underlying).safeTransfer(asset.reinvestmentStrategy, amount);
+    IERC20(asset.underlying).safeTransfer(asset.reinvestmentController, amount);
 
     emit Sweep(assetId, amount);
   }
@@ -376,7 +376,7 @@ contract Hub is IHub, AccessManaged {
     asset.swept -= amount.toUint128();
     asset.updateDrawnRate(assetId);
 
-    IERC20(asset.underlying).safeTransferFrom(asset.reinvestmentStrategy, address(this), amount);
+    IERC20(asset.underlying).safeTransferFrom(asset.reinvestmentController, address(this), amount);
 
     emit Reclaim(assetId, amount);
   }
@@ -574,7 +574,7 @@ contract Hub is IHub, AccessManaged {
         feeReceiver: _assets[assetId].feeReceiver,
         liquidityFee: _assets[assetId].liquidityFee,
         irStrategy: _assets[assetId].irStrategy,
-        reinvestmentStrategy: _assets[assetId].reinvestmentStrategy
+        reinvestmentController: _assets[assetId].reinvestmentController
       });
   }
 
@@ -760,8 +760,8 @@ contract Hub is IHub, AccessManaged {
     address caller,
     uint256 amount
   ) internal view {
-    // sufficient check to disallow when strategy unset
-    require(caller == asset.reinvestmentStrategy, OnlyReinvestmentStrategy());
+    // sufficient check to disallow when controller unset
+    require(caller == asset.reinvestmentController, OnlyReinvestmentController());
     require(amount > 0 && amount <= asset.liquidity, InvalidSweepAmount());
   }
 
@@ -770,8 +770,8 @@ contract Hub is IHub, AccessManaged {
     address caller,
     uint256 amount
   ) internal view {
-    // sufficient check to disallow when strategy unset
-    require(caller == asset.reinvestmentStrategy, OnlyReinvestmentStrategy());
+    // sufficient check to disallow when controller unset
+    require(caller == asset.reinvestmentController, OnlyReinvestmentController());
     require(amount > 0 && amount <= asset.swept, InvalidSweepAmount());
   }
 }

src/contracts/HubConfigurator.sol

@@ -126,14 +126,14 @@ contract HubConfigurator is Ownable, IHubConfigurator {
   }
 
   /// @inheritdoc IHubConfigurator
-  function updateReinvestmentStrategy(
+  function updateReinvestmentController(
     address hub,
     uint256 assetId,
-    address reinvestmentStrategy
+    address reinvestmentController
   ) external override onlyOwner {
     IHub targetHub = IHub(hub);
     DataTypes.AssetConfig memory config = targetHub.getAssetConfig(assetId);
-    config.reinvestmentStrategy = reinvestmentStrategy;
+    config.reinvestmentController = reinvestmentController;
     targetHub.updateAssetConfig(assetId, config);
   }
 

src/contracts/Spoke.sol

@@ -173,7 +173,7 @@ contract Spoke is ISpoke, Multicall, AccessManaged {
   /// @inheritdoc ISpoke
   function updatePositionManager(address positionManager, bool active) external restricted {
     _positionManager[positionManager].active = active;
-    emit PositionManagerUpdate(positionManager, active);
+    emit UpdatePositionManager(positionManager, active);
   }
 
   // /////

src/contracts/TreasurySpoke.sol

@@ -62,22 +62,17 @@ contract TreasurySpoke is ITreasurySpoke, Ownable {
   }
 
   /// @inheritdoc ISpokeBase
-  function borrow(uint256 reserveId, uint256 amount, address) external {
-    /// intentionally left blank
+  function borrow(uint256, uint256, address) external pure {
+    revert UnsupportedAction();
   }
 
   /// @inheritdoc ISpokeBase
-  function repay(uint256 reserveId, uint256 amount, address) external {
-    /// intentionally left blank
+  function repay(uint256, uint256, address) external pure {
+    revert UnsupportedAction();
   }
 
   /// @inheritdoc ISpokeBase
-  function liquidationCall(
-    uint256 collateralReserveId,
-    uint256 debtReserveId,
-    address user,
-    uint256 debtToCover
-  ) external {
-    /// intentionally left blank
+  function liquidationCall(uint256, uint256, address, uint256) external pure {
+    revert UnsupportedAction();
   }
 }

src/interfaces/IHub.sol

@@ -96,9 +96,9 @@ interface IHub is IHubBase, IAccessManaged {
   error SurplusDeficitReported(uint256 amount);
   error SpokeNotActive();
   error InvalidFeeShares();
-  error InvalidReinvestmentStrategy();
+  error InvalidReinvestmentController();
   error InvalidSweepAmount();
-  error OnlyReinvestmentStrategy();
+  error OnlyReinvestmentController();
 
   /**
    * @notice Adds a new asset to the hub.
@@ -205,16 +205,16 @@ interface IHub is IHubBase, IAccessManaged {
   function eliminateDeficit(uint256 assetId, uint256 amount) external returns (uint256);
 
   /**
-   * @notice Sweeps an amount of liquidity of the corresponding asset and sends it to the configured reinvestment strategy.
-   * @dev The strategy handles the actual reinvestment of funds, redistribution of interest, and investment caps.
+   * @notice Sweeps an amount of liquidity of the corresponding asset and sends it to the configured reinvestment controller.
+   * @dev The controller handles the actual reinvestment of funds, redistribution of interest, and investment caps.
    * @param assetId The identifier of the asset.
    * @param amount The amount to sweep.
    */
   function sweep(uint256 assetId, uint256 amount) external;
 
   /**
-   * @notice Reclaims an amount of liquidity of the corresponding asset from the configured reinvestment strategy.
-   * @dev The strategy can only reclaim up to swept amount. All accrued interest is distributed offchain.
+   * @notice Reclaims an amount of liquidity of the corresponding asset from the configured reinvestment controller.
+   * @dev The controller can only reclaim up to swept amount. All accrued interest is distributed offchain.
    * @param assetId The identifier of the asset.
    * @param amount The amount to reclaim.
    */

src/interfaces/IHubConfigurator.sol

@@ -97,15 +97,15 @@ interface IHubConfigurator {
   function updateInterestRateStrategy(address hub, uint256 assetId, address irStrategy) external;
 
   /**
-   * @notice Updates the reinvestment strategy of an asset.
+   * @notice Updates the reinvestment controller of an asset.
    * @param hub The address of the Hub contract.
    * @param assetId The identifier of the asset.
-   * @param reinvestmentStrategy The new reinvestment strategy.
+   * @param reinvestmentController The new reinvestment controller.
    */
-  function updateReinvestmentStrategy(
+  function updateReinvestmentController(
     address hub,
     uint256 assetId,
-    address reinvestmentStrategy
+    address reinvestmentController
   ) external;
 
   /**

src/interfaces/ISpoke.sol

@@ -90,7 +90,7 @@ interface ISpoke is ISpokeBase, IMulticall, IAccessManaged {
    * @param positionManager The address of the position manager.
    * @param active True if position manager has become active, false otherwise.
    */
-  event PositionManagerUpdate(address indexed positionManager, bool active);
+  event UpdatePositionManager(address indexed positionManager, bool active);
 
   event RefreshPremiumDebt(
     uint256 indexed reserveId,

src/interfaces/ITreasurySpoke.sol

@@ -8,6 +8,8 @@ import {ISpokeBase} from 'src/interfaces/ISpokeBase.sol';
  * @title ITreasurySpoke
  */
 interface ITreasurySpoke is ISpokeBase {
+  error UnsupportedAction();
+
   /**
    * @notice Supplies a specified amount of the underlying asset to a given reserve.
    * @dev The Hub pulls the underlying asset from the caller, so prior approval is required.

src/libraries/math/MathUtils.sol

@@ -5,8 +5,7 @@ import {WadRayMath} from './WadRayMath.sol';
 
 /**
  * @title MathUtils library
- * @author Aave
- * @notice Provides functions to perform linear and compounded interest calculations
+ * @author Aave Labs
  */
 library MathUtils {
   using WadRayMath for uint256;
@@ -24,7 +23,6 @@ library MathUtils {
     uint256 rate,
     uint40 lastUpdateTimestamp
   ) internal view returns (uint256) {
-    //solium-disable-next-line
     uint256 result = rate * (block.timestamp - uint256(lastUpdateTimestamp));
     unchecked {
       result = result / SECONDS_PER_YEAR;
@@ -33,81 +31,14 @@ library MathUtils {
     return WadRayMath.RAY + result;
   }
 
-  /**
-   * @notice Calculates the new weighted average given a current weighted average, the sum of the weights subtracted with a new value, weight.
-   * @dev Add precision to weighted average & new value before calling this method.
-   * @param currentWeightedAvg The base weighted average.
-   * @param currentSumWeights The base sum of weights.
-   * @param newValue The new value to add or subtract.
-   * @param newValueWeight The weight of the new value.
-   * @return newWeightedAvg The weighted average after the operation.
-   * @return newSumWeights The sum of weights after operation, cannot be less than 0.
-   */
-  function addToWeightedAverage(
-    uint256 currentWeightedAvg,
-    uint256 currentSumWeights,
-    uint256 newValue,
-    uint256 newValueWeight
-  ) internal pure returns (uint256, uint256) {
-    // newWeightedAvg, newSumWeights
-
-    if (newValueWeight == 0) {
-      return (currentWeightedAvg, currentSumWeights);
-    }
-    if (currentSumWeights == 0) {
-      return (newValue, newValueWeight);
-    }
-
-    uint256 newSumWeights = currentSumWeights + newValueWeight;
-    uint256 newWeightedAvg = ((currentWeightedAvg * currentSumWeights) +
-      (newValue * newValueWeight)) / newSumWeights; // newSumWeights cannot be zero when execution reaches here
-
-    return (newWeightedAvg, newSumWeights);
-  }
-
-  /**
-   * @notice Calculates the new weighted average given a current weighted average, the sum of the weights added with a new value, weight.
-   * @dev Add precision to weighted average & new value before calling this method.
-   * @param currentWeightedAvg The base weighted average.
-   * @param currentSumWeights The base sum of weights.
-   * @param newValue The new value to add or subtract.
-   * @param newValueWeight The weight of the new value.
-   * @return newWeightedAvg The weighted average after the operation.
-   * @return newSumWeights The sum of weights after operation, cannot be less than 0.
-   * @dev Reverts when newValueWeight is greater than currentSumWeights.
-   * @dev Reverts when the newWeightedValue (weight * value) is greater than currentWeightedSum (currentSumWeights * currentWeightedAvg).
-   */
-  function subtractFromWeightedAverage(
-    uint256 currentWeightedAvg,
-    uint256 currentSumWeights,
-    uint256 newValue,
-    uint256 newValueWeight
-  ) internal pure returns (uint256, uint256) {
-    // newWeightedAvg, newSumWeights
-    if (newValueWeight == 0) return (currentWeightedAvg, currentSumWeights);
-
-    if (currentSumWeights == newValueWeight) return (0, 0); // no change
-    if (currentSumWeights < newValueWeight) revert();
-
-    uint256 newWeightedValue = newValue * newValueWeight;
-    uint256 currentWeightedSum = currentWeightedAvg * currentSumWeights;
-
-    if (currentWeightedSum < newWeightedValue) revert();
-
-    uint256 newSumWeights = currentSumWeights - newValueWeight;
-    uint256 newWeightedAvg = (currentWeightedSum - newWeightedValue) / newSumWeights;
-
-    return (newWeightedAvg, newSumWeights);
-  }
-
   /**
    * @notice Returns the minimum of two values.
    * @param a The first value to compare.
    * @param b The second value to compare.
    * @return result The minimum of the two values.
    */
   function min(uint256 a, uint256 b) internal pure returns (uint256 result) {
-    assembly {
+    assembly ('memory-safe') {
       result := xor(b, mul(xor(a, b), lt(a, b)))
     }
   }