Merge pull request #305 from maticnetwork/shares-tests

Shares tests
maticnetwork · Jun 29, 2020 · 9749201 · 9749201
2 parents 95f6164 + 14d124d
commit 9749201
Show file tree

Hide file tree

Showing 2 changed files with 261 additions and 97 deletions.
diff --git a/contracts/staking/stakeManager/StakeManager.sol b/contracts/staking/stakeManager/StakeManager.sol
@@ -303,7 +303,6 @@ contract StakeManager is IStakeManager, StakeManagerStorage, Initializable {
         uint256 amount,
         address delegator
     ) external returns (bool) {
-        require(delegationEnabled, "Delegation is disabled");
         require(validators[validatorId].contractAddress == msg.sender, "Invalid contract address");
         return token.transferFrom(delegator, address(this), amount);
     }
@@ -427,6 +426,11 @@ contract StakeManager is IStakeManager, StakeManagerStorage, Initializable {
     }
 
     function updateValidatorState(uint256 validatorId, int256 amount) public {
+        if (amount > 0) {
+            // deposit during shares purchase
+            require(delegationEnabled, "Delegation is disabled");
+        }
+
         require(validators[validatorId].contractAddress == msg.sender, "Invalid contract address");
         updateTimeline(amount, 0, 0);
     }