merge main

Uniswap · Apr 26, 2024 · 4ee5ef8 · 4ee5ef8
2 parents b8be10f + b9f442c
commit 4ee5ef8
Show file tree

Hide file tree

Showing 74 changed files with 237 additions and 215 deletions.
diff --git a/.forge-snapshots/BitMathMostSignificantBitMaxUint128.snap b/.forge-snapshots/BitMathMostSignificantBitMaxUint128.snap
@@ -1 +1 @@
-392
+393
diff --git a/.forge-snapshots/BitMathMostSignificantBitMaxUint256.snap b/.forge-snapshots/BitMathMostSignificantBitMaxUint256.snap
@@ -1 +1 @@
-412
+413
diff --git a/.forge-snapshots/BitMathMostSignificantBitSmallNumber.snap b/.forge-snapshots/BitMathMostSignificantBitSmallNumber.snap
@@ -1 +1 @@
-320
+321
diff --git a/.forge-snapshots/ERC6909Claims approve.snap b/.forge-snapshots/ERC6909Claims approve.snap
@@ -0,0 +1 @@
+46492
diff --git a/.forge-snapshots/ERC6909Claims burn.snap b/.forge-snapshots/ERC6909Claims burn.snap
@@ -0,0 +1 @@
+29428
diff --git a/.forge-snapshots/ERC6909Claims mint.snap b/.forge-snapshots/ERC6909Claims mint.snap
@@ -0,0 +1 @@
+46815
diff --git a/.forge-snapshots/ERC6909Claims transfer.snap b/.forge-snapshots/ERC6909Claims transfer.snap
@@ -0,0 +1 @@
+52046
diff --git a/.forge-snapshots/ERC6909Claims transferFrom as operator.snap b/.forge-snapshots/ERC6909Claims transferFrom as operator.snap
@@ -0,0 +1 @@
+54699
diff --git a/.forge-snapshots/ERC6909Claims transferFrom with approval.snap b/.forge-snapshots/ERC6909Claims transferFrom with approval.snap
@@ -0,0 +1 @@
+60247
diff --git a/.forge-snapshots/ERC6909Claims transferFrom with infinite approval.snap b/.forge-snapshots/ERC6909Claims transferFrom with infinite approval.snap
@@ -0,0 +1 @@
+57049
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
@@ -1 +1 @@
-258504
+278788
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
@@ -1 +1 @@
-135869
+136156
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-138703
+145947
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
@@ -1 +1 @@
-98008
+108949
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
@@ -1 +1 @@
-126137
+149549
diff --git a/.forge-snapshots/erc20 collect protocol fees.snap b/.forge-snapshots/erc20 collect protocol fees.snap
@@ -1 +1 @@
-24960
+57332
diff --git a/.forge-snapshots/flipTick_flippingATickThatResultsInDeletingAWord.snap b/.forge-snapshots/flipTick_flippingATickThatResultsInDeletingAWord.snap
@@ -0,0 +1 @@
+33
diff --git a/...FlippingFirstTickInWordToInitialized.snap → ...flippingFirstTickInWordToInitialized.snap b/...FlippingFirstTickInWordToInitialized.snap → ...flippingFirstTickInWordToInitialized.snap
diff --git a/...lippingSecondTickInWordToInitialized.snap → ...lippingSecondTickInWordToInitialized.snap b/...lippingSecondTickInWordToInitialized.snap → ...lippingSecondTickInWordToInitialized.snap
diff --git a/.forge-snapshots/flipTick_gasCostOfFlippingATickThatResultsInDeletingAWord.snap b/.forge-snapshots/flipTick_gasCostOfFlippingATickThatResultsInDeletingAWord.snap
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
@@ -1 +1 @@
-51288
+61933
diff --git a/.forge-snapshots/native collect protocol fees.snap b/.forge-snapshots/native collect protocol fees.snap
@@ -1 +1 @@
-36633
+59565
diff --git a/...neWord_lteFalse_gasCostForEntireWord.snap → ...WithinOneWord_lteFalse_forEntireWord.snap b/...neWord_lteFalse_gasCostForEntireWord.snap → ...WithinOneWord_lteFalse_forEntireWord.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostOnBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostOnBoundary.snap
diff --git a/...rd_lteFalse_gasCostJustBelowBoundary.snap → ...inOneWord_lteFalse_justBelowBoundary.snap b/...rd_lteFalse_gasCostJustBelowBoundary.snap → ...inOneWord_lteFalse_justBelowBoundary.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_onBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_onBoundary.snap
@@ -0,0 +1 @@
+33
diff --git a/...OneWord_lteTrue_gasCostForEntireWord.snap → ...kWithinOneWord_lteTrue_forEntireWord.snap b/...OneWord_lteTrue_gasCostForEntireWord.snap → ...kWithinOneWord_lteTrue_forEntireWord.snap
diff --git a/...ord_lteTrue_gasCostJustBelowBoundary.snap → ...hinOneWord_lteTrue_justBelowBoundary.snap b/...ord_lteTrue_gasCostJustBelowBoundary.snap → ...hinOneWord_lteTrue_justBelowBoundary.snap
diff --git a/...hinOneWord_lteTrue_gasCostOnBoundary.snap → ...WithinOneWord_lteTrue_onBoundary_gas.snap b/...hinOneWord_lteTrue_gasCostOnBoundary.snap → ...WithinOneWord_lteTrue_onBoundary_gas.snap
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
@@ -1 +1 @@
-22586
+22560
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
@@ -1 +1 @@
-53085
+115868
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
@@ -1 +1 @@
-140857
+113155
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-137135
+115856
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
@@ -1 +1 @@
-126052
+130538
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
@@ -1 +1 @@
-137445
+148889
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
@@ -1 +1 @@
-70347
+113433
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -1 +1 @@
-60666
+124803
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
@@ -1 +1 @@
-78655
+136807
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
@@ -1 +1 @@
-74498
+125922
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
@@ -1 +1 @@
-134785
+148001
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
@@ -1 +1 @@
-151448
+164904
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
@@ -1 +1 @@
-157359
+224124
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
@@ -1 +1 @@
-89935
+149105
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
@@ -1 +1 @@
-60645
+124815
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
@@ -1 +1 @@
-150265
+181394
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
@@ -1 +1 @@
-130962
+159641
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -24,7 +24,7 @@ body:
       attributes:
           label: To Reproduce
           description: If you have written tests to showcase the bug, what can we run to reproduce the issue?
-          placeholder: "git checkout <branchname> / forge test --match-test <testName>"
+          placeholder: "git checkout <branchname> / forge test --isolate --mt <testName>"
     - type: textarea
       attributes:
           label: Additional context

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,8 @@ jobs:
           FOUNDRY_PROFILE: ci
 
       - name: Run tests
-        run: forge test -vvv
+        run: forge test --isolate -vvv
         env:
           FOUNDRY_PROFILE: ci
+          FORGE_SNAPSHOT_CHECK: true
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ All contributions must follow the below standards. Maintainers will close out PR
 
 `forge build` to get contract artifacts and dependencies for forge
 
-`forge test` to run forge tests and update snapshots
+`forge test --isolate` to run forge tests and update snapshots
 
 ## Code of Conduct
 

diff --git a/lib/forge-gas-snapshot b/lib/forge-gas-snapshot
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/PoolManager.sol b/src/PoolManager.sol
@@ -209,17 +209,14 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         external
         override
         onlyWhenUnlocked
-        returns (BalanceDelta delta)
+        returns (BalanceDelta)
     {
         PoolId id = key.toId();
         _checkPoolInitialized(id);
 
         key.hooks.beforeSwap(key, params, hookData);
 
-        uint256 feeForProtocol;
-        uint24 swapFee;
-        Pool.SwapState memory state;
-        (delta, feeForProtocol, swapFee, state) = pools[id].swap(
+        (BalanceDelta delta, uint256 feeForProtocol, uint24 swapFee, Pool.SwapState memory state) = pools[id].swap(
             Pool.SwapParams({
                 tickSpacing: key.tickSpacing,
                 zeroForOne: params.zeroForOne,
@@ -240,6 +237,8 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         );
 
         key.hooks.afterSwap(key, params, delta, hookData);
+
+        return delta;
     }
 
     /// @inheritdoc IPoolManager

diff --git a/src/interfaces/IPoolManager.sol b/src/interfaces/IPoolManager.sol
@@ -48,12 +48,7 @@ interface IPoolManager is IProtocolFees, IERC6909Claims, IExtsload {
     /// @param tickSpacing The minimum number of ticks between initialized ticks
     /// @param hooks The hooks contract address for the pool, or address(0) if none
     event Initialize(
-        PoolId indexed id,
-        Currency indexed currency0,
-        Currency indexed currency1,
-        uint24 fee,
-        int24 tickSpacing,
-        IHooks hooks
+        PoolId id, Currency indexed currency0, Currency indexed currency1, uint24 fee, int24 tickSpacing, IHooks hooks
     );
 
     /// @notice Emitted when a liquidity position is modified
@@ -77,7 +72,7 @@ interface IPoolManager is IProtocolFees, IERC6909Claims, IExtsload {
     /// @param fee The swap fee in hundredths of a bip
     event Swap(
         PoolId indexed id,
-        address indexed sender,
+        address sender,
         int128 amount0,
         int128 amount1,
         uint160 sqrtPriceX96,

diff --git a/src/libraries/NonZeroDeltaCount.sol b/src/libraries/NonZeroDeltaCount.sol
@@ -8,17 +8,18 @@ import {IHooks} from "../interfaces/IHooks.sol";
 /// TODO: This library can be deleted when we have the transient keyword support in solidity.
 library NonZeroDeltaCount {
     // The slot holding the number of nonzero deltas. uint256(keccak256("NonzeroDeltaCount")) - 1
-    uint256 constant NONZERO_DELTA_COUNT = uint256(0x7d4b3164c6e45b97e7d87b7125a44c5828d005af88f9d751cfd78729c5d99a0b);
+    uint256 constant NONZERO_DELTA_COUNT_SLOT =
+        uint256(0x7d4b3164c6e45b97e7d87b7125a44c5828d005af88f9d751cfd78729c5d99a0b);
 
     function read() internal view returns (uint256 count) {
-        uint256 slot = NONZERO_DELTA_COUNT;
+        uint256 slot = NONZERO_DELTA_COUNT_SLOT;
         assembly {
             count := tload(slot)
         }
     }
 
     function increment() internal {
-        uint256 slot = NONZERO_DELTA_COUNT;
+        uint256 slot = NONZERO_DELTA_COUNT_SLOT;
         assembly {
             let count := tload(slot)
             count := add(count, 1)
@@ -29,7 +30,7 @@ library NonZeroDeltaCount {
     /// @notice Potential to underflow.
     /// Current usage ensures this will not happen because we call decrement with known boundaries (only up to the number of times we call increment).
     function decrement() internal {
-        uint256 slot = NONZERO_DELTA_COUNT;
+        uint256 slot = NONZERO_DELTA_COUNT_SLOT;
         assembly {
             let count := tload(slot)
             count := sub(count, 1)

diff --git a/src/libraries/Pool.sol b/src/libraries/Pool.sol
@@ -332,14 +332,12 @@ library Pool {
 
         bool exactInput = params.amountSpecified < 0;
 
-        state = SwapState({
-            amountSpecifiedRemaining: params.amountSpecified,
-            amountCalculated: 0,
-            sqrtPriceX96: slot0Start.sqrtPriceX96,
-            tick: slot0Start.tick,
-            feeGrowthGlobalX128: zeroForOne ? self.feeGrowthGlobal0X128 : self.feeGrowthGlobal1X128,
-            liquidity: cache.liquidityStart
-        });
+        state.amountSpecifiedRemaining = params.amountSpecified;
+        state.amountCalculated = 0;
+        state.sqrtPriceX96 = slot0Start.sqrtPriceX96;
+        state.tick = slot0Start.tick;
+        state.feeGrowthGlobalX128 = zeroForOne ? self.feeGrowthGlobal0X128 : self.feeGrowthGlobal1X128;
+        state.liquidity = cache.liquidityStart;
 
         StepComputations memory step;
         swapFee =

diff --git a/src/test/ActionsRouter.sol b/src/test/ActionsRouter.sol
@@ -32,6 +32,9 @@ contract ActionsRouter is IUnlockCallback, Test {
 
     error ActionNotSupported();
 
+    // error thrown so that incorrectly formatted tests don't pass silently
+    error CheckParameters();
+
     IPoolManager manager;
 
     constructor(IPoolManager _manager) {
@@ -40,6 +43,7 @@ contract ActionsRouter is IUnlockCallback, Test {
 
     function unlockCallback(bytes calldata data) external returns (bytes memory) {
         (Actions[] memory actions, bytes[] memory params) = abi.decode(data, (Actions[], bytes[]));
+        if (actions.length != params.length || actions.length == 0) revert CheckParameters();
         for (uint256 i = 0; i < actions.length; i++) {
             Actions action = actions[i];
             bytes memory param = params[i];

diff --git a/src/test/BitMathEchidnaTest.sol b/src/test/BitMathEchidnaTest.sol
diff --git a/src/test/UnsafeMathEchidnaTest.sol b/src/test/UnsafeMathEchidnaTest.sol
+0 −1		.forge-snapshots/add.snap
+0 −1		.forge-snapshots/addClosure.snap
+1 −1		.forge-snapshots/checkManyAdd.snap
+1 −1		.forge-snapshots/checkSize.snap
+1 −1		.forge-snapshots/internalClosure.snap
+1 −1		.forge-snapshots/manyAdd.snap
+1 −1		.forge-snapshots/manySstore.snap
+1 −0		.forge-snapshots/singleSstore.snap
+1 −0		.forge-snapshots/singleSstoreClosure.snap
+1 −0		.forge-snapshots/singleSstoreLastCall.snap
+1 −1		.forge-snapshots/sizeTarget.snap
+1 −1		.forge-snapshots/sstoreClosure.snap
+1 −1		.github/workflows/test.yml
+21 −0		LICENSE
+7 −1		README.md
+1 −1		lib/forge-std
+11 −2		src/GasSnapshot.sol
+4 −0		src/test/SimpleOperations.sol
+5 −2		src/utils/UintString.sol
+31 −23		test/GasSnapshot.t.sol
+1 −0		.gitattributes
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+0 −3		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+518 −225		src/StdAssertions.sol
+15 −9		src/StdChains.sol
+7 −11		src/StdJson.sol
+201 −106		src/StdStorage.sol
+179 −0		src/StdToml.sol
+1 −1		src/StdUtils.sol
+4 −4		src/Test.sol
+1,395 −495		src/Vm.sol
+51 −33		src/mocks/MockERC20.sol
+46 −32		src/mocks/MockERC721.sol
+39 −909		test/StdAssertions.t.sol
+31 −26		test/StdChains.t.sol
+19 −11		test/StdCheats.t.sol
+3 −1		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+159 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+3 −3		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol