Merge remote-tracking branch 'upstream/main' into rm-unnecessary-unlo…

…cked-check

.forge-snapshots/add liquidity to already existing position with salt.snap

@@ -1 +1 @@
-144401
+144425

.forge-snapshots/addLiquidity CA fee.snap

@@ -1 +1 @@
-170697
+170721

.forge-snapshots/addLiquidity with empty hook.snap

@@ -1 +1 @@
-274002
+274026

.forge-snapshots/addLiquidity with native token.snap

@@ -1 +1 @@
-135010
+135022

.forge-snapshots/create new liquidity to a position with salt.snap

@@ -1 +1 @@
-292593
+292617

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

@@ -1 +1 @@
-106202
+106226

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

@@ -1 +1 @@
-145504
+145528

.forge-snapshots/erc20 collect protocol fees.snap

@@ -1 +1 @@
-57326
+57338

.forge-snapshots/initialize.snap

@@ -1 +1 @@
-59536
+51536

.forge-snapshots/poolManager bytecode size.snap

@@ -1 +1 @@
-23884
+23504

.forge-snapshots/removeLiquidity CA fee.snap

@@ -1 +1 @@
-141195
+141219

.forge-snapshots/removeLiquidity with empty hook.snap

@@ -1 +1 @@
-130597
+130621

.forge-snapshots/removeLiquidity with native token.snap

@@ -1 +1 @@
-112525
+112535

.forge-snapshots/simple addLiquidity second addition same range.snap

@@ -1 +1 @@
-98719
+98743

.forge-snapshots/simple addLiquidity.snap

@@ -1 +1 @@
-161264
+161288

.forge-snapshots/simple removeLiquidity some liquidity remains.snap

@@ -1 +1 @@
-92971
+92995

.forge-snapshots/simple removeLiquidity.snap

@@ -1 +1 @@
-85084
+85108

.forge-snapshots/simple swap with native.snap

@@ -1 +1 @@
-108503
+108515

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-123204
+123228

.forge-snapshots/swap CA custom curve + swap noop.snap

@@ -1 +1 @@
-124391
+124415

.forge-snapshots/swap CA fee on unspecified.snap

@@ -1 +1 @@
-154630
+154654

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

@@ -1 +1 @@
-105625
+105637

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-116574
+116598

.forge-snapshots/swap burn 6909 for input.snap

@@ -1 +1 @@
-129257
+129281

.forge-snapshots/swap burn native 6909 for input.snap

@@ -1 +1 @@
-118713
+118725

.forge-snapshots/swap mint native output as 6909.snap

@@ -1 +1 @@
-139616
+139628

.forge-snapshots/swap mint output as 6909.snap

@@ -1 +1 @@
-155045
+155069

.forge-snapshots/swap skips hook call if hook is caller.snap

@@ -1 +1 @@
-206177
+206165

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-132202
+132226

.forge-snapshots/swap with return dynamic fee.snap

@@ -1 +1 @@
-145554
+145542

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @uniswap/protocols

.github/workflows/coverage.yml

@@ -32,35 +32,41 @@ jobs:
         run: |
           {
           echo 'COVERAGE<<EOF'
-          forge coverage --ir-minimum | grep '^|' | grep -v 'test/' | tr -d \`
+          forge coverage --ir-minimum | grep '^|' | grep -v 'test/' | tr -d \` | tr -d $ | tr -d { | tr -d }
           echo EOF
           } >> "$GITHUB_OUTPUT"
         env:
           FOUNDRY_RPC_URL: "${{ secrets.RPC_URL }}"
 
       - name: Check coverage is updated
         uses: actions/github-script@v5
+        env:
+          OUTPUT: ${{ steps.coverage.outputs.COVERAGE }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
+            const { OUTPUT } = process.env;
             const fs = require('fs');
             const file = "coverage.txt"
             if(!fs.existsSync(file)) {
               console.log("Nothing to check");
               return
             }
             const currentCoverage = fs.readFileSync(file, "utf8").trim();
-            const newCoverage = (`${{ steps.coverage.outputs.COVERAGE }}`).trim();
+            const newCoverage = (`${ OUTPUT }`).trim();
             if (newCoverage != currentCoverage) {
               core.setFailed(`Code coverage not updated. Run : forge coverage | grep '^|' | grep -v 'test/'  > coverage.txt`);
             }
 
       - name: Comment on PR
         id: comment
         uses: actions/github-script@v5
+        env:
+          OUTPUT: ${{ steps.coverage.outputs.COVERAGE }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
+            const { OUTPUT } = process.env;
             const {data: comments} = await github.rest.issues.listComments({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
@@ -69,8 +75,7 @@ jobs:
 
             const botComment = comments.find(comment => comment.user.id === 41898282)
 
-            const output = `${{ steps.coverage.outputs.COVERAGE }}`;
-            const commentBody = `Forge code coverage:\n${output}\n`;
+            const commentBody = `Forge code coverage:\n${ OUTPUT }\n`;
 
             if (botComment) {
               github.rest.issues.updateComment({

.github/workflows/tests-merge.yml

@@ -1,14 +1,16 @@
 name: Tests
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
 
 jobs:
   forge-tests:
     name: Forge Tests
-    runs-on: ubuntu-latest
+    runs-on:
+      group: forge-testing
 
     steps:
       - uses: actions/checkout@v3

src/PoolManager.sol

@@ -128,9 +128,8 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         key.hooks.beforeInitialize(key, sqrtPriceX96);
 
         PoolId id = key.toId();
-        uint24 protocolFee = _fetchProtocolFee(key);
 
-        tick = _pools[id].initialize(sqrtPriceX96, protocolFee, lpFee);
+        tick = _pools[id].initialize(sqrtPriceX96, lpFee);
 
         key.hooks.afterInitialize(key, sqrtPriceX96, tick);
 
@@ -174,7 +173,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         BalanceDelta hookDelta;
         (callerDelta, hookDelta) = key.hooks.afterModifyLiquidity(key, params, callerDelta, feesAccrued, hookData);
 
-        // if the hook doesnt have the flag to be able to return deltas, hookDelta will always be 0
+        // if the hook doesn't have the flag to be able to return deltas, hookDelta will always be 0
         if (hookDelta != BalanceDeltaLibrary.ZERO_DELTA) _accountPoolBalanceDelta(key, hookDelta, address(key.hooks));
 
         _accountPoolBalanceDelta(key, callerDelta, msg.sender);
@@ -217,7 +216,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         BalanceDelta hookDelta;
         (swapDelta, hookDelta) = key.hooks.afterSwap(key, params, swapDelta, hookData, beforeSwapDelta);
 
-        // if the hook doesnt have the flag to be able to return deltas, hookDelta will always be 0
+        // if the hook doesn't have the flag to be able to return deltas, hookDelta will always be 0
         if (hookDelta != BalanceDeltaLibrary.ZERO_DELTA) _accountPoolBalanceDelta(key, hookDelta, address(key.hooks));
 
         _accountPoolBalanceDelta(key, swapDelta, msg.sender);

src/ProtocolFees.sol

@@ -6,7 +6,6 @@ import {IProtocolFeeController} from "./interfaces/IProtocolFeeController.sol";
 import {IProtocolFees} from "./interfaces/IProtocolFees.sol";
 import {PoolKey} from "./types/PoolKey.sol";
 import {ProtocolFeeLibrary} from "./libraries/ProtocolFeeLibrary.sol";
-import {BipsLibrary} from "./libraries/BipsLibrary.sol";
 import {Owned} from "solmate/src/auth/Owned.sol";
 import {PoolId} from "./types/PoolId.sol";
 import {Pool} from "./libraries/Pool.sol";
@@ -17,18 +16,13 @@ abstract contract ProtocolFees is IProtocolFees, Owned {
     using ProtocolFeeLibrary for uint24;
     using Pool for Pool.State;
     using CustomRevert for bytes4;
-    using BipsLibrary for uint256;
 
     /// @inheritdoc IProtocolFees
     mapping(Currency currency => uint256 amount) public protocolFeesAccrued;
 
     /// @inheritdoc IProtocolFees
     IProtocolFeeController public protocolFeeController;
 
-    // a percentage of the block.gaslimit denoted in basis points, used as the gas limit for fee controller calls
-    // 100 bps is 1%, at 30M gas, the limit is 300K
-    uint256 private constant BLOCK_LIMIT_BPS = 100;
-
     constructor() Owned(msg.sender) {}
 
     /// @inheritdoc IProtocolFees
@@ -65,42 +59,6 @@ abstract contract ProtocolFees is IProtocolFees, Owned {
     /// @dev this is overridden in PoolManager.sol to give access to the _pools mapping
     function _getPool(PoolId id) internal virtual returns (Pool.State storage);
 
-    /// @notice Fetch the protocol fees for a given pool
-    /// @dev the success of this function is false if the call fails or the returned fees are invalid
-    /// @dev to prevent an invalid protocol fee controller from blocking pools from being initialized
-    /// the success of this function is NOT checked on initialize and if the call fails, the protocol fees are set to 0.
-    function _fetchProtocolFee(PoolKey memory key) internal returns (uint24 protocolFee) {
-        if (address(protocolFeeController) != address(0)) {
-            uint256 controllerGasLimit = block.gaslimit.calculatePortion(BLOCK_LIMIT_BPS);
-
-            // note that EIP-150 mandates that calls requesting more than 63/64ths of remaining gas
-            // will be allotted no more than this amount, so controllerGasLimit must be set with this
-            // in mind.
-            if (gasleft() < controllerGasLimit) ProtocolFeeCannotBeFetched.selector.revertWith();
-
-            address toAddress = address(protocolFeeController);
-
-            bytes memory data = abi.encodeCall(IProtocolFeeController.protocolFeeForPool, (key));
-
-            bool success;
-            uint256 returnData;
-            assembly ("memory-safe") {
-                // only load the first 32 bytes of the return data to prevent gas griefing
-                success := call(controllerGasLimit, toAddress, 0, add(data, 0x20), mload(data), 0, 32)
-                // if success is false this wont actually be returned, instead 0 will be returned
-                returnData := mload(0)
-
-                // success if return data size is 32 bytes
-                success := and(success, eq(returndatasize(), 32))
-            }
-
-            // Ensure return data does not overflow a uint24 and that the underlying fees are within bounds.
-            protocolFee = success && (returnData == uint24(returnData)) && uint24(returnData).isValidProtocolFee()
-                ? uint24(returnData)
-                : 0;
-        }
-    }
-
     function _updateProtocolFees(Currency currency, uint256 amount) internal {
         unchecked {
             protocolFeesAccrued[currency] += amount;

src/interfaces/IProtocolFees.sol

@@ -8,8 +8,6 @@ import {PoolKey} from "../types/PoolKey.sol";
 
 /// @notice Interface for all protocol-fee related functions in the pool manager
 interface IProtocolFees {
-    /// @notice Thrown when not enough gas is provided to look up the protocol fee
-    error ProtocolFeeCannotBeFetched();
     /// @notice Thrown when protocol fee is set too high
     error ProtocolFeeTooLarge(uint24 fee);
 

src/libraries/Hooks.sol

@@ -126,7 +126,7 @@ library Hooks {
             : (uint160(address(self)) & ALL_HOOK_MASK > 0 || fee.isDynamicFee());
     }
 
-    /// @notice performs a hook call using the given calldata on the given hook that doesnt return a delta
+    /// @notice performs a hook call using the given calldata on the given hook that doesn't return a delta
     /// @return result The complete data returned by the hook
     function callHook(IHooks self, bytes memory data) internal returns (bytes memory result) {
         bool success;
@@ -268,7 +268,7 @@ library Hooks {
                 // any return in unspecified is passed to the afterSwap hook for handling
                 int128 hookDeltaSpecified = hookReturn.getSpecifiedDelta();
 
-                // Update the swap amount according to the hook's return, and check that the swap type doesnt change (exact input/output)
+                // Update the swap amount according to the hook's return, and check that the swap type doesn't change (exact input/output)
                 if (hookDeltaSpecified != 0) {
                     bool exactInput = amountToSwap < 0;
                     amountToSwap += hookDeltaSpecified;

src/libraries/Pool.sol

@@ -94,16 +94,13 @@ library Pool {
         if (tickUpper > TickMath.MAX_TICK) TickUpperOutOfBounds.selector.revertWith(tickUpper);
     }
 
-    function initialize(State storage self, uint160 sqrtPriceX96, uint24 protocolFee, uint24 lpFee)
-        internal
-        returns (int24 tick)
-    {
+    function initialize(State storage self, uint160 sqrtPriceX96, uint24 lpFee) internal returns (int24 tick) {
         if (self.slot0.sqrtPriceX96() != 0) PoolAlreadyInitialized.selector.revertWith();
 
         tick = TickMath.getTickAtSqrtPrice(sqrtPriceX96);
 
-        self.slot0 = Slot0.wrap(bytes32(0)).setSqrtPriceX96(sqrtPriceX96).setTick(tick).setProtocolFee(protocolFee)
-            .setLpFee(lpFee);
+        // the initial protocolFee is 0 so doesn't need to be set
+        self.slot0 = Slot0.wrap(bytes32(0)).setSqrtPriceX96(sqrtPriceX96).setTick(tick).setLpFee(lpFee);
     }
 
     function setProtocolFee(State storage self, uint24 protocolFee) internal {
@@ -404,7 +401,7 @@ library Pool {
             }
 
             // Shift tick if we reached the next price, and preemptively decrement for zeroForOne swaps to tickNext - 1.
-            // If the swap doesnt continue (if amountRemaining == 0 or sqrtPriceLimit is met), slot0.tick will be 1 less
+            // If the swap doesn't continue (if amountRemaining == 0 or sqrtPriceLimit is met), slot0.tick will be 1 less
             // than getTickAtSqrtPrice(slot0.sqrtPrice). This doesn't affect swaps, but donation calls should verify both
             // price and tick to reward the correct LPs.
             if (result.sqrtPriceX96 == step.sqrtPriceNextX96) {