Merge branch 'main' into main

Uniswap · Nov 6, 2024 · a7aa748 · a7aa748
2 parents 5104876 + 362c9ca
commit a7aa748
Show file tree

Hide file tree

Showing 161 changed files with 560 additions and 462 deletions.
diff --git a/.forge-snapshots/BitMathLeastSignificantBitMaxUint128.snap b/.forge-snapshots/BitMathLeastSignificantBitMaxUint128.snap
diff --git a/.forge-snapshots/BitMathLeastSignificantBitMaxUint256.snap b/.forge-snapshots/BitMathLeastSignificantBitMaxUint256.snap
diff --git a/.forge-snapshots/BitMathLeastSignificantBitSmallNumber.snap b/.forge-snapshots/BitMathLeastSignificantBitSmallNumber.snap
diff --git a/.forge-snapshots/BitMathMostSignificantBitMaxUint128.snap b/.forge-snapshots/BitMathMostSignificantBitMaxUint128.snap
diff --git a/.forge-snapshots/BitMathMostSignificantBitMaxUint256.snap b/.forge-snapshots/BitMathMostSignificantBitMaxUint256.snap
diff --git a/.forge-snapshots/BitMathMostSignificantBitSmallNumber.snap b/.forge-snapshots/BitMathMostSignificantBitSmallNumber.snap
diff --git a/.forge-snapshots/ERC6909Claims approve.snap b/.forge-snapshots/ERC6909Claims approve.snap
diff --git a/.forge-snapshots/ERC6909Claims burn.snap b/.forge-snapshots/ERC6909Claims burn.snap
diff --git a/.forge-snapshots/ERC6909Claims mint.snap b/.forge-snapshots/ERC6909Claims mint.snap
diff --git a/.forge-snapshots/ERC6909Claims transfer.snap b/.forge-snapshots/ERC6909Claims transfer.snap
diff --git a/.forge-snapshots/ERC6909Claims transferFrom as operator.snap b/.forge-snapshots/ERC6909Claims transferFrom as operator.snap
diff --git a/.forge-snapshots/ERC6909Claims transferFrom with approval.snap b/.forge-snapshots/ERC6909Claims transferFrom with approval.snap
diff --git a/.forge-snapshots/ERC6909Claims transferFrom with infinite approval.snap b/.forge-snapshots/ERC6909Claims transferFrom with infinite approval.snap
diff --git a/.forge-snapshots/NoDelegateCall.snap b/.forge-snapshots/NoDelegateCall.snap
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactInCapped.snap b/.forge-snapshots/SwapMath_oneForZero_exactInCapped.snap
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactInPartial.snap b/.forge-snapshots/SwapMath_oneForZero_exactInPartial.snap
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactOutCapped.snap b/.forge-snapshots/SwapMath_oneForZero_exactOutCapped.snap
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactOutPartial.snap b/.forge-snapshots/SwapMath_oneForZero_exactOutPartial.snap
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactInCapped.snap b/.forge-snapshots/SwapMath_zeroForOne_exactInCapped.snap
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactInPartial.snap b/.forge-snapshots/SwapMath_zeroForOne_exactInPartial.snap
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactOutCapped.snap b/.forge-snapshots/SwapMath_zeroForOne_exactOutCapped.snap
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactOutPartial.snap b/.forge-snapshots/SwapMath_zeroForOne_exactOutPartial.snap
diff --git a/.forge-snapshots/TickMathGetSqrtPriceAtTick.snap b/.forge-snapshots/TickMathGetSqrtPriceAtTick.snap
diff --git a/.forge-snapshots/TickMathGetTickAtSqrtPrice.snap b/.forge-snapshots/TickMathGetTickAtSqrtPrice.snap
diff --git a/.forge-snapshots/add liquidity to already existing position with salt.snap b/.forge-snapshots/add liquidity to already existing position with salt.snap
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
diff --git a/.forge-snapshots/clear.snap b/.forge-snapshots/clear.snap
diff --git a/.forge-snapshots/create new liquidity to a position with salt.snap b/.forge-snapshots/create new liquidity to a position with salt.snap
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
diff --git a/.forge-snapshots/erc20 collect protocol fees.snap b/.forge-snapshots/erc20 collect protocol fees.snap
diff --git a/.forge-snapshots/extsload getFeeGrowthGlobals.snap b/.forge-snapshots/extsload getFeeGrowthGlobals.snap
diff --git a/.forge-snapshots/extsload getFeeGrowthInside.snap b/.forge-snapshots/extsload getFeeGrowthInside.snap
diff --git a/.forge-snapshots/extsload getLiquidity.snap b/.forge-snapshots/extsload getLiquidity.snap
diff --git a/.forge-snapshots/extsload getPositionInfo.snap b/.forge-snapshots/extsload getPositionInfo.snap
diff --git a/.forge-snapshots/extsload getPositionLiquidity.snap b/.forge-snapshots/extsload getPositionLiquidity.snap
diff --git a/.forge-snapshots/extsload getSlot0.snap b/.forge-snapshots/extsload getSlot0.snap
diff --git a/.forge-snapshots/extsload getTickBitmap.snap b/.forge-snapshots/extsload getTickBitmap.snap
diff --git a/.forge-snapshots/extsload getTickFeeGrowthOutside.snap b/.forge-snapshots/extsload getTickFeeGrowthOutside.snap
diff --git a/.forge-snapshots/extsload getTickInfo.snap b/.forge-snapshots/extsload getTickInfo.snap
diff --git a/.forge-snapshots/extsload getTickLiquidity.snap b/.forge-snapshots/extsload getTickLiquidity.snap
diff --git a/.forge-snapshots/flipTick_flippingATickThatResultsInDeletingAWord.snap b/.forge-snapshots/flipTick_flippingATickThatResultsInDeletingAWord.snap
diff --git a/.forge-snapshots/flipTick_flippingFirstTickInWordToInitialized.snap b/.forge-snapshots/flipTick_flippingFirstTickInWordToInitialized.snap
diff --git a/.forge-snapshots/flipTick_flippingSecondTickInWordToInitialized.snap b/.forge-snapshots/flipTick_flippingSecondTickInWordToInitialized.snap
diff --git a/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap b/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap
diff --git a/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap b/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap
diff --git a/.forge-snapshots/getAmount1Delta_gasCostForAmount1WhereRoundUpIsFalse.snap b/.forge-snapshots/getAmount1Delta_gasCostForAmount1WhereRoundUpIsFalse.snap
diff --git a/.forge-snapshots/getAmount1Delta_gasCostForAmount1WhereRoundUpIsTrue.snap b/.forge-snapshots/getAmount1Delta_gasCostForAmount1WhereRoundUpIsTrue.snap
diff --git a/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas.snap b/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas.snap
diff --git a/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas.snap b/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas.snap
diff --git a/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas.snap b/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas.snap
diff --git a/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas.snap b/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas.snap
diff --git a/.forge-snapshots/getReserves.snap b/.forge-snapshots/getReserves.snap
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
diff --git a/.forge-snapshots/native collect protocol fees.snap b/.forge-snapshots/native collect protocol fees.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_forEntireWord.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_forEntireWord.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_justBelowBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_justBelowBoundary.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_onBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_onBoundary.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_forEntireWord.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_forEntireWord.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_justBelowBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_justBelowBoundary.snap
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_onBoundary_gas.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_onBoundary_gas.snap
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
diff --git a/.forge-snapshots/set protocol fee.snap b/.forge-snapshots/set protocol fee.snap
diff --git a/.forge-snapshots/simple addLiquidity second addition same range.snap b/.forge-snapshots/simple addLiquidity second addition same range.snap
diff --git a/.forge-snapshots/simple addLiquidity.snap b/.forge-snapshots/simple addLiquidity.snap
diff --git a/.forge-snapshots/simple removeLiquidity some liquidity remains.snap b/.forge-snapshots/simple removeLiquidity some liquidity remains.snap
diff --git a/.forge-snapshots/simple removeLiquidity.snap b/.forge-snapshots/simple removeLiquidity.snap
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
diff --git a/.forge-snapshots/sparse external sload.snap b/.forge-snapshots/sparse external sload.snap
diff --git a/.forge-snapshots/swap CA custom curve + swap noop.snap b/.forge-snapshots/swap CA custom curve + swap noop.snap
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
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
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
diff --git a/.forge-snapshots/swap with return dynamic fee.snap b/.forge-snapshots/swap with return dynamic fee.snap
diff --git a/.forge-snapshots/tickSpacingToMaxLiquidityPerTick_gasCost60TickSpacing.snap b/.forge-snapshots/tickSpacingToMaxLiquidityPerTick_gasCost60TickSpacing.snap
diff --git a/.forge-snapshots/tickSpacingToMaxLiquidityPerTick_gasCostMaxTickSpacing.snap b/.forge-snapshots/tickSpacingToMaxLiquidityPerTick_gasCostMaxTickSpacing.snap
diff --git a/.forge-snapshots/tickSpacingToMaxLiquidityPerTick_gasCostMinTickSpacing.snap b/.forge-snapshots/tickSpacingToMaxLiquidityPerTick_gasCostMinTickSpacing.snap
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/forge-gas-snapshot"]
-	path = lib/forge-gas-snapshot
-	url = https://github.com/marktoda/forge-gas-snapshot
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/transmissions11/solmate

diff --git a/.prettierignore b/.prettierignore
@@ -4,4 +4,5 @@ out
 lib/
 cache/
 *.sol
-dist/
+dist/
+snapshots/
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/remappings.txt b/remappings.txt
@@ -1,7 +1,6 @@
 @ensdomains/=node_modules/@ensdomains/
 @openzeppelin/=lib/openzeppelin-contracts/
 ds-test/=lib/forge-std/lib/ds-test/src/
-forge-gas-snapshot/=lib/forge-gas-snapshot/src/
 forge-std/=lib/forge-std/src/
 hardhat/=node_modules/hardhat/
 solmate/=lib/solmate/
diff --git a/snapshots/ClearTest.json b/snapshots/ClearTest.json
@@ -0,0 +1,3 @@
+{
+  "clear": "1717"
+}
diff --git a/snapshots/CustomAccountingTest.json b/snapshots/CustomAccountingTest.json
@@ -0,0 +1,6 @@
+{
+  "addLiquidity CA fee": "170695",
+  "removeLiquidity CA fee": "141199",
+  "swap CA custom curve + swap noop": "124402",
+  "swap CA fee on unspecified": "154572"
+}
diff --git a/snapshots/ERC6909ClaimsTest.json b/snapshots/ERC6909ClaimsTest.json
@@ -0,0 +1,9 @@
+{
+  "ERC6909Claims approve": "46323",
+  "ERC6909Claims burn": "29389",
+  "ERC6909Claims mint": "46603",
+  "ERC6909Claims transfer": "51756",
+  "ERC6909Claims transferFrom as operator": "54437",
+  "ERC6909Claims transferFrom with approval": "59939",
+  "ERC6909Claims transferFrom with infinite approval": "56770"
+}
diff --git a/snapshots/ExtsloadTest.json b/snapshots/ExtsloadTest.json
@@ -0,0 +1,3 @@
+{
+  "sparse external sload": "2164"
+}
diff --git a/snapshots/ModifyLiquidityTest.json b/snapshots/ModifyLiquidityTest.json
@@ -0,0 +1,4 @@
+{
+  "add liquidity to already existing position with salt": "144401",
+  "create new liquidity to a position with salt": "292593"
+}
diff --git a/snapshots/PoolManagerInitializeTest.json b/snapshots/PoolManagerInitializeTest.json
@@ -0,0 +1,3 @@
+{
+  "initialize": "51532"
+}
diff --git a/snapshots/PoolManagerTest.json b/snapshots/PoolManagerTest.json
@@ -0,0 +1,24 @@
+{
+  "addLiquidity with empty hook": "274012",
+  "addLiquidity with native token": "135001",
+  "donate gas with 1 token": "106214",
+  "donate gas with 2 tokens": "145510",
+  "erc20 collect protocol fees": "57500",
+  "native collect protocol fees": "59643",
+  "poolManager bytecode size": "24050",
+  "removeLiquidity with empty hook": "130613",
+  "removeLiquidity with native token": "112523",
+  "simple addLiquidity": "161276",
+  "simple addLiquidity second addition same range": "98731",
+  "simple removeLiquidity": "85099",
+  "simple removeLiquidity some liquidity remains": "92986",
+  "simple swap": "123144",
+  "simple swap with native": "108434",
+  "swap against liquidity": "116527",
+  "swap against liquidity with native token": "105569",
+  "swap burn 6909 for input": "129285",
+  "swap burn native 6909 for input": "118672",
+  "swap mint native output as 6909": "139620",
+  "swap mint output as 6909": "154985",
+  "swap with hooks": "132165"
+}
diff --git a/snapshots/ProtocolFeesTest.json b/snapshots/ProtocolFeesTest.json
@@ -0,0 +1,3 @@
+{
+  "set protocol fee": "31730"
+}
diff --git a/snapshots/SkipCallsTest.json b/snapshots/SkipCallsTest.json
@@ -0,0 +1,3 @@
+{
+  "swap skips hook call if hook is caller": "206030"
+}
diff --git a/snapshots/SqrtPriceMathTest.json b/snapshots/SqrtPriceMathTest.json
@@ -0,0 +1,10 @@
+{
+  "getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse": "243",
+  "getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue": "360",
+  "getAmount1Delta_gasCostForAmount1WhereRoundUpIsFalse": "229",
+  "getAmount1Delta_gasCostForAmount1WhereRoundUpIsTrue": "264",
+  "getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas": "316",
+  "getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas": "539",
+  "getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas": "544",
+  "getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas": "214"
+}