From fb44fef30b63846840a673b63d1e031e8e2f306a Mon Sep 17 00:00:00 2001
From: wadealexc <pragma-services@proton.me>
Date: Mon, 16 Oct 2023 19:44:28 +0000
Subject: [PATCH] Remove useless stake updates and fix issue where operator was
 set incorrectly for withdrawal processing

---
 src/contracts/core/DelegationManager.sol | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/contracts/core/DelegationManager.sol b/src/contracts/core/DelegationManager.sol
index f53455754..17615d2e1 100644
--- a/src/contracts/core/DelegationManager.sol
+++ b/src/contracts/core/DelegationManager.sol
@@ -245,9 +245,6 @@ contract DelegationManager is Initializable, OwnableUpgradeable, Pausable, Deleg
         (IStrategy[] memory strategies, uint256[] memory shares)
             = getDelegatableShares(staker);
 
-        // push the operator's new stake to the StakeRegistry
-        _pushOperatorStakeUpdate(operator);
-
         // emit an event if this action was not initiated by the staker themselves
         if (msg.sender != staker) {
             emit StakerForceUndelegated(staker, operator);
@@ -607,16 +604,19 @@ contract DelegationManager is Initializable, OwnableUpgradeable, Pausable, Deleg
                         podOwner: staker,
                         shares: withdrawal.shares[i]
                     });
-                    currentOperator = delegatedTo[staker];
+                    address podOwnerOperator = delegatedTo[staker];
                     // Similar to `isDelegated` logic
-                    if (currentOperator != address(0)) {
+                    if (podOwnerOperator != address(0)) {
                         _increaseOperatorShares({
-                            operator: currentOperator,
+                            operator: podOwnerOperator,
                             // the 'staker' here is the address receiving new shares
                             staker: staker,
                             strategy: withdrawal.strategies[i],
                             shares: increaseInDelegateableShares
                         });
+
+                        // push the operator's new stake to the StakeRegistry
+                        _pushOperatorStakeUpdate(podOwnerOperator);
                     }
                 } else {
                     strategyManager.addShares(msg.sender, withdrawal.strategies[i], withdrawal.shares[i]);
@@ -687,9 +687,6 @@ contract DelegationManager is Initializable, OwnableUpgradeable, Pausable, Deleg
                     strategy: strategies[i],
                     shares: shares[i]
                 });
-
-                // push the operator's new stake to the StakeRegistry
-                _pushOperatorStakeUpdate(operator);
             }
 
             // Remove active shares from EigenPodManager/StrategyManager
@@ -709,6 +706,11 @@ contract DelegationManager is Initializable, OwnableUpgradeable, Pausable, Deleg
             unchecked { ++i; }
         }
 
+        // Push the operator's new stake to the StakeRegistry
+        if (operator != address(0)) {
+            _pushOperatorStakeUpdate(operator);
+        }
+
         // Create queue entry and increment withdrawal nonce
         uint256 nonce = cumulativeWithdrawalsQueued[staker];
         cumulativeWithdrawalsQueued[staker]++;