Skip to content

Commit

Permalink
Merge branch 'main' into eoa-no-sub
Browse files Browse the repository at this point in the history
  • Loading branch information
snreynolds authored Dec 6, 2024
2 parents 9bbd3d0 + 51df60a commit 40844c3
Show file tree
Hide file tree
Showing 114 changed files with 218 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": "61332"
}
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": "132997",
"Payments_swap_settleFromCaller_takeAllToSpecifiedAddress": "134973",
"Payments_swap_settleWithBalance_takeAllToMsgSender": "127102",
"Payments_swap_settleWithBalance_takeAllToSpecifiedAddress": "127212"
}
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": "51576",
"PositionManager_burn_empty_native": "51576",
"PositionManager_burn_nonEmpty_native_withClose": "128316",
"PositionManager_burn_nonEmpty_native_withTakePair": "127696",
"PositionManager_burn_nonEmpty_withClose": "135236",
"PositionManager_burn_nonEmpty_withTakePair": "134615",
"PositionManager_collect_native": "148571",
"PositionManager_collect_sameRange": "157220",
"PositionManager_collect_withClose": "157220",
"PositionManager_collect_withTakePair": "156456",
"PositionManager_decreaseLiquidity_native": "114165",
"PositionManager_decreaseLiquidity_withClose": "122555",
"PositionManager_decreaseLiquidity_withTakePair": "121791",
"PositionManager_decrease_burnEmpty": "138177",
"PositionManager_decrease_burnEmpty_native": "131258",
"PositionManager_decrease_sameRange_allLiquidity": "135218",
"PositionManager_decrease_take_take": "123169",
"PositionManager_increaseLiquidity_erc20_withClose": "162419",
"PositionManager_increaseLiquidity_erc20_withSettlePair": "161283",
"PositionManager_increaseLiquidity_native": "145296",
"PositionManager_increase_autocompoundExactUnclaimedFees": "138010",
"PositionManager_increase_autocompoundExcessFeesCredit": "180194",
"PositionManager_increase_autocompound_clearExcess": "150782",
"PositionManager_mint_native": "369623",
"PositionManager_mint_nativeWithSweep_withClose": "378280",
"PositionManager_mint_nativeWithSweep_withSettlePair": "377364",
"PositionManager_mint_onSameTickLower": "321205",
"PositionManager_mint_onSameTickUpper": "321875",
"PositionManager_mint_sameRange": "247444",
"PositionManager_mint_settleWithBalance_sweep": "423280",
"PositionManager_mint_warmedPool_differentRange": "327236",
"PositionManager_mint_withClose": "423986",
"PositionManager_mint_withSettlePair": "422936",
"PositionManager_multicall_initialize_mint": "460558",
"PositionManager_permit": "79259",
"PositionManager_permit_secondPosition": "62159",
"PositionManager_permit_twice": "45035",
"PositionManager_subscribe": "88475",
"PositionManager_unsubscribe": "63253",
"positionManager bytecode size": "19060"
}
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": "24179"
}
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": "146317",
"Quoter_exactInputSingle_zeroForOne_multiplePositions": "151973",
"Quoter_exactOutputSingle_oneForZero": "80048",
"Quoter_exactOutputSingle_zeroForOne": "84626",
"Quoter_quoteExactInput_oneHop_1TickLoaded": "122994",
"Quoter_quoteExactInput_oneHop_initializedAfter": "147949",
"Quoter_quoteExactInput_oneHop_startingInitialized": "81420",
"Quoter_quoteExactInput_twoHops": "205421",
"Quoter_quoteExactOutput_oneHop_1TickLoaded": "122296",
"Quoter_quoteExactOutput_oneHop_2TicksLoaded": "152648",
"Quoter_quoteExactOutput_oneHop_initializedAfter": "122364",
"Quoter_quoteExactOutput_oneHop_startingInitialized": "98875",
"Quoter_quoteExactOutput_twoHops": "204897"
}
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": "2367",
"StateView_extsload_getFeeGrowthInside": "8444",
"StateView_extsload_getLiquidity": "1480",
"StateView_extsload_getPositionInfo": "2973",
"StateView_extsload_getPositionLiquidity": "1750",
"StateView_extsload_getSlot0": "1548",
"StateView_extsload_getTickBitmap": "1476",
"StateView_extsload_getTickFeeGrowthOutside": "2672",
"StateView_extsload_getTickInfo": "2896",
"StateView_extsload_getTickLiquidity": "1748"
}
Loading

0 comments on commit 40844c3

Please sign in to comment.