[SI][Vaults] feat: Dashboard UX updates

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);

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:

contracts/0.8.25/vaults/Permissions.sol

@@ -121,11 +121,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);
     }
 

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);
     }
 
     /**

scripts/scratch/steps/0145-deploy-vaults.ts

@@ -12,8 +12,7 @@ export async function main() {
   const state = readNetworkState({ deployer });
 
   const accountingAddress = state[Sk.accounting].proxy.address;
-  const lidoAddress = state[Sk.appLido].proxy.address;
-  const wstEthAddress = state[Sk.wstETH].address;
+  const locatorAddress = state[Sk.lidoLocator].proxy.address;
 
   const depositContract = state.chainSpec.depositContract;
   const wethContract = state.delegation.deployParameters.wethContract;
@@ -27,9 +26,8 @@ export async function main() {
 
   // Deploy Delegation implementation contract
   const delegation = await deployWithoutProxy(Sk.delegationImpl, "Delegation", deployer, [
-    lidoAddress,
     wethContract,
-    wstEthAddress,
+    locatorAddress,
   ]);
   const delegationAddress = await delegation.getAddress();
 

test/0.8.25/vaults/contracts/WETH9__MockForVault.sol

@@ -3,8 +3,6 @@
 
 pragma solidity 0.4.24;
 
-import {StETH} from "contracts/0.4.24/StETH.sol";
-
 contract WETH9__MockForVault {
     string public name = "Wrapped Ether";
     string public symbol = "WETH";

test/0.8.25/vaults/dashboard/contracts/ERC721_MockForDashboard.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: UNLICENSED
+// for testing purposes only
+
+pragma solidity 0.8.25;
+
+import {ERC721} from "@openzeppelin/contracts-v5.2/token/ERC721/ERC721.sol";
+
+contract ERC721_MockForDashboard is ERC721 {
+    constructor() ERC721("MockERC721", "M721") {}
+
+    function mint(address _recipient, uint256 _tokenId) external {
+        _mint(_recipient, _tokenId);
+    }
+}

test/0.8.25/vaults/dashboard/contracts/StETHPermit__HarnessForDashboard.sol

@@ -59,8 +59,4 @@ contract StETHPermit__HarnessForDashboard is StETHPermit {
     function mock__setTotalShares(uint256 _totalShares) external {
         totalShares = _totalShares;
     }
-
-    function mock__getTotalShares() external view returns (uint256) {
-        return _getTotalShares();
-    }
 }

test/0.8.25/vaults/dashboard/contracts/VaultFactory__MockForDashboard.sol

@@ -28,8 +28,18 @@ contract VaultFactory__MockForDashboard is UpgradeableBeacon {
         bytes memory immutableArgs = abi.encode(vault);
         dashboard = Dashboard(payable(Clones.cloneWithImmutableArgs(dashboardImpl, immutableArgs)));
 
-        dashboard.initialize(msg.sender);
+        dashboard.initialize(address(this));
         dashboard.grantRole(dashboard.DEFAULT_ADMIN_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.FUND_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.WITHDRAW_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.MINT_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.BURN_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.REBALANCE_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.PAUSE_BEACON_CHAIN_DEPOSITS_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.RESUME_BEACON_CHAIN_DEPOSITS_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.REQUEST_VALIDATOR_EXIT_ROLE(), msg.sender);
+        dashboard.grantRole(dashboard.VOLUNTARY_DISCONNECT_ROLE(), msg.sender);
+
         dashboard.revokeRole(dashboard.DEFAULT_ADMIN_ROLE(), address(this));
 
         vault.initialize(address(dashboard), _operator, "");

test/0.8.25/vaults/dashboard/contracts/VaultHub__MockForDashboard.sol

@@ -41,19 +41,31 @@ contract VaultHub__MockForDashboard {
         emit Mock__VaultDisconnected(vault);
     }
 
-    function mintSharesBackedByVault(address /* vault */, address recipient, uint256 amount) external {
+    function mintSharesBackedByVault(address vault, address recipient, uint256 amount) external {
+        if (vault == address(0)) revert ZeroArgument("_vault");
+        if (recipient == address(0)) revert ZeroArgument("recipient");
+        if (amount == 0) revert ZeroArgument("amount");
+
         steth.mintExternalShares(recipient, amount);
+        vaultSockets[vault].sharesMinted = uint96(vaultSockets[vault].sharesMinted + amount);
     }
 
-    function burnSharesBackedByVault(address /* vault */, uint256 amount) external {
-        steth.burnExternalShares(amount);
+    function burnSharesBackedByVault(address _vault, uint256 _amountOfShares) external {
+        if (_vault == address(0)) revert ZeroArgument("_vault");
+        if (_amountOfShares == 0) revert ZeroArgument("_amountOfShares");
+        steth.burnExternalShares(_amountOfShares);
+        vaultSockets[_vault].sharesMinted = uint96(vaultSockets[_vault].sharesMinted - _amountOfShares);
     }
 
     function voluntaryDisconnect(address _vault) external {
         emit Mock__VaultDisconnected(_vault);
     }
 
     function rebalance() external payable {
+        vaultSockets[msg.sender].sharesMinted = 0;
+
         emit Mock__Rebalanced(msg.value);
     }
+
+    error ZeroArgument(string argument);
 }