finish contracts restructuring

contracts/HydraStakingV2/modules/APRCalculatorConnector.sol → contracts/APRCalculator/APRCalculatorConnector.sol

@@ -3,9 +3,8 @@ pragma solidity 0.8.17;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
-import {IAPRCalculator} from "./../../APRCalculator/IAPRCalculator.sol";
-
-import {Unauthorized} from "./../../common/Errors.sol";
+import {Unauthorized} from "./../common/Errors.sol";
+import {IAPRCalculator} from "./IAPRCalculator.sol";
 
 abstract contract APRCalculatorConnector is Initializable {
     IAPRCalculator public aprCalculatorContract;

contracts/HydraChain/HydraChain.sol

@@ -35,11 +35,10 @@ contract HydraChain is IHydraChain, ValidatorManager, Inspector, PowerExponent {
     function initialize(
         ValidatorInit[] calldata newValidators,
         address governance,
-        IBLS newBls,
-        uint256 initialCommission
+        IBLS newBls
     ) external initializer onlySystemCall {
         __PowerExponent_init();
-        __ValidatorManager_init(newValidators, newBls, governance, initialCommission);
+        __ValidatorManager_init(newValidators, newBls, governance);
         __Inspector_init();
 
         _initialize();

contracts/HydraStakingV2/modules/EpochManagerConnector.sol → contracts/HydraChain/modules/EpochManager/EpochManagerConnector.sol

@@ -3,9 +3,8 @@ pragma solidity 0.8.17;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
-import {IEpochManager} from "./../../HydraChain/modules/EpochManager/IEpochManager.sol";
-
-import {Unauthorized} from "./../../common/Errors.sol";
+import {Unauthorized} from "./../../../common/Errors.sol";
+import {IEpochManager} from "./IEpochManager.sol";
 
 abstract contract EpochManagerConnector is Initializable {
     IEpochManager public epochManagerContract;

contracts/HydraChain/modules/ValidatorManager/ValidatorManager.sol

@@ -51,17 +51,15 @@ abstract contract ValidatorManager is IValidatorManager, System, AccessControl,
     function __ValidatorManager_init(
         ValidatorInit[] calldata newValidators,
         IBLS newBls,
-        address governance,
-        uint256 initialCommission
+        address governance
     ) internal onlyInitializing {
         __AccessControl_init(governance);
-        __ValidatorManager_init_unchained(newValidators, newBls, initialCommission);
+        __ValidatorManager_init_unchained(newValidators, newBls);
     }
 
     function __ValidatorManager_init_unchained(
         ValidatorInit[] calldata newValidators,
-        IBLS newBls,
-        uint256 initialCommission
+        IBLS newBls
     ) internal onlyInitializing {
         bls = newBls;
         // set initial validators

contracts/HydraStakingV2/modules/DelegatedStaking/Delegation.sol → contracts/HydraDelegation/Delegation.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {Governed} from "./../../../common/Governed/Governed.sol";
-import {Withdrawal} from "./../Withdrawal/Withdrawal.sol";
-import {APRCalculatorConnector} from "./../APRCalculatorConnector.sol";
+import {Governed} from "./../common/Governed/Governed.sol";
+import {Withdrawal} from "./../common/Withdrawal/Withdrawal.sol";
+import {APRCalculatorConnector} from "./../APRCalculator/APRCalculatorConnector.sol";
 import {DelegationPoolLib} from "./DelegationPoolLib.sol";
 import {IDelegation, DelegationPool} from "./IDelegation.sol";
 
@@ -13,13 +13,14 @@ contract Delegation is IDelegation, Governed, Withdrawal, APRCalculatorConnector
     /// @notice A constant for the minimum delegation limit
     uint256 public constant MIN_DELEGATION_LIMIT = 1 ether;
 
-    uint256 public totalDelegation;
     /// @notice Keeps the delegation pools
     mapping(address => DelegationPool) public delegationPools;
     // @note maybe this must be part of the ValidatorSet
     /// @notice The minimum delegation amount to be delegated
     uint256 public minDelegation;
 
+    uint256 internal _totalDelegation;
+
     function delegationOf(address staker, address delegator) public view returns (uint256) {
         return delegationPools[staker].balanceOf(delegator);
     }
@@ -28,6 +29,10 @@ contract Delegation is IDelegation, Governed, Withdrawal, APRCalculatorConnector
         return delegationPools[staker].supply;
     }
 
+    function totalDelegation() external view returns (uint256) {
+        return _totalDelegation;
+    }
+
     /**
      * @inheritdoc IDelegation
      */
@@ -65,7 +70,7 @@ contract Delegation is IDelegation, Governed, Withdrawal, APRCalculatorConnector
             revert DelegateRequirement({src: "delegate", msg: "DELEGATION_TOO_LOW"});
 
         delegation.deposit(delegator, amount);
-        totalDelegation += amount;
+        _totalDelegation += amount;
 
         emit Delegated(staker, delegator, amount);
     }
@@ -84,7 +89,7 @@ contract Delegation is IDelegation, Governed, Withdrawal, APRCalculatorConnector
             revert DelegateRequirement({src: "undelegate", msg: "DELEGATION_TOO_LOW"});
 
         delegation.withdraw(delegator, amount);
-        totalDelegation -= amount;
+        _totalDelegation -= amount;
 
         emit Undelegated(validator, delegator, amount);
     }
@@ -100,7 +105,7 @@ contract Delegation is IDelegation, Governed, Withdrawal, APRCalculatorConnector
         _withdraw(delegator, reward);
     }
 
-    function _distributeDelegatorReward(address staker, uint256 reward) internal {
+    function _distributeDelegationRewards(address staker, uint256 reward) internal virtual {
         delegationPools[staker].distributeReward(reward);
         emit DelegatorRewardDistributed(staker, reward);
     }

contracts/HydraStakingV2/modules/DelegatedStaking/DelegationPoolLib.sol → contracts/HydraDelegation/DelegationPoolLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "./../../../common/libs/SafeMathInt.sol";
+import "./../common/libs/SafeMathInt.sol";
 import {DelegationPool} from "./IDelegation.sol";
 
 error NoTokensDelegated(address validator);

contracts/HydraDelegation/HydraDelegation.sol

@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import {Delegation} from "./Delegation.sol";
+import {LiquidDelegation} from "./modules/LiquidDelegation/LiquidDelegation.sol";
+import {VestedDelegation} from "./modules/VestedDelegation/VestedDelegation.sol";
+import {APRCalculatorConnector} from "./../APRCalculator/APRCalculatorConnector.sol";
+import {IHydraDelegation} from "./IHydraDelegation.sol";
+import {StakerInit} from "./../HydraStaking/IHydraStaking.sol";
+import {HydraStakingConnector} from "./../HydraStakingV2/HydraStakingConnector.sol";
+
+contract HydraDelegation is
+    IHydraDelegation,
+    APRCalculatorConnector,
+    HydraStakingConnector,
+    Delegation,
+    LiquidDelegation,
+    VestedDelegation
+{
+    /// @notice A constant for the maximum comission a validator can receive from the delegator's rewards
+    uint256 public constant MAX_COMMISSION = 100;
+
+    mapping(address => uint256) public delegationCommissionPerStaker;
+
+    // _______________ Initializer _______________
+
+    // TODO: Move commision to Delegation module
+    function __DelegatedStaking_init(
+        StakerInit[] calldata initialStakers,
+        uint256 initialCommission
+    ) internal onlyInitializing {
+        __DelegatedStaking_init_unchained(initialStakers, initialCommission);
+    }
+
+    function __DelegatedStaking_init_unchained(
+        StakerInit[] calldata initialStakers,
+        uint256 initialCommission
+    ) internal onlyInitializing {
+        for (uint256 i = 0; i < initialStakers.length; i++) {
+            _setCommission(initialStakers[i].addr, initialCommission);
+        }
+    }
+
+    function stakerDelegationCommission(address staker) external view returns (uint256) {
+        return delegationCommissionPerStaker[staker];
+    }
+
+    function distributeDelegationRewards(address staker, uint256 reward, uint256 epochId) external onlyHydraStaking {
+        _distributeDelegationRewards(staker, reward, epochId);
+    }
+
+    /**
+     * @inheritdoc IHydraDelegation
+     */
+    function setCommission(uint256 newCommission) external {
+        _setCommission(msg.sender, newCommission);
+    }
+
+    function _delegate(
+        address staker,
+        address delegator,
+        uint256 amount
+    ) internal virtual override(Delegation, LiquidDelegation, VestedDelegation) {
+        super._delegate(staker, delegator, amount);
+    }
+
+    function _undelegate(
+        address validator,
+        address delegator,
+        uint256 amount
+    ) internal virtual override(Delegation, LiquidDelegation, VestedDelegation) {
+        super._undelegate(validator, delegator, amount);
+    }
+
+    function _setCommission(address staker, uint256 newCommission) private {
+        if (newCommission > MAX_COMMISSION) revert InvalidCommission(newCommission);
+
+        delegationCommissionPerStaker[staker] = newCommission;
+
+        emit CommissionUpdated(staker, newCommission);
+    }
+}

contracts/HydraStakingV2/modules/DelegatedStaking/IDelegation.sol → contracts/HydraDelegation/IDelegation.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {IWithdrawal} from "./../Withdrawal/IWithdrawal.sol";
+import {IWithdrawal} from "./../common/Withdrawal/IWithdrawal.sol";
 
 struct DelegationPool {
     uint256 supply;
@@ -21,6 +21,10 @@ interface IDelegation is IWithdrawal {
 
     error DelegateRequirement(string src, string msg);
 
+    function totalDelegation() external view returns (uint256);
+
+    function totalDelegationOf(address staker) external view returns (uint256);
+
     /**
      * @notice Gets delegator's unclaimed rewards index (without custom APR params applied)
      * @param validator Address of validator

contracts/HydraDelegation/IHydraDelegation.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import {ILiquid} from "./../common/Liquid/ILiquid.sol";
+import {IDelegation} from "./IDelegation.sol";
+import {IVestedDelegation} from "./modules/VestedDelegation/IVestedDelegation.sol";
+
+interface IHydraDelegation is IDelegation, IVestedDelegation, ILiquid {
+    event CommissionUpdated(address indexed validator, uint256 newCommission);
+
+    error InvalidCommission(uint256 commission);
+
+    function stakerDelegationCommission(address staker) external view returns (uint256);
+
+    /**
+     * @notice Sets commission for validator.
+     * @param newCommission New commission (100 = 100%)
+     */
+    function setCommission(uint256 newCommission) external;
+
+    function distributeDelegationRewards(address staker, uint256 reward, uint256 epochId) external;
+}

contracts/HydraStakingV2/modules/DelegatedStaking/modules/VestedDelegation/VestedDelegation.sol → contracts/HydraDelegation/modules/VestedDelegation/VestedDelegation.sol

@@ -2,16 +2,16 @@
 pragma solidity 0.8.17;
 
 import {Delegation} from "./../../Delegation.sol";
-import {APRCalculatorConnector} from "./../../../APRCalculatorConnector.sol";
-import {EpochManagerConnector} from "./../../../EpochManagerConnector.sol";
+import {Governed} from "./../../../common/Governed/Governed.sol";
+import {Withdrawal} from "./../../../common/Withdrawal/Withdrawal.sol";
+import {APRCalculatorConnector} from "./../../../APRCalculator/APRCalculatorConnector.sol";
+import {EpochManagerConnector} from "./../../../HydraChain/modules/EpochManager/EpochManagerConnector.sol";
 import {VestingManagerFactory} from "./../VestingManagerFactory/VestingManagerFactory.sol";
+import {DelegationPoolLib} from "./../../DelegationPoolLib.sol";
+import {VestedPositionLib} from "./../../../common/Vesting/VestedPositionLib.sol";
 import {DelegationPool} from "./../../IDelegation.sol";
+import {VestingPosition} from "./../../../common/Vesting/IVesting.sol";
 import {IVestedDelegation, DelegationPoolParams, RPS} from "./IVestedDelegation.sol";
-import {VestingPosition} from "./../../../VestedStaking/IVesting.sol";
-import {Withdrawal} from "./../../../../modules/Withdrawal/Withdrawal.sol";
-import {Governed} from "./../../../../../common/Governed/Governed.sol";
-import {VestedPositionLib} from "./../../../VestedStaking/VestedPositionLib.sol";
-import {DelegationPoolLib} from "./../../DelegationPoolLib.sol";
 
 contract VestedDelegation is
     IVestedDelegation,
@@ -290,6 +290,15 @@ contract VestedDelegation is
         super._undelegate(staker, delegator, amount);
     }
 
+    function _distributeDelegationRewards(address staker, uint256 reward, uint256 epochId) internal virtual {
+        _distributeDelegationRewards(staker, reward);
+
+        // Keep history record of the rewardPerShare to be used on reward claim
+        if (reward > 0) {
+            _saveEpochRPS(staker, delegationPools[staker].magnifiedRewardPerShare, epochId);
+        }
+    }
+
     /**
      * @inheritdoc IVestedDelegation
      */

contracts/HydraStakingV2/modules/DelegatedStaking/modules/VestingManagerFactory/VestingManagerFactory.sol → contracts/HydraDelegation/modules/VestingManagerFactory/VestingManagerFactory.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.17;
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/Clones.sol";
 
-import {VestingManager} from "./../../../../../VestingManager/VestingManager.sol";
+import {VestingManager} from "./../../../VestingManager/VestingManager.sol";
 
 // TODO: use different proxy design pattern, so implementation for all proxies can be changed at once
 abstract contract VestingManagerFactory is Initializable {

contracts/HydraStakingV2/HydraStaking.sol

@@ -13,9 +13,9 @@ import {PenalizeableStaking} from "./modules/PenalizeableStaking/PenalizeableSta
 import {IHydraStaking, StakerInit} from "./IHydraStaking.sol";
 import {PenalizedStakeDistribution} from "./modules/PenalizeableStaking/IPenalizeableStaking.sol";
 import {Uptime} from "./../HydraChain/modules/ValidatorManager/IValidatorManager.sol";
-import {EpochManagerConnector} from "./modules/EpochManagerConnector.sol";
+import {EpochManagerConnector} from "./../HydraChain/modules/EpochManager/EpochManagerConnector.sol";
 import {Governed} from "./../common/Governed/Governed.sol";
-import {DelegationPool} from "./modules/DelegatedStaking/IDelegation.sol";
+import {DelegationPool} from "./../HydraDelegation/IDelegation.sol";
 
 // TODO: An optimization we can do is keeping only once the general apr params for a block so we don' have to keep them for every single user
 
@@ -88,11 +88,11 @@ contract HydraStaking is
     // _______________ Public functions _______________
 
     function totalBalanceOf(address staker) public view returns (uint256) {
-        return stakeOf(staker) + totalDelegationOf(staker);
+        return stakeOf(staker) + _getStakerDelegatedBalance(staker);
     }
 
     function totalBalance() public view returns (uint256) {
-        return totalStake + totalDelegation;
+        return totalStake + _totalDelegation();
     }
 
     // _______________ Internal functions _______________
@@ -119,13 +119,11 @@ contract HydraStaking is
         }
     }
 
-    function _delegate(address staker, address delegator, uint256 amount) internal virtual override {
-        super._delegate(staker, delegator, amount);
+    function _onDelegate(address staker) internal virtual override {
         _syncState(staker);
     }
 
-    function _undelegate(address staker, address delegator, uint256 amount) internal virtual override {
-        super._undelegate(staker, delegator, amount);
+    function _onUndelegate(address staker) internal virtual override {
         _syncState(staker);
     }
 
@@ -169,10 +167,8 @@ contract HydraStaking is
         require(uptime.signedBlocks <= totalBlocks, "SIGNED_BLOCKS_EXCEEDS_TOTAL");
 
         uint256 totalStake = stakeOf(uptime.validator);
-        uint256 commission = delegationCommissionPerStaker[uptime.validator];
-
-        DelegationPool storage delegationPool = delegationPools[uptime.validator];
-        uint256 delegation = delegationPool.supply;
+        uint256 commission = _getstakerDelegationCommission(uptime.validator);
+        uint256 delegation = _getStakerDelegatedBalance(uptime.validator);
         // slither-disable-next-line divide-before-multiply
         uint256 validatorReward = (fullReward * (totalStake + delegation) * uptime.signedBlocks) /
             (totalSupply * totalBlocks);
@@ -184,12 +180,7 @@ contract HydraStaking is
         );
 
         _distributeStakingReward(uptime.validator, validatorShares);
-        _distributeDelegatorReward(uptime.validator, delegatorShares);
-
-        // Keep history record of the rewardPerShare to be used on reward claim
-        if (delegatorShares > 0) {
-            _saveEpochRPS(uptime.validator, delegationPool.magnifiedRewardPerShare, epochId);
-        }
+        distributeDelegationRewards(uptime.validator, delegatorShares, epochId);
 
         // Keep history record of the validator rewards to be used on maturing vesting reward claim
         if (validatorShares > 0) {