Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Refactor, simplifying _beforeTokenTransfer

Browse Source
This commit is contained in:
Lasse Herskind 2021-06-03 15:59:20 +02:00
parent c1ce8475de
commit e36a2f0e21
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/protocol/tokenization/StaticATokenLM.sol
View File

@ -426,14 +426,11 @@ contract StaticATokenLM is ERC20 {
address to,
uint256 amount
) internal override {
// Only enter when not minting or burning.
if (from != address(0)) {
_updateUnclaimedRewards(from);
_updateUserIndex(from);
_updateUser(from);
}
if (to != address(0)) {
_updateUnclaimedRewards(to);
_updateUserIndex(to);
_updateUser(to);
}
}
@ -457,7 +454,6 @@ contract StaticATokenLM is ERC20 {
uint256 diff = externalLifetimeRewards.sub(lifeTimeRewards).wadToRay();
rewardIndex = rewardIndex.add((diff).rayDivNoRounding(_supply.wadToRay()));
lifeTimeRewards = externalLifetimeRewards;
}
}
@ -523,15 +519,16 @@ contract StaticATokenLM is ERC20 {
}
/**
* @dev Adding the pending rewards to the unclaimed for specific user
* @dev Adding the pending rewards to the unclaimed for specific user and updating user index
* @param user The address of the user to update
*/
function _updateUnclaimedRewards(address user) internal {
function _updateUser(address user) internal {
uint256 balance = balanceOf(user);
if (balance > 0) {
uint256 pending = _getPendingRewards(user, balance, false);
_unclaimedRewards[user] = _unclaimedRewards[user].add(pending);
}
_updateUserIndex(user);
}
/**
@ -568,8 +565,7 @@ contract StaticATokenLM is ERC20 {
_rewardIndex = _rewardIndex.add((diff).rayDivNoRounding(_supply.wadToRay()));
}
uint256 _reward = rayBalance.rayMulNoRounding(_rewardIndex.sub(_userIndex[user]));
return _reward;
return rayBalance.rayMulNoRounding(_rewardIndex.sub(_userIndex[user]));
}
/**