Uncheck negation after toInt128 (#589)

The majority of changes applied surround the `toInt128` method where subtraction operations inside `take` and `mint` methods in PoolManager.sol are now unchecked. This is coupled with removing an unnecessary unchecked block in the same file. These modifications contribute to the slight alteration in snapshot data.
Uniswap · Apr 18, 2024 · 10bce5b · 10bce5b
1 parent d7411cc
commit 10bce5b
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 28 deletions.
diff --git a/.forge-snapshots/DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap b/.forge-snapshots/DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap
@@ -1 +1 @@
-131807
+131731
diff --git a/.forge-snapshots/DynamicFees.swap_withDynamicFee.snap b/.forge-snapshots/DynamicFees.swap_withDynamicFee.snap
@@ -1 +1 @@
-90781
+90705
diff --git a/.forge-snapshots/PoolManager.bytecodeSize.snap b/.forge-snapshots/PoolManager.bytecodeSize.snap
@@ -1 +1 @@
-22630
+22628
diff --git a/.forge-snapshots/PoolManager.removeLiquidity.snap b/.forge-snapshots/PoolManager.removeLiquidity.snap
@@ -1 +1 @@
-137995
+137843
diff --git a/.forge-snapshots/PoolManager.removeLiquidity_withEmptyHook.snap b/.forge-snapshots/PoolManager.removeLiquidity_withEmptyHook.snap
@@ -1 +1 @@
-53945
+53793
diff --git a/.forge-snapshots/PoolManager.removeLiquidity_withNative.snap b/.forge-snapshots/PoolManager.removeLiquidity_withNative.snap
@@ -1 +1 @@
-141717
+141565
diff --git a/.forge-snapshots/PoolManager.swap_againstLiquidityWithNativeToken.snap b/.forge-snapshots/PoolManager.swap_againstLiquidityWithNativeToken.snap
@@ -1 +1 @@
-71233
+71157
diff --git a/.forge-snapshots/PoolManager.swap_mintNativeOutputAs6909.snap b/.forge-snapshots/PoolManager.swap_mintNativeOutputAs6909.snap
@@ -1 +1 @@
-135671
+135595
diff --git a/.forge-snapshots/PoolManager.swap_mintOutputAs6909.snap b/.forge-snapshots/PoolManager.swap_mintOutputAs6909.snap
@@ -1 +1 @@
-152294
+152218
diff --git a/.forge-snapshots/PoolManager.swap_simple.snap b/.forge-snapshots/PoolManager.swap_simple.snap
@@ -1 +1 @@
-138291
+138215
diff --git a/.forge-snapshots/PoolManager.swap_simpleWithNative.snap b/.forge-snapshots/PoolManager.swap_simpleWithNative.snap
@@ -1 +1 @@
-126898
+126822
diff --git a/.forge-snapshots/PoolManager.swap_withHooks.snap b/.forge-snapshots/PoolManager.swap_withHooks.snap
@@ -1 +1 @@
-61531
+61455
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -1 +1 @@
-61552
+61476
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
@@ -1 +1 @@
-79445
+79369
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
@@ -1 +1 @@
-75288
+75212
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
@@ -1 +1 @@
-158953
+158801
diff --git a/src/PoolManager.sol b/src/PoolManager.sol
@@ -157,12 +157,10 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         int256 current = currency.getDelta(msg.sender);
         int256 next = current + delta;
 
-        unchecked {
-            if (next == 0) {
-                NonZeroDeltaCount.decrement();
-            } else if (current == 0) {
-                NonZeroDeltaCount.increment();
-            }
+        if (next == 0) {
+            NonZeroDeltaCount.decrement();
+        } else if (current == 0) {
+            NonZeroDeltaCount.increment();
         }
 
         currency.setDelta(msg.sender, next);
@@ -265,9 +263,11 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
 
     /// @inheritdoc IPoolManager
     function take(Currency currency, address to, uint256 amount) external override onlyWhenUnlocked {
-        // subtraction must be safe
-        _accountDelta(currency, -(amount.toInt128()));
-        currency.transfer(to, amount);
+        unchecked {
+            // subtraction must be safe
+            _accountDelta(currency, -(amount.toInt128()));
+            currency.transfer(to, amount);
+        }
     }
 
     /// @inheritdoc IPoolManager
@@ -285,9 +285,11 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
 
     /// @inheritdoc IPoolManager
     function mint(address to, uint256 id, uint256 amount) external override onlyWhenUnlocked {
-        // subtraction must be safe
-        _accountDelta(CurrencyLibrary.fromId(id), -(amount.toInt128()));
-        _mint(to, id, amount);
+        unchecked {
+            // subtraction must be safe
+            _accountDelta(CurrencyLibrary.fromId(id), -(amount.toInt128()));
+            _mint(to, id, amount);
+        }
     }
 
     /// @inheritdoc IPoolManager