Merge branch 'feat/vaults' into feat/vaults-develop-sync

# Conflicts: # contracts/0.4.24/StETH.sol # contracts/0.8.25/vaults/VaultStaffRoom.sol
lidofinance · Dec 2, 2024 · fe2b426 · fe2b426
2 parents f5cadef + d534778
commit fe2b426
Show file tree

Hide file tree

Showing 25 changed files with 1,499 additions and 667 deletions.
diff --git a/contracts/0.4.24/Lido.sol b/contracts/0.4.24/Lido.sol
@@ -591,16 +591,41 @@ contract Lido is Versioned, StETHPermit, AragonApp {
         stakingRouter.deposit.value(depositsValue)(depositsCount, _stakingModuleId, _depositCalldata);
     }
 
+    /// @notice Mint stETH shares
+    /// @param _recipient recipient of the shares
+    /// @param _sharesAmount amount of shares to mint
+    /// @dev can be called only by accounting
+    function mintShares(address _recipient, uint256 _sharesAmount) public {
+        _auth(getLidoLocator().accounting());
+
+        _mintShares(_recipient, _sharesAmount);
+        // emit event after minting shares because we are always having the net new ether under the hood
+        // for vaults we have new locked ether and for fees we have a part of rewards
+        _emitTransferAfterMintingShares(_recipient, _sharesAmount);
+    }
+
+    /// @notice Burn stETH shares from the sender address
+    /// @param _sharesAmount amount of shares to burn
+    /// @dev can be called only by burner
+    function burnShares(uint256 _sharesAmount) public {
+        _auth(getLidoLocator().burner());
+
+        _burnShares(msg.sender, _sharesAmount);
+
+        // historically there is no events for this kind of burning
+        // TODO: should burn events be emitted here?
+        // maybe TransferShare for cover burn and all events for withdrawal burn
+    }
+
     /// @notice Mint shares backed by external vaults
     ///
     /// @param _receiver Address to receive the minted shares
     /// @param _amountOfShares Amount of shares to mint
-    ///
-    /// @dev authentication goes through isMinter in StETH
+    /// @return stethAmount The amount of stETH minted
+    /// @dev can be called only by accounting (authentication in mintShares method)
     function mintExternalShares(address _receiver, uint256 _amountOfShares) external {
-        if (_receiver == address(0)) revert("MINT_RECEIVER_ZERO_ADDRESS");
-        if (_amountOfShares == 0) revert("MINT_ZERO_AMOUNT_OF_SHARES");
-
+        require(_receiver != address(0), "MINT_RECEIVER_ZERO_ADDRESS");
+        require(_amountOfShares != 0, "MINT_ZERO_AMOUNT_OF_SHARES");
         _whenNotStakingPaused();
 
         uint256 stethAmount = super.getPooledEthByShares(_amountOfShares);
@@ -620,11 +645,9 @@ contract Lido is Versioned, StETHPermit, AragonApp {
     /// @notice Burns external shares from a specified account
     ///
     /// @param _amountOfShares Amount of shares to burn
-    ///
-    /// @dev authentication goes through _isBurner() method
     function burnExternalShares(uint256 _amountOfShares) external {
-        if (_amountOfShares == 0) revert("BURN_ZERO_AMOUNT_OF_SHARES");
-
+        require(_amountOfShares != 0, "BURN_ZERO_AMOUNT_OF_SHARES");
+        _auth(getLidoLocator().accounting());
         _whenNotStakingPaused();
 
         uint256 stethAmount = super.getPooledEthByShares(_amountOfShares);
@@ -634,7 +657,9 @@ contract Lido is Versioned, StETHPermit, AragonApp {
 
         EXTERNAL_BALANCE_POSITION.setStorageUint256(extBalance - stethAmount);
 
-        burnShares(msg.sender, _amountOfShares);
+        _burnShares(msg.sender, _amountOfShares);
+
+        _emitTransferEvents(msg.sender, address(0), stethAmount, _amountOfShares);
 
         emit ExternalSharesBurned(msg.sender, _amountOfShares, stethAmount);
     }
@@ -916,16 +941,6 @@ contract Lido is Versioned, StETHPermit, AragonApp {
         return _getPooledEther().add(EXTERNAL_BALANCE_POSITION.getStorageUint256());
     }
 
-    /// @dev override isMinter from StETH to allow accounting to mint
-    function _isMinter(address _sender) internal view returns (bool) {
-        return _sender == getLidoLocator().accounting();
-    }
-
-    /// @dev override isBurner from StETH to allow accounting to burn
-    function _isBurner(address _sender) internal view returns (bool) {
-        return _sender == getLidoLocator().burner() || _sender == getLidoLocator().accounting();
-    }
-
     function _pauseStaking() internal {
         STAKING_STATE_POSITION.setStorageStakeLimitStruct(
             STAKING_STATE_POSITION.getStorageStakeLimitStruct().setStakeLimitPauseState(true)

diff --git a/contracts/0.4.24/StETH.sol b/contracts/0.4.24/StETH.sol
@@ -360,31 +360,6 @@ contract StETH is IERC20, Pausable {
         return tokensAmount;
     }
 
-    function mintShares(address _recipient, uint256 _sharesAmount) public {
-        require(_isMinter(msg.sender), "AUTH_FAILED");
-
-        _mintShares(_recipient, _sharesAmount);
-        _emitTransferAfterMintingShares(_recipient, _sharesAmount);
-    }
-
-    function burnShares(address _account, uint256 _sharesAmount) public {
-        require(_isBurner(msg.sender), "AUTH_FAILED");
-
-        _burnShares(_account, _sharesAmount);
-
-        // TODO: do something with Transfer event
-    }
-
-    // solhint-disable-next-line
-    function _isMinter(address) internal view returns (bool) {
-        return false;
-    }
-
-    // solhint-disable-next-line
-    function _isBurner(address) internal view returns (bool) {
-        return false;
-    }
-
     /**
      * @return the total amount (in wei) of Ether controlled by the protocol.
      * @dev This is used for calculating tokens from shares and vice versa.