refactor: final slashing cleanup (#982)

* chore: clean comments and naming in dm

* refactor: simplify undelegate method
* feat: removed 0 address check because 0 stakers cant be delegated
* feat: condensed non-staker caller logic

* refactor: remove unnecessary check

* feat: use checks-effects-interactions when completing withdrawals
* feat: remove implicit public method for queuedWithdrawals and impl dedicated getter

* feat: deprecate withdrawer field

* chore: make bindings and clean compile errors

* refactor: redelegate reuses delegateTo and undelegate

* fix: broken integration test

* docs: update to reflect deprecated field

* feat: add getter for stakers withdrawal roots

Author: wadealexc

src/contracts/core/DelegationManager.sol

@@ -129,7 +129,11 @@ contract DelegationManager is
         address operator,
         SignatureWithExpiry memory approverSignatureAndExpiry,
         bytes32 approverSalt
+<<<<<<< HEAD
     ) public nonReentrant {
+=======
+    ) public {
+>>>>>>> 337b1b66 (refactor: final slashing cleanup (#982))
         require(!isDelegated(msg.sender), ActivelyDelegated());
         require(isOperator(operator), OperatorNotRegistered());
 
@@ -148,7 +152,11 @@ contract DelegationManager is
     /// @inheritdoc IDelegationManager
     function undelegate(
         address staker
+<<<<<<< HEAD
     ) public nonReentrant returns (bytes32[] memory withdrawalRoots) {
+=======
+    ) public returns (bytes32[] memory withdrawalRoots) {
+>>>>>>> 337b1b66 (refactor: final slashing cleanup (#982))
         // Check that the `staker` can undelegate
         require(isDelegated(staker), NotActivelyDelegated());
         require(!isOperator(staker), OperatorsCannotUndelegate());
@@ -569,7 +577,11 @@ contract DelegationManager is
         // Remove the withdrawal from the queue. Note that for legacy withdrawals, the removals
         // from `_stakerQueuedWithdrawalRoots` and `queuedWithdrawals` will no-op.
         _stakerQueuedWithdrawalRoots[withdrawal.staker].remove(withdrawalRoot);
+<<<<<<< HEAD
         delete _queuedWithdrawals[withdrawalRoot];
+=======
+        delete queuedWithdrawals[withdrawalRoot];
+>>>>>>> 337b1b66 (refactor: final slashing cleanup (#982))
         delete pendingWithdrawals[withdrawalRoot];
         emit SlashingWithdrawalCompleted(withdrawalRoot);
 
@@ -977,6 +989,13 @@ contract DelegationManager is
         (withdrawal, shares) = _getSharesByWithdrawalRoot(withdrawalRoot);
     }
 
+    /// @inheritdoc IDelegationManager
+    function getQueuedWithdrawal(
+        bytes32 withdrawalRoot
+    ) external view returns (Withdrawal memory) {
+        return queuedWithdrawals[withdrawalRoot];
+    }
+
     /// @inheritdoc IDelegationManager
     function getQueuedWithdrawals(
         address staker

src/test/integration/tests/Deposit_Delegate_Allocate.t.sol

@@ -164,6 +164,7 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
         // 1. Deposit Into Strategies
         staker.depositIntoEigenlayer(strategies, tokenBalances);
         uint256[] memory shares = _calculateExpectedShares(strategies, tokenBalances);
+        // TODO - post-deposit and post-delegate checks?
 
         // 2. Delegate to an operator
         staker.delegateTo(operator);

src/test/integration/tests/eigenpod/EigenPod_Slashing_Migration.t.sol

@@ -33,7 +33,7 @@ contract Integration_EigenPod_Slashing_Migration is IntegrationCheckUtils, Eigen
         // Initialize state
         (User staker, ,) = _newRandomStaker();    
 
-        (uint40[] memory validators, uint64 beaconBalanceGwei) = staker.startValidators();
+        (uint40[] memory validators, ) = staker.startValidators();
         beaconChain.advanceEpoch_NoRewards(); 
 
         // 1. Verify validators' withdrawal credentials

src/test/integration/users/User.t.sol

@@ -679,13 +679,6 @@ contract User is Logger, IDelegationManagerTypes, IAllocationManagerTypes {
             );
 
             uint256 scaledShares = dsf.scaleForQueueWithdrawal(depositShares[i]);
-<<<<<<< HEAD
-=======
-
-            if (strategies[i] == beaconChainETHStrategy) {
-                scaledShares -= scaledShares % 1 gwei;
-            }
->>>>>>> 7e54c342 (refactor: scaled shares accounting (#975))
 
             expectedWithdrawals[i] = Withdrawal({
                 staker: staker,