Merge branch 'feat/vaults' into feat/vaults-triggerable-exits

# Conflicts: # contracts/0.8.25/vaults/Dashboard.sol
lidofinance · Feb 3, 2025 · 8763f26 · 8763f26
2 parents fde279b + 31bf140
commit 8763f26
Show file tree

Hide file tree

Showing 22 changed files with 1,875 additions and 334 deletions.
diff --git a/contracts/0.8.25/interfaces/ILido.sol b/contracts/0.8.25/interfaces/ILido.sol
@@ -16,6 +16,8 @@ interface ILido is IERC20, IERC20Permit {
 
     function transferSharesFrom(address, address, uint256) external returns (uint256);
 
+    function transferShares(address, uint256) external returns (uint256);
+
     function rebalanceExternalEtherToInternal() external payable;
 
     function getTotalPooledEther() external view returns (uint256);

diff --git a/contracts/0.8.25/vaults/Dashboard.sol b/contracts/0.8.25/vaults/Dashboard.sol
diff --git a/contracts/0.8.25/vaults/Delegation.sol b/contracts/0.8.25/vaults/Delegation.sol
@@ -84,11 +84,10 @@ contract Delegation is Dashboard {
     /**
      * @notice Constructs the contract.
      * @dev Stores token addresses in the bytecode to reduce gas costs.
-     * @param _steth Address of the stETH token contract.
      * @param _weth Address of the weth token contract.
-     * @param _wsteth Address of the wstETH token contract.
+     * @param _lidoLocator Address of the Lido locator contract.
      */
-    constructor(address _steth, address _weth, address _wsteth) Dashboard(_steth, _weth, _wsteth) {}
+    constructor(address _weth, address _lidoLocator) Dashboard(_weth, _lidoLocator) {}
 
     /**
      * @notice Initializes the contract:

diff --git a/contracts/0.8.25/vaults/Permissions.sol b/contracts/0.8.25/vaults/Permissions.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-// SPDX-FileCopyrightText: 2024 Lido <[email protected]>
+// SPDX-FileCopyrightText: 2025 Lido <[email protected]>
 
 // See contracts/COMPILERS.md
 pragma solidity 0.8.25;
@@ -126,11 +126,11 @@ abstract contract Permissions is AccessControlVoteable {
         _unsafeWithdraw(_recipient, _ether);
     }
 
-    function _mint(address _recipient, uint256 _shares) internal onlyRole(MINT_ROLE) {
+    function _mintShares(address _recipient, uint256 _shares) internal onlyRole(MINT_ROLE) {
         vaultHub.mintSharesBackedByVault(address(stakingVault()), _recipient, _shares);
     }
 
-    function _burn(uint256 _shares) internal onlyRole(BURN_ROLE) {
+    function _burnShares(uint256 _shares) internal onlyRole(BURN_ROLE) {
         vaultHub.burnSharesBackedByVault(address(stakingVault()), _shares);
     }
 

diff --git a/contracts/0.8.9/Burner.sol b/contracts/0.8.9/Burner.sol
@@ -244,9 +244,9 @@ contract Burner is IBurner, AccessControlEnumerable {
         if (_amount == 0) revert ZeroRecoveryAmount();
         if (_token == address(LIDO)) revert StETHRecoveryWrongFunc();
 
-        emit ERC20Recovered(msg.sender, _token, _amount);
-
         IERC20(_token).safeTransfer(LOCATOR.treasury(), _amount);
+
+        emit ERC20Recovered(msg.sender, _token, _amount);
     }
 
     /**
@@ -259,9 +259,9 @@ contract Burner is IBurner, AccessControlEnumerable {
     function recoverERC721(address _token, uint256 _tokenId) external {
         if (_token == address(LIDO)) revert StETHRecoveryWrongFunc();
 
-        emit ERC721Recovered(msg.sender, _token, _tokenId);
-
         IERC721(_token).transferFrom(address(this), LOCATOR.treasury(), _tokenId);
+
+        emit ERC721Recovered(msg.sender, _token, _tokenId);
     }
 
     /**