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: Gas optimization and refactor of CurveRewardsAwareAToken

Browse Source
This commit is contained in:
Lasse Herskind 2021-06-04 13:21:50 +02:00
parent db9a5b64dd
commit ad8d1ea817
1 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
contracts/adapters/rewards/CurveRewardsAwareAToken.sol
View File

@ -24,6 +24,8 @@ contract CurveRewardsAwareAToken is RewardsAwareAToken {
// reward address => pending reward to be distributed; // reward address => pending reward to be distributed;
mapping(address => uint256) internal _pendingRewards; mapping(address => uint256) internal _pendingRewards;
uint256 internal _lastBlockUpdate;
/** /**
* @param crvToken The address of the $CRV token * @param crvToken The address of the $CRV token
*/ */
@ -126,27 +128,7 @@ contract CurveRewardsAwareAToken is RewardsAwareAToken {
* @param token the reward token to retrieve lifetime rewards and accrued since last call * @param token the reward token to retrieve lifetime rewards and accrued since last call
*/ */
function _getExternalLifetimeExtraRewards(address token) internal returns (uint256) { function _getExternalLifetimeExtraRewards(address token) internal returns (uint256) {
uint256[MAX_REWARD_TOKENS] memory priorTokenBalances; _updateRewards();
for (uint256 index = 1; index < MAX_REWARD_TOKENS; index++) {
address rewardToken = _getRewardsTokenAddress(index);
if (rewardToken == address(0)) break;
if (rewardToken == CRV_TOKEN) continue;
priorTokenBalances[index] = IERC20(rewardToken).balanceOf(address(this));
}
ICurveGauge(_gaugeController).claim_rewards(address(this));
for (uint256 index = 1; index < MAX_REWARD_TOKENS; index++) {
address rewardToken = _getRewardsTokenAddress(index);
if (rewardToken == address(0)) break;
if (rewardToken == CRV_TOKEN) continue;
uint256 balance = IERC20(rewardToken).balanceOf(address(this));
_pendingRewards[rewardToken] = _pendingRewards[rewardToken].add(
balance.sub(priorTokenBalances[index])
);
}
uint256 accrued = _pendingRewards[token]; uint256 accrued = _pendingRewards[token];
_pendingRewards[token] = 0; _pendingRewards[token] = 0;
@ -199,27 +181,33 @@ contract CurveRewardsAwareAToken is RewardsAwareAToken {
// Mint CRV to aToken // Mint CRV to aToken
ICurveMinter(ICurveGaugeView(_gaugeController).minter()).mint(_gaugeController); ICurveMinter(ICurveGaugeView(_gaugeController).minter()).mint(_gaugeController);
// Claim other Curve gauge tokens, and track the pending rewards to distribute at `_retrieveAvailableReward` call _updateRewards();
uint256[MAX_REWARD_TOKENS] memory priorTokenBalances; }
for (uint256 index = 1; index < MAX_REWARD_TOKENS; index++) { function _updateRewards() internal {
address rewardToken = _getRewardsTokenAddress(index); if (block.number > _lastBlockUpdate) {
if (rewardToken == address(0)) break; _lastBlockUpdate = block.number;
if (rewardToken == CRV_TOKEN) continue; // Claim other Curve gauge tokens, and track the pending rewards to distribute at `_retrieveAvailableReward` call
priorTokenBalances[index] = IERC20(rewardToken).balanceOf(address(this)); uint256[MAX_REWARD_TOKENS] memory priorTokenBalances;
}
// Mint other rewards to aToken
ICurveGauge(_gaugeController).claim_rewards(address(this));
for (uint256 index = 1; index < MAX_REWARD_TOKENS; index++) { for (uint256 index = 1; index < MAX_REWARD_TOKENS; index++) {
address rewardToken = _getRewardsTokenAddress(index); address rewardToken = _getRewardsTokenAddress(index);
if (rewardToken == address(0)) break; if (rewardToken == address(0)) break;
if (rewardToken == CRV_TOKEN) continue; if (rewardToken == CRV_TOKEN) continue;
uint256 balance = IERC20(rewardToken).balanceOf(address(this)); priorTokenBalances[index] = IERC20(rewardToken).balanceOf(address(this));
}
// Mint other rewards to aToken
ICurveGauge(_gaugeController).claim_rewards(address(this));
_pendingRewards[rewardToken] = _pendingRewards[rewardToken].add( for (uint256 index = 1; index < MAX_REWARD_TOKENS; index++) {
balance.sub(priorTokenBalances[index]) address rewardToken = _getRewardsTokenAddress(index);
); if (rewardToken == address(0)) break;
if (rewardToken == CRV_TOKEN) continue;
uint256 balance = IERC20(rewardToken).balanceOf(address(this));
_pendingRewards[rewardToken] = _pendingRewards[rewardToken].add(
balance.sub(priorTokenBalances[index])
);
}
} }
} }