Merge pull request #29 from lidofinance/set-reward-address

CS-79 feat: set reward address
lidofinance · Oct 27, 2023 · 8049c0d · 8049c0d
2 parents d2e0c25 + 0a9619f
commit 8049c0d
Show file tree

Hide file tree

Showing 10 changed files with 465 additions and 304 deletions.
diff --git a/src/CSAccounting.sol b/src/CSAccounting.sol
@@ -486,8 +486,11 @@ contract CSAccounting is CSAccountingBase, AccessControlEnumerable {
         uint256 cumulativeFeeShares,
         uint256 stETHAmount
     ) external {
-        address rewardAddress = _getNodeOperatorRewardAddress(nodeOperatorId);
-        _isSenderEligableToClaim(rewardAddress);
+        (
+            address managerAddress,
+            address rewardAddress
+        ) = _getNodeOperatorAddresses(nodeOperatorId);
+        _isSenderEligibleToClaim(managerAddress);
         uint256 claimableShares = _pullFeeRewards(
             rewardsProof,
             nodeOperatorId,
@@ -521,8 +524,11 @@ contract CSAccounting is CSAccountingBase, AccessControlEnumerable {
         uint256 cumulativeFeeShares,
         uint256 wstETHAmount
     ) external {
-        address rewardAddress = _getNodeOperatorRewardAddress(nodeOperatorId);
-        _isSenderEligableToClaim(rewardAddress);
+        (
+            address managerAddress,
+            address rewardAddress
+        ) = _getNodeOperatorAddresses(nodeOperatorId);
+        _isSenderEligibleToClaim(managerAddress);
         uint256 claimableShares = _pullFeeRewards(
             rewardsProof,
             nodeOperatorId,
@@ -572,33 +578,24 @@ contract CSAccounting is CSAccountingBase, AccessControlEnumerable {
     function _getNodeOperatorActiveKeys(
         uint256 nodeOperatorId
     ) internal view returns (uint256) {
-        (
-            ,
-            ,
-            ,
-            ,
-            ,
-            uint256 totalWithdrawnValidators,
-            uint256 totalAddedValidators,
-
-        ) = CSM.getNodeOperator({
-                _nodeOperatorId: nodeOperatorId,
-                _fullInfo: false
-            });
-        return totalAddedValidators - totalWithdrawnValidators;
-    }
-
-    function _getNodeOperatorRewardAddress(
+        ICSModule.NodeOperatorInfo memory nodeOperator = CSM.getNodeOperator(
+            nodeOperatorId
+        );
+        return
+            nodeOperator.totalAddedValidators -
+            nodeOperator.totalWithdrawnValidators;
+    }
+
+    function _getNodeOperatorAddresses(
         uint256 nodeOperatorId
-    ) internal view returns (address) {
-        (, , address rewardAddress, , , , , ) = CSM.getNodeOperator({
-            _nodeOperatorId: nodeOperatorId,
-            _fullInfo: false
-        });
-        return rewardAddress;
+    ) internal view returns (address, address) {
+        ICSModule.NodeOperatorInfo memory nodeOperator = CSM.getNodeOperator(
+            nodeOperatorId
+        );
+        return (nodeOperator.managerAddress, nodeOperator.rewardAddress);
     }
 
-    function _isSenderEligableToClaim(address rewardAddress) internal view {
+    function _isSenderEligibleToClaim(address rewardAddress) internal view {
         if (msg.sender != rewardAddress) {
             revert NotOwnerToClaim(msg.sender, rewardAddress);
         }