Fix linting (#504)

* Fix linting

* bump forge version

Author: gretzke

.github/workflows/lint.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@50d5a8956f2e319df19e6b57539d7e2acb9f8c1e # v1.5.0
         with:
-          version: v1.3.6
+          version: v1.4.3
 
       - name: Check format
         run: forge fmt --check

src/PositionManager.sol

@@ -498,10 +498,7 @@ contract PositionManager is
         (liquidityDelta, feesAccrued) = poolManager.modifyLiquidity(
             poolKey,
             ModifyLiquidityParams({
-                tickLower: info.tickLower(),
-                tickUpper: info.tickUpper(),
-                liquidityDelta: liquidityChange,
-                salt: salt
+                tickLower: info.tickLower(), tickUpper: info.tickUpper(), liquidityDelta: liquidityChange, salt: salt
             }),
             hookData
         );

src/V4Router.sol

@@ -120,9 +120,10 @@ abstract contract V4Router is IV4Router, BaseActionsRouter, DeltaResolver {
             amountOut =
                 _getFullDebt(params.zeroForOne ? params.poolKey.currency1 : params.poolKey.currency0).toUint128();
         }
-        uint128 amountIn = (
-            uint256(-int256(_swap(params.poolKey, params.zeroForOne, int256(uint256(amountOut)), params.hookData)))
-        ).toUint128();
+        uint128 amountIn = (uint256(
+                -int256(_swap(params.poolKey, params.zeroForOne, int256(uint256(amountOut)), params.hookData))
+            ))
+        .toUint128();
         if (amountIn > params.amountInMaximum) revert V4TooMuchRequested(params.amountInMaximum, amountIn);
     }
 
@@ -144,7 +145,7 @@ abstract contract V4Router is IV4Router, BaseActionsRouter, DeltaResolver {
                 (PoolKey memory poolKey, bool oneForZero) = pathKey.getPoolAndSwapDirection(currencyOut);
                 // The output delta will always be negative, except for when interacting with certain hook pools
                 amountIn = (uint256(-int256(_swap(poolKey, !oneForZero, int256(uint256(amountOut)), pathKey.hookData))))
-                    .toUint128();
+                .toUint128();
 
                 amountOut = amountIn;
                 currencyOut = pathKey.intermediateCurrency;

src/base/ERC721Permit_v4.sol

@@ -92,7 +92,8 @@ abstract contract ERC721Permit_v4 is ERC721, IERC721Permit_v4, EIP712_v4, Unorde
     }
 
     function _isApprovedOrOwner(address spender, uint256 tokenId) internal view returns (bool) {
-        return spender == ownerOf(tokenId) || getApproved[tokenId] == spender
-            || isApprovedForAll[ownerOf(tokenId)][spender];
+        return
+            spender == ownerOf(tokenId) || getApproved[tokenId] == spender
+                || isApprovedForAll[ownerOf(tokenId)][spender];
     }
 }

src/base/Notifier.sol

@@ -60,12 +60,7 @@ abstract contract Notifier is INotifier {
     }
 
     /// @inheritdoc INotifier
-    function unsubscribe(uint256 tokenId)
-        external
-        payable
-        onlyIfPoolManagerLocked
-        onlyIfApproved(msg.sender, tokenId)
-    {
+    function unsubscribe(uint256 tokenId) external payable onlyIfPoolManagerLocked onlyIfApproved(msg.sender, tokenId) {
         _unsubscribe(tokenId);
     }
 

src/base/hooks/BaseTokenWrapperHook.sol

@@ -2,7 +2,9 @@
 pragma solidity ^0.8.0;
 
 import {
-    toBeforeSwapDelta, BeforeSwapDelta, BeforeSwapDeltaLibrary
+    toBeforeSwapDelta,
+    BeforeSwapDelta,
+    BeforeSwapDeltaLibrary
 } from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";
 import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
 import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
@@ -129,8 +131,9 @@ abstract contract BaseTokenWrapperHook is BaseHook, DeltaResolver {
 
         if (wrapZeroForOne == params.zeroForOne) {
             // we are wrapping
-            uint256 inputAmount =
-                isExactInput ? uint256(-params.amountSpecified) : _getWrapInputRequired(uint256(params.amountSpecified));
+            uint256 inputAmount = isExactInput
+                ? uint256(-params.amountSpecified)
+                : _getWrapInputRequired(uint256(params.amountSpecified));
             (uint256 actualUnderlyingAmount, uint256 wrappedAmount) = _deposit(inputAmount);
             int128 amountUnspecified =
                 isExactInput ? -wrappedAmount.toInt256().toInt128() : actualUnderlyingAmount.toInt256().toInt128();

src/interfaces/IV4Quoter.sol

@@ -42,9 +42,7 @@ interface IV4Quoter is IImmutableState, IMsgSender {
     /// exactAmount The desired input amount
     /// @return amountOut The output quote for the exactIn swap
     /// @return gasEstimate Estimated gas units used for the swap
-    function quoteExactInput(QuoteExactParams memory params)
-        external
-        returns (uint256 amountOut, uint256 gasEstimate);
+    function quoteExactInput(QuoteExactParams memory params) external returns (uint256 amountOut, uint256 gasEstimate);
 
     /// @notice Returns the delta amounts for a given exact output swap of a single pool
     /// @param params The params for the quote, encoded as `QuoteExactSingleParams`
@@ -65,7 +63,5 @@ interface IV4Quoter is IImmutableState, IMsgSender {
     /// exactAmount The desired output amount
     /// @return amountIn The input quote for the exactOut swap
     /// @return gasEstimate Estimated gas units used for the swap
-    function quoteExactOutput(QuoteExactParams memory params)
-        external
-        returns (uint256 amountIn, uint256 gasEstimate);
+    function quoteExactOutput(QuoteExactParams memory params) external returns (uint256 amountIn, uint256 gasEstimate);
 }

src/libraries/CalldataDecoder.sol

@@ -320,11 +320,7 @@ library CalldataDecoder {
     }
 
     /// @dev equivalent to: abi.decode(params, (Currency, uint256)) in calldata
-    function decodeCurrencyAndUint256(bytes calldata params)
-        internal
-        pure
-        returns (Currency currency, uint256 amount)
-    {
+    function decodeCurrencyAndUint256(bytes calldata params) internal pure returns (Currency currency, uint256 amount) {
         assembly ("memory-safe") {
             if lt(params.length, 0x40) {
                 mstore(0, SLICE_ERROR_SELECTOR)

src/libraries/LiquidityAmounts.sol

@@ -59,7 +59,9 @@ library LiquidityAmounts {
         uint256 amount0,
         uint256 amount1
     ) internal pure returns (uint128 liquidity) {
-        if (sqrtPriceAX96 > sqrtPriceBX96) (sqrtPriceAX96, sqrtPriceBX96) = (sqrtPriceBX96, sqrtPriceAX96);
+        if (sqrtPriceAX96 > sqrtPriceBX96) {
+            (sqrtPriceAX96, sqrtPriceBX96) = (sqrtPriceBX96, sqrtPriceAX96);
+        }
 
         if (sqrtPriceX96 <= sqrtPriceAX96) {
             liquidity = getLiquidityForAmount0(sqrtPriceAX96, sqrtPriceBX96, amount0);

src/libraries/PositionInfoLibrary.sol

@@ -95,11 +95,10 @@ library PositionInfoLibrary {
     {
         bytes25 _poolId = bytes25(PoolId.unwrap(_poolKey.toId()));
         assembly {
-            info :=
-                or(
-                    or(and(MASK_UPPER_200_BITS, _poolId), shl(TICK_UPPER_OFFSET, and(MASK_24_BITS, _tickUpper))),
-                    shl(TICK_LOWER_OFFSET, and(MASK_24_BITS, _tickLower))
-                )
+            info := or(
+                or(and(MASK_UPPER_200_BITS, _poolId), shl(TICK_UPPER_OFFSET, and(MASK_24_BITS, _tickUpper))),
+                shl(TICK_LOWER_OFFSET, and(MASK_24_BITS, _tickLower))
+            )
         }
     }
 }