Merge branch 'feature/V2' of github.com:DODOEX/contractV2 into feature/V2

contracts/DODOVendingMachine/impl/DVMFunding.sol

@@ -15,14 +15,9 @@ import {IDODOCallee} from "../../intf/IDODOCallee.sol";
 contract DVMFunding is DVMVault {
     // ============ Events ============
 
-    event BuyShares(address indexed to, uint256 increaseShares, uint256 totalShares);
+    event BuyShares(address to, uint256 increaseShares, uint256 totalShares);
 
-    event SellShares(
-        address indexed payer,
-        address indexed to,
-        uint256 decreaseShares,
-        uint256 totalShares
-    );
+    event SellShares(address payer, address to, uint256 decreaseShares, uint256 totalShares);
 
     // ============ Buy & Sell Shares ============
 
@@ -50,8 +45,8 @@ contract DVMFunding is DVMVault {
         // 在提币的时候向下取整。因此永远不会出现，balance为0但totalsupply不为0的情况
         // 但有可能出现，reserve>0但totalSupply=0的场景
         if (totalSupply == 0) {
-            require(baseBalance >= 10**3); // 以免出现balance很大但shares很小的情况
-            shares = baseBalance;
+            require(baseBalance >= 10**3, "INSUFFICIENT_LIQUIDITY_MINED");
+            shares = baseBalance; // 以免出现balance很大但shares很小的情况
         } else if (baseReserve > 0 && quoteReserve == 0) {
             // case 2. supply when quote reserve is 0
             shares = baseInput.mul(totalSupply).div(baseReserve);
@@ -62,7 +57,6 @@ contract DVMFunding is DVMVault {
             uint256 mintRatio = quoteInputRatio < baseInputRatio ? quoteInputRatio : baseInputRatio;
             shares = DecimalMath.mulFloor(totalSupply, mintRatio);
         }
-        require(shares > 0, "INSUFFICIENT_LIQUIDITY_MINED");
         _mint(to, shares);
         _sync();
         emit BuyShares(to, shares, _SHARES_[to]);