Merge pull request #212 from tetu-io/dev

Dev

Author: belbix

contracts/base/vault/SmartVault.sol

@@ -34,7 +34,7 @@ contract SmartVault is Initializable, ERC20Upgradeable, VaultStorage, Controllab
   // ************* CONSTANTS ********************
   /// @notice Version of the contract
   /// @dev Should be incremented when contract changed
-  string public constant override VERSION = "1.10.6";
+  string public constant override VERSION = "1.10.8";
   /// @dev Denominator for penalty numerator
   uint256 public constant override LOCK_PENALTY_DENOMINATOR = 1000;
   uint256 public constant override TO_INVEST_DENOMINATOR = 1000;
@@ -113,6 +113,7 @@ contract SmartVault is Initializable, ERC20Upgradeable, VaultStorage, Controllab
     }
     // set 100% to invest
     _setToInvest(TO_INVEST_DENOMINATOR);
+    _setDoHardWorkOnInvest(true);
     // set deposit fee
     if (_depositFee > 0) {
       require(_depositFee <= DEPOSIT_FEE_DENOMINATOR / 100);
@@ -338,7 +339,13 @@ contract SmartVault is Initializable, ERC20Upgradeable, VaultStorage, Controllab
     _isActive();
     _onlyAllowedUsers(msg.sender);
 
+    // need to invest before mint, if we will compound the profit the user should receive correct amount of shares
+    if (_alwaysInvest()) {
+      _invest();
+    }
+
     _deposit(amount, msg.sender, msg.sender);
+
     if (_alwaysInvest()) {
       _invest();
     }
@@ -350,7 +357,10 @@ contract SmartVault is Initializable, ERC20Upgradeable, VaultStorage, Controllab
     _isActive();
     _onlyAllowedUsers(msg.sender);
 
+    _invest();
+
     _deposit(amount, msg.sender, msg.sender);
+
     _invest();
   }
 
@@ -360,7 +370,12 @@ contract SmartVault is Initializable, ERC20Upgradeable, VaultStorage, Controllab
     _isActive();
     _onlyAllowedUsers(msg.sender);
 
+    if (_alwaysInvest()) {
+      _invest();
+    }
+
     _deposit(amount, msg.sender, holder);
+
     if (_alwaysInvest()) {
       _invest();
     }

contracts/infrastructure/price/IPriceCalculator.sol

@@ -18,8 +18,4 @@ interface IPriceCalculator {
 
   function getPriceWithDefaultOutput(address token) external view returns (uint256);
 
-  function getLargestPool(address token, address[] memory usedLps) external view returns (address, uint256, address);
-
-  function getPriceFromLp(address lpAddress, address token) external view returns (uint256);
-
 }

contracts/infrastructure/price/PriceCalculator.sol

@@ -349,7 +349,7 @@ contract PriceCalculator is Initializable, ControllableV2, IPriceCalculator {
   // Gives the LP with largest liquidity for a given token
   // and a given tokenset (either keyTokens or pricingTokens)
   function getLargestPool(address token, address[] memory usedLps)
-  public override view returns (address, uint256, address) {
+  public view returns (address, uint256, address) {
     uint256 largestLpSize = 0;
     address largestKeyToken = address(0);
     uint256 largestPlatformIdx = 0;
@@ -465,7 +465,7 @@ contract PriceCalculator is Initializable, ControllableV2, IPriceCalculator {
   }
 
   //Generic function giving the price of a given token vs another given token on Swap platform.
-  function getPriceFromLp(address lpAddress, address token) public override view returns (uint256) {
+  function getPriceFromLp(address lpAddress, address token) public view returns (uint256) {
     address _factory = IUniswapV2Pair(lpAddress).factory();
     if (_factory == DYSTOPIA_FACTORY || _factory == CONE_FACTORY) {
       (address token0, address token1) = IDystopiaPair(lpAddress).tokens();