Merge pull request #348 from maticnetwork/fixes-v2

Fixes v2
maticnetwork · Mar 2, 2021 · 6f755fb · 6f755fb
2 parents 357ae25 + 4f63c14
commit 6f755fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/contracts/staking/stakeManager/StakeManager.sol b/contracts/staking/stakeManager/StakeManager.sol
@@ -945,7 +945,9 @@ contract StakeManager is
             }
         }
 
-        validators[validatorId].initialRewardPerStake = newRewardPerStake;
+        if (newRewardPerStake > initialRewardPerStake) {
+            validators[validatorId].initialRewardPerStake = newRewardPerStake;
+        }
     }
 
     function _updateRewards(uint256 validatorId) private {

diff --git a/contracts/staking/stakeManager/StakeManagerExtension.sol b/contracts/staking/stakeManager/StakeManagerExtension.sol
@@ -129,12 +129,15 @@ contract StakeManagerExtension is StakeManagerStorage, Initializable, StakeManag
         for (uint256 i = validatorIdFrom; i < validatorIdTo; ++i) {
             ValidatorShare contractAddress = ValidatorShare(validators[i].contractAddress);
             if (contractAddress != ValidatorShare(0)) {
-                validators[i].delegatorsReward = contractAddress.validatorRewards_deprecated().add(INITIALIZED_AMOUNT);
+                // move validator rewards out from ValidatorShare contract
+                validators[i].reward = contractAddress.validatorRewards_deprecated().add(INITIALIZED_AMOUNT);
                 validators[i].delegatedAmount = contractAddress.activeAmount();
                 validators[i].commissionRate = contractAddress.commissionRate_deprecated();
+            } else {
+                validators[i].reward = validators[i].reward.add(INITIALIZED_AMOUNT);
             }
 
-            validators[i].reward = validators[i].reward.add(INITIALIZED_AMOUNT);
+            validators[i].delegatorsReward = INITIALIZED_AMOUNT;
         }
     }
 

diff --git a/contracts/staking/validatorShare/ValidatorShare.sol b/contracts/staking/validatorShare/ValidatorShare.sol
@@ -180,6 +180,7 @@ contract ValidatorShare is IValidatorShare, ERC20NonTradable, OwnableLockable, I
     }
 
     function migrateIn(address user, uint256 amount) external onlyOwner {
+        _withdrawAndTransferReward(user);
         _buyShares(amount, 0, user);
     }
 
@@ -317,7 +318,11 @@ contract ValidatorShare is IValidatorShare, ERC20NonTradable, OwnableLockable, I
     function _calculateRewardPerShareWithRewards(uint256 accumulatedReward) private view returns (uint256) {
         uint256 _rewardPerShare = rewardPerShare;
         if (accumulatedReward != 0) {
-            _rewardPerShare = _rewardPerShare.add(accumulatedReward.mul(_getRatePrecision()).div(totalSupply()));
+            uint256 totalShares = totalSupply();
+
+            if (totalShares != 0) {
+                _rewardPerShare = _rewardPerShare.add(accumulatedReward.mul(_getRatePrecision()).div(totalShares));
+            }
         }
 
         return _rewardPerShare;