adhere to CEI when unsubscribing on burn (#333)

Uniswap · Sep 4, 2024 · f9cf32b · f9cf32b
1 parent 4899de7
commit f9cf32b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/.forge-snapshots/PositionManager_burn_empty.snap b/.forge-snapshots/PositionManager_burn_empty.snap
@@ -1 +1 @@
-47320
+47276
diff --git a/.forge-snapshots/PositionManager_burn_empty_native.snap b/.forge-snapshots/PositionManager_burn_empty_native.snap
@@ -1 +1 @@
-47137
+47094
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
@@ -1 +1 @@
-123966
+123923
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
@@ -1 +1 @@
-123464
+123420
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
@@ -1 +1 @@
-131044
+131001
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
@@ -1 +1 @@
-130542
+130499
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-135120
+135076
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-127859
+127816
diff --git a/src/PositionManager.sol b/src/PositionManager.sol
@@ -335,11 +335,13 @@ contract PositionManager is
             (liquidityDelta - feesAccrued).validateMinOut(amount0Min, amount1Min);
         }
 
-        if (positionConfigs[tokenId].hasSubscriber()) _unsubscribe(tokenId, config);
+        bool hasSubscriber = positionConfigs[tokenId].hasSubscriber();
 
         delete positionConfigs[tokenId];
         // Burn the token.
         _burn(tokenId);
+
+        if (hasSubscriber) _unsubscribe(tokenId, config);
     }
 
     function _settlePair(Currency currency0, Currency currency1) internal {