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

Pull exact #127

Merged
merged 5 commits into from
Nov 13, 2024
Merged

Pull exact #127

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69abeb0
Pull exact amont of incentives when setting rewards interval post rou…
corddry Nov 12, 2024
39b2740
Improve accuracy of RewardsSet event
corddry Nov 12, 2024
9ba7bcf
Store RewardsInterval.accumulated at higher precision
corddry Nov 12, 2024
ceca42a
Rename elapsedScaled
corddry Nov 13, 2024
732a6ba
Inline unnecessary variable
corddry Nov 13, 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
22 changes: 12 additions & 10 deletions src/WrappedVault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
uint256 public constant MIN_CAMPAIGN_DURATION = 1 weeks;
/// @dev The minimum lifespan of an extended campaign
uint256 public constant MIN_CAMPAIGN_EXTENSION = 1 weeks;
/// @dev RewardsPerToken.accumulated is scaled up to prevent loss of incentives
uint256 public constant RPT_PRECISION = 1e27;

/// @dev The address of the underlying vault being incentivized
IWrappedVault public immutable VAULT;
Expand Down Expand Up @@ -236,22 +238,22 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
rewardToClaimantToFees[reward][ERC4626I_FACTORY.protocolFeeRecipient()] += protocolFeeTaken;

// Calculate the new rate
uint256 rewardsAfterFee = rewardsAdded - frontendFeeTaken - protocolFeeTaken;

uint32 newStart = block.timestamp > uint256(rewardsInterval.start) ? block.timestamp.toUint32() : rewardsInterval.start;

if ((newEnd - newStart) < MIN_CAMPAIGN_EXTENSION) revert InvalidIntervalDuration();

uint256 remainingRewards = rewardsInterval.rate * (rewardsInterval.end - newStart);
uint256 rate = (rewardsAfterFee + remainingRewards) / (newEnd - newStart);
uint256 rate = (rewardsAdded - frontendFeeTaken - protocolFeeTaken + remainingRewards) / (newEnd - newStart);
rewardsAdded = (rate - rewardsInterval.rate) * (newEnd - newStart) + frontendFeeTaken + protocolFeeTaken;

if (rate < rewardsInterval.rate) revert RateCannotDecrease();

rewardsInterval.start = newStart;
rewardsInterval.end = newEnd.toUint32();
rewardsInterval.rate = rate.toUint96();

emit RewardsSet(reward, newStart, newEnd.toUint32(), rate, (rewardsAfterFee + remainingRewards), protocolFeeTaken, frontendFeeTaken);
emit RewardsSet(reward, newStart, newEnd.toUint32(), rate, (rate * (newEnd - newStart)), protocolFeeTaken, frontendFeeTaken);

pullReward(reward, msg.sender, rewardsAdded);
}
Expand Down Expand Up @@ -288,10 +290,10 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
rewardToClaimantToFees[reward][ERC4626I_FACTORY.protocolFeeRecipient()] += protocolFeeTaken;

// Calculate the rate
uint256 rewardsAfterFee = totalRewards - frontendFeeTaken - protocolFeeTaken;
uint256 rate = rewardsAfterFee / (end - start);
uint256 rate = (totalRewards - frontendFeeTaken - protocolFeeTaken) / (end - start);

if (rate == 0) revert NoZeroRateAllowed();
totalRewards = rate * (end - start) + frontendFeeTaken + protocolFeeTaken;

rewardsInterval.start = start.toUint32();
rewardsInterval.end = end.toUint32();
Expand All @@ -303,7 +305,7 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
// Any unclaimed rewards can still be claimed
rewardsPerToken.lastUpdated = start.toUint32();

emit RewardsSet(reward, block.timestamp.toUint32(), rewardsInterval.end, rate, rewardsAfterFee, protocolFeeTaken, frontendFeeTaken);
emit RewardsSet(reward, block.timestamp.toUint32(), rewardsInterval.end, rate, (rate * (end - start)), protocolFeeTaken, frontendFeeTaken);

pullReward(reward, msg.sender, totalRewards);
}
Expand Down Expand Up @@ -349,17 +351,17 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {

// If there are no stakers we just change the last update time, the rewards for intervals without stakers are not accumulated

uint256 elapsedWAD = elapsed * 1e18;
// The rewards per token are scaled up for precision
uint256 elapsedScaled = elapsed * RPT_PRECISION;
// Calculate and update the new value of the accumulator.
rewardsPerTokenOut.accumulated = (rewardsPerTokenIn.accumulated + (elapsedWAD.mulDivDown(rewardsInterval_.rate, totalSupply))); // The
// rewards per token are scaled up for precision
rewardsPerTokenOut.accumulated = (rewardsPerTokenIn.accumulated + (elapsedScaled.mulDivDown(rewardsInterval_.rate, totalSupply)));

return rewardsPerTokenOut;
}

/// @notice Calculate the rewards accumulated by a stake between two checkpoints.
function _calculateUserRewards(uint256 stake_, uint256 earlierCheckpoint, uint256 latterCheckpoint) internal pure returns (uint256) {
return stake_ * (latterCheckpoint - earlierCheckpoint) / 1e18; // We must scale down the rewards by the precision factor
return stake_ * (latterCheckpoint - earlierCheckpoint) / RPT_PRECISION; // We must scale down the rewards by the precision factor
}

/// @notice Update and return the rewards per token accumulator according to the rate, the time elapsed since the last update, and the current total staked
Expand Down
Loading