Skip to content
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

Prorated rewards v2 #631

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Prorated rewards v2 #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4de2415
basic test passing
cam-schultz Oct 15, 2024
2af7729
revert if no reward claimable
cam-schultz Oct 15, 2024
1717d36
claimValidatorRewards remaining unit tests
cam-schultz Oct 15, 2024
8220a73
correct uptime period calculation
cam-schultz Oct 16, 2024
2025630
move uptime threshold check to PoSValidatorManager
cam-schultz Oct 16, 2024
32f05d9
remove unused reward sparams
cam-schultz Oct 16, 2024
b61b8b2
add testing helpers
cam-schultz Oct 16, 2024
776c72d
reorder methods
cam-schultz Oct 16, 2024
dd390a9
consistent messageIndex placement
cam-schultz Oct 16, 2024
5a608bc
update abi
cam-schultz Oct 16, 2024
ec8b480
store uptime since validation start
cam-schultz Oct 16, 2024
c209726
Merge branch 'validator-manager' into prorated-rewards
cam-schultz Oct 16, 2024
503da7d
format
cam-schultz Oct 16, 2024
d21de01
correct arg order
cam-schultz Oct 24, 2024
fac829a
calculate owed rewards by subtracting claimed rewards
cam-schultz Oct 29, 2024
ee8ac29
Merge branch 'main' into prorated-rewards
cam-schultz Oct 29, 2024
27bf88f
Merge branch 'prorated-rewards' into prorated-rewards-v2
cam-schultz Oct 29, 2024
5d82650
update bindings
cam-schultz Oct 29, 2024
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
257 changes: 231 additions & 26 deletions abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 11 additions & 42 deletions abi-bindings/go/validator-manager/ExampleRewardCalculator/ExampleRewardCalculator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

257 changes: 231 additions & 26 deletions abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 2 additions & 13 deletions contracts/validator-manager/ExampleRewardCalculator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import {IRewardCalculator} from "./interfaces/IRewardCalculator.sol";
contract ExampleRewardCalculator is IRewardCalculator {
uint256 public constant SECONDS_IN_YEAR = 31536000;

uint8 public constant UPTIME_REWARDS_THRESHOLD_PERCENTAGE = 80;

uint16 public constant BIPS_CONVERSION_FACTOR = 10000;

uint64 public immutable rewardBasisPoints;
Expand All @@ -26,20 +24,11 @@ contract ExampleRewardCalculator is IRewardCalculator {
*/
function calculateReward(
uint256 stakeAmount,
uint64 validatorStartTime,
uint64, // validatorStartTime
uint64 stakingStartTime,
uint64 stakingEndTime,
uint64 uptimeSeconds
uint64 // uptimeSeconds
) external view returns (uint256) {
// Equivalent to uptimeSeconds/(validator.endedAt - validator.startedAt) < UPTIME_REWARDS_THRESHOLD_PERCENTAGE/100
// Rearranged to prevent integer division truncation.
if (
uptimeSeconds * 100
< (stakingEndTime - validatorStartTime) * UPTIME_REWARDS_THRESHOLD_PERCENTAGE
) {
return 0;
}

Comment on lines -34 to -42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think with the current implementation, it would make more sense to keep all the uptime checks in the calculator. If the calculator returns 0, we don't release any rewards which is totally fine.

return (stakeAmount * rewardBasisPoints * (stakingEndTime - stakingStartTime))
/ SECONDS_IN_YEAR / BIPS_CONVERSION_FACTOR;
}
Expand Down
Loading
Loading