Before after add/remove liquidity, remove all modifyPosition hooks

.forge-snapshots/addLiquidity with empty hook.snap

@@ -0,0 +1 @@
+323249

.forge-snapshots/addLiquidity with native token.snap

@@ -0,0 +1 @@
+200141

.forge-snapshots/addLiquidity.snap

@@ -0,0 +1 @@
+200109

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

@@ -1 +1 @@
-194519
+194300

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

@@ -1 +1 @@
-146864
+146667

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

@@ -1 +1 @@
-137968
+137771

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

@@ -1 +1 @@
-185390
+185216

.forge-snapshots/erc20 collect protocol fees.snap

@@ -1 +1 @@
-26968
+27033

.forge-snapshots/gas overhead of no-op lock.snap

@@ -1 +1 @@
-15246
+15224

.forge-snapshots/initialize.snap

@@ -1 +1 @@
-74268
+74200

.forge-snapshots/mintWithEmptyHookEOAInitiated.snap

@@ -1 +1 @@
-255158
+255129

.forge-snapshots/modify position with noop.snap

@@ -1 +1 @@
-58201
+58013

.forge-snapshots/native collect protocol fees.snap

@@ -1 +1 @@
-38634
+38699

.forge-snapshots/poolManager bytecode size.snap

@@ -1 +1 @@
-23592
+23823

.forge-snapshots/removeLiquidity with empty hook.snap

@@ -0,0 +1 @@
+106962

.forge-snapshots/removeLiquidity with native token.snap

@@ -0,0 +1 @@
+208322

.forge-snapshots/removeLiquidity.snap

@@ -0,0 +1 @@
+204612

.forge-snapshots/simple swap with native.snap

@@ -1 +1 @@
-195835
+195638

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-204403
+204206

.forge-snapshots/simpleSwapEOAInitiated.snap

@@ -1 +1 @@
-175669
+175475

.forge-snapshots/simpleSwapNativeEOAInitiated.snap

@@ -1 +1 @@
-172331
+172131

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

@@ -1 +1 @@
-126463
+126266

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-113954
+113757

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

@@ -1 +1 @@
-133127
+132930

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

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

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

@@ -1 +1 @@
-216596
+216399

.forge-snapshots/swap with dynamic fee.snap

@@ -1 +1 @@
-193620
+193401

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-113932
+113735

.forge-snapshots/swap with noop.snap

@@ -1 +1 @@
-51546
+51304

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

@@ -1 +1 @@
-200363
+200144

src/PoolManager.sol

@@ -177,7 +177,7 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
     }
 
     /// @inheritdoc IPoolManager
-    function modifyPosition(
+    function modifyLiquidity(
         PoolKey memory key,
         IPoolManager.ModifyPositionParams memory params,
         bytes calldata hookData

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

@@ -155,8 +155,13 @@ interface IPoolManager is IFees, IClaims {
         int256 liquidityDelta;
     }
 
-    /// @notice Modify the position for the given pool
-    function modifyPosition(PoolKey memory key, ModifyPositionParams memory params, bytes calldata hookData)
+    /// @notice Modify the liquidity for the given pool
+    /// @dev Poke by calling with a zero liquidityDelta
+    /// @param key The pool to modify liquidity in
+    /// @param params The parameters for modifying the liquidity
+    /// @param hookData Any data to pass to the callback, via `ILockCallback(msg.sender).lockAcquired(data)`
+    /// @return delta The balance delta of the liquidity
+    function modifyLiquidity(PoolKey memory key, ModifyPositionParams memory params, bytes calldata hookData)
         external
         returns (BalanceDelta);
 

src/libraries/Hooks.sol

@@ -11,29 +11,33 @@ import {Lockers} from "./Lockers.sol";
 /// @notice V4 decides whether to invoke specific hooks by inspecting the leading bits of the address that
 /// the hooks contract is deployed to.
 /// For example, a hooks contract deployed to address: 0x9000000000000000000000000000000000000000
-/// has leading bits '1001' which would cause the 'before initialize' and 'after modify position' hooks to be used.
+/// has leading bits '1001' which would cause the 'before initialize' and 'after add liquidity' hooks to be used.
 library Hooks {
     using FeeLibrary for uint24;
     using Hooks for IHooks;
 
     uint256 internal constant BEFORE_INITIALIZE_FLAG = 1 << 159;
     uint256 internal constant AFTER_INITIALIZE_FLAG = 1 << 158;
-    uint256 internal constant BEFORE_MODIFY_POSITION_FLAG = 1 << 157;
-    uint256 internal constant AFTER_MODIFY_POSITION_FLAG = 1 << 156;
-    uint256 internal constant BEFORE_SWAP_FLAG = 1 << 155;
-    uint256 internal constant AFTER_SWAP_FLAG = 1 << 154;
-    uint256 internal constant BEFORE_DONATE_FLAG = 1 << 153;
-    uint256 internal constant AFTER_DONATE_FLAG = 1 << 152;
-    uint256 internal constant NO_OP_FLAG = 1 << 151;
-    uint256 internal constant ACCESS_LOCK_FLAG = 1 << 150;
+    uint256 internal constant BEFORE_ADD_LIQUIDITY_FLAG = 1 << 157;
+    uint256 internal constant AFTER_ADD_LIQUIDITY_FLAG = 1 << 156;
+    uint256 internal constant BEFORE_REMOVE_LIQUIDITY_FLAG = 1 << 155;
+    uint256 internal constant AFTER_REMOVE_LIQUIDITY_FLAG = 1 << 154;
+    uint256 internal constant BEFORE_SWAP_FLAG = 1 << 153;
+    uint256 internal constant AFTER_SWAP_FLAG = 1 << 152;
+    uint256 internal constant BEFORE_DONATE_FLAG = 1 << 151;
+    uint256 internal constant AFTER_DONATE_FLAG = 1 << 150;
+    uint256 internal constant NO_OP_FLAG = 1 << 149;
+    uint256 internal constant ACCESS_LOCK_FLAG = 1 << 148;
 
     bytes4 public constant NO_OP_SELECTOR = bytes4(keccak256(abi.encodePacked("NoOp")));
 
     struct Permissions {
         bool beforeInitialize;
         bool afterInitialize;
-        bool beforeModifyPosition;
-        bool afterModifyPosition;
+        bool beforeAddLiquidity;
+        bool afterAddLiquidity;
+        bool beforeRemoveLiquidity;
+        bool afterRemoveLiquidity;
         bool beforeSwap;
         bool afterSwap;
         bool beforeDonate;
@@ -60,8 +64,10 @@ library Hooks {
         if (
             permissions.beforeInitialize != self.hasPermission(BEFORE_INITIALIZE_FLAG)
                 || permissions.afterInitialize != self.hasPermission(AFTER_INITIALIZE_FLAG)
-                || permissions.beforeModifyPosition != self.hasPermission(BEFORE_MODIFY_POSITION_FLAG)
-                || permissions.afterModifyPosition != self.hasPermission(AFTER_MODIFY_POSITION_FLAG)
+                || permissions.beforeAddLiquidity != self.hasPermission(BEFORE_ADD_LIQUIDITY_FLAG)
+                || permissions.afterAddLiquidity != self.hasPermission(AFTER_ADD_LIQUIDITY_FLAG)
+                || permissions.beforeRemoveLiquidity != self.hasPermission(BEFORE_REMOVE_LIQUIDITY_FLAG)
+                || permissions.afterRemoveLiquidity != self.hasPermission(AFTER_REMOVE_LIQUIDITY_FLAG)
                 || permissions.beforeSwap != self.hasPermission(BEFORE_SWAP_FLAG)
                 || permissions.afterSwap != self.hasPermission(AFTER_SWAP_FLAG)
                 || permissions.beforeDonate != self.hasPermission(BEFORE_DONATE_FLAG)
@@ -76,10 +82,11 @@ library Hooks {
     /// @notice Ensures that the hook address includes at least one hook flag or dynamic fees, or is the 0 address
     /// @param hook The hook to verify
     function isValidHookAddress(IHooks hook, uint24 fee) internal pure returns (bool) {
-        // if NoOp is allowed, at least one of beforeModifyPosition, beforeSwap and beforeDonate should be allowed
+        // if NoOp is allowed, at least one of beforeRemoveLiquidity, beforeAddLiquidity, beforeSwap and beforeDonate should be allowed
         if (
-            hook.hasPermission(NO_OP_FLAG) && !hook.hasPermission(BEFORE_MODIFY_POSITION_FLAG)
-                && !hook.hasPermission(BEFORE_SWAP_FLAG) && !hook.hasPermission(BEFORE_DONATE_FLAG)
+            hook.hasPermission(NO_OP_FLAG) && !hook.hasPermission(BEFORE_ADD_LIQUIDITY_FLAG)
+                && !hook.hasPermission(BEFORE_REMOVE_LIQUIDITY_FLAG) && !hook.hasPermission(BEFORE_SWAP_FLAG)
+                && !hook.hasPermission(BEFORE_DONATE_FLAG)
         ) {
             return false;
         }
@@ -161,12 +168,16 @@ library Hooks {
         IPoolManager.ModifyPositionParams memory params,
         bytes calldata hookData
     ) internal returns (bool shouldExecute) {
-        if (self.hasPermission(BEFORE_MODIFY_POSITION_FLAG)) {
+        if (params.liquidityDelta > 0 && key.hooks.hasPermission(BEFORE_ADD_LIQUIDITY_FLAG)) {
             shouldExecute = self.callHookNoopable(
-                abi.encodeWithSelector(IHooks.beforeModifyPosition.selector, msg.sender, key, params, hookData)
+                abi.encodeWithSelector(IHooks.beforeAddLiquidity.selector, msg.sender, key, params, hookData)
+            );
+        } else if (params.liquidityDelta <= 0 && key.hooks.hasPermission(BEFORE_REMOVE_LIQUIDITY_FLAG)) {
+            shouldExecute = self.callHookNoopable(
+                abi.encodeWithSelector(IHooks.beforeRemoveLiquidity.selector, msg.sender, key, params, hookData)
             );
         } else {
-            return true;
+            shouldExecute = true;
         }
     }
 
@@ -178,9 +189,13 @@ library Hooks {
         BalanceDelta delta,
         bytes calldata hookData
     ) internal {
-        if (key.hooks.hasPermission(AFTER_MODIFY_POSITION_FLAG)) {
+        if (params.liquidityDelta > 0 && key.hooks.hasPermission(AFTER_ADD_LIQUIDITY_FLAG)) {
+            self.callHook(
+                abi.encodeWithSelector(IHooks.afterAddLiquidity.selector, msg.sender, key, params, delta, hookData)
+            );
+        } else if (params.liquidityDelta <= 0 && key.hooks.hasPermission(AFTER_REMOVE_LIQUIDITY_FLAG)) {
             self.callHook(
-                abi.encodeWithSelector(IHooks.afterModifyPosition.selector, msg.sender, key, params, delta, hookData)
+                abi.encodeWithSelector(IHooks.afterRemoveLiquidity.selector, msg.sender, key, params, delta, hookData)
             );
         }
     }