Pull exact #127
Merged
Pull exact #127
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kmbarry1
reviewed
Nov 12, 2024
src/WrappedVault.sol
Outdated
| @@ -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 * (end - start)), rewardsAfterFee, protocolFeeTaken, frontendFeeTaken); | |||
There was a problem hiding this comment.
I think you meant to replace rewardsAfterFee with (rate * (end - start)) rather than rate?
kmbarry1
reviewed
Nov 12, 2024
src/WrappedVault.sol
Outdated
| @@ -244,14 +244,15 @@ contract WrappedVault is Owned, ERC20, IWrappedVault { | |||
|
|
|||
| uint256 remainingRewards = rewardsInterval.rate * (rewardsInterval.end - newStart); | |||
| uint256 rate = (rewardsAfterFee + remainingRewards) / (newEnd - newStart); | |||
There was a problem hiding this comment.
Since you no longer re-use rewardsAfterFee below, you could eliminate its declaration above and inline its computation here:
uint256 rate = (rewardsAdded - frontendFeeTaken - protocolFeeTaken + remainingRewards) / (newEnd - newStart);
kmbarry1
reviewed
Nov 12, 2024
src/WrappedVault.sol
Outdated
| @@ -292,6 +293,7 @@ contract WrappedVault is Owned, ERC20, IWrappedVault { | |||
| uint256 rate = rewardsAfterFee / (end - start); | |||
There was a problem hiding this comment.
Assuming I'm correct about the event argument below, here you can also eliminate `rewardsAfterFee as an intermediate variable:
- uint256 rewardsAfterFee = totalRewards - frontendFeeTaken - protocolFeeTaken;
- uint256 rate = rewardsAfterFee / (end - start);
+ uint256 rate = (totalRewards - frontendFeeTaken - protocolFeeTaken) / (end - start);
0xleastwood
reviewed
Nov 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.