Support arbitrary hookData on test routers

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

@@ -1 +1 @@
-94397
+96005

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

@@ -1 +1 @@
-151710
+153358

.forge-snapshots/mint with empty hook.snap

@@ -1 +1 @@
-300485
+307152

.forge-snapshots/mint with native token.snap

@@ -1 +1 @@
-273557
+275102

.forge-snapshots/mint.snap

@@ -1 +1 @@
-292221
+293760

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-48050
+49720

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

@@ -1 +1 @@
-123316
+124982

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-108023
+109692

.forge-snapshots/swap with dynamic fee.snap

@@ -1 +1 @@
-89869
+91502

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-48025
+49691

.forge-snapshots/swap with native.snap

@@ -1 +1 @@
-48050
+49720

contracts/test/MockHooks.sol

@@ -13,38 +13,48 @@ contract MockHooks is IHooks, IHookFeeManager {
     using PoolIdLibrary for PoolKey;
     using Hooks for IHooks;
 
+    bytes public beforeInitializeData;
+    bytes public afterInitializeData;
+    bytes public beforeModifyPositionData;
+    bytes public afterModifyPositionData;
+    bytes public beforeSwapData;
+    bytes public afterSwapData;
+    bytes public beforeDonateData;
+    bytes public afterDonateData;
+
     mapping(bytes4 => bytes4) public returnValues;
 
     mapping(PoolId => uint16) public swapFees;
 
     mapping(PoolId => uint16) public withdrawFees;
 
-    function beforeInitialize(address, PoolKey calldata, uint160, bytes calldata)
+    function beforeInitialize(address, PoolKey calldata, uint160, bytes calldata hookData)
         external
-        view
         override
         returns (bytes4)
     {
+        beforeInitializeData = hookData;
         bytes4 selector = MockHooks.beforeInitialize.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
 
-    function afterInitialize(address, PoolKey calldata, uint160, int24, bytes calldata)
+    function afterInitialize(address, PoolKey calldata, uint160, int24, bytes calldata hookData)
         external
-        view
         override
         returns (bytes4)
     {
+        afterInitializeData = hookData;
         bytes4 selector = MockHooks.afterInitialize.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
 
-    function beforeModifyPosition(address, PoolKey calldata, IPoolManager.ModifyPositionParams calldata, bytes calldata)
-        external
-        view
-        override
-        returns (bytes4)
-    {
+    function beforeModifyPosition(
+        address,
+        PoolKey calldata,
+        IPoolManager.ModifyPositionParams calldata,
+        bytes calldata hookData
+    ) external override returns (bytes4) {
+        beforeModifyPositionData = hookData;
         bytes4 selector = MockHooks.beforeModifyPosition.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
@@ -54,48 +64,51 @@ contract MockHooks is IHooks, IHookFeeManager {
         PoolKey calldata,
         IPoolManager.ModifyPositionParams calldata,
         BalanceDelta,
-        bytes calldata
-    ) external view override returns (bytes4) {
+        bytes calldata hookData
+    ) external override returns (bytes4) {
+        afterModifyPositionData = hookData;
         bytes4 selector = MockHooks.afterModifyPosition.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
 
-    function beforeSwap(address, PoolKey calldata, IPoolManager.SwapParams calldata, bytes calldata)
+    function beforeSwap(address, PoolKey calldata, IPoolManager.SwapParams calldata, bytes calldata hookData)
         external
-        view
         override
         returns (bytes4)
     {
+        beforeSwapData = hookData;
         bytes4 selector = MockHooks.beforeSwap.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
 
-    function afterSwap(address, PoolKey calldata, IPoolManager.SwapParams calldata, BalanceDelta, bytes calldata)
-        external
-        view
-        override
-        returns (bytes4)
-    {
+    function afterSwap(
+        address,
+        PoolKey calldata,
+        IPoolManager.SwapParams calldata,
+        BalanceDelta,
+        bytes calldata hookData
+    ) external override returns (bytes4) {
+        afterSwapData = hookData;
         bytes4 selector = MockHooks.afterSwap.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
 
-    function beforeDonate(address, PoolKey calldata, uint256, uint256, bytes calldata)
+    function beforeDonate(address, PoolKey calldata, uint256, uint256, bytes calldata hookData)
         external
-        view
         override
         returns (bytes4)
     {
+        beforeDonateData = hookData;
         bytes4 selector = MockHooks.beforeDonate.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }
 
-    function afterDonate(address, PoolKey calldata, uint256, uint256, bytes calldata)
+    function afterDonate(address, PoolKey calldata, uint256, uint256, bytes calldata hookData)
         external
-        view
         override
         returns (bytes4)
     {
+        afterDonateData = hookData;
         bytes4 selector = MockHooks.afterDonate.selector;
         return returnValues[selector] == bytes4(0) ? selector : returnValues[selector];
     }

contracts/test/PoolDonateTest.sol

@@ -24,14 +24,17 @@ contract PoolDonateTest is ILockCallback {
         PoolKey key;
         uint256 amount0;
         uint256 amount1;
+        bytes hookData;
     }
 
-    function donate(PoolKey memory key, uint256 amount0, uint256 amount1)
+    function donate(PoolKey memory key, uint256 amount0, uint256 amount1, bytes memory hookData)
         external
         payable
         returns (BalanceDelta delta)
     {
-        delta = abi.decode(manager.lock(abi.encode(CallbackData(msg.sender, key, amount0, amount1))), (BalanceDelta));
+        delta = abi.decode(
+            manager.lock(abi.encode(CallbackData(msg.sender, key, amount0, amount1, hookData))), (BalanceDelta)
+        );
 
         uint256 ethBalance = address(this).balance;
         if (ethBalance > 0) {
@@ -44,7 +47,7 @@ contract PoolDonateTest is ILockCallback {
 
         CallbackData memory data = abi.decode(rawData, (CallbackData));
 
-        BalanceDelta delta = manager.donate(data.key, data.amount0, data.amount1, new bytes(0));
+        BalanceDelta delta = manager.donate(data.key, data.amount0, data.amount1, data.hookData);
 
         if (delta.amount0() > 0) {
             if (data.key.currency0.isNative()) {

contracts/test/PoolModifyPositionTest.sol

@@ -22,14 +22,15 @@ contract PoolModifyPositionTest is ILockCallback {
         address sender;
         PoolKey key;
         IPoolManager.ModifyPositionParams params;
+        bytes hookData;
     }
 
-    function modifyPosition(PoolKey memory key, IPoolManager.ModifyPositionParams memory params)
+    function modifyPosition(PoolKey memory key, IPoolManager.ModifyPositionParams memory params, bytes memory hookData)
         external
         payable
         returns (BalanceDelta delta)
     {
-        delta = abi.decode(manager.lock(abi.encode(CallbackData(msg.sender, key, params))), (BalanceDelta));
+        delta = abi.decode(manager.lock(abi.encode(CallbackData(msg.sender, key, params, hookData))), (BalanceDelta));
 
         uint256 ethBalance = address(this).balance;
         if (ethBalance > 0) {
@@ -42,7 +43,7 @@ contract PoolModifyPositionTest is ILockCallback {
 
         CallbackData memory data = abi.decode(rawData, (CallbackData));
 
-        BalanceDelta delta = manager.modifyPosition(data.key, data.params, new bytes(0));
+        BalanceDelta delta = manager.modifyPosition(data.key, data.params, data.hookData);
 
         if (delta.amount0() > 0) {
             if (data.key.currency0.isNative()) {

contracts/test/PoolSwapTest.sol

@@ -23,33 +23,34 @@ contract PoolSwapTest is ILockCallback {
         TestSettings testSettings;
         PoolKey key;
         IPoolManager.SwapParams params;
+        bytes hookData;
     }
 
     struct TestSettings {
         bool withdrawTokens;
         bool settleUsingTransfer;
     }
 
-    function swap(PoolKey memory key, IPoolManager.SwapParams memory params, TestSettings memory testSettings)
-        external
-        payable
-        returns (BalanceDelta delta)
-    {
-        delta =
-            abi.decode(manager.lock(abi.encode(CallbackData(msg.sender, testSettings, key, params))), (BalanceDelta));
+    function swap(
+        PoolKey memory key,
+        IPoolManager.SwapParams memory params,
+        TestSettings memory testSettings,
+        bytes memory hookData
+    ) external payable returns (BalanceDelta delta) {
+        delta = abi.decode(
+            manager.lock(abi.encode(CallbackData(msg.sender, testSettings, key, params, hookData))), (BalanceDelta)
+        );
 
         uint256 ethBalance = address(this).balance;
-        if (ethBalance > 0) {
-            CurrencyLibrary.NATIVE.transfer(msg.sender, ethBalance);
-        }
+        if (ethBalance > 0) CurrencyLibrary.NATIVE.transfer(msg.sender, ethBalance);
     }
 
     function lockAcquired(bytes calldata rawData) external returns (bytes memory) {
         require(msg.sender == address(manager));
 
         CallbackData memory data = abi.decode(rawData, (CallbackData));
 
-        BalanceDelta delta = manager.swap(data.key, data.params, new bytes(0));
+        BalanceDelta delta = manager.swap(data.key, data.params, data.hookData);
 
         if (data.params.zeroForOne) {
             if (delta.amount0() > 0) {

test/PoolManager.gas.spec.ts

@@ -90,7 +90,8 @@ describe('PoolManager gas tests', () => {
           {
             withdrawTokens: true,
             settleUsingTransfer: true,
-          }
+          },
+          '0x00'
         )
       }
       const swapToHigherPrice: SwapToPriceFunction = (sqrtPriceX96, to) => {
@@ -104,7 +105,8 @@ describe('PoolManager gas tests', () => {
           {
             withdrawTokens: true,
             settleUsingTransfer: true,
-          }
+          },
+          '0x00'
         )
       }
       const swapToLowerPrice: SwapToPriceFunction = (sqrtPriceX96, to) => {
@@ -118,18 +120,23 @@ describe('PoolManager gas tests', () => {
           {
             withdrawTokens: true,
             settleUsingTransfer: true,
-          }
+          },
+          '0x00'
         )
       }
       const modifyPosition: ModifyPositionFunction = (tickLower, tickUpper, liquidityDelta) => {
-        return modifyPositionTest.modifyPosition(poolKey, {
-          tickLower,
-          tickUpper,
-          liquidityDelta,
-        })
+        return modifyPositionTest.modifyPosition(
+          poolKey,
+          {
+            tickLower,
+            tickUpper,
+            liquidityDelta,
+          },
+          '0x00'
+        )
       }
       const donate: DonateFunction = (amount0, amount1) => {
-        return donateTest.donate(poolKey, amount0, amount1)
+        return donateTest.donate(poolKey, amount0, amount1, '0x00')
       }
       const getSlot0 = async () => {
         return await manager.getSlot0(getPoolId(poolKey))
@@ -373,6 +380,7 @@ describe('PoolManager gas tests', () => {
             withdrawTokens: true,
             settleUsingTransfer: true,
           },
+          '0x00',
           {
             value: amount,
           }
@@ -389,7 +397,8 @@ describe('PoolManager gas tests', () => {
           {
             withdrawTokens: true,
             settleUsingTransfer: true,
-          }
+          },
+          '0x00'
         )
       }
       const swapToLowerPrice: SwapToPriceFunction = (sqrtPriceX96, to) => {
@@ -404,6 +413,7 @@ describe('PoolManager gas tests', () => {
             withdrawTokens: true,
             settleUsingTransfer: true,
           },
+          '0x00',
           {
             value: MaxUint128,
           }
@@ -417,11 +427,12 @@ describe('PoolManager gas tests', () => {
             tickUpper,
             liquidityDelta,
           },
+          '0x00',
           { value: liquidityDelta }
         )
       }
       const donate: DonateFunction = (amount0, amount1) => {
-        return donateTest.donate(poolKey, amount0, amount1, { value: amount0 })
+        return donateTest.donate(poolKey, amount0, amount1, '0x00', { value: amount0 })
       }
       const getSlot0 = async () => {
         return await manager.getSlot0(getPoolId(poolKey))