pancakeswap · chefburger · Jun 17, 2024 · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap
@@ -1 +1 @@
-354468
+354066
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap
@@ -1 +1 @@
-169905
+169503
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap
@@ -1 +1 @@
-240616
+240214
diff --git a/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap
@@ -1 +1 @@
-117090
+116696
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap
@@ -1 +1 @@
-133844
+133828
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap b/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap
@@ -1 +1 @@
-166609
+166601
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap
@@ -1 +1 @@
-153974
+153966
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap b/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap
@@ -1 +1 @@
-146019
+146003
diff --git a/.forge-snapshots/SqrtPriceMathTest#getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap b/.forge-snapshots/SqrtPriceMathTest#getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap
@@ -1 +1 @@
-380
+372
diff --git a/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromInput_zeroForOneEqualsTrue.snap b/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromInput_zeroForOneEqualsTrue.snap
@@ -1 +1 @@
-571
+563
diff --git a/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromOutput_zeroForOneEqualsFalse.snap b/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromOutput_zeroForOneEqualsFalse.snap
@@ -1 +1 @@
-582
+574
diff --git a/.forge-snapshots/SwapMathTest#SwapOneForZeroExactInCapped.snap b/.forge-snapshots/SwapMathTest#SwapOneForZeroExactInCapped.snap
@@ -1 +1 @@
-1296
+1288
diff --git a/.forge-snapshots/SwapMathTest#SwapOneForZeroExactOutCapped.snap b/.forge-snapshots/SwapMathTest#SwapOneForZeroExactOutCapped.snap
@@ -1 +1 @@
-1133
+1125
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInCapped.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInCapped.snap
@@ -1 +1 @@
-1301
+1293
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInPartial.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInPartial.snap
@@ -1 +1 @@
-2118
+2110
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutCapped.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutCapped.snap
@@ -1 +1 @@
-1130
+1122
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutPartial.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutPartial.snap
@@ -1 +1 @@
-2118
+2110
diff --git a/.forge-snapshots/TickTest#tickSpacingToMaxLiquidityPerTick.snap b/.forge-snapshots/TickTest#tickSpacingToMaxLiquidityPerTick.snap
@@ -1 +1 @@
-563
+29
diff --git a/.forge-snapshots/TickTest#update.snap b/.forge-snapshots/TickTest#update.snap
@@ -1 +1 @@
-133918
+133389
diff --git a/src/pool-cl/libraries/FullMath.sol b/src/pool-cl/libraries/FullMath.sol
@@ -110,9 +110,8 @@ library FullMath {
     function mulDivRoundingUp(uint256 a, uint256 b, uint256 denominator) internal pure returns (uint256 result) {
         unchecked {
             result = mulDiv(a, b, denominator);
-            if (mulmod(a, b, denominator) > 0) {
-                require(result < type(uint256).max);
-                result++;
+            if (mulmod(a, b, denominator) != 0) {
+                require(++result > 0);
             }
         }
     }

diff --git a/src/pool-cl/libraries/Tick.sol b/src/pool-cl/libraries/Tick.sol
@@ -50,12 +50,22 @@ library Tick {
     /// @dev Executed within the pool constructor
     /// @param tickSpacing The amount of required tick separation, realized in multiples of `tickSpacing`
     ///     e.g., a tickSpacing of 3 requires ticks to be initialized every 3rd tick i.e., ..., -6, -3, 0, 3, 6, ...
-    /// @return The max liquidity per tick
-    function tickSpacingToMaxLiquidityPerTick(int24 tickSpacing) internal pure returns (uint128) {
-        int24 minTick = (TickMath.MIN_TICK / tickSpacing) * tickSpacing;
-        int24 maxTick = (TickMath.MAX_TICK / tickSpacing) * tickSpacing;
-        uint24 numTicks = uint24((maxTick - minTick) / tickSpacing) + 1;
-        return type(uint128).max / numTicks;
+    /// @return result The max liquidity per tick
+    function tickSpacingToMaxLiquidityPerTick(int24 tickSpacing) internal pure returns (uint128 result) {
+        // Equivalent to v3 but in assembly for gas efficiency:
+        // int24 minTick = (TickMath.MIN_TICK / tickSpacing) * tickSpacing;
+        // int24 maxTick = (TickMath.MAX_TICK / tickSpacing) * tickSpacing;
+        // uint24 numTicks = uint24((maxTick - minTick) / tickSpacing) + 1;
+        // return type(uint128).max / numTicks;
+        int24 MAX_TICK = TickMath.MAX_TICK;
+        int24 MIN_TICK = TickMath.MIN_TICK;
+        // tick spacing will never be 0 since TickMath.MIN_TICK_SPACING is 1
+        assembly {
+            let minTick := mul(sdiv(MIN_TICK, tickSpacing), tickSpacing)
+            let maxTick := mul(sdiv(MAX_TICK, tickSpacing), tickSpacing)
+            let numTicks := add(sdiv(sub(maxTick, minTick), tickSpacing), 1)
+            result := div(sub(shl(128, 1), 1), numTicks)
+        }
     }
 
     /// @notice Retrieves fee growth data

diff --git a/test/pool-cl/helpers/PoolModifyPositionTest.sol b/test/pool-cl/helpers/PoolModifyPositionTest.sol
diff --git a/test/pool-cl/libraries/FullMath.t.sol b/test/pool-cl/libraries/FullMath.t.sol
@@ -52,7 +52,7 @@ contract FullMathTest is Test {
     function test_mulDiv_fuzz(uint256 x, uint256 y, uint256 d) public {
         vm.assume(d != 0);
         vm.assume(y != 0);
-        vm.assume(x <= type(uint256).max / y);
+        x = bound(x, 0, type(uint256).max / y);
         assertEq(FullMath.mulDiv(x, y, d), x * y / d);
     }
 
@@ -97,10 +97,14 @@ contract FullMathTest is Test {
     function test_mulDivRoundingUp_fuzz(uint256 x, uint256 y, uint256 d) public {
         vm.assume(d != 0);
         vm.assume(y != 0);
-        vm.assume(x <= type(uint256).max / y);
+        x = bound(x, 0, type(uint256).max / y);
         uint256 numerator = x * y;
         uint256 result = FullMath.mulDivRoundingUp(x, y, d);
-        assertTrue(result == numerator / d || result == numerator / d + 1);
+        if (mulmod(x, y, d) > 0) {
+            assertEq(result, numerator / d + 1);
+        } else {
+            assertEq(result, numerator / d);
+        }
     }
 
     function test_mulDivRounding(uint256 x, uint256 y, uint256 d) public {

diff --git a/test/pool-cl/libraries/Tick.t.sol b/test/pool-cl/libraries/Tick.t.sol
@@ -542,4 +542,14 @@ contract TickTest is Test, GasSnapshot {
         // max liquidity at every tick is less than the cap
         assertGe(type(uint128).max, uint256(maxLiquidityPerTick) * numTicks);
     }
+
+    function test_fuzz_tickSpacingToMaxLiquidityPerTick(int24 tickSpacing) public pure {
+        vm.assume(tickSpacing > 0);
+        // v3 math
+        int24 minTick = (TickMath.MIN_TICK / tickSpacing) * tickSpacing;
+        int24 maxTick = (TickMath.MAX_TICK / tickSpacing) * tickSpacing;
+        uint24 numTicks = uint24((maxTick - minTick) / tickSpacing) + 1;
+        // assert that the result is the same as the v3 math
+        assertEq(type(uint128).max / numTicks, Tick.tickSpacingToMaxLiquidityPerTick(tickSpacing));
+    }
 }