Skip to content

Commit

Permalink
fix: rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
gpsanant committed Dec 18, 2024
1 parent c287537 commit 471497a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/contracts/core/DelegationManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,11 @@ contract DelegationManager is
}

/// @inheritdoc IDelegationManager
function convertToDepositShares(address staker, IStrategy[] memory strategies, uint256[] memory withdrawableShares) external view returns (uint256[] memory) {
function convertToDepositShares(
address staker,
IStrategy[] memory strategies,
uint256[] memory withdrawableShares
) external view returns (uint256[] memory) {
// Get the slashing factors for the staker/operator/strategies
address operator = delegatedTo[staker];
uint256[] memory slashingFactors = _getSlashingFactors(staker, operator, strategies);
Expand Down
8 changes: 6 additions & 2 deletions src/contracts/interfaces/IDelegationManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ interface IDelegationManager is ISignatureUtils, IDelegationManagerErrors, IDele
function getQueuedWithdrawals(
address staker
) external view returns (Withdrawal[] memory withdrawals, uint256[][] memory shares);

/**
* @notice Converts shares for a set of strategies to deposit shares, likely in order to input into `queueWithdrawals`
* @param staker the staker to convert shares for
Expand All @@ -489,7 +489,11 @@ interface IDelegationManager is ISignatureUtils, IDelegationManagerErrors, IDele
* @return the deposit shares
* @dev will be a few wei off due to rounding errors
*/
function convertToDepositShares(address staker, IStrategy[] memory strategies, uint256[] memory withdrawableShares) external view returns (uint256[] memory);
function convertToDepositShares(
address staker,
IStrategy[] memory strategies,
uint256[] memory withdrawableShares
) external view returns (uint256[] memory);

/// @notice Returns the keccak256 hash of `withdrawal`.
function calculateWithdrawalRoot(
Expand Down

0 comments on commit 471497a

Please sign in to comment.