Remove claimRewards double call #228
Merged
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
Rubilmax
force-pushed
the
fix/claim-rewards-called-twice
branch
from
2304cf4
to
ed732e5
Compare
Morpho-compound-eth-mainnet gas diffs
🧾 Summary (20% most significant diffs)
Full diff report 👇
|
Codecov Report
@@ Coverage Diff @@
## upgrade-0 #228 +/- ##
=============================================
+ Coverage 46.79% 47.22% +0.42%
=============================================
Files 15 15
Lines 359 360 +1
Branches 12 11 -1
=============================================
+ Hits 168 170 +2
Misses 189 189
+ Partials 2 1 -1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
MerlinEgalite
approved these changes
Dec 15, 2022
Morpho-aave-v3-avalanche-mainnet gas diffs
🧾 Summary (20% most significant diffs)
Full diff report 👇
|
…ults into fix/claim-rewards-called-twice
MerlinEgalite
requested changes
Dec 15, 2022
| _accrueUnclaimedRewardsFromRewardsIndex(from, newRewardsIndex); | ||
| _accrueUnclaimedRewardsFromRewardsIndex(to, newRewardsIndex); | ||
|
|
||
| super._beforeTokenTransfer(from, to, amount); | ||
| } | ||
|
|
||
| function _claimRewards() internal returns (uint256 newRewardsIndex) { | ||
| function _claimVaultRewards() internal returns (uint256 newRewardsIndex) { |
There was a problem hiding this comment.
why change the name? IMO it's clear enough
There was a problem hiding this comment.
Because there's the external function claimRewards and it may suggest that this internal function is the implementation to claimRewards
| @@ -469,21 +469,6 @@ contract TestSupplyVault is TestSetupVaults { | |||
| assertApproxEqAbs(uint256(userReward1_1), userReward1_2, 1); | |||
| } | |||
|
|
|||
| // TODO: fix this test by using updated indexes in previewMint | |||
| // function testShouldMintCorrectAmountWhenMorphoPoolIndexesOutdated() public { | |||
There was a problem hiding this comment.
Did you re-try this test? Perhaps redundant to new tests though..
There was a problem hiding this comment.
This test is redundant yes
There was a problem hiding this comment.
And it is passing, except on aave-v3 on which the lens was not added
pakim249CAL
approved these changes
Dec 15, 2022
MerlinEgalite
approved these changes
Dec 15, 2022
|
Wow the gas diff 🕺 |
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.
Pull Request
Issue(s) fixed
This pull request fixes #220
It also harmonizes the way we manage rewards, so that most of the code of morpho-compound's tokenized vaults is duplicated in morpho-aave-v3's vault, with an additional dimension:
rewardTokenLook at the gas diff below (they are not broken @MathisGD)! 🚀