Merge pull request #9 from euler-xyz/cantina-490

Cantina 490: BalanceUtils.transferBalance may give wrong info to the hook
euler-xyz · Jul 30, 2024 · a92a2fb · a92a2fb
2 parents 50deb12 + 67533d4
commit a92a2fb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/EVault/shared/BalanceUtils.sol b/src/EVault/shared/BalanceUtils.sol
@@ -80,6 +80,10 @@ abstract contract BalanceUtils is Base {
             Shares newFromBalance = origFromBalance.subUnchecked(amount);
             user.setBalance(newFromBalance);
 
+            if (fromBalanceForwarderEnabled) {
+                balanceTracker.balanceTrackerHook(from, newFromBalance.toUint(), isControlCollateralInProgress());
+            }
+
             // update to
 
             user = vaultStorage.users[to];
@@ -89,11 +93,7 @@ abstract contract BalanceUtils is Base {
             Shares newToBalance = origToBalance + amount;
             user.setBalance(newToBalance);
 
-            if (fromBalanceForwarderEnabled) {
-                balanceTracker.balanceTrackerHook(from, newFromBalance.toUint(), isControlCollateralInProgress());
-            }
-
-            if (toBalanceForwarderEnabled && from != to) {
+            if (toBalanceForwarderEnabled) {
                 balanceTracker.balanceTrackerHook(to, newToBalance.toUint(), false);
             }
         }