Merge branch 'v0.3.0-backport' into missing-test

coinsandsteeldev · web-flow · commit f89c4e3ebf03 · 2021-03-03T14:32:45.000+07:00
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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,7 @@ contract ValidatorShare is IValidatorShare, ERC20NonTradable, OwnableLockable, I`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`function migrateIn(address user, uint256 amount) external onlyOwner {`
	`183`	`+ _withdrawAndTransferReward(user);`
`183`	`184`	`_buyShares(amount, 0, user);`
`184`	`185`	`}`
`185`	`186`