posm slippage

.forge-snapshots/PositionManager_burn_empty.snap

@@ -1 +1 @@
-47248
+47639

.forge-snapshots/PositionManager_burn_empty_native.snap

@@ -1 +1 @@
-47066
+47456

.forge-snapshots/PositionManager_burn_nonEmpty.snap

@@ -1 +1 @@
-130117
+130604

.forge-snapshots/PositionManager_burn_nonEmpty_native.snap

@@ -1 +1 @@
-123039
+123525

.forge-snapshots/PositionManager_collect.snap

@@ -1 +1 @@
-151223
+151829

.forge-snapshots/PositionManager_collect_native.snap

@@ -1 +1 @@
-142375
+142981

.forge-snapshots/PositionManager_collect_sameRange.snap

@@ -1 +1 @@
-151223
+151829

.forge-snapshots/PositionManager_decreaseLiquidity.snap

@@ -1 +1 @@
-116766
+117372

.forge-snapshots/PositionManager_decreaseLiquidity_native.snap

@@ -1 +1 @@
-109375
+109860

.forge-snapshots/PositionManager_decrease_burnEmpty.snap

@@ -1 +1 @@
-135156
+136042

.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap

@@ -1 +1 @@
-127895
+128781

.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap

@@ -1 +1 @@
-129482
+130088

.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap

@@ -1 +1 @@
-152736
+154000

.forge-snapshots/PositionManager_increaseLiquidity_native.snap

@@ -1 +1 @@
-134536
+135800

.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap

@@ -1 +1 @@
-135432
+136451

.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap

@@ -1 +1 @@
-171588
+172607

.forge-snapshots/PositionManager_mint.snap

@@ -1 +1 @@
-372837
+373981

.forge-snapshots/PositionManager_mint_native.snap

@@ -1 +1 @@
-337537
+338681

.forge-snapshots/PositionManager_mint_nativeWithSweep.snap

@@ -1 +1 @@
-346399
+347557

.forge-snapshots/PositionManager_mint_onSameTickLower.snap

@@ -1 +1 @@
-315519
+316663

.forge-snapshots/PositionManager_mint_onSameTickUpper.snap

@@ -1 +1 @@
-316161
+317305

.forge-snapshots/PositionManager_mint_sameRange.snap

@@ -1 +1 @@
-241743
+242887

.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap

@@ -1 +1 @@
-371451
+372610

.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap

@@ -1 +1 @@
-321537
+322681

.forge-snapshots/PositionManager_multicall_initialize_mint.snap

@@ -1 +1 @@
-417173
+418329

src/PositionManager.sol

@@ -100,31 +100,54 @@ contract PositionManager is
     /// @param params is an encoding of uint256 tokenId, PositionConfig memory config, uint256 liquidity, bytes hookData
     /// @dev Calling increase with 0 liquidity will credit the caller with any underlying fees of the position
     function _increase(bytes memory params) internal {
-        (uint256 tokenId, PositionConfig memory config, uint256 liquidity, bytes memory hookData) =
-            abi.decode(params, (uint256, PositionConfig, uint256, bytes));
+        (
+            uint256 tokenId,
+            PositionConfig memory config,
+            uint256 liquidity,
+            uint128 amount0Max,
+            uint128 amount1Max,
+            bytes memory hookData
+        ) = abi.decode(params, (uint256, PositionConfig, uint256, uint128, uint128, bytes));
 
         if (positionConfigs[tokenId] != config.toId()) revert IncorrectPositionConfigForTokenId(tokenId);
         // Note: The tokenId is used as the salt for this position, so every minted position has unique storage in the pool manager.
         BalanceDelta liquidityDelta = _modifyLiquidity(config, liquidity.toInt256(), bytes32(tokenId), hookData);
+        if (liquidityDelta.amount0() < 0 && amount0Max < uint128(-liquidityDelta.amount0())) revert SlippageExceeded();
+        if (liquidityDelta.amount1() < 0 && amount1Max < uint128(-liquidityDelta.amount1())) revert SlippageExceeded();
     }
 
     /// @param params is an encoding of uint256 tokenId, PositionConfig memory config, uint256 liquidity, bytes hookData
     /// @dev Calling decrease with 0 liquidity will credit the caller with any underlying fees of the position
     function _decrease(bytes memory params) internal {
-        (uint256 tokenId, PositionConfig memory config, uint256 liquidity, bytes memory hookData) =
-            abi.decode(params, (uint256, PositionConfig, uint256, bytes));
+        (
+            uint256 tokenId,
+            PositionConfig memory config,
+            uint256 liquidity,
+            uint128 amount0Min,
+            uint128 amount1Min,
+            bytes memory hookData
+        ) = abi.decode(params, (uint256, PositionConfig, uint256, uint128, uint128, bytes));
 
         if (!_isApprovedOrOwner(_msgSender(), tokenId)) revert NotApproved(_msgSender());
         if (positionConfigs[tokenId] != config.toId()) revert IncorrectPositionConfigForTokenId(tokenId);
 
         // Note: the tokenId is used as the salt.
         BalanceDelta liquidityDelta = _modifyLiquidity(config, -(liquidity.toInt256()), bytes32(tokenId), hookData);
+        if (uint128(liquidityDelta.amount0()) < amount0Min || uint128(liquidityDelta.amount1()) < amount1Min) {
+            revert SlippageExceeded();
+        }
     }
 
     /// @param params is an encoding of PositionConfig memory config, uint256 liquidity, address recipient, bytes hookData where recipient is the receiver / owner of the ERC721
     function _mint(bytes memory params) internal {
-        (PositionConfig memory config, uint256 liquidity, address owner, bytes memory hookData) =
-            abi.decode(params, (PositionConfig, uint256, address, bytes));
+        (
+            PositionConfig memory config,
+            uint256 liquidity,
+            uint128 amount0Max,
+            uint128 amount1Max,
+            address owner,
+            bytes memory hookData
+        ) = abi.decode(params, (PositionConfig, uint256, uint128, uint128, address, bytes));
 
         // mint receipt token
         uint256 tokenId;
@@ -136,7 +159,8 @@ contract PositionManager is
 
         // _beforeModify is not called here because the tokenId is newly minted
         BalanceDelta liquidityDelta = _modifyLiquidity(config, liquidity.toInt256(), bytes32(tokenId), hookData);
-
+        if (amount0Max < uint128(-liquidityDelta.amount0())) revert SlippageExceeded();
+        if (amount1Max < uint128(-liquidityDelta.amount1())) revert SlippageExceeded();
         positionConfigs[tokenId] = config.toId();
     }
 
@@ -168,8 +192,8 @@ contract PositionManager is
     /// @param params is an encoding of uint256 tokenId, PositionConfig memory config, bytes hookData
     /// @dev this is overloaded with ERC721Permit._burn
     function _burn(bytes memory params) internal {
-        (uint256 tokenId, PositionConfig memory config, bytes memory hookData) =
-            abi.decode(params, (uint256, PositionConfig, bytes));
+        (uint256 tokenId, PositionConfig memory config, uint128 amount0Min, uint128 amount1Min, bytes memory hookData) =
+            abi.decode(params, (uint256, PositionConfig, uint128, uint128, bytes));
 
         if (!_isApprovedOrOwner(_msgSender(), tokenId)) revert NotApproved(_msgSender());
         if (positionConfigs[tokenId] != config.toId()) revert IncorrectPositionConfigForTokenId(tokenId);
@@ -179,6 +203,9 @@ contract PositionManager is
         // Can only call modify if there is non zero liquidity.
         if (liquidity > 0) {
             liquidityDelta = _modifyLiquidity(config, -(liquidity.toInt256()), bytes32(tokenId), hookData);
+            if (uint128(liquidityDelta.amount0()) < amount0Min || uint128(liquidityDelta.amount1()) < amount1Min) {
+                revert SlippageExceeded();
+            }
         }
 
         delete positionConfigs[tokenId];

src/interfaces/IPositionManager.sol

@@ -5,6 +5,7 @@ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
 
 interface IPositionManager {
     error NotApproved(address caller);
+    error SlippageExceeded();
     error DeadlinePassed();
     error IncorrectPositionConfigForTokenId(uint256 tokenId);
 

test/position-managers/Execute.t.sol

@@ -91,8 +91,14 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
 
         Plan memory planner = Planner.init();
 
-        planner.add(Actions.INCREASE_LIQUIDITY, abi.encode(tokenId, config, liquidityToAdd, ZERO_BYTES));
-        planner.add(Actions.INCREASE_LIQUIDITY, abi.encode(tokenId, config, liquidityToAdd2, ZERO_BYTES));
+        planner.add(
+            Actions.INCREASE_LIQUIDITY,
+            abi.encode(tokenId, config, liquidityToAdd, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, ZERO_BYTES)
+        );
+        planner.add(
+            Actions.INCREASE_LIQUIDITY,
+            abi.encode(tokenId, config, liquidityToAdd2, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, ZERO_BYTES)
+        );
 
         bytes memory calls = planner.finalizeModifyLiquidity(config.poolKey);
         lpm.modifyLiquidities(calls, _deadline);
@@ -113,8 +119,16 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
 
         Plan memory planner = Planner.init();
 
-        planner.add(Actions.MINT_POSITION, abi.encode(config, initialLiquidity, address(this), ZERO_BYTES));
-        planner.add(Actions.INCREASE_LIQUIDITY, abi.encode(tokenId, config, liquidityToAdd, ZERO_BYTES));
+        planner.add(
+            Actions.MINT_POSITION,
+            abi.encode(
+                config, initialLiquidity, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, address(this), ZERO_BYTES
+            )
+        );
+        planner.add(
+            Actions.INCREASE_LIQUIDITY,
+            abi.encode(tokenId, config, liquidityToAdd, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, ZERO_BYTES)
+        );
 
         bytes memory calls = planner.finalizeModifyLiquidity(config.poolKey);
         lpm.modifyLiquidities(calls, _deadline);
@@ -151,8 +165,16 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
         hook.clearDeltas(); // clear the delta so that we can check the net delta for BURN & MINT
 
         Plan memory planner = Planner.init();
-        planner.add(Actions.BURN_POSITION, abi.encode(tokenId, config, ZERO_BYTES));
-        planner.add(Actions.MINT_POSITION, abi.encode(newConfig, newLiquidity, address(this), ZERO_BYTES));
+        planner.add(
+            Actions.BURN_POSITION,
+            abi.encode(
+                tokenId, config, uint128(-delta.amount0()) - 1 wei, uint128(-delta.amount1()) - 1 wei, ZERO_BYTES
+            )
+        );
+        planner.add(
+            Actions.MINT_POSITION,
+            abi.encode(newConfig, newLiquidity, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, address(this), ZERO_BYTES)
+        );
         bytes memory calls = planner.finalizeModifyLiquidity(config.poolKey);
 
         lpm.modifyLiquidities(calls, _deadline);

test/position-managers/IncreaseLiquidity.t.sol

@@ -114,7 +114,9 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
 
         // TODO: Can we make this easier to re-invest fees, so that you don't need to know the exact collect amount?
         Plan memory planner = Planner.init();
-        planner.add(Actions.INCREASE_LIQUIDITY, abi.encode(tokenIdAlice, config, liquidityDelta, ZERO_BYTES));
+        planner.add(
+            Actions.INCREASE_LIQUIDITY, abi.encode(tokenIdAlice, config, liquidityDelta, 0 wei, 0 wei, ZERO_BYTES)
+        );
         bytes memory calls = planner.finalizeModifyLiquidity(config.poolKey);
         vm.startPrank(alice);
         lpm.modifyLiquidities(calls, _deadline);
@@ -369,11 +371,84 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
         }
     }
 
+    function test_increaseLiquidity_slippage_revertAmount0() public {
+        // increasing liquidity with strict slippage parameters (amount0) will revert
+        uint256 tokenId = lpm.nextTokenId();
+        mint(config, 100e18, address(this), ZERO_BYTES);
+
+        // revert since amount0Max is too low
+        bytes memory calls = getIncreaseEncoded(tokenId, config, 100e18, 1 wei, type(uint128).max, ZERO_BYTES);
+        vm.expectRevert(IPositionManager.SlippageExceeded.selector);
+        lpm.modifyLiquidities(calls, _deadline);
+    }
+
+    function test_increaseLiquidity_slippage_revertAmount1() public {
+        // increasing liquidity with strict slippage parameters (amount1) will revert
+        uint256 tokenId = lpm.nextTokenId();
+        mint(config, 100e18, address(this), ZERO_BYTES);
+
+        // revert since amount1Max is too low
+        bytes memory calls = getIncreaseEncoded(tokenId, config, 100e18, type(uint128).max, 1 wei, ZERO_BYTES);
+        vm.expectRevert(IPositionManager.SlippageExceeded.selector);
+        lpm.modifyLiquidities(calls, _deadline);
+    }
+
+    function test_increaseLiquidity_slippage_exactDoesNotRevert() public {
+        // increasing liquidity with perfect slippage parameters does not revert
+        uint256 tokenId = lpm.nextTokenId();
+        mint(config, 100e18, address(this), ZERO_BYTES);
+
+        uint128 newLiquidity = 10e18;
+        (uint256 amount0, uint256 amount1) = LiquidityAmounts.getAmountsForLiquidity(
+            SQRT_PRICE_1_1,
+            TickMath.getSqrtPriceAtTick(config.tickLower),
+            TickMath.getSqrtPriceAtTick(config.tickUpper),
+            newLiquidity
+        );
+        assertEq(amount0, amount1); // symmetric liquidity addition
+        uint128 slippage = uint128(amount0) + 1;
+
+        bytes memory calls = getIncreaseEncoded(tokenId, config, newLiquidity, slippage, slippage, ZERO_BYTES);
+        lpm.modifyLiquidities(calls, _deadline);
+        BalanceDelta delta = getLastDelta();
+
+        // confirm that delta == slippage tolerance
+        assertEq(-delta.amount0(), int128(slippage));
+        assertEq(-delta.amount1(), int128(slippage));
+    }
+
+    /// price movement from swaps will cause slippage reverts
+    function test_increaseLiquidity_slippage_revert_swap() public {
+        // increasing liquidity with perfect slippage parameters does not revert
+        uint256 tokenId = lpm.nextTokenId();
+        mint(config, 100e18, address(this), ZERO_BYTES);
+
+        uint128 newLiquidity = 10e18;
+        (uint256 amount0, uint256 amount1) = LiquidityAmounts.getAmountsForLiquidity(
+            SQRT_PRICE_1_1,
+            TickMath.getSqrtPriceAtTick(config.tickLower),
+            TickMath.getSqrtPriceAtTick(config.tickUpper),
+            newLiquidity
+        );
+        assertEq(amount0, amount1); // symmetric liquidity addition
+        uint128 slippage = uint128(amount0) + 1;
+
+        // swap to create slippage
+        swap(key, true, -10e18, ZERO_BYTES);
+
+        bytes memory calls = getIncreaseEncoded(tokenId, config, newLiquidity, slippage, slippage, ZERO_BYTES);
+        vm.expectRevert(IPositionManager.SlippageExceeded.selector);
+        lpm.modifyLiquidities(calls, _deadline);
+    }
+
     function test_mint_settleWithBalance() public {
         uint256 liquidityAlice = 3_000e18;
 
         Plan memory planner = Planner.init();
-        planner.add(Actions.MINT_POSITION, abi.encode(config, liquidityAlice, alice, ZERO_BYTES));
+        planner.add(
+            Actions.MINT_POSITION,
+            abi.encode(config, liquidityAlice, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, alice, ZERO_BYTES)
+        );
         planner.add(Actions.SETTLE_WITH_BALANCE, abi.encode(currency0));
         planner.add(Actions.SETTLE_WITH_BALANCE, abi.encode(currency1));
         planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));
@@ -422,7 +497,10 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
 
         // alice increases with the balance in the position manager
         Plan memory planner = Planner.init();
-        planner.add(Actions.INCREASE_LIQUIDITY, abi.encode(tokenIdAlice, config, liquidityAlice, ZERO_BYTES));
+        planner.add(
+            Actions.INCREASE_LIQUIDITY,
+            abi.encode(tokenIdAlice, config, liquidityAlice, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, ZERO_BYTES)
+        );
         planner.add(Actions.SETTLE_WITH_BALANCE, abi.encode(currency0));
         planner.add(Actions.SETTLE_WITH_BALANCE, abi.encode(currency1));
         planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));