Merge pull request #40 from lidofinance/fix/frt-cap

Force FRT < RR

Author: avsetsin

script/HarnessCore.s.sol

@@ -168,14 +168,11 @@ contract HarnessCore is Script {
         return (true, abi.decode(ret, (address)));
     }
 
-    function _arr6(
-        string memory a,
-        string memory b,
-        string memory c,
-        string memory d,
-        string memory e,
-        string memory f
-    ) private pure returns (string[] memory r) {
+    function _arr6(string memory a, string memory b, string memory c, string memory d, string memory e, string memory f)
+        private
+        pure
+        returns (string[] memory r)
+    {
         r = new string[](6);
         r[0] = a;
         r[1] = b;

src/StvStETHPool.sol

@@ -488,25 +488,29 @@ contract StvStETHPool is StvPool {
         IVaultHub.VaultConnection memory connection = DASHBOARD.vaultConnection();
 
         uint256 maxReserveRatioBP = TOTAL_BASIS_POINTS - 1;
+        uint256 maxForcedRebalanceThresholdBP = maxReserveRatioBP - 1;
 
         /// Invariants from the OperatorGrid
         assert(connection.reserveRatioBP > 0);
         assert(connection.reserveRatioBP <= maxReserveRatioBP);
         assert(connection.forcedRebalanceThresholdBP > 0);
-        assert(connection.forcedRebalanceThresholdBP <= connection.reserveRatioBP);
+        assert(connection.forcedRebalanceThresholdBP < connection.reserveRatioBP);
 
         uint16 newReserveRatioBP = uint16(Math.min(connection.reserveRatioBP + RESERVE_RATIO_GAP_BP, maxReserveRatioBP));
-        uint16 newThresholdBP =
-            uint16(Math.min(connection.forcedRebalanceThresholdBP + RESERVE_RATIO_GAP_BP, maxReserveRatioBP));
+        uint16 newForcedRebalanceThresholdBP = uint16(
+            Math.min(connection.forcedRebalanceThresholdBP + RESERVE_RATIO_GAP_BP, maxForcedRebalanceThresholdBP)
+        );
 
         StvStETHPoolStorage storage $ = _getStvStETHPoolStorage();
 
-        if (newReserveRatioBP == $.reserveRatioBP && newThresholdBP == $.forcedRebalanceThresholdBP) return;
+        if (newReserveRatioBP == $.reserveRatioBP && newForcedRebalanceThresholdBP == $.forcedRebalanceThresholdBP) {
+            return;
+        }
 
         $.reserveRatioBP = newReserveRatioBP;
-        $.forcedRebalanceThresholdBP = newThresholdBP;
+        $.forcedRebalanceThresholdBP = newForcedRebalanceThresholdBP;
 
-        emit VaultParametersUpdated(newReserveRatioBP, newThresholdBP);
+        emit VaultParametersUpdated(newReserveRatioBP, newForcedRebalanceThresholdBP);
     }
 
     // =================================================================================

src/interfaces/ggv/IBoringOnChainQueue.sol

@@ -57,12 +57,9 @@ interface IBoringOnChainQueue {
         uint96 minimumShares
     ) external;
 
-    function requestOnChainWithdraw(
-        address assetOut,
-        uint128 amountOfShares,
-        uint16 discount,
-        uint24 secondsToDeadline
-    ) external returns (bytes32 requestId);
+    function requestOnChainWithdraw(address assetOut, uint128 amountOfShares, uint16 discount, uint24 secondsToDeadline)
+        external
+        returns (bytes32 requestId);
     function cancelOnChainWithdraw(OnChainWithdraw memory request) external returns (bytes32 requestId);
     function replaceOnChainWithdraw(OnChainWithdraw memory oldRequest, uint16 discount, uint24 secondsToDeadline)
         external