Merge branch 'main' into update-v4-core-submodule

.forge-snapshots/FullOracleObserve0After5Seconds.snap

@@ -1 +1 @@
-1922
+1912

.forge-snapshots/FullOracleObserve200By13.snap

@@ -1 +1 @@
-20282
+20210

.forge-snapshots/FullOracleObserve200By13Plus5.snap

@@ -1 +1 @@
-20520
+20443

.forge-snapshots/FullOracleObserve5After5Seconds.snap

@@ -1 +1 @@
-2034
+2024

.forge-snapshots/FullOracleObserveOldest.snap

@@ -1 +1 @@
-19330
+19279

.forge-snapshots/FullOracleObserveOldestAfter5Seconds.snap

@@ -1 +1 @@
-19612
+19555

.forge-snapshots/FullOracleObserveZero.snap

@@ -1 +1 @@
-1483
+1477

.forge-snapshots/FullRangeAddInitialLiquidity.snap

@@ -1 +1 @@
-393062
+392772

.forge-snapshots/FullRangeAddLiquidity.snap

@@ -1 +1 @@
-187418
+187139

.forge-snapshots/FullRangeFirstSwap.snap

@@ -1 +1 @@
-136762
+136542

.forge-snapshots/FullRangeInitialize.snap

@@ -1 +1 @@
-1059719
+1041060

.forge-snapshots/FullRangeRemoveLiquidity.snap

@@ -1 +1 @@
-180886
+175903

.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap

@@ -1 +1 @@
-373831
+363995

.forge-snapshots/FullRangeSecondSwap.snap

@@ -1 +1 @@
-97479
+97295

.forge-snapshots/FullRangeSwap.snap

@@ -1 +1 @@
-135037
+134817

.forge-snapshots/OracleGrow10Slots.snap

@@ -1 +1 @@
-232968
+232960

.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap

@@ -1 +1 @@
-223657
+223649

.forge-snapshots/OracleGrow1Slot.snap

@@ -1 +1 @@
-32853
+32845

.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap

@@ -1 +1 @@
-23553
+23545

.forge-snapshots/OracleInitialize.snap

@@ -1 +1 @@
-51321
+51310

.forge-snapshots/OracleObserveBetweenOldestAndOldestPlusOne.snap

@@ -1 +1 @@
-5397
+5368

.forge-snapshots/OracleObserveCurrentTime.snap

@@ -1 +1 @@
-1483
+1477

.forge-snapshots/OracleObserveCurrentTimeCounterfactual.snap

@@ -1 +1 @@
-1483
+1477

.forge-snapshots/OracleObserveLast20Seconds.snap

@@ -1 +1 @@
-73451
+73037

.forge-snapshots/OracleObserveLatestEqual.snap

@@ -1 +1 @@
-1483
+1477

.forge-snapshots/OracleObserveLatestTransform.snap

@@ -1 +1 @@
-1922
+1912

.forge-snapshots/OracleObserveMiddle.snap

@@ -1 +1 @@
-5572
+5541

.forge-snapshots/OracleObserveOldest.snap

@@ -1 +1 @@
-5115
+5092

.forge-snapshots/OracleObserveSinceMostRecent.snap

@@ -1 +1 @@
-2537
+2522

.forge-snapshots/TWAMMSubmitOrder.snap

@@ -1 +1 @@
-122817
+122753

.github/workflows/test.yml

@@ -22,6 +22,6 @@ jobs:
           version: nightly
 
       - name: Run tests
-        run: forge test -vvv --via-ir
+        run: forge test -vvv
         env:
           FOUNDRY_PROFILE: ci

README.md

@@ -45,7 +45,7 @@ contract CoolHook is BaseHook {
     function beforeModifyPosition(
         address,
         IPoolManager.PoolKey calldata key,
-        IPoolManager.ModifyPositionParams calldata params
+        IPoolManager.ModifyLiquidityParams calldata params
     ) external override poolManagerOnly returns (bytes4) {
         // hook logic
         return BaseHook.beforeModifyPosition.selector;

contracts/BaseHook.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.24;
 
 import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
@@ -40,13 +40,13 @@ abstract contract BaseHook is IHooks {
         _;
     }
 
-    function getHooksCalls() public pure virtual returns (Hooks.Permissions memory);
+    function getHookPermissions() public pure virtual returns (Hooks.Permissions memory);
 
     // this function is virtual so that we can override it during testing,
     // which allows us to deploy an implementation to any address
     // and then etch the bytecode into the correct address
     function validateHookAddress(BaseHook _this) internal pure virtual {
-        Hooks.validateHookPermissions(_this, getHooksCalls());
+        Hooks.validateHookPermissions(_this, getHookPermissions());
     }
 
     function lockAcquired(address, /*sender*/ bytes calldata data)
@@ -77,18 +77,37 @@ abstract contract BaseHook is IHooks {
         revert HookNotImplemented();
     }
 
-    function beforeModifyPosition(address, PoolKey calldata, IPoolManager.ModifyPositionParams calldata, bytes calldata)
+    function beforeAddLiquidity(address, PoolKey calldata, IPoolManager.ModifyLiquidityParams calldata, bytes calldata)
         external
         virtual
         returns (bytes4)
     {
         revert HookNotImplemented();
     }
 
-    function afterModifyPosition(
+    function beforeRemoveLiquidity(
         address,
         PoolKey calldata,
-        IPoolManager.ModifyPositionParams calldata,
+        IPoolManager.ModifyLiquidityParams calldata,
+        bytes calldata
+    ) external virtual returns (bytes4) {
+        revert HookNotImplemented();
+    }
+
+    function afterAddLiquidity(
+        address,
+        PoolKey calldata,
+        IPoolManager.ModifyLiquidityParams calldata,
+        BalanceDelta,
+        bytes calldata
+    ) external virtual returns (bytes4) {
+        revert HookNotImplemented();
+    }
+
+    function afterRemoveLiquidity(
+        address,
+        PoolKey calldata,
+        IPoolManager.ModifyLiquidityParams calldata,
         BalanceDelta,
         bytes calldata
     ) external virtual returns (bytes4) {

contracts/hooks/examples/FullRange.sol

@@ -50,7 +50,7 @@ contract FullRange is BaseHook, ILockCallback {
     struct CallbackData {
         address sender;
         PoolKey key;
-        IPoolManager.ModifyPositionParams params;
+        IPoolManager.ModifyLiquidityParams params;
     }
 
     struct PoolInfo {
@@ -87,12 +87,14 @@ contract FullRange is BaseHook, ILockCallback {
         _;
     }
 
-    function getHooksCalls() public pure override returns (Hooks.Permissions memory) {
+    function getHookPermissions() public pure override returns (Hooks.Permissions memory) {
         return Hooks.Permissions({
             beforeInitialize: true,
             afterInitialize: false,
-            beforeModifyPosition: true,
-            afterModifyPosition: false,
+            beforeAddLiquidity: true,
+            beforeRemoveLiquidity: false,
+            afterAddLiquidity: false,
+            afterRemoveLiquidity: false,
             beforeSwap: true,
             afterSwap: false,
             beforeDonate: false,
@@ -138,7 +140,7 @@ contract FullRange is BaseHook, ILockCallback {
         }
         BalanceDelta addedDelta = modifyPosition(
             key,
-            IPoolManager.ModifyPositionParams({
+            IPoolManager.ModifyLiquidityParams({
                 tickLower: MIN_TICK,
                 tickUpper: MAX_TICK,
                 liquidityDelta: liquidity.toInt256()
@@ -182,7 +184,7 @@ contract FullRange is BaseHook, ILockCallback {
 
         delta = modifyPosition(
             key,
-            IPoolManager.ModifyPositionParams({
+            IPoolManager.ModifyLiquidityParams({
                 tickLower: MIN_TICK,
                 tickUpper: MAX_TICK,
                 liquidityDelta: -(params.liquidity.toInt256())
@@ -219,15 +221,15 @@ contract FullRange is BaseHook, ILockCallback {
         return FullRange.beforeInitialize.selector;
     }
 
-    function beforeModifyPosition(
+    function beforeAddLiquidity(
         address sender,
         PoolKey calldata,
-        IPoolManager.ModifyPositionParams calldata,
+        IPoolManager.ModifyLiquidityParams calldata,
         bytes calldata
     ) external view override returns (bytes4) {
         if (sender != address(this)) revert SenderMustBeHook();
 
-        return FullRange.beforeModifyPosition.selector;
+        return FullRange.beforeAddLiquidity.selector;
     }
 
     function beforeSwap(address, PoolKey calldata key, IPoolManager.SwapParams calldata, bytes calldata)
@@ -245,7 +247,7 @@ contract FullRange is BaseHook, ILockCallback {
         return IHooks.beforeSwap.selector;
     }
 
-    function modifyPosition(PoolKey memory key, IPoolManager.ModifyPositionParams memory params)
+    function modifyPosition(PoolKey memory key, IPoolManager.ModifyLiquidityParams memory params)
         internal
         returns (BalanceDelta delta)
     {
@@ -277,7 +279,7 @@ contract FullRange is BaseHook, ILockCallback {
         poolManager.take(key.currency1, sender, uint256(uint128(-delta.amount1())));
     }
 
-    function _removeLiquidity(PoolKey memory key, IPoolManager.ModifyPositionParams memory params)
+    function _removeLiquidity(PoolKey memory key, IPoolManager.ModifyLiquidityParams memory params)
         internal
         returns (BalanceDelta delta)
     {
@@ -295,7 +297,7 @@ contract FullRange is BaseHook, ILockCallback {
         );
 
         params.liquidityDelta = -(liquidityToRemove.toInt256());
-        delta = poolManager.modifyPosition(key, params, ZERO_BYTES);
+        delta = poolManager.modifyLiquidity(key, params, ZERO_BYTES);
         pool.hasAccruedFees = false;
     }
 
@@ -314,17 +316,17 @@ contract FullRange is BaseHook, ILockCallback {
             delta = _removeLiquidity(data.key, data.params);
             _takeDeltas(data.sender, data.key, delta);
         } else {
-            delta = poolManager.modifyPosition(data.key, data.params, ZERO_BYTES);
+            delta = poolManager.modifyLiquidity(data.key, data.params, ZERO_BYTES);
             _settleDeltas(data.sender, data.key, delta);
         }
         return abi.encode(delta);
     }
 
     function _rebalance(PoolKey memory key) public {
         PoolId poolId = key.toId();
-        BalanceDelta balanceDelta = poolManager.modifyPosition(
+        BalanceDelta balanceDelta = poolManager.modifyLiquidity(
             key,
-            IPoolManager.ModifyPositionParams({
+            IPoolManager.ModifyLiquidityParams({
                 tickLower: MIN_TICK,
                 tickUpper: MAX_TICK,
                 liquidityDelta: -(poolManager.getLiquidity(poolId).toInt256())
@@ -358,9 +360,9 @@ contract FullRange is BaseHook, ILockCallback {
             uint256(uint128(-balanceDelta.amount1()))
         );
 
-        BalanceDelta balanceDeltaAfter = poolManager.modifyPosition(
+        BalanceDelta balanceDeltaAfter = poolManager.modifyLiquidity(
             key,
-            IPoolManager.ModifyPositionParams({
+            IPoolManager.ModifyLiquidityParams({
                 tickLower: MIN_TICK,
                 tickUpper: MAX_TICK,
                 liquidityDelta: liquidity.toInt256()