Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
snreynolds committed Dec 9, 2024
2 parents 5dcbdb7 + 51df60a commit f5e0b0d
Show file tree
Hide file tree
Showing 113 changed files with 210 additions and 211 deletions.
1 change: 0 additions & 1 deletion .forge-snapshots/BaseActionsRouter_mock10commands.snap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_burn_empty.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_burn_empty_native.snap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_collect_native.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_collect_sameRange.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_collect_withClose.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_collect_withTakePair.snap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty.snap

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_decrease_take_take.snap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_mint_native.snap

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickLower.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickUpper.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_mint_sameRange.snap

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_mint_withClose.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_mint_withSettlePair.snap

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_permit.snap

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_permit_twice.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_subscribe.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/PositionManager_unsubscribe.snap

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/Quoter_exactOutputSingle_oneForZero.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/Quoter_exactOutputSingle_zeroForOne.snap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/Quoter_quoteExactInput_twoHops.snap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/Quoter_quoteExactOutput_twoHops.snap

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/StateView_extsload_getLiquidity.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/StateView_extsload_getPositionInfo.snap

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/StateView_extsload_getSlot0.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/StateView_extsload_getTickBitmap.snap

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/StateView_extsload_getTickInfo.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/StateView_extsload_getTickLiquidity.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_Bytecode.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactInputSingle.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut2Hops.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut3Hops.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOutputSingle.snap

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/positionDescriptor bytecode size.snap

This file was deleted.

1 change: 0 additions & 1 deletion .forge-snapshots/positionManager bytecode size.snap

This file was deleted.

3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
[submodule "lib/permit2"]
path = lib/permit2
url = https://github.com/Uniswap/permit2
[submodule "lib/forge-gas-snapshot"]
path = lib/forge-gas-snapshot
url = https://github.com/marktoda/forge-gas-snapshot
1 change: 0 additions & 1 deletion lib/forge-gas-snapshot
Submodule forge-gas-snapshot deleted from 9fc447
1 change: 0 additions & 1 deletion remappings.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@uniswap/v4-core/=lib/v4-core/
forge-gas-snapshot/=lib/forge-gas-snapshot/src/
ds-test/=lib/v4-core/lib/forge-std/lib/ds-test/src/
forge-std/=lib/v4-core/lib/forge-std/src/
openzeppelin-contracts/=lib/v4-core/lib/openzeppelin-contracts/
Expand Down
3 changes: 3 additions & 0 deletions snapshots/BaseActionsRouterTest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"BaseActionsRouter_mock10commands": "63076"
}
6 changes: 6 additions & 0 deletions snapshots/PaymentsTests.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"Payments_swap_settleFromCaller_takeAllToMsgSender": "133006",
"Payments_swap_settleFromCaller_takeAllToSpecifiedAddress": "134475",
"Payments_swap_settleWithBalance_takeAllToMsgSender": "126957",
"Payments_swap_settleWithBalance_takeAllToSpecifiedAddress": "127095"
}
42 changes: 42 additions & 0 deletions snapshots/PosMGasTest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"PositionManager_burn_empty": "51102",
"PositionManager_burn_empty_native": "51102",
"PositionManager_burn_nonEmpty_native_withClose": "127695",
"PositionManager_burn_nonEmpty_native_withTakePair": "127137",
"PositionManager_burn_nonEmpty_withClose": "134600",
"PositionManager_burn_nonEmpty_withTakePair": "134043",
"PositionManager_collect_native": "147732",
"PositionManager_collect_sameRange": "156364",
"PositionManager_collect_withClose": "156364",
"PositionManager_collect_withTakePair": "155679",
"PositionManager_decreaseLiquidity_native": "113681",
"PositionManager_decreaseLiquidity_withClose": "121933",
"PositionManager_decreaseLiquidity_withTakePair": "121248",
"PositionManager_decrease_burnEmpty": "137500",
"PositionManager_decrease_burnEmpty_native": "130595",
"PositionManager_decrease_sameRange_allLiquidity": "134649",
"PositionManager_decrease_take_take": "122490",
"PositionManager_increaseLiquidity_erc20_withClose": "160652",
"PositionManager_increaseLiquidity_erc20_withSettlePair": "159563",
"PositionManager_increaseLiquidity_native": "143532",
"PositionManager_increase_autocompoundExactUnclaimedFees": "138231",
"PositionManager_increase_autocompoundExcessFeesCredit": "179593",
"PositionManager_increase_autocompound_clearExcess": "149511",
"PositionManager_mint_native": "367550",
"PositionManager_mint_nativeWithSweep_withClose": "376153",
"PositionManager_mint_nativeWithSweep_withSettlePair": "375348",
"PositionManager_mint_onSameTickLower": "319298",
"PositionManager_mint_onSameTickUpper": "319940",
"PositionManager_mint_sameRange": "245522",
"PositionManager_mint_settleWithBalance_sweep": "420760",
"PositionManager_mint_warmedPool_differentRange": "325316",
"PositionManager_mint_withClose": "421910",
"PositionManager_mint_withSettlePair": "420939",
"PositionManager_multicall_initialize_mint": "458237",
"PositionManager_permit": "79175",
"PositionManager_permit_secondPosition": "62063",
"PositionManager_permit_twice": "44975",
"PositionManager_subscribe": "87968",
"PositionManager_unsubscribe": "62697",
"positionManager bytecode size": "23877"
}
3 changes: 3 additions & 0 deletions snapshots/PositionDescriptorTest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"positionDescriptor bytecode size": "24110"
}
15 changes: 15 additions & 0 deletions snapshots/QuoterTest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"Quoter_exactInputSingle_oneForZero_multiplePositions": "145902",
"Quoter_exactInputSingle_zeroForOne_multiplePositions": "152117",
"Quoter_exactOutputSingle_oneForZero": "79267",
"Quoter_exactOutputSingle_zeroForOne": "84512",
"Quoter_quoteExactInput_oneHop_1TickLoaded": "122728",
"Quoter_quoteExactInput_oneHop_initializedAfter": "147363",
"Quoter_quoteExactInput_oneHop_startingInitialized": "80638",
"Quoter_quoteExactInput_twoHops": "204942",
"Quoter_quoteExactOutput_oneHop_1TickLoaded": "122224",
"Quoter_quoteExactOutput_oneHop_2TicksLoaded": "152879",
"Quoter_quoteExactOutput_oneHop_initializedAfter": "122251",
"Quoter_quoteExactOutput_oneHop_startingInitialized": "98545",
"Quoter_quoteExactOutput_twoHops": "204670"
}
12 changes: 12 additions & 0 deletions snapshots/StateViewTest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"StateView_extsload_getFeeGrowthGlobals": "2203",
"StateView_extsload_getFeeGrowthInside": "7875",
"StateView_extsload_getLiquidity": "1439",
"StateView_extsload_getPositionInfo": "2761",
"StateView_extsload_getPositionLiquidity": "1691",
"StateView_extsload_getSlot0": "1486",
"StateView_extsload_getTickBitmap": "1432",
"StateView_extsload_getTickFeeGrowthOutside": "2490",
"StateView_extsload_getTickInfo": "2693",
"StateView_extsload_getTickLiquidity": "1686"
}
Loading

0 comments on commit f5e0b0d

Please sign in to comment.