merge in changes

Uniswap · Jun 3, 2024 · 41619f9 · 41619f9
2 parents 0f9936e + 666faf8
commit 41619f9
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/.forge-snapshots/FullRangeAddInitialLiquidity.snap b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
@@ -1 +1 @@
-311165
+311137
diff --git a/.forge-snapshots/FullRangeAddLiquidity.snap b/.forge-snapshots/FullRangeAddLiquidity.snap
@@ -1 +1 @@
-122974
+122946
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1 +1 @@
-110572
+110544
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1 +1 @@
-240050
+240022
diff --git a/contracts/BaseHook.sol b/contracts/BaseHook.sol
@@ -41,7 +41,7 @@ abstract contract BaseHook is IHooks, SafeCallback {
         Hooks.validateHookPermissions(_this, getHookPermissions());
     }
 
-    function _unlockCallback(bytes calldata data) internal override virtual 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();

diff --git a/contracts/hooks/examples/FullRange.sol b/contracts/hooks/examples/FullRange.sol
@@ -298,7 +298,6 @@ contract FullRange is BaseHook {
     function _unlockCallback(bytes calldata rawData)
         internal
         override
-        onlyByManager
         returns (bytes memory)
     {
         CallbackData memory data = abi.decode(rawData, (CallbackData));

diff --git a/contracts/hooks/examples/TWAMM.sol b/contracts/hooks/examples/TWAMM.sol
@@ -309,7 +309,7 @@ contract TWAMM is BaseHook, ITWAMM {
         IERC20Minimal(Currency.unwrap(token)).safeTransfer(to, amountTransferred);
     }
 
-    function _unlockCallback(bytes calldata rawData) internal override(BaseHook) returns (bytes memory) {
+    function _unlockCallback(bytes calldata rawData) internal override returns (bytes memory) {
         (PoolKey memory key, IPoolManager.SwapParams memory swapParams) =
             abi.decode(rawData, (PoolKey, IPoolManager.SwapParams));