merge in main; regenerate gas

.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap

@@ -1 +1 @@
-123968
+123966

.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap

@@ -1 +1 @@
-123465
+123464

.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap

@@ -1 +1 @@
-131046
+131044

.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap

@@ -1 +1 @@
-130544
+130542

.forge-snapshots/PositionManager_collect_native.snap

@@ -1 +1 @@
-142433
+142431

.forge-snapshots/PositionManager_collect_sameRange.snap

@@ -1 +1 @@
-151281
+151279

.forge-snapshots/PositionManager_collect_withClose.snap

@@ -1 +1 @@
-151281
+151279

.forge-snapshots/PositionManager_collect_withTakePair.snap

@@ -1 +1 @@
-150641
+150639

.forge-snapshots/PositionManager_decreaseLiquidity_native.snap

@@ -1 +1 @@
-109421
+109420

.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap

@@ -1 +1 @@
-116824
+116822

.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap

@@ -1 +1 @@
-116184
+116182

.forge-snapshots/PositionManager_decrease_burnEmpty.snap

@@ -1 +1 @@
-135121
+135120

.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap

@@ -1 +1 @@
-127860
+127859

.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap

@@ -1 +1 @@
-129540
+129538

.forge-snapshots/PositionManager_decrease_take_take.snap

@@ -1 +1 @@
-117357
+117355

.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap

@@ -1 +1 @@
-155531
+155504

.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap

@@ -1 +1 @@
-154533
+154506

.forge-snapshots/PositionManager_increaseLiquidity_native.snap

@@ -1 +1 @@
-137331
+137304

.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap

@@ -1 +1 @@
-133676
+133649

.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap

@@ -1 +1 @@
-174592
+174565

.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap

@@ -1 +1 @@
-144548
+144521

.forge-snapshots/PositionManager_mint_native.snap

@@ -1 +1 @@
-341053
+341026

.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap

@@ -1 +1 @@
-349545
+349518

.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap

@@ -1 +1 @@
-348847
+348820

.forge-snapshots/PositionManager_mint_onSameTickLower.snap

@@ -1 +1 @@
-319035
+319008

.forge-snapshots/PositionManager_mint_onSameTickUpper.snap

@@ -1 +1 @@
-319677
+319650

.forge-snapshots/PositionManager_mint_sameRange.snap

@@ -1 +1 @@
-245259
+245232

.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap

@@ -1 +1 @@
-375077
+375050

.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap

@@ -1 +1 @@
-325053
+325026

.forge-snapshots/PositionManager_mint_withClose.snap

@@ -1 +1 @@
-376353
+376326

.forge-snapshots/PositionManager_mint_withSettlePair.snap

@@ -1 +1 @@
-375493
+375466

.forge-snapshots/PositionManager_multicall_initialize_mint.snap

@@ -1 +1 @@
-420780
+420753

src/PositionManager.sol

@@ -24,7 +24,7 @@ import {Actions} from "./libraries/Actions.sol";
 import {Notifier} from "./base/Notifier.sol";
 import {CalldataDecoder} from "./libraries/CalldataDecoder.sol";
 import {Permit2Forwarder} from "./base/Permit2Forwarder.sol";
-import {SlippageCheckLibrary} from "./libraries/SlippageCheck.sol";
+import {SlippageCheck} from "./libraries/SlippageCheck.sol";
 import {PositionConfigId, PositionConfigIdLibrary} from "./libraries/PositionConfigId.sol";
 
 //                                           444444444
@@ -111,7 +111,7 @@ contract PositionManager is
     using SafeCast for uint256;
     using SafeCast for int256;
     using CalldataDecoder for bytes;
-    using SlippageCheckLibrary for BalanceDelta;
+    using SlippageCheck for BalanceDelta;
     using PositionConfigIdLibrary for PositionConfigId;
 
     /// @inheritdoc IPositionManager

src/base/Permit2Forwarder.sol

@@ -8,6 +8,8 @@ import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"
 contract Permit2Forwarder {
     IAllowanceTransfer public immutable permit2;
 
+    error Wrap__Permit2Reverted(address _permit2, bytes reason);
+
     constructor(IAllowanceTransfer _permit2) {
         permit2 = _permit2;
     }
@@ -17,16 +19,26 @@ contract Permit2Forwarder {
     function permit(address owner, IAllowanceTransfer.PermitSingle calldata permitSingle, bytes calldata signature)
         external
         payable
+        returns (bytes memory err)
     {
-        permit2.permit(owner, permitSingle, signature);
+        // use try/catch in case an actor front-runs the permit, which would DOS multicalls
+        try permit2.permit(owner, permitSingle, signature) {}
+        catch (bytes memory reason) {
+            err = abi.encodeWithSelector(Wrap__Permit2Reverted.selector, address(permit2), reason);
+        }
     }
 
     /// @notice allows forwarding batch permits to permit2
     /// @dev this function is payable to allow multicall with NATIVE based actions
     function permitBatch(address owner, IAllowanceTransfer.PermitBatch calldata _permitBatch, bytes calldata signature)
         external
         payable
+        returns (bytes memory err)
     {
-        permit2.permit(owner, _permitBatch, signature);
+        // use try/catch in case an actor front-runs the permit, which would DOS multicalls
+        try permit2.permit(owner, _permitBatch, signature) {}
+        catch (bytes memory reason) {
+            err = abi.encodeWithSelector(Wrap__Permit2Reverted.selector, address(permit2), reason);
+        }
     }
 }

src/libraries/SlippageCheck.sol

@@ -6,11 +6,11 @@ import {SafeCastTemp} from "./SafeCast.sol";
 
 /// @title Slippage Check Library
 /// @notice a library for checking if a delta exceeds a maximum ceiling or fails to meet a minimum floor
-library SlippageCheckLibrary {
+library SlippageCheck {
     using SafeCastTemp for int128;
 
-    error MaximumAmountExceeded();
-    error MinimumAmountInsufficient();
+    error MaximumAmountExceeded(uint128 maximumAmount, uint128 amountRequested);
+    error MinimumAmountInsufficient(uint128 minimumAmount, uint128 amountReceived);
 
     /// @notice Revert if one or both deltas does not meet a minimum output
     /// @param delta The principal amount of tokens to be removed, does not include any fees accrued
@@ -22,8 +22,11 @@ library SlippageCheckLibrary {
         // However, on pools where hooks can return deltas on modify liquidity, it is possible for a returned delta to be negative.
         // Because we use SafeCast, this will revert in those cases when the delta is negative.
         // This means this contract will NOT support pools where the hook returns a negative delta on burn/decrease.
-        if (delta.amount0().toUint128() < amount0Min || delta.amount1().toUint128() < amount1Min) {
-            revert MinimumAmountInsufficient();
+        if (delta.amount0().toUint128() < amount0Min) {
+            revert MinimumAmountInsufficient(amount0Min, delta.amount0().toUint128());
+        }
+        if (delta.amount1().toUint128() < amount1Min) {
+            revert MinimumAmountInsufficient(amount1Min, delta.amount1().toUint128());
         }
     }
 
@@ -38,9 +41,9 @@ library SlippageCheckLibrary {
         // Thus, we only cast the delta if it is guaranteed to be negative.
         // And we do NOT revert in the positive delta case. Since a positive delta means the hook is crediting tokens to the user for minting/increasing liquidity, we do not check slippage.
         // This means this contract will NOT support _positive_ slippage checks (minAmountOut checks) on pools where the hook returns a positive delta on mint/increase.
-        if (
-            delta.amount0() < 0 && amount0Max < uint128(-delta.amount0())
-                || delta.amount1() < 0 && amount1Max < uint128(-delta.amount1())
-        ) revert MaximumAmountExceeded();
+        int128 amount0 = delta.amount0();
+        int128 amount1 = delta.amount1();
+        if (amount0 < 0 && amount0Max < uint128(-amount0)) revert MaximumAmountExceeded(amount0Max, uint128(-amount0));
+        if (amount1 < 0 && amount1Max < uint128(-amount1)) revert MaximumAmountExceeded(amount1Max, uint128(-amount1));
     }
 }

test/position-managers/IncreaseLiquidity.t.sol

@@ -22,7 +22,7 @@ import {IERC20} from "forge-std/interfaces/IERC20.sol";
 import {PositionManager} from "../../src/PositionManager.sol";
 import {DeltaResolver} from "../../src/base/DeltaResolver.sol";
 import {PositionConfig} from "../../src/libraries/PositionConfig.sol";
-import {SlippageCheckLibrary} from "../../src/libraries/SlippageCheck.sol";
+import {SlippageCheck} from "../../src/libraries/SlippageCheck.sol";
 import {IPositionManager} from "../../src/interfaces/IPositionManager.sol";
 import {Actions} from "../../src/libraries/Actions.sol";
 import {Planner, Plan} from "../shared/Planner.sol";
@@ -540,9 +540,16 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
         uint256 tokenId = lpm.nextTokenId();
         mint(config, 100e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
+        uint128 newLiquidity = 100e18;
+        (uint256 amount0,) = LiquidityAmounts.getAmountsForLiquidity(
+            SQRT_PRICE_1_1,
+            TickMath.getSqrtPriceAtTick(config.tickLower),
+            TickMath.getSqrtPriceAtTick(config.tickUpper),
+            newLiquidity
+        );
         // revert since amount0Max is too low
-        bytes memory calls = getIncreaseEncoded(tokenId, config, 100e18, 1 wei, type(uint128).max, ZERO_BYTES);
-        vm.expectRevert(SlippageCheckLibrary.MaximumAmountExceeded.selector);
+        bytes memory calls = getIncreaseEncoded(tokenId, config, newLiquidity, 1 wei, type(uint128).max, ZERO_BYTES);
+        vm.expectRevert(abi.encodeWithSelector(SlippageCheck.MaximumAmountExceeded.selector, 1 wei, amount0 + 1));
         lpm.modifyLiquidities(calls, _deadline);
     }
 
@@ -551,9 +558,16 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
         uint256 tokenId = lpm.nextTokenId();
         mint(config, 100e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
+        uint128 newLiquidity = 100e18;
+        (, uint256 amount1) = LiquidityAmounts.getAmountsForLiquidity(
+            SQRT_PRICE_1_1,
+            TickMath.getSqrtPriceAtTick(config.tickLower),
+            TickMath.getSqrtPriceAtTick(config.tickUpper),
+            newLiquidity
+        );
         // revert since amount1Max is too low
-        bytes memory calls = getIncreaseEncoded(tokenId, config, 100e18, type(uint128).max, 1 wei, ZERO_BYTES);
-        vm.expectRevert(SlippageCheckLibrary.MaximumAmountExceeded.selector);
+        bytes memory calls = getIncreaseEncoded(tokenId, config, newLiquidity, type(uint128).max, 1 wei, ZERO_BYTES);
+        vm.expectRevert(abi.encodeWithSelector(SlippageCheck.MaximumAmountExceeded.selector, 1 wei, amount1 + 1));
         lpm.modifyLiquidities(calls, _deadline);
     }
 
@@ -601,7 +615,9 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
         swap(key, true, -10e18, ZERO_BYTES);
 
         bytes memory calls = getIncreaseEncoded(tokenId, config, newLiquidity, slippage, slippage, ZERO_BYTES);
-        vm.expectRevert(SlippageCheckLibrary.MaximumAmountExceeded.selector);
+        vm.expectRevert(
+            abi.encodeWithSelector(SlippageCheck.MaximumAmountExceeded.selector, slippage, 299996249439153403)
+        );
         lpm.modifyLiquidities(calls, _deadline);
     }