optimize rsi

create new custom errors for the rsi;
ensure that the new RSI is between the range - 0% to 50%;
set initial rsi bonus on stake position;
adapt tests and create new ones for the APR;

contracts/RewardPool/modules/APR.sol

@@ -4,6 +4,8 @@ pragma solidity 0.8.17;
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/access/AccessControl.sol";
 
+import "./../../common/Errors.sol";
+
 contract APR is Initializable, AccessControl {
     uint256 public constant INITIAL_BASE_APR = 500;
     uint256 public constant INITIAL_MACRO_FACTOR = 7500;
@@ -41,7 +43,10 @@ contract APR is Initializable, AccessControl {
     }
 
     function setRSI(uint256 newRSI) public onlyRole(MANAGER_ROLE) {
-        require(newRSI <= getMaxRSI(), "TOO_HIGH_RSI");
+        if (newRSI < INITIAL_RSI_BONUS) revert TooLowRSI(newRSI, INITIAL_RSI_BONUS);
+
+        uint256 maxRSI = getMaxRSI();
+        if (newRSI > getMaxRSI()) revert TooHighRSI(newRSI, maxRSI);
 
         rsi = newRSI;
     }
@@ -57,10 +62,10 @@ contract APR is Initializable, AccessControl {
 
     function getMaxAPR() public view returns (uint256 nominator, uint256 denominator) {
         // TODO: Base + vesting and RSI must return the max possible value here (implement max base)
-        uint256 vesting = getVestingBonus(52);
+        uint256 vestBonus = getVestingBonus(52);
         uint256 rsiBonusFactor = getMaxRSI();
 
-        nominator = (base + vesting) * macroFactor * rsiBonusFactor;
+        nominator = (base + vestBonus) * macroFactor * rsiBonusFactor;
         denominator = 10000 * 10000 * 10000;
     }
 

contracts/RewardPool/modules/DelegationRewards.sol

@@ -192,12 +192,12 @@ abstract contract DelegationRewards is RewardPoolBase, Vesting, RewardsWithdrawa
         uint256 newBalance = balance + amount;
         if (newBalance < minDelegation) revert DelegateRequirement({src: "vesting", msg: "DELEGATION_TOO_LOW"});
 
-        // @note Potentially use memory variable to avoid get from storage twice
-        if (delegationPositions[validator][delegator].isMaturing()) {
+        VestingPosition memory position = delegationPositions[validator][delegator];
+        if (position.isMaturing()) {
             revert DelegateRequirement({src: "vesting", msg: "POSITION_MATURING"});
         }
 
-        if (delegationPositions[validator][delegator].isActive()) {
+        if (position.isActive()) {
             revert DelegateRequirement({src: "vesting", msg: "POSITION_ACTIVE"});
         }
 

contracts/RewardPool/modules/Vesting.sol

@@ -125,7 +125,7 @@ abstract contract Vesting is APR {
         uint256 durationIncrease = _calculateDurationIncrease(amount, oldBalance, duration);
         positions[staker].duration = duration + durationIncrease;
         positions[staker].end = positions[staker].end + durationIncrease;
-        positions[staker].rsiBonus = 0;
+        positions[staker].rsiBonus = rsi;
     }
 
     /**

contracts/common/Errors.sol

@@ -10,3 +10,5 @@ error SendFailed();
 error AlreadyRegistered(address validator);
 error InvalidCommission(uint256 commission);
 error InvalidMinStake(uint256 minStake);
+error TooLowRSI(uint256 newRSI, uint256 minRSI);
+error TooHighRSI(uint256 newRSI, uint256 maxRSI);

docs/RewardPool/RewardPool.md

@@ -1785,6 +1785,40 @@ error StakeRequirement(string src, string msg)
 | src | string | undefined |
 | msg | string | undefined |
 
+### TooHighRSI
+
+```solidity
+error TooHighRSI(uint256 newRSI, uint256 maxRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| maxRSI | uint256 | undefined |
+
+### TooLowRSI
+
+```solidity
+error TooLowRSI(uint256 newRSI, uint256 minRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| minRSI | uint256 | undefined |
+
 ### Unauthorized
 
 ```solidity

docs/RewardPool/modules/APR.md

@@ -562,3 +562,40 @@ event RoleRevoked(bytes32 indexed role, address indexed account, address indexed
 
 
 
+## Errors
+
+### TooHighRSI
+
+```solidity
+error TooHighRSI(uint256 newRSI, uint256 maxRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| maxRSI | uint256 | undefined |
+
+### TooLowRSI
+
+```solidity
+error TooLowRSI(uint256 newRSI, uint256 minRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| minRSI | uint256 | undefined |
+
+

docs/RewardPool/modules/DelegationRewards.md

@@ -1559,6 +1559,40 @@ error StakeRequirement(string src, string msg)
 | src | string | undefined |
 | msg | string | undefined |
 
+### TooHighRSI
+
+```solidity
+error TooHighRSI(uint256 newRSI, uint256 maxRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| maxRSI | uint256 | undefined |
+
+### TooLowRSI
+
+```solidity
+error TooLowRSI(uint256 newRSI, uint256 minRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| minRSI | uint256 | undefined |
+
 ### Unauthorized
 
 ```solidity

docs/RewardPool/modules/StakingRewards.md

@@ -1509,4 +1509,38 @@ error StakeRequirement(string src, string msg)
 | src | string | undefined |
 | msg | string | undefined |
 
+### TooHighRSI
+
+```solidity
+error TooHighRSI(uint256 newRSI, uint256 maxRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| maxRSI | uint256 | undefined |
+
+### TooLowRSI
+
+```solidity
+error TooLowRSI(uint256 newRSI, uint256 minRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| minRSI | uint256 | undefined |
+
 

docs/RewardPool/modules/Vesting.md

@@ -875,3 +875,40 @@ event RoleRevoked(bytes32 indexed role, address indexed account, address indexed
 
 
 
+## Errors
+
+### TooHighRSI
+
+```solidity
+error TooHighRSI(uint256 newRSI, uint256 maxRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| maxRSI | uint256 | undefined |
+
+### TooLowRSI
+
+```solidity
+error TooLowRSI(uint256 newRSI, uint256 minRSI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newRSI | uint256 | undefined |
+| minRSI | uint256 | undefined |
+
+