merge routing

.forge-snapshots/FullRangeAddInitialLiquidity.snap

@@ -1 +1 @@
-383800
+311181

.forge-snapshots/FullRangeAddLiquidity.snap

@@ -1 +1 @@
-178167
+122990

.forge-snapshots/FullRangeFirstSwap.snap

@@ -1 +1 @@
-127046
+80220

.forge-snapshots/FullRangeInitialize.snap

@@ -1 +1 @@
-1017530
+1015181

.forge-snapshots/FullRangeRemoveLiquidity.snap

@@ -1 +1 @@
-168345
+110566

.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap

@@ -1 +1 @@
-344222
+240044

.forge-snapshots/FullRangeSecondSwap.snap

@@ -1 +1 @@
-87975
+45930

.forge-snapshots/FullRangeSwap.snap

@@ -1 +1 @@
-125848
+79351

.forge-snapshots/RouterBytecode.snap

@@ -1 +1 @@
-5726
+5925

.forge-snapshots/RouterExactIn1Hop.snap

@@ -1 +1 @@
-155521
+101468

.forge-snapshots/RouterExactIn2Hops.snap

@@ -1 +1 @@
-231664
+160449

.forge-snapshots/RouterExactIn3Hops.snap

@@ -1 +1 @@
-315181
+212680

.forge-snapshots/RouterExactInputSingle.snap

@@ -1 +1 @@
-161452
+106771

.forge-snapshots/RouterExactOut1Hop.snap

@@ -1 +1 @@
-156533
+102242

.forge-snapshots/RouterExactOut2Hops.snap

@@ -1 +1 @@
-233574
+159812

.forge-snapshots/RouterExactOut3Hops.snap

@@ -1 +1 @@
-316054
+212732

.forge-snapshots/RouterExactOutputSingle.snap

@@ -1 +1 @@
-160423
+105380

.forge-snapshots/TWAMMSubmitOrder.snap

@@ -1 +1 @@
-122867
+122336

contracts/BaseHook.sol

@@ -6,28 +6,20 @@ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol";
 import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";
 import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
+import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";
+import {SafeCallback} from "./base/SafeCallback.sol";
+import {ImmutableState} from "./base/ImmutableState.sol";
 
-abstract contract BaseHook is IHooks {
-    error NotPoolManager();
+abstract contract BaseHook is IHooks, SafeCallback {
     error NotSelf();
     error InvalidPool();
     error LockFailure();
     error HookNotImplemented();
 
-    /// @notice The address of the pool manager
-    IPoolManager public immutable poolManager;
-
-    constructor(IPoolManager _poolManager) {
-        poolManager = _poolManager;
+    constructor(IPoolManager _manager) ImmutableState(_manager) {
         validateHookAddress(this);
     }
 
-    /// @dev Only the pool manager may call this function
-    modifier poolManagerOnly() {
-        if (msg.sender != address(poolManager)) revert NotPoolManager();
-        _;
-    }
-
     /// @dev Only this address may call this function
     modifier selfOnly() {
         if (msg.sender != address(this)) revert NotSelf();
@@ -49,7 +41,7 @@ abstract contract BaseHook is IHooks {
         Hooks.validateHookPermissions(_this, getHookPermissions());
     }
 
-    function unlockCallback(bytes calldata data) external virtual poolManagerOnly returns (bytes memory) {
+    function _unlockCallback(bytes calldata data) internal virtual override returns (bytes memory) {
         (bool success, bytes memory returnData) = address(this).call(data);
         if (success) return returnData;
         if (returnData.length == 0) revert LockFailure();
@@ -95,7 +87,7 @@ abstract contract BaseHook is IHooks {
         IPoolManager.ModifyLiquidityParams calldata,
         BalanceDelta,
         bytes calldata
-    ) external virtual returns (bytes4) {
+    ) external virtual returns (bytes4, BalanceDelta) {
         revert HookNotImplemented();
     }
 
@@ -105,22 +97,22 @@ abstract contract BaseHook is IHooks {
         IPoolManager.ModifyLiquidityParams calldata,
         BalanceDelta,
         bytes calldata
-    ) external virtual returns (bytes4) {
+    ) external virtual returns (bytes4, BalanceDelta) {
         revert HookNotImplemented();
     }
 
     function beforeSwap(address, PoolKey calldata, IPoolManager.SwapParams calldata, bytes calldata)
         external
         virtual
-        returns (bytes4)
+        returns (bytes4, BeforeSwapDelta, uint24)
     {
         revert HookNotImplemented();
     }
 
     function afterSwap(address, PoolKey calldata, IPoolManager.SwapParams calldata, BalanceDelta, bytes calldata)
         external
         virtual
-        returns (bytes4)
+        returns (bytes4, int128)
     {
         revert HookNotImplemented();
     }

contracts/V4Router.sol

@@ -146,7 +146,7 @@ abstract contract V4Router is IV4Router, IUnlockCallback {
                 zeroForOne,
                 amountSpecified,
                 sqrtPriceLimitX96 == 0
-                    ? (zeroForOne ? TickMath.MIN_SQRT_RATIO + 1 : TickMath.MAX_SQRT_RATIO - 1)
+                    ? (zeroForOne ? TickMath.MIN_SQRT_PRICE + 1 : TickMath.MAX_SQRT_PRICE - 1)
                     : sqrtPriceLimitX96
             ),
             hookData
@@ -177,6 +177,7 @@ abstract contract V4Router is IV4Router, IUnlockCallback {
     }
 
     function _payAndSettle(Currency currency, address msgSender, int128 settleAmount) private {
+        poolManager.sync(currency);
         _pay(Currency.unwrap(currency), msgSender, address(poolManager), uint256(uint128(-settleAmount)));
         poolManager.settle(currency);
     }

contracts/base/ImmutableState.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.8.19;
+
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+
+contract ImmutableState {
+    IPoolManager public immutable manager;
+
+    constructor(IPoolManager _manager) {
+        manager = _manager;
+    }
+}

contracts/base/SafeCallback.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.19;
+
+import {IUnlockCallback} from "@uniswap/v4-core/src/interfaces/callback/IUnlockCallback.sol";
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+import {ImmutableState} from "./ImmutableState.sol";
+
+abstract contract SafeCallback is ImmutableState, IUnlockCallback {
+    error NotManager();
+
+    modifier onlyByManager() {
+        if (msg.sender != address(manager)) revert NotManager();
+        _;
+    }
+
+    /// @dev We force the onlyByManager modifier by exposing a virtual function after the onlyByManager check.
+    function unlockCallback(bytes calldata data) external onlyByManager returns (bytes memory) {
+        return _unlockCallback(data);
+    }
+
+    function _unlockCallback(bytes calldata data) internal virtual returns (bytes memory);
+}