Skip to content

fix: release voter epoch rewards CELO to LockedGold #11699

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

Open
pahor167 wants to merge 7 commits into
base: release/core-contracts/17
Choose a base branch
from
+94 −0
Open

fix: release voter epoch rewards CELO to LockedGold #11699

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec380e9
fix: release voter epoch rewards CELO to LockedGold
Mar 23, 2026
2be06ce
Merge branch 'release/core-contracts/16' into pahor/EpochManagerRelease
pahor167 Mar 23, 2026
f3bc3b2
fix: correct version bump to patch (1.1.0.3)
Mar 23, 2026
3f99d13
fix: release only distributed voter rewards to LockedGold
Apr 7, 2026
f5a5cd1
fix: move totalDistributedVoterRewards out of struct to preserve stor…
Apr 7, 2026
5832af3
Merge branch 'release/core-contracts/16' into pahor/EpochManagerRelease
pahor167 Apr 7, 2026
a9b7271
fix: revert version bump to 1.1.0.3 (release diff is against v14 base…
Apr 7, 2026
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
6 changes: 5 additions & 1 deletion packages/protocol/contracts-0.8/common/EpochManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ contract EpochManager is
* @return Patch version of the contract.
*/
function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
return (1, 1, 0, 3);
return (1, 1, 1, 0);
}

/**
Expand Down Expand Up @@ -761,6 +761,10 @@ contract EpochManager is
_setElectedSigners(_newlyElected);

ICeloUnreleasedTreasury celoUnreleasedTreasury = getCeloUnreleasedTreasury();
celoUnreleasedTreasury.release(
registry.getAddressForOrDie(LOCKED_GOLD_REGISTRY_ID),
_epochProcessing.totalRewardsVoter
Comment thread
pahor167 marked this conversation as resolved.
Outdated
);
celoUnreleasedTreasury.release(
registry.getAddressForOrDie(GOVERNANCE_REGISTRY_ID),
_epochProcessing.totalRewardsCommunity
Expand Down
65 changes: 65 additions & 0 deletions packages/protocol/test-sol/unit/common/EpochManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ contract EpochManagerTest is TestWithUtils08 {
address carbonOffsettingPartner;
address communityRewardFund;
address reserveAddress;
address lockedGoldAddress;
address scoreManagerAddress;

uint256 firstEpochNumber = 3;
Expand Down Expand Up @@ -90,6 +91,7 @@ contract EpochManagerTest is TestWithUtils08 {
scoreManagerAddress = actor("scoreManagerAddress");

reserveAddress = actor("reserve");
lockedGoldAddress = actor("lockedGold");

carbonOffsettingPartner = actor("carbonOffsettingPartner");
communityRewardFund = actor("communityRewardFund");
Expand All @@ -108,6 +110,7 @@ contract EpochManagerTest is TestWithUtils08 {
registry.setAddressFor(ScoreManagerContract, address(scoreManager));
registry.setAddressFor(StableTokenContract, address(stableToken));
registry.setAddressFor(ReserveContract, reserveAddress);
registry.setAddressFor(LockedGoldContract, lockedGoldAddress);
registry.setAddressFor(ElectionContract, address(election));

celoUnreleasedTreasury.setRegistry(REGISTRY_ADDRESS);
Expand Down Expand Up @@ -578,6 +581,53 @@ contract EpochManagerTest_finishNextEpochProcess is EpochManagerTest {
assertEq(celoToken.balanceOf(carbonOffsettingPartner), epochRewards.totalRewardsCarbonFund());
}

function test_TransfersVoterRewardsToLockedGold() public {
(
address[] memory groups,
address[] memory lessers,
address[] memory greaters
) = getGroupsWithLessersAndGreaters();

uint256 lockedGoldBalanceBefore = celoToken.balanceOf(lockedGoldAddress);

epochManagerContract.startNextEpochProcess();
epochManagerContract.finishNextEpochProcess(groups, lessers, greaters);

uint256 lockedGoldBalanceAfter = celoToken.balanceOf(lockedGoldAddress);
assertEq(
lockedGoldBalanceAfter - lockedGoldBalanceBefore,
epochRewards.totalRewardsVoter(),
"LockedGold should receive totalRewardsVoter CELO"
Comment thread
pahor167 marked this conversation as resolved.
Outdated
);
}

function test_TransfersAllEpochRewards() public {
Comment thread
pahor167 marked this conversation as resolved.
Outdated
(
address[] memory groups,
address[] memory lessers,
address[] memory greaters
) = getGroupsWithLessersAndGreaters();

epochManagerContract.startNextEpochProcess();
epochManagerContract.finishNextEpochProcess(groups, lessers, greaters);

assertEq(
celoToken.balanceOf(lockedGoldAddress),
epochRewards.totalRewardsVoter(),
"LockedGold should receive voter rewards"
);
assertEq(
celoToken.balanceOf(communityRewardFund),
epochRewards.totalRewardsCommunity(),
"Governance should receive community rewards"
);
assertEq(
celoToken.balanceOf(carbonOffsettingPartner),
epochRewards.totalRewardsCarbonFund(),
"Carbon fund should receive carbon rewards"
);
}

function test_TransfersToValidatorGroup() public {
(
address[] memory groups,
Expand Down Expand Up @@ -743,6 +793,21 @@ contract EpochManagerTest_processGroup is EpochManagerTest {
assertEq(celoToken.balanceOf(carbonOffsettingPartner), epochRewards.totalRewardsCarbonFund());
}

function test_TransfersVoterRewardsToLockedGold() public {
uint256 lockedGoldBalanceBefore = celoToken.balanceOf(lockedGoldAddress);

epochManagerContract.startNextEpochProcess();
epochManagerContract.setToProcessGroups();
epochManagerContract.processGroup(group, address(0), address(0));

uint256 lockedGoldBalanceAfter = celoToken.balanceOf(lockedGoldAddress);
assertEq(
lockedGoldBalanceAfter - lockedGoldBalanceBefore,
epochRewards.totalRewardsVoter(),
"LockedGold should receive totalRewardsVoter CELO via processGroup path"
);
}

Comment thread
pahor167 marked this conversation as resolved.
function test_TransfersToValidatorGroup() public {
epochManagerContract.startNextEpochProcess();
epochManagerContract.setToProcessGroups();
Expand Down
Loading