Before after add/remove liquidity, remove all modifyPosition hooks

.forge-snapshots/addLiquidity with empty hook.snap

@@ -0,0 +1 @@
+320193

.forge-snapshots/addLiquidity with native token.snap

@@ -0,0 +1 @@
+202979

.forge-snapshots/addLiquidity.snap

@@ -0,0 +1 @@
+202925

.forge-snapshots/before swap hook, already cached dynamic fee.snap

@@ -1 +1 @@
-193083
+193128

.forge-snapshots/cached dynamic fee, no hooks.snap

@@ -1 +1 @@
-148446
+148469

.forge-snapshots/donate gas with 1 token.snap

@@ -1 +1 @@
-139060
+139105

.forge-snapshots/donate gas with 2 tokens.snap

@@ -1 +1 @@
-186482
+186572

.forge-snapshots/initialize.snap

@@ -1 +1 @@
-78563
+78605

.forge-snapshots/mintWithEmptyHookEOAInitiated.snap

@@ -1 +1 @@
-250959
+251938

.forge-snapshots/modify position with noop.snap

@@ -1 +1 @@
-56530
+56865

.forge-snapshots/poolManager bytecode size.snap

@@ -1 +1 @@
-26329
+26933

.forge-snapshots/removeLiquidity with empty hook.snap

@@ -0,0 +1 @@
+105900

.forge-snapshots/removeLiquidity with native token.snap

@@ -0,0 +1 @@
+211283

.forge-snapshots/removeLiquidity.snap

@@ -0,0 +1 @@
+207550

.forge-snapshots/simple swap with native.snap

@@ -1 +1 @@
-197331
+197354

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-205899
+205922

.forge-snapshots/simpleSwapEOAInitiated.snap

@@ -1 +1 @@
-177187
+177210

.forge-snapshots/simpleSwapNativeEOAInitiated.snap

@@ -1 +1 @@
-173849
+173872

.forge-snapshots/swap against liquidity with native token.snap

@@ -1 +1 @@
-127924
+127947

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-115415
+115438

.forge-snapshots/swap burn claim for input.snap

@@ -1 +1 @@
-134509
+134487

.forge-snapshots/swap mint 1155 as output.snap

@@ -0,0 +1 @@
+169598

.forge-snapshots/swap mint output as claim.snap

@@ -1 +1 @@
-218114
+218137

.forge-snapshots/swap with dynamic fee.snap

@@ -1 +1 @@
-192325
+192370

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-115393
+115416

.forge-snapshots/update dynamic fee in before swap.snap

@@ -1 +1 @@
-198919
+198941

src/PoolManager.sol

@@ -195,7 +195,54 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
     }
 
     /// @inheritdoc IPoolManager
-    function modifyPosition(
+    function addLiquidity(PoolKey memory key, IPoolManager.ModifyPositionParams memory params, bytes calldata hookData)
+        external
+        override
+        noDelegateCall
+        onlyByLocker
+        returns (BalanceDelta delta)
+    {
+        (bool set) = Lockers.setCurrentHook(key.hooks);
+
+        PoolId id = key.toId();
+        _checkPoolInitialized(id);
+
+        if (key.hooks.shouldCallBeforeAddLiquidity()) {
+            bytes4 selector = key.hooks.beforeAddLiquidity(msg.sender, key, params, hookData);
+            // Sentinel return value used to signify that a NoOp occurred.
+            if (key.hooks.isValidNoOpCall(selector)) {
+                // We only want to clear the current hook if it was set in setCurrentHook in this execution frame.
+                if (set) Lockers.clearCurrentHook();
+                return BalanceDeltaLibrary.MAXIMUM_DELTA;
+            } else if (selector != IHooks.beforeAddLiquidity.selector) {
+                revert Hooks.InvalidHookResponse();
+            }
+        }
+
+        delta = _modifyPosition(
+            key,
+            IPoolManager.PoolModifyPositionParams({
+                tickLower: params.tickLower,
+                tickUpper: params.tickUpper,
+                liquidityDelta: params.liquidityDelta.toInt128()
+            })
+        );
+
+        if (key.hooks.shouldCallAfterAddLiquidity()) {
+            if (
+                key.hooks.afterAddLiquidity(msg.sender, key, params, delta, hookData)
+                    != IHooks.afterAddLiquidity.selector
+            ) {
+                revert Hooks.InvalidHookResponse();
+            }
+        }
+
+        // We only want to clear the current hook if it was set in setCurrentHook in this execution frame.
+        if (set) Lockers.clearCurrentHook();
+    }
+
+    /// @inheritdoc IPoolManager
+    function removeLiquidity(
         PoolKey memory key,
         IPoolManager.ModifyPositionParams memory params,
         bytes calldata hookData
@@ -205,18 +252,45 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
         PoolId id = key.toId();
         _checkPoolInitialized(id);
 
-        if (key.hooks.shouldCallBeforeModifyPosition()) {
-            bytes4 selector = key.hooks.beforeModifyPosition(msg.sender, key, params, hookData);
+        if (key.hooks.shouldCallBeforeRemoveLiquidity()) {
+            bytes4 selector = key.hooks.beforeRemoveLiquidity(msg.sender, key, params, hookData);
             // Sentinel return value used to signify that a NoOp occurred.
             if (key.hooks.isValidNoOpCall(selector)) {
                 // We only want to clear the current hook if it was set in setCurrentHook in this execution frame.
                 if (set) Lockers.clearCurrentHook();
                 return BalanceDeltaLibrary.MAXIMUM_DELTA;
-            } else if (selector != IHooks.beforeModifyPosition.selector) {
+            } else if (selector != IHooks.beforeRemoveLiquidity.selector) {
+                revert Hooks.InvalidHookResponse();
+            }
+        }
+
+        delta = _modifyPosition(
+            key,
+            IPoolManager.PoolModifyPositionParams({
+                tickLower: params.tickLower,
+                tickUpper: params.tickUpper,
+                liquidityDelta: -params.liquidityDelta.toInt128()
+            })
+        );
+
+        if (key.hooks.shouldCallAfterRemoveLiquidity()) {
+            if (
+                key.hooks.afterRemoveLiquidity(msg.sender, key, params, delta, hookData)
+                    != IHooks.afterRemoveLiquidity.selector
+            ) {
                 revert Hooks.InvalidHookResponse();
             }
         }
 
+        // We only want to clear the current hook if it was set in setCurrentHook in this execution frame.
+        if (set) Lockers.clearCurrentHook();
+    }
+
+    function _modifyPosition(PoolKey memory key, IPoolManager.PoolModifyPositionParams memory params)
+        internal
+        returns (BalanceDelta delta)
+    {
+        PoolId id = key.toId();
         Pool.FeeAmounts memory feeAmounts;
         (delta, feeAmounts) = pools[id].modifyPosition(
             Pool.ModifyPositionParams({
@@ -245,18 +319,6 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
             }
         }
 
-        if (key.hooks.shouldCallAfterModifyPosition()) {
-            if (
-                key.hooks.afterModifyPosition(msg.sender, key, params, delta, hookData)
-                    != IHooks.afterModifyPosition.selector
-            ) {
-                revert Hooks.InvalidHookResponse();
-            }
-        }
-
-        // We only want to clear the current hook if it was set in setCurrentHook in this execution frame.
-        if (set) Lockers.clearCurrentHook();
-
         emit ModifyPosition(id, msg.sender, params.tickLower, params.tickUpper, params.liquidityDelta);
     }
 

src/interfaces/IHooks.sol

@@ -35,26 +35,53 @@ interface IHooks {
         bytes calldata hookData
     ) external returns (bytes4);
 
-    /// @notice The hook called before a position is modified
-    /// @param sender The initial msg.sender for the modify position call
+    /// @notice The hook called before liquidity is added
+    /// @param sender The initial msg.sender for the add liquidity call
     /// @param key The key for the pool
-    /// @param params The parameters for modifying the position
+    /// @param params The parameters for adding liquidity
     /// @param hookData Arbitrary data handed into the PoolManager by the liquidty provider to be be passed on to the hook
     /// @return bytes4 The function selector for the hook
-    function beforeModifyPosition(
+    function beforeAddLiquidity(
         address sender,
         PoolKey calldata key,
         IPoolManager.ModifyPositionParams calldata params,
         bytes calldata hookData
     ) external returns (bytes4);
 
-    /// @notice The hook called after a position is modified
-    /// @param sender The initial msg.sender for the modify position call
+    /// @notice The hook called after liquidity is added
+    /// @param sender The initial msg.sender for the add liquidity call
     /// @param key The key for the pool
-    /// @param params The parameters for modifying the position
+    /// @param params The parameters for adding liquidity
     /// @param hookData Arbitrary data handed into the PoolManager by the liquidty provider to be be passed on to the hook
     /// @return bytes4 The function selector for the hook
-    function afterModifyPosition(
+    function afterAddLiquidity(
+        address sender,
+        PoolKey calldata key,
+        IPoolManager.ModifyPositionParams calldata params,
+        BalanceDelta delta,
+        bytes calldata hookData
+    ) external returns (bytes4);
+
+    /// @notice The hook called before liquidity is removed
+    /// @param sender The initial msg.sender for the remove liquidity call
+    /// @param key The key for the pool
+    /// @param params The parameters for removing liquidity
+    /// @param hookData Arbitrary data handed into the PoolManager by the liquidty provider to be be passed on to the hook
+    /// @return bytes4 The function selector for the hook
+    function beforeRemoveLiquidity(
+        address sender,
+        PoolKey calldata key,
+        IPoolManager.ModifyPositionParams calldata params,
+        bytes calldata hookData
+    ) external returns (bytes4);
+
+    /// @notice The hook called after liquidity is removed
+    /// @param sender The initial msg.sender for the remove liquidity call
+    /// @param key The key for the pool
+    /// @param params The parameters for removing liquidity
+    /// @param hookData Arbitrary data handed into the PoolManager by the liquidty provider to be be passed on to the hook
+    /// @return bytes4 The function selector for the hook
+    function afterRemoveLiquidity(
         address sender,
         PoolKey calldata key,
         IPoolManager.ModifyPositionParams calldata params,

src/interfaces/IPoolManager.sol

@@ -146,16 +146,39 @@ interface IPoolManager is IFees, IClaims {
     /// @return The data returned by the call to `ILockCallback(msg.sender).lockAcquired(data)`
     function lock(address lockTarget, bytes calldata data) external payable returns (bytes memory);
 
-    struct ModifyPositionParams {
+    struct PoolModifyPositionParams {
         // the lower and upper tick of the position
         int24 tickLower;
         int24 tickUpper;
         // how to modify the liquidity
         int256 liquidityDelta;
     }
 
-    /// @notice Modify the position for the given pool
-    function modifyPosition(PoolKey memory key, ModifyPositionParams memory params, bytes calldata hookData)
+    struct ModifyPositionParams {
+        // the lower and upper tick of the position
+        int24 tickLower;
+        int24 tickUpper;
+        // how to modify the liquidity
+        uint256 liquidityDelta;
+    }
+
+    /// @notice Add a new liquidity position in a pool
+    /// @dev Poke by calling with a zero liquidityDelta
+    /// @param key The pool to add a position in
+    /// @param params The parameters to pass into _modifyPosition
+    /// @param hookData Any data to pass to the callback, via `ILockCallback(msg.sender).lockAcquired(data)`
+    /// @return delta The balance delta of the position added
+    function addLiquidity(PoolKey memory key, ModifyPositionParams memory params, bytes calldata hookData)
+        external
+        returns (BalanceDelta);
+
+    /// @notice Remove a liquidity position in a pool
+    /// @dev Poke by calling with a zero liquidityDelta
+    /// @param key The pool to remove a position in
+    /// @param params The parameters to pass into _modifyPosition
+    /// @param hookData Any data to pass to the callback, via `ILockCallback(msg.sender).lockAcquired(data)`
+    /// @return delta The balance delta of the position removed
+    function removeLiquidity(PoolKey memory key, ModifyPositionParams memory params, bytes calldata hookData)
         external
         returns (BalanceDelta);