Skip to content

Remove claimRewards double call #228

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

Merged
merged 7 commits into from
Dec 19, 2022
Merged

Remove claimRewards double call #228

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed732e5
Remove claimRewards double call
Rubilmax Dec 15, 2022
ee59b45
Propagate to morpho-aave-v3
Rubilmax Dec 15, 2022
6d1eb1a
Remove redundant calls on deposits/withdrawals
Rubilmax Dec 15, 2022
e91e8bc
Harmonized morpho-compound & morpho-aave-v3
Rubilmax Dec 15, 2022
ad7d519
Removed comments
Rubilmax Dec 15, 2022
77ea1c3
Merge branch 'upgrade-0' of github.com:morpho-dao/morpho-tokenized-va…
Rubilmax Dec 15, 2022
e1151fe
Avoid accruing rewards of address(0)
Rubilmax Dec 15, 2022
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
32 changes: 22 additions & 10 deletions src/compound/SupplyVault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,28 +116,40 @@ contract SupplyVault is ISupplyVault, SupplyVaultBase {
address to,
uint256 amount
) internal override {
_accrueUnclaimedRewards(from);
_accrueUnclaimedRewards(to);
uint256 newRewardsIndex = _claimRewards();
_accrueUnclaimedRewardsFromRewardsIndex(from, newRewardsIndex);
_accrueUnclaimedRewardsFromRewardsIndex(to, newRewardsIndex);

super._beforeTokenTransfer(from, to, amount);
}

function _accrueUnclaimedRewards(address _user) internal returns (uint256 unclaimed) {
uint256 supply = totalSupply();
uint256 rewardsIndexMem = rewardsIndex;
function _claimRewards() internal returns (uint256 newRewardsIndex) {
newRewardsIndex = rewardsIndex;

uint256 supply = totalSupply();
if (supply > 0) {
address[] memory poolTokens = new address[](1);
poolTokens[0] = poolToken;
rewardsIndexMem += morpho.claimRewards(poolTokens, false).divWadDown(supply);
rewardsIndex = rewardsIndexMem;

newRewardsIndex += morpho.claimRewards(poolTokens, false).divWadDown(supply);
rewardsIndex = newRewardsIndex;
}
}

function _accrueUnclaimedRewards(address _user) internal returns (uint256 unclaimed) {
return _accrueUnclaimedRewardsFromRewardsIndex(_user, _claimRewards());
}

function _accrueUnclaimedRewardsFromRewardsIndex(address _user, uint256 _newRewardsIndex)
internal
returns (uint256 unclaimed)
{
UserRewardsData storage userRewardsData = userRewards[_user];
uint256 rewardsIndexDiff;

// Safe because we always have `rewardsIndex` >= `userRewardsData.index`.
unchecked {
rewardsIndexDiff = rewardsIndexMem - userRewardsData.index;
rewardsIndexDiff = _newRewardsIndex - userRewardsData.index;
}

unclaimed = userRewardsData.unclaimed;
Expand All @@ -146,8 +158,8 @@ contract SupplyVault is ISupplyVault, SupplyVaultBase {
userRewardsData.unclaimed = unclaimed.safeCastTo128();
}

userRewardsData.index = rewardsIndexMem.safeCastTo128();
userRewardsData.index = _newRewardsIndex.safeCastTo128();

emit Accrued(_user, rewardsIndexMem, unclaimed);
emit Accrued(_user, _newRewardsIndex, unclaimed);
}
}