skip calls to hooks when msg.sender is hook contract + test

.forge-snapshots/addLiquidity with empty hook.snap

@@ -1 +1 @@
-312292
+312352

.forge-snapshots/addLiquidity with native token.snap

@@ -1 +1 @@
-192474
+192456

.forge-snapshots/addLiquidity.snap

@@ -1 +1 @@
-192452
+192434

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

@@ -1 +1 @@
-184412
+184324

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

@@ -1 +1 @@
-138439
+138312

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

@@ -1 +1 @@
-131592
+131574

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

@@ -1 +1 @@
-176613
+176595

.forge-snapshots/poolManager bytecode size.snap

@@ -1 +1 @@
-23279
+23263

.forge-snapshots/removeLiquidity with empty hook.snap

@@ -1 +1 @@
-99307
+99289

.forge-snapshots/removeLiquidity with native token.snap

@@ -1 +1 @@
-200680
+200662

.forge-snapshots/removeLiquidity.snap

@@ -1 +1 @@
-196957
+196939

.forge-snapshots/simple swap with native.snap

@@ -1 +1 @@
-187012
+186885

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-195549
+195422

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

@@ -1 +1 @@
-117675
+117548

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-105139
+105012

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

@@ -1 +1 @@
-125350
+125223

.forge-snapshots/swap burn native 6909 for input.snap

@@ -1 +1 @@
-121303
+121176

.forge-snapshots/swap mint native output as 6909.snap

@@ -1 +1 @@
-189538
+189411

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

@@ -1 +1 @@
-206343
+206216

.forge-snapshots/swap with dynamic fee.snap

@@ -1 +1 @@
-183513
+183425

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-105117
+104990

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

@@ -1 +1 @@
-190217
+190129

src/libraries/Hooks.sol

@@ -96,10 +96,12 @@ library Hooks {
 
     /// @notice performs a hook call using the given calldata on the given hook
     function callHook(IHooks self, bytes memory data) internal {
-        (bytes4 expectedSelector, bytes4 selector) = _callHook(self, data);
+        if (msg.sender != address(self)) {
+            (bytes4 expectedSelector, bytes4 selector) = _callHook(self, data);
 
-        if (selector != expectedSelector) {
-            revert InvalidHookResponse();
+            if (selector != expectedSelector) {
+                revert InvalidHookResponse();
+            }
         }
     }
 
@@ -132,9 +134,9 @@ library Hooks {
         IPoolManager.ModifyLiquidityParams memory params,
         bytes calldata hookData
     ) internal {
-        if (params.liquidityDelta > 0 && key.hooks.hasPermission(BEFORE_ADD_LIQUIDITY_FLAG)) {
+        if (params.liquidityDelta > 0 && self.hasPermission(BEFORE_ADD_LIQUIDITY_FLAG)) {
             self.callHook(abi.encodeWithSelector(IHooks.beforeAddLiquidity.selector, msg.sender, key, params, hookData));
-        } else if (params.liquidityDelta <= 0 && key.hooks.hasPermission(BEFORE_REMOVE_LIQUIDITY_FLAG)) {
+        } else if (params.liquidityDelta <= 0 && self.hasPermission(BEFORE_REMOVE_LIQUIDITY_FLAG)) {
             self.callHook(
                 abi.encodeWithSelector(IHooks.beforeRemoveLiquidity.selector, msg.sender, key, params, hookData)
             );
@@ -149,11 +151,11 @@ library Hooks {
         BalanceDelta delta,
         bytes calldata hookData
     ) internal {
-        if (params.liquidityDelta > 0 && key.hooks.hasPermission(AFTER_ADD_LIQUIDITY_FLAG)) {
+        if (params.liquidityDelta > 0 && self.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)) {
+        } else if (params.liquidityDelta <= 0 && self.hasPermission(AFTER_REMOVE_LIQUIDITY_FLAG)) {
             self.callHook(
                 abi.encodeWithSelector(IHooks.afterRemoveLiquidity.selector, msg.sender, key, params, delta, hookData)
             );
@@ -164,7 +166,7 @@ library Hooks {
     function beforeSwap(IHooks self, PoolKey memory key, IPoolManager.SwapParams memory params, bytes calldata hookData)
         internal
     {
-        if (key.hooks.hasPermission(BEFORE_SWAP_FLAG)) {
+        if (self.hasPermission(BEFORE_SWAP_FLAG)) {
             self.callHook(abi.encodeWithSelector(IHooks.beforeSwap.selector, msg.sender, key, params, hookData));
         }
     }
@@ -177,7 +179,7 @@ library Hooks {
         BalanceDelta delta,
         bytes calldata hookData
     ) internal {
-        if (key.hooks.hasPermission(AFTER_SWAP_FLAG)) {
+        if (self.hasPermission(AFTER_SWAP_FLAG)) {
             self.callHook(abi.encodeWithSelector(IHooks.afterSwap.selector, msg.sender, key, params, delta, hookData));
         }
     }
@@ -186,7 +188,7 @@ library Hooks {
     function beforeDonate(IHooks self, PoolKey memory key, uint256 amount0, uint256 amount1, bytes calldata hookData)
         internal
     {
-        if (key.hooks.hasPermission(BEFORE_DONATE_FLAG)) {
+        if (self.hasPermission(BEFORE_DONATE_FLAG)) {
             self.callHook(
                 abi.encodeWithSelector(IHooks.beforeDonate.selector, msg.sender, key, amount0, amount1, hookData)
             );
@@ -197,7 +199,7 @@ library Hooks {
     function afterDonate(IHooks self, PoolKey memory key, uint256 amount0, uint256 amount1, bytes calldata hookData)
         internal
     {
-        if (key.hooks.hasPermission(AFTER_DONATE_FLAG)) {
+        if (self.hasPermission(AFTER_DONATE_FLAG)) {
             self.callHook(
                 abi.encodeWithSelector(IHooks.afterDonate.selector, msg.sender, key, amount0, amount1, hookData)
             );

src/test/PoolSwapTest.sol

@@ -66,9 +66,6 @@ contract PoolSwapTest is Test, PoolTestBase {
         (,, uint256 reserveAfter0, int256 deltaAfter0) = _fetchBalances(data.key.currency0, data.sender, address(this));
         (,, uint256 reserveAfter1, int256 deltaAfter1) = _fetchBalances(data.key.currency1, data.sender, address(this));
 
-        assertEq(reserveBefore0, reserveAfter0);
-        assertEq(reserveBefore1, reserveAfter1);
-
         if (data.params.zeroForOne) {
             if (data.params.amountSpecified > 0) {
                 // exact input, 0 for 1

src/test/SkipCallsTestHook.sol

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.24;
+
+import {Hooks} from "../libraries/Hooks.sol";
+import {BaseTestHooks} from "./BaseTestHooks.sol";
+import {IHooks} from "../interfaces/IHooks.sol";
+import {IPoolManager} from "../interfaces/IPoolManager.sol";
+import {PoolKey} from "../types/PoolKey.sol";
+import {BalanceDelta} from "../types/BalanceDelta.sol";
+import {PoolId, PoolIdLibrary} from "../types/PoolId.sol";
+import {FeeLibrary} from "../../src/libraries/FeeLibrary.sol";
+import {IERC20Minimal} from "../interfaces/external/IERC20Minimal.sol";
+import {CurrencyLibrary, Currency} from "../types/Currency.sol";
+import {PoolTestBase} from "./PoolTestBase.sol";
+import {Test} from "forge-std/Test.sol";
+
+contract SkipCallsTestHook is BaseTestHooks, Test {
+    using PoolIdLibrary for PoolKey;
+    using Hooks for IHooks;
+    using FeeLibrary for uint24;
+
+    uint256 public counter;
+    IPoolManager manager;
+    uint24 internal fee;
+
+    function setManager(IPoolManager _manager) external {
+        manager = _manager;
+    }
+
+    function setFee(uint24 _fee) external {
+        fee = _fee;
+    }
+
+    function getFee(address, PoolKey calldata) public view returns (uint24) {
+        return fee;
+    }
+
+    function beforeSwap(address, PoolKey calldata key, IPoolManager.SwapParams calldata params, bytes calldata hookData)
+        external
+        override
+        returns (bytes4)
+    {
+        counter++;
+        callSwap(key, params, hookData);
+        return IHooks.beforeSwap.selector;
+    }
+
+    function callSwap(PoolKey calldata key, IPoolManager.SwapParams calldata params, bytes calldata hookData) public {
+        IPoolManager(msg.sender).swap(key, params, hookData);
+        address payer = abi.decode(hookData, (address));
+        int256 delta0 = IPoolManager(msg.sender).currencyDelta(address(this), key.currency0);
+        assertEq(delta0, params.amountSpecified);
+        int256 delta1 = IPoolManager(msg.sender).currencyDelta(address(this), key.currency1);
+        assert(delta1 < 0);
+        IERC20Minimal(Currency.unwrap(key.currency0)).transferFrom(payer, msg.sender, uint256(delta0));
+        manager.settle(key.currency0);
+        manager.take(key.currency1, payer, uint256(-delta1));
+    }
+}

test/SkipCallsTestHook.t.sol

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.20;
+
+import {Test} from "forge-std/Test.sol";
+import {Vm} from "forge-std/Vm.sol";
+import {PoolId, PoolIdLibrary} from "../src/types/PoolId.sol";
+import {Hooks} from "../src/libraries/Hooks.sol";
+import {FeeLibrary} from "../src/libraries/FeeLibrary.sol";
+import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
+import {IFees} from "../src/interfaces/IFees.sol";
+import {IHooks} from "../src/interfaces/IHooks.sol";
+import {PoolKey} from "../src/types/PoolKey.sol";
+import {PoolManager} from "../src/PoolManager.sol";
+import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
+import {Deployers} from "./utils/Deployers.sol";
+import {IDynamicFeeManager} from "././../src/interfaces/IDynamicFeeManager.sol";
+import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
+import {DynamicFeesTestHook} from "../src/test/DynamicFeesTestHook.sol";
+import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
+import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
+import {Constants} from "../test/utils/Constants.sol";
+import {SkipCallsTestHook} from "../src/test/SkipCallsTestHook.sol";
+
+contract SkipCallsTest is Test, Deployers, GasSnapshot {
+    using PoolIdLibrary for PoolKey;
+
+    /// 1111 1111 1100
+    SkipCallsTestHook skipCallsTestHook = SkipCallsTestHook(
+        address(
+            uint160(0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF)
+                & uint160(
+                    ~Hooks.BEFORE_INITIALIZE_FLAG & ~Hooks.AFTER_INITIALIZE_FLAG & ~Hooks.BEFORE_ADD_LIQUIDITY_FLAG
+                        & ~Hooks.AFTER_ADD_LIQUIDITY_FLAG & ~Hooks.BEFORE_REMOVE_LIQUIDITY_FLAG
+                        & ~Hooks.AFTER_REMOVE_LIQUIDITY_FLAG & ~Hooks.AFTER_SWAP_FLAG & ~Hooks.BEFORE_DONATE_FLAG
+                        & ~Hooks.AFTER_DONATE_FLAG
+                )
+        )
+    );
+
+    function setUp() public {
+        SkipCallsTestHook impl = new SkipCallsTestHook();
+        vm.etch(address(skipCallsTestHook), address(impl).code);
+        deployFreshManagerAndRouters();
+        skipCallsTestHook.setManager(IPoolManager(manager));
+
+        (currency0, currency1) = deployMintAndApprove2Currencies();
+        (key,) = initPoolAndAddLiquidity(
+            currency0,
+            currency1,
+            IHooks(address(skipCallsTestHook)),
+            FeeLibrary.DYNAMIC_FEE_FLAG,
+            SQRT_RATIO_1_1,
+            ZERO_BYTES
+        );
+    }
+
+    function test_beforeSwap_invalidSender() public {
+        IPoolManager.SwapParams memory swapParams =
+            IPoolManager.SwapParams({zeroForOne: true, amountSpecified: 100, sqrtPriceLimitX96: SQRT_RATIO_1_2});
+
+        PoolSwapTest.TestSettings memory testSettings =
+            PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
+
+        MockERC20(Currency.unwrap(key.currency0)).approve(address(skipCallsTestHook), Constants.MAX_UINT256);
+
+        assertEq(skipCallsTestHook.counter(), 0);
+        swapRouter.swap(key, swapParams, testSettings, abi.encode(address(this)));
+        assertEq(skipCallsTestHook.counter(), 1);
+    }
+}