Fixes after Bailsec audit to new withdrawal flow

projects/vaults/contracts/adapter-claimers/MellowAdapterClaimer.sol

@@ -6,7 +6,7 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/
 import {ERC165Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import {IAdapterClaimer} from "../interfaces/adapter-claimer/IAdapterClaimer.sol";
 import {IMellowSymbioticVault} from "../interfaces/symbiotic-vault/mellow-core/IMellowSymbioticVault.sol";
@@ -25,6 +25,8 @@ contract MellowAdapterClaimer is
     OwnableUpgradeable,
     IAdapterClaimer
 {
+    using SafeERC20 for IERC20;
+
     address internal _adapter;
 
     /// @custom:oz-upgrades-unsafe-allow constructor
@@ -39,10 +41,7 @@ contract MellowAdapterClaimer is
         __ERC165_init();
 
         _adapter = msg.sender;
-        require(
-            IERC20(asset).approve(_adapter, type(uint256).max),
-            ApprovalFailed()
-        );
+        IERC20(asset).safeIncreaseAllowance(_adapter, type(uint256).max);
     }
 
     /**
@@ -66,4 +65,22 @@ contract MellowAdapterClaimer is
                 amount
             );
     }
+
+    /*///////////////////////////////
+    ////// Pausable functions //////
+    /////////////////////////////*/
+
+    /**
+     * @dev Pauses the contract
+     */
+    function pause() external onlyOwner {
+        _pause();
+    }
+
+    /**
+     * @dev Unpauses the contract
+     */
+    function unpause() external onlyOwner {
+        _unpause();
+    }
 }

projects/vaults/contracts/adapter-claimers/SymbioticAdapterClaimer.sol

@@ -6,7 +6,7 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/
 import {ERC165Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import {IVault} from "../interfaces/symbiotic-vault/symbiotic-core/IVault.sol";
 import {IAdapterClaimer} from "../interfaces/adapter-claimer/IAdapterClaimer.sol";
@@ -25,6 +25,8 @@ contract SymbioticAdapterClaimer is
     OwnableUpgradeable,
     IAdapterClaimer
 {
+    using SafeERC20 for IERC20;
+
     address internal _adapter;
 
     /// @custom:oz-upgrades-unsafe-allow constructor
@@ -39,10 +41,7 @@ contract SymbioticAdapterClaimer is
         __ERC165_init();
 
         _adapter = msg.sender;
-        require(
-            IERC20(asset).approve(_adapter, type(uint256).max),
-            ApprovalFailed()
-        );
+        IERC20(asset).safeIncreaseAllowance(_adapter, type(uint256).max);
     }
 
 
@@ -62,4 +61,22 @@ contract SymbioticAdapterClaimer is
         require(msg.sender == _adapter, OnlyAdapter());
         return IVault(vault).claim(recipient, epoch);
     }
+
+    /*///////////////////////////////
+    ////// Pausable functions //////
+    /////////////////////////////*/
+
+    /**
+     * @dev Pauses the contract
+     */
+    function pause() external onlyOwner {
+        _pause();
+    }
+
+    /**
+     * @dev Unpauses the contract
+     */
+    function unpause() external onlyOwner {
+        _unpause();
+    }
 }

projects/vaults/contracts/adapter-handler/AdapterHandler.sol

@@ -90,7 +90,7 @@ contract AdapterHandler is InceptionAssetsHandler, IAdapterHandler {
      * @dev Reserved storage gap to allow for future upgrades without shifting storage layout.
      * @notice Occupies 38 slots (50 total slots minus 12 used).
      */
-    uint256[50 - 11] private __gap;
+    uint256[50 - 12] private __gap;
 
     modifier onlyOperator() {
         require(msg.sender == _operator, OnlyOperatorAllowed());
@@ -295,7 +295,7 @@ contract AdapterHandler is InceptionAssetsHandler, IAdapterHandler {
 
     /**
      * @notice Claims the free balance from a specified adapter contract.
-     * @dev Can only be called by an operator, when the contract is not paused, and is non-reentrant.
+     * @dev Can only be called by an operator and when is non-reentrant.
      * @param adapter The address of the adapter contract from which to claim the free balance.
      */
     function claimAdapterFreeBalance(address adapter) external onlyOperator nonReentrant {
@@ -307,7 +307,7 @@ contract AdapterHandler is InceptionAssetsHandler, IAdapterHandler {
      * @notice Claim and transfer rewards from the specified adapter to the rewards treasury.
      * The treasury may optionally swap the received tokens and forward them to the operator
      * for further distribution to the vault as additional rewards.
-     * @dev Can only be called by an operator, when the contract is not paused, and is non-reentrant.
+     * @dev Can only be called by an operator and when is non-reentrant.
      * @param adapter The address of the adapter contract from which to claim rewards.
      * @param token Reward token.
      * @param rewardsData Adapter related bytes of data for rewards.
@@ -335,7 +335,9 @@ contract AdapterHandler is InceptionAssetsHandler, IAdapterHandler {
      * @dev The function allows the operator to deposit asset as rewards.
      * It verifies that the previous rewards timeline is over before accepting new rewards.
      */
-    function addRewards(uint256 amount) external onlyOperator nonReentrant {
+    function addRewards(uint256 amount) external onlyOperator {
+        require(rewardsTimeline > 0, RewardsTimelineNotSet());
+
         /// @dev verify whether the prev timeline is over
         if (currentRewards > 0) {
             uint256 totalDays = rewardsTimeline / 1 days;
@@ -456,7 +458,7 @@ contract AdapterHandler is InceptionAssetsHandler, IAdapterHandler {
      */
     function getFlashCapacity() public view returns (uint256 total) {
         uint256 _assets = totalAssets();
-        uint256 _sum = redeemReservedAmount() + depositBonusAmount;
+        uint256 _sum = redeemReservedAmount() + depositBonusAmount + withdrawalQueue.totalPendingRedeemAmount();
         return _sum > _assets ? 0 : _assets - _sum;
     }
 
@@ -516,10 +518,11 @@ contract AdapterHandler is InceptionAssetsHandler, IAdapterHandler {
     /**
      * @notice Removes an adapter from the system
      * @param adapter Address of the adapter to remove
+     * @param skipEmptyCheck Skip check adapter to empty
      */
-    function removeAdapter(address adapter) external onlyOwner {
+    function removeAdapter(address adapter, bool skipEmptyCheck) external onlyOwner {
         require(_adapters.contains(adapter), AdapterNotFound());
-        require(IInceptionBaseAdapter(adapter).getTotalBalance() == 0, AdapterNotEmpty());
+        require(skipEmptyCheck || IInceptionBaseAdapter(adapter).getTotalBalance() == 0, AdapterNotEmpty());
 
         emit AdapterRemoved(adapter);
         _adapters.remove(adapter);

projects/vaults/contracts/adapters/InceptionBaseAdapter.sol

@@ -27,6 +27,9 @@ abstract contract InceptionBaseAdapter is
     address internal _trusteeManager;
     address internal _inceptionVault;
 
+    // @notice This variable must not be used for already deployed vaults — take care during upgrades
+    uint256[50 - 3] private __gap;
+
     modifier onlyTrustee() {
         require(
             msg.sender == _inceptionVault || msg.sender == _trusteeManager,

projects/vaults/contracts/adapters/InceptionEigenAdapter.sol

@@ -63,20 +63,6 @@ contract InceptionEigenAdapter is InceptionBaseAdapter, IInceptionEigenLayerAdap
         _asset.safeApprove(strategyManager, type(uint256).max);
     }
 
-    /**
-    * @dev checks whether it's still possible to deposit into the strategy
-    * @param amount Amount of tokens to delegate/deposit
-    * @notice Be cautious when using this function, as certain strategies may not enforce TVL limits by inheritance.
-    */
-    function _beforeDepositAssetIntoStrategy(uint256 amount) internal view {
-        (uint256 maxPerDeposit, uint256 maxTotalDeposits) = _strategy.getTVLLimits();
-
-        require(amount <= maxPerDeposit, ExceedsMaxPerDeposit(maxPerDeposit, amount));
-
-        uint256 currentBalance = _asset.balanceOf(address(_strategy));
-        require(currentBalance + amount <= maxTotalDeposits, ExceedsMaxTotalDeposited(maxTotalDeposits, currentBalance));
-    }
-
     /**
      * @notice Delegates funds to an operator or deposits into strategy
      * @dev If operator is zero address and amount > 0, deposits into strategy
@@ -92,8 +78,6 @@ contract InceptionEigenAdapter is InceptionBaseAdapter, IInceptionEigenLayerAdap
     ) external override onlyTrustee whenNotPaused returns (uint256) {
         // depositIntoStrategy
         if (amount > 0 && operator == address(0)) {
-            _beforeDepositAssetIntoStrategy(amount);
-
             // transfer from the vault
             _asset.safeTransferFrom(msg.sender, address(this), amount);
             // deposit the asset to the appropriate strategy
@@ -173,13 +157,19 @@ contract InceptionEigenAdapter is InceptionBaseAdapter, IInceptionEigenLayerAdap
     ) external override onlyTrustee whenNotPaused returns (uint256, uint256) {
         require(_data.length == 0, InvalidDataLength(0, _data.length));
 
-        uint256[] memory sharesToWithdraw = new uint256[](1);
+        address staker = address(this);
+        uint256[] memory withdrawableShares = new uint256[](1);
         IStrategy[] memory strategies = new IStrategy[](1);
 
         strategies[0] = _strategy;
-        sharesToWithdraw[0] = _strategy.underlyingToShares(amount);
+        withdrawableShares[0] = _strategy.underlyingToShares(amount);
+
+        uint256[] memory sharesToWithdraw = _delegationManager.convertToDepositShares(
+            staker,
+            strategies,
+            withdrawableShares
+        );
 
-        address staker = address(this);
         uint256 nonce = _delegationManager.cumulativeWithdrawalsQueued(staker);
         if (emergency) _emergencyQueuedWithdrawals[nonce] = true;
 
@@ -189,7 +179,7 @@ contract InceptionEigenAdapter is InceptionBaseAdapter, IInceptionEigenLayerAdap
         withdrawals[0] = IDelegationManager.QueuedWithdrawalParams({
             strategies: strategies,
             shares: sharesToWithdraw,
-            withdrawer: staker
+            __deprecated_withdrawer: staker
         });
 
         // queue from EL

projects/vaults/contracts/adapters/InceptionEigenAdapterWrap.sol

@@ -63,24 +63,9 @@ contract InceptionEigenAdapterWrap is InceptionBaseAdapter, IInceptionEigenLayer
         _setRewardsCoordinator(rewardCoordinator, claimer);
 
         // approve spending by strategyManager
-        _asset.safeApprove(strategyManager, type(uint256).max);
         wrappedAsset().stETH().approve(strategyManager, type(uint256).max);
     }
 
-    /**
-    * @dev checks whether it's still possible to deposit into the strategy
-    * @param amount Amount of tokens to delegate/deposit
-    * @notice Be cautious when using this function, as certain strategies may not enforce TVL limits by inheritance.
-    */
-    function _beforeDepositAssetIntoStrategy(uint256 amount) internal view {
-        (uint256 maxPerDeposit, uint256 maxTotalDeposits) = _strategy.getTVLLimits();
-
-        require(amount <= maxPerDeposit, ExceedsMaxPerDeposit(maxPerDeposit, amount));
-
-        uint256 currentBalance = _asset.balanceOf(address(_strategy));
-        require(currentBalance + amount <= maxTotalDeposits, ExceedsMaxTotalDeposited(maxTotalDeposits, currentBalance));
-    }
-
     /**
      * @notice Delegates funds to an operator or deposits into strategy
      * @dev If operator is zero address and amount > 0, deposits into strategy
@@ -96,11 +81,13 @@ contract InceptionEigenAdapterWrap is InceptionBaseAdapter, IInceptionEigenLayer
     ) external override onlyTrustee whenNotPaused returns (uint256) {
         // depositIntoStrategy
         if (amount > 0 && operator == address(0)) {
-            _beforeDepositAssetIntoStrategy(amount);
-
             // transfer from the vault
             _asset.safeTransferFrom(msg.sender, address(this), amount);
-            amount = wrappedAsset().unwrap(amount);
+
+            uint256 balanceBefore = wrappedAsset().stETH().balanceOf(address(this));
+            wrappedAsset().unwrap(amount);
+            amount = wrappedAsset().stETH().balanceOf(address(this)) - balanceBefore;
+
             // deposit the asset to the appropriate strategy
             return wrappedAsset().getWstETHByStETH(_strategy.sharesToUnderlying(
                 _strategyManager.depositIntoStrategy(
@@ -180,15 +167,21 @@ contract InceptionEigenAdapterWrap is InceptionBaseAdapter, IInceptionEigenLayer
     ) external override onlyTrustee whenNotPaused returns (uint256, uint256) {
         require(_data.length == 0, InvalidDataLength(0, _data.length));
 
-        uint256[] memory sharesToWithdraw = new uint256[](1);
+        address staker = address(this);
+        uint256[] memory withdrawableShares = new uint256[](1);
         IStrategy[] memory strategies = new IStrategy[](1);
 
         strategies[0] = _strategy;
-        sharesToWithdraw[0] = _strategy.underlyingToShares(
+        withdrawableShares[0] = _strategy.underlyingToShares(
             wrappedAsset().getStETHByWstETH(amount)
         );
 
-        address staker = address(this);
+        uint256[] memory sharesToWithdraw = _delegationManager.convertToDepositShares(
+            staker,
+            strategies,
+            withdrawableShares
+        );
+
         uint256 nonce = _delegationManager.cumulativeWithdrawalsQueued(staker);
         if (emergency) _emergencyQueuedWithdrawals[nonce] = true;
 
@@ -198,7 +191,7 @@ contract InceptionEigenAdapterWrap is InceptionBaseAdapter, IInceptionEigenLayer
         withdrawals[0] = IDelegationManager.QueuedWithdrawalParams({
             strategies: strategies,
             shares: sharesToWithdraw,
-            withdrawer: staker
+            __deprecated_withdrawer: staker
         });
 
         // queue withdrawal from EL

projects/vaults/contracts/adapters/InceptionSymbioticAdapter.sol

@@ -343,17 +343,19 @@ contract InceptionSymbioticAdapter is
     /**
      * @notice Removes a vault from the adapter
      * @param vaultAddress Address of the vault to remove
+     * @param skipEmptyCheck Skip check vault to empty
      */
-    function removeVault(address vaultAddress) external onlyOwner {
+    function removeVault(address vaultAddress, bool skipEmptyCheck) external onlyOwner {
         require(vaultAddress != address(0), ZeroAddress());
         require(Address.isContract(vaultAddress), NotContract());
         require(_symbioticVaults.contains(vaultAddress), NotAdded());
 
         if (
+            !skipEmptyCheck && (
             getDeposited(vaultAddress) != 0 ||
             _pendingWithdrawalAmount(vaultAddress, false) > 0 ||
             _pendingWithdrawalAmount(vaultAddress, true) > 0
-        ) revert VaultNotEmpty();
+        )) revert VaultNotEmpty();
 
         _symbioticVaults.remove(vaultAddress);