refactor: move operator receiver functionality from BeaconDeposit to BlockRewardController

Author: ZERGUCCI

src/pol/BeaconDeposit.sol

@@ -62,9 +62,6 @@ contract BeaconDeposit is IBeaconDeposit, ERC165 {
     /// @dev The mapping of public keys to operator change requests.
     mapping(bytes => QueuedOperator) public queuedOperator;
 
-    /// @dev The mapping of operators to their receiver addresses.
-    mapping(address => address) public operatorReceivers;
-    
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                            VIEWS                           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -184,21 +181,6 @@ contract BeaconDeposit is IBeaconDeposit, ERC165 {
         emit OperatorUpdated(pubkey, newOperator, oldOperator);
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                        OPERATOR RECEIVERS                  */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /**
-     * @notice Sets or updates the receiver address for an operator's base bgt rewards
-     * @dev Only the operator can set their receiver
-     * @param receiver The address that will receive base bgt rewards. Set to address(0) to receive rewards directly to operator
-     */
-    function setOperatorReceiver(address receiver) external {
-        address oldReceiver = operatorReceivers[msg.sender];
-        operatorReceivers[msg.sender] = receiver;
-        emit OperatorReceiverUpdated(msg.sender, oldReceiver, receiver);
-    }
-
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                            INTERNAL                         */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -234,4 +216,4 @@ contract BeaconDeposit is IBeaconDeposit, ERC165 {
             }
         }
     }
-}
+}

src/pol/interfaces/IBeaconDeposit.sol

@@ -45,22 +45,6 @@ interface IBeaconDeposit is IPOLErrors {
      */
     event OperatorUpdated(bytes indexed pubkey, address newOperator, address previousOperator);
 
-    /// @notice Emitted when an operator sets or changes their receiver address
-    /// @param operator The operator address that changed their receiver
-    /// @param oldReceiver The previous receiver address (zero if first time setting)
-    /// @param newReceiver The new receiver address (zero if clearing receiver)
-    event OperatorReceiverUpdated(address indexed operator, address indexed oldReceiver, address indexed newReceiver);
-
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                            STORAGE                          */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /**
-     * @notice Mapping of operators to their receiver addresses for base rewards
-     * @dev Returns address(0) if no receiver is set
-     */
-    function operatorReceivers(address) external view returns (address);
-
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                            VIEWS                           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -118,11 +102,4 @@ interface IBeaconDeposit is IPOLErrors {
      * @param pubkey The pubkey of the validator.
      */
     function acceptOperatorChange(bytes calldata pubkey) external;
-
-    /**
-     * @notice Sets or updates the receiver address for an operator's base rewards
-     * @dev Only the operator can set their receiver
-     * @param receiver The address that will receive base rewards. Set to address(0) to receive rewards directly
-     */
-    function setOperatorReceiver(address receiver) external;
-}
+}

src/pol/interfaces/IBlockRewardController.sol

@@ -59,6 +59,12 @@ interface IBlockRewardController is IPOLErrors {
     /// @param amount The amount of base BGT minted
     event BaseMinted(address indexed operator, address indexed receiver, uint256 indexed amount);
 
+    /// @notice Emitted when an operator sets or changes their receiver address
+    /// @param operator The operator address that changed their receiver
+    /// @param oldReceiver The previous receiver address (zero if first time setting)
+    /// @param newReceiver The new receiver address (zero if clearing receiver)
+    event OperatorReceiverUpdated(address indexed operator, address indexed oldReceiver, address indexed newReceiver);
+
     /// @notice Returns the constant base rate for BGT.
     /// @return The constant base amount of BGT to be minted in the current block.
     function baseRate() external view returns (uint256);
@@ -158,4 +164,11 @@ interface IBlockRewardController is IPOLErrors {
      * @param _distributor The new distributor contract.
      */
     function setDistributor(address _distributor) external;
+
+    /**
+     * @notice Sets or updates the receiver address for an operator's base BGT rewards
+     * @dev Only the operator can set their receiver
+     * @param receiver The address that will receive base BGT rewards. Set to address(0) to receive rewards directly
+     */
+    function setOperatorReceiver(address receiver) external;
 }

src/pol/rewards/BlockRewardController.sol

@@ -63,6 +63,9 @@ contract BlockRewardController is IBlockRewardController, OwnableUpgradeable, UU
     /// @notice The reward convexity param in the function, determines how fast it converges to its max, 18 dec.
     int256 public rewardConvexity;
 
+    /// @notice The mapping of operators to their receiver addresses for base rewards
+    mapping(address => address) public operatorReceivers;
+
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
@@ -237,7 +240,7 @@ contract BlockRewardController is IBlockRewardController, OwnableUpgradeable, UU
         address operator = beaconDepositContract.getOperator(pubkey);
 
         // Check if the operator has set a receiver for their base rewards
-        address receiver = beaconDepositContract.operatorReceivers(operator);
+        address receiver = operatorReceivers[operator];
         // If no receiver is set (address(0)), mint to operator directly
         if (base > 0) {
             address mintTo = receiver == address(0) ? operator : receiver;
@@ -250,4 +253,19 @@ contract BlockRewardController is IBlockRewardController, OwnableUpgradeable, UU
 
         return reward;
     }
+
+    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+    /*                       OPERATOR RECEIVERS                   */
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+    /**
+     * @notice Sets or updates the receiver address for an operator's base BGT rewards
+     * @dev Only the operator can set their receiver
+     * @param receiver The address that will receive base BGT rewards. Set to address(0) to receive rewards directly
+     */
+    function setOperatorReceiver(address receiver) external {
+        address oldReceiver = operatorReceivers[msg.sender];
+        operatorReceivers[msg.sender] = receiver;
+        emit OperatorReceiverUpdated(msg.sender, oldReceiver, receiver);
+    }
 }

test/mock/pol/BeaconDepositMock.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.26;
 
 contract BeaconDepositMock {
     mapping(bytes => address) public pubkeyToOperator;
-    mapping(address => address) public operatorReceivers;
 
     function setOperator(bytes memory pubkey, address operator) public {
         pubkeyToOperator[pubkey] = operator;
@@ -12,8 +11,4 @@ contract BeaconDepositMock {
     function getOperator(bytes memory pubkey) public view returns (address) {
         return pubkeyToOperator[pubkey];
     }
-
-    function setOperatorReceiver(address receiver) external {
-        operatorReceivers[msg.sender] = receiver;
-    }
-}
+}

test/mock/pol/NoopBlockRewardController.sol

@@ -62,4 +62,7 @@ contract NoopBlockRewardController is IBlockRewardController {
 
     /// @inheritdoc IBlockRewardController
     function setDistributor(address _distributor) external { }
+
+    /// @inheritdoc IBlockRewardController
+    function setOperatorReceiver(address _receiver) external { }
 }

test/pol/BeaconDeposit.t.sol

@@ -224,87 +224,6 @@ contract BeaconDepositTest is Test {
         depositContract.acceptOperatorChange(VALIDATOR_PUBKEY);
     }
 
-    function test_SetOperatorReceiver() public {
-        test_Deposit();
-        address receiver = makeAddr("receiver");
-        
-        vm.prank(operator);
-        vm.expectEmit(true, true, true, true);
-        emit IBeaconDeposit.OperatorReceiverUpdated(operator, address(0), receiver);
-        depositContract.setOperatorReceiver(receiver);
-        
-        // Verify receiver is set correctly
-        assertEq(depositContract.operatorReceivers(operator), receiver);
-    }
-
-    function test_SetOperatorReceiver_Update() public {
-        test_Deposit();
-        address receiver1 = makeAddr("receiver1");
-        address receiver2 = makeAddr("receiver2");
-        
-        // Set initial receiver
-        vm.prank(operator);
-        depositContract.setOperatorReceiver(receiver1);
-        
-        // Update to new receiver
-        vm.prank(operator);
-        vm.expectEmit(true, true, true, true);
-        emit IBeaconDeposit.OperatorReceiverUpdated(operator, receiver1, receiver2);
-        depositContract.setOperatorReceiver(receiver2);
-        
-        assertEq(depositContract.operatorReceivers(operator), receiver2);
-    }
-
-    function test_SetOperatorReceiver_Clear() public {
-        test_Deposit();
-        address receiver = makeAddr("receiver");
-        
-        // Set receiver
-        vm.prank(operator);
-        depositContract.setOperatorReceiver(receiver);
-        
-        // Verify receiver is set correctly
-        assertEq(depositContract.operatorReceivers(operator), receiver);
-        
-        // Clear receiver by setting to address(0)
-        vm.prank(operator);
-        vm.expectEmit(true, true, true, true);
-        emit IBeaconDeposit.OperatorReceiverUpdated(operator, receiver, address(0));
-        depositContract.setOperatorReceiver(address(0));
-        
-        // Verify receiver is cleared
-        assertEq(depositContract.operatorReceivers(operator), address(0));
-    }
-
-    function test_GetOperatorReceiver_NonExistent() public {
-        address nonExistentOperator = makeAddr("nonExistentOperator");
-        
-        // Should return address(0) for non-existent operator
-        assertEq(depositContract.operatorReceivers(nonExistentOperator), address(0));
-    }
-
-    function test_SetOperatorReceiver_MultipleOperators() public {
-        test_Deposit();
-        
-        // Setup second operator and validator using a different pubkey
-        bytes memory pubkey2 = abi.encodePacked(bytes32("33"), bytes16("17")); // Different value from _create48Byte()
-        address operator2 = makeAddr("operator2");
-        vm.deal(operator2, 10_000 ether);
-        
-        vm.prank(operator2);
-        depositContract.deposit{ value: 10_000 ether }(pubkey2, _credential(operator2), _create96Byte(), operator2);
-        
-        // Set different receivers for first operator but not second operator
-        address receiver1 = makeAddr("receiver1");
-        
-        vm.prank(operator);
-        depositContract.setOperatorReceiver(receiver1);
-        
-        // Verify receivers are set correctly
-        assertEq(depositContract.operatorReceivers(operator), receiver1);
-        assertEq(depositContract.operatorReceivers(operator2), address(0));
-    }
-
     function testFuzz_AcceptOperatorChange_FailsIfNotEnoughTime(uint256 timeElapsed) public {
         timeElapsed = _bound(timeElapsed, 0, 1 days - 1);
         testFuzz_RequestOperatorChange(newOperator);
@@ -343,4 +262,4 @@ contract BeaconDepositTest is Test {
     function _create48Byte() internal pure returns (bytes memory) {
         return abi.encodePacked(bytes32("32"), bytes16("16"));
     }
-}
+}

test/pol/BlockRewardController.t.sol

@@ -266,10 +266,10 @@ contract BlockRewardControllerTest is POLTest {
         address receiver = makeAddr("receiver");
         // Set receiver for operator
         vm.prank(operator);
-        BeaconDepositMock(beaconDepositContract).setOperatorReceiver(receiver);
+        blockRewardController.setOperatorReceiver(receiver);
 
         // Verify receiver is set correctly
-        assertEq(BeaconDepositMock(beaconDepositContract).operatorReceivers(operator), receiver);
+        assertEq(blockRewardController.operatorReceivers(operator), receiver);
 
         // Process rewards - should mint base rewards to receiver instead of operator
         vm.prank(address(distributor));
@@ -289,14 +289,14 @@ contract BlockRewardControllerTest is POLTest {
         address receiver = makeAddr("receiver");
         // First set a receiver
         vm.prank(operator);
-        BeaconDepositMock(beaconDepositContract).setOperatorReceiver(receiver);
+        blockRewardController.setOperatorReceiver(receiver);
 
         // Then clear it by setting to address(0)
         vm.prank(operator);
-        BeaconDepositMock(beaconDepositContract).setOperatorReceiver(address(0));
+        blockRewardController.setOperatorReceiver(address(0));
 
         // Verify receiver is cleared
-        assertEq(BeaconDepositMock(beaconDepositContract).operatorReceivers(operator), address(0));
+        assertEq(blockRewardController.operatorReceivers(operator), address(0));
 
         // Process rewards - should mint base rewards to operator since receiver is cleared
         vm.prank(address(distributor));
@@ -314,7 +314,7 @@ contract BlockRewardControllerTest is POLTest {
         test_SetBaseRate();
 
         // Verify no receiver is set
-        assertEq(BeaconDepositMock(beaconDepositContract).operatorReceivers(operator), address(0));
+        assertEq(blockRewardController.operatorReceivers(operator), address(0));
 
         // Process rewards - should mint base rewards to operator since no receiver set
         vm.prank(address(distributor));
@@ -331,15 +331,15 @@ contract BlockRewardControllerTest is POLTest {
         test_SetDistributor();
         test_SetBaseRate();
 
-        // Setup second operator and validator
+        // Setup second operator with mock BeaconDeposit
         address operator2 = makeAddr("operator2");
         bytes memory pubkey2 = bytes("validator2");
         BeaconDepositMock(beaconDepositContract).setOperator(pubkey2, operator2);
 
-        // Setup receivers
+        // Setup receivers in BlockRewardController
         address receiver1 = makeAddr("receiver1");
         vm.prank(operator);
-        BeaconDepositMock(beaconDepositContract).setOperatorReceiver(receiver1);
+        blockRewardController.setOperatorReceiver(receiver1);
 
         // Don't set receiver for operator2
 
@@ -348,7 +348,7 @@ contract BlockRewardControllerTest is POLTest {
         vm.expectCall(address(bgt), abi.encodeCall(IBGT.mint, (receiver1, 1.0 ether)));
         blockRewardController.processRewards(valData.pubkey, DISTRIBUTE_FOR_TIMESTAMP, true);
 
-        // Process rewards for second operator - should go to operator2
+        // Process rewards for second operator - should go to operator2 directly
         vm.prank(address(distributor));
         vm.expectCall(address(bgt), abi.encodeCall(IBGT.mint, (operator2, 1.0 ether)));
         blockRewardController.processRewards(pubkey2, DISTRIBUTE_FOR_TIMESTAMP, true);