Refactor modifyLiquidity function in Pool (#604)

This change optimizes the `modifyLiquidity` function in the Pool.sol file. Local variables were moved, improving code readability and making the code more cohesive. Variables in memory were moved on the stack, improving performance. Corresponding snapshot values were also updated to reflect these changes.
Uniswap · May 11, 2024 · 8dfc536 · 8dfc536
1 parent 8b4473e
commit 8dfc536
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 22 deletions.
diff --git a/.forge-snapshots/add liquidity to already existing position with salt.snap b/.forge-snapshots/add liquidity to already existing position with salt.snap
@@ -1 +1 @@
-151456
+151376
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
@@ -1 +1 @@
-329809
+329729
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
@@ -1 +1 @@
-284524
+284443
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
@@ -1 +1 @@
-141632
+141552
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-151432
+151352
diff --git a/.forge-snapshots/create new liquidity to a position with salt.snap b/.forge-snapshots/create new liquidity to a position with salt.snap
@@ -1 +1 @@
-299984
+299904
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
@@ -1 +1 @@
-23627
+23601
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
@@ -1 +1 @@
-185379
+185299
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
@@ -1 +1 @@
-121413
+121333
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
@@ -1 +1 @@
-118188
+118108
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-121401
+121321
diff --git a/src/libraries/Pool.sol b/src/libraries/Pool.sol
@@ -149,8 +149,6 @@ library Pool {
         uint128 liquidityGrossAfterLower;
         bool flippedUpper;
         uint128 liquidityGrossAfterUpper;
-        uint256 feeGrowthInside0X128;
-        uint256 feeGrowthInside1X128;
     }
 
     /// @notice Effect changes to a position in a pool
@@ -167,8 +165,6 @@ library Pool {
         int24 tickUpper = params.tickUpper;
         checkTicks(tickLower, tickUpper);
 
-        uint256 feesOwed0;
-        uint256 feesOwed1;
         {
             ModifyLiquidityState memory state;
 
@@ -197,11 +193,17 @@ library Pool {
                 }
             }
 
-            (state.feeGrowthInside0X128, state.feeGrowthInside1X128) = getFeeGrowthInside(self, tickLower, tickUpper);
+            {
+                (uint256 feeGrowthInside0X128, uint256 feeGrowthInside1X128) =
+                    getFeeGrowthInside(self, tickLower, tickUpper);
 
-            Position.Info storage position = self.positions.get(params.owner, tickLower, tickUpper, params.salt);
-            (feesOwed0, feesOwed1) =
-                position.update(liquidityDelta, state.feeGrowthInside0X128, state.feeGrowthInside1X128);
+                Position.Info storage position = self.positions.get(params.owner, tickLower, tickUpper, params.salt);
+                (uint256 feesOwed0, uint256 feesOwed1) =
+                    position.update(liquidityDelta, feeGrowthInside0X128, feeGrowthInside1X128);
+
+                // Fees earned from LPing are added to the user's currency delta.
+                feeDelta = toBalanceDelta(feesOwed0.toInt128(), feesOwed1.toInt128());
+            }
 
             // clear any tick data that is no longer needed
             if (liquidityDelta < 0) {
@@ -246,9 +248,6 @@ library Pool {
                 );
             }
         }
-
-        // Fees earned from LPing are added to the user's currency delta.
-        feeDelta = toBalanceDelta(feesOwed0.toInt128(), feesOwed1.toInt128());
     }
 
     struct SwapCache {