crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ordering of function calls, remove optimization in _forceSetCumulativeReward

Browse Source
This commit is contained in:
Amir Bandeali
2019-09-25 11:31:30 -07:00
parent 4440075425
commit 9e3331d018
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/staking/contracts/src/stake/MixinStake.sol
View File

@@ -187,6 +187,11 @@ contract MixinStake is
// Sanity check the pool we're delegating to exists.
_assertStakingPoolExists(poolId);
_withdrawAndSyncDelegatorRewards(
poolId,
staker
);
// Increment how much stake the staker has delegated to the input pool.
_increaseNextBalance(
_delegatedStakeToPoolByOwner[staker][poolId],
@@ -195,11 +200,6 @@ contract MixinStake is
// Increment how much stake has been delegated to pool.
_increaseNextBalance(_delegatedStakeByPoolId[poolId], amount);
_withdrawAndSyncDelegatorRewards(
poolId,
staker
);
}
/// @dev Un-Delegates a owners stake from a staking pool.
@@ -216,6 +216,11 @@ contract MixinStake is
// sanity check the pool we're undelegating from exists
_assertStakingPoolExists(poolId);
_withdrawAndSyncDelegatorRewards(
poolId,
staker
);
// decrement how much stake the staker has delegated to the input pool
_decreaseNextBalance(
_delegatedStakeToPoolByOwner[staker][poolId],
@@ -224,11 +229,6 @@ contract MixinStake is
// decrement how much stake has been delegated to pool
_decreaseNextBalance(_delegatedStakeByPoolId[poolId], amount);
_withdrawAndSyncDelegatorRewards(
poolId,
staker
);
}
/// @dev Returns a storage pointer to a user's stake in a given status.

11
contracts/staking/contracts/src/staking_pools/MixinCumulativeRewards.sol
View File

@@ -68,15 +68,10 @@ contract MixinCumulativeRewards is
{
uint256 currentEpoch_ = currentEpoch;
_cumulativeRewardsByPool[poolId][currentEpoch_] = value;
// Check if we should do any work
uint256 currentMostRecentEpoch = _cumulativeRewardsByPoolLastStored[poolId];
if (currentEpoch_ == currentMostRecentEpoch) {
return;
}
// Update state to reflect the most recent cumulative reward
assert(currentEpoch_ > currentMostRecentEpoch);
uint256 currentMostRecentEpoch = _cumulativeRewardsByPoolLastStored[poolId];
assert(currentEpoch_ >= currentMostRecentEpoch);
_cumulativeRewardsByPoolLastStored[poolId] = currentEpoch_;
}