Skip to content

fix: reward manager fund migration bug #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaspitz merged 3 commits into from
Jun 5, 2025
Merged

fix: reward manager fund migration bug #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00d782a
fix: reward manager
shaspitz Jun 3, 2025
de24e79
match interface
shaspitz Jun 3, 2025
af408f7
fix test
shaspitz Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions contracts/contracts/interfaces/IRewardManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ interface IRewardManager {
function overrideReceiver(address overrideAddress, bool migrateExistingRewards) external;

/// @dev Removes the override address for a receiver.
/// @param migrateExistingRewards If true, existing rewards for the overridden address will be migrated atomically to the msg.sender.
function removeOverrideAddress(bool migrateExistingRewards) external;
function removeOverrideAddress() external;

/// @dev Allows a reward recipient to claim their rewards.
function claimRewards() external;
Expand Down
6 changes: 2 additions & 4 deletions contracts/contracts/validator-registry/rewards/RewardManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,9 @@ contract RewardManager is IRewardManager, RewardManagerStorage,
}

/// @dev Removes the override address for a receiver.
/// @param migrateExistingRewards If true, existing rewards for the overridden address will be migrated atomically to the msg.sender.
function removeOverrideAddress(bool migrateExistingRewards) external whenNotPaused nonReentrant {
function removeOverrideAddress() external whenNotPaused nonReentrant {
address toBeRemoved = overrideAddresses[msg.sender];
require(toBeRemoved != address(0), NoOverriddenAddressToRemove());
if (migrateExistingRewards) { _migrateRewards(toBeRemoved, msg.sender); }
overrideAddresses[msg.sender] = address(0);
emit OverrideAddressRemoved(msg.sender);
}
Expand Down Expand Up @@ -190,7 +188,7 @@ contract RewardManager is IRewardManager, RewardManagerStorage,
emit RewardsClaimed(msg.sender, amount);
}

/// @dev DANGER: This function should ONLY be called from overrideClaimAddress or removeOverriddenClaimAddress
/// @dev DANGER: This function should ONLY be called from overrideReceiver
/// with careful attention to parameter order.
function _migrateRewards(address from, address to) internal {
uint256 amount = unclaimedRewards[from];
Expand Down
19 changes: 10 additions & 9 deletions contracts/test/validator-registry/rewards/RewardManagerTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ contract RewardManagerTest is Test {

vm.prank(user1);
vm.expectRevert(PausableUpgradeable.EnforcedPause.selector);
rewardManager.removeOverrideAddress(false);
rewardManager.removeOverrideAddress();

vm.prank(user1);
vm.expectRevert(PausableUpgradeable.EnforcedPause.selector);
Expand Down Expand Up @@ -335,7 +335,7 @@ contract RewardManagerTest is Test {
vm.prank(operatorFromMiddlewareTest);
vm.expectEmit();
emit OverrideAddressRemoved(operatorFromMiddlewareTest);
rewardManager.removeOverrideAddress(false);
rewardManager.removeOverrideAddress();

vm.deal(user3, 4 ether);
vm.expectEmit();
Expand Down Expand Up @@ -394,17 +394,18 @@ contract RewardManagerTest is Test {
vm.expectEmit();
emit OverrideAddressRemoved(vanillaTestUser);
vm.prank(vanillaTestUser);
rewardManager.removeOverrideAddress(true);
rewardManager.removeOverrideAddress();

assertEq(rewardManager.unclaimedRewards(user4), 0 ether);
assertEq(rewardManager.unclaimedRewards(vanillaTestUser), 9 ether);
assertEq(rewardManager.unclaimedRewards(user4), 9 ether);
assertEq(rewardManager.unclaimedRewards(vanillaTestUser), 0 ether);

uint256 balanceBefore = vanillaTestUser.balance;
vm.prank(vanillaTestUser);
// Rewards must be claimed manually from the override address, even if that override address is removed
uint256 balanceBefore = user4.balance;
vm.prank(user4);
vm.expectEmit();
emit RewardsClaimed(vanillaTestUser, 9 ether);
emit RewardsClaimed(user4, 9 ether);
rewardManager.claimRewards();
assertEq(vanillaTestUser.balance, balanceBefore + 9 ether);
assertEq(user4.balance, balanceBefore + 9 ether);
}

function testAutoClaim() public {
Expand Down
Loading