Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
marktoda committed Oct 24, 2024
1 parent a8144f8 commit 8065052
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 59 deletions.
8 changes: 4 additions & 4 deletions snapshots/PaymentsTests.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Payments_swap_settleFromCaller_takeAllToMsgSender": "129601",
"Payments_swap_settleFromCaller_takeAllToSpecifiedAddress": "131664",
"Payments_swap_settleWithBalance_takeAllToMsgSender": "123869",
"Payments_swap_settleWithBalance_takeAllToSpecifiedAddress": "124011"
"Payments_swap_settleFromCaller_takeAllToMsgSender": "129642",
"Payments_swap_settleFromCaller_takeAllToSpecifiedAddress": "131705",
"Payments_swap_settleWithBalance_takeAllToMsgSender": "123910",
"Payments_swap_settleWithBalance_takeAllToSpecifiedAddress": "124052"
}
60 changes: 30 additions & 30 deletions snapshots/PosMGasTest.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{
"PositionManager_burn_empty": "50446",
"PositionManager_burn_empty_native": "50446",
"PositionManager_burn_nonEmpty_native_withClose": "125584",
"PositionManager_burn_nonEmpty_native_withTakePair": "125031",
"PositionManager_burn_nonEmpty_withClose": "132446",
"PositionManager_burn_nonEmpty_withTakePair": "131893",
"PositionManager_collect_native": "146294",
"PositionManager_collect_sameRange": "154872",
"PositionManager_collect_withClose": "154872",
"PositionManager_collect_withTakePair": "154193",
"PositionManager_decreaseLiquidity_native": "111980",
"PositionManager_decreaseLiquidity_withClose": "119753",
"PositionManager_decreaseLiquidity_withTakePair": "119074",
"PositionManager_decrease_burnEmpty": "135243",
"PositionManager_decrease_burnEmpty_native": "128380",
"PositionManager_decrease_sameRange_allLiquidity": "132440",
"PositionManager_decrease_take_take": "120329",
"PositionManager_increaseLiquidity_erc20_withClose": "159057",
"PositionManager_increaseLiquidity_erc20_withSettlePair": "157997",
"PositionManager_increaseLiquidity_native": "140872",
"PositionManager_burn_nonEmpty_native_withClose": "125624",
"PositionManager_burn_nonEmpty_native_withTakePair": "125106",
"PositionManager_burn_nonEmpty_withClose": "132486",
"PositionManager_burn_nonEmpty_withTakePair": "131968",
"PositionManager_collect_native": "146344",
"PositionManager_collect_sameRange": "154922",
"PositionManager_collect_withClose": "154922",
"PositionManager_collect_withTakePair": "154287",
"PositionManager_decreaseLiquidity_native": "112020",
"PositionManager_decreaseLiquidity_withClose": "119803",
"PositionManager_decreaseLiquidity_withTakePair": "119168",
"PositionManager_decrease_burnEmpty": "135283",
"PositionManager_decrease_burnEmpty_native": "128420",
"PositionManager_decrease_sameRange_allLiquidity": "132490",
"PositionManager_decrease_take_take": "120423",
"PositionManager_increaseLiquidity_erc20_withClose": "159083",
"PositionManager_increaseLiquidity_erc20_withSettlePair": "158035",
"PositionManager_increaseLiquidity_native": "140898",
"PositionManager_increase_autocompoundExactUnclaimedFees": "136359",
"PositionManager_increase_autocompoundExcessFeesCredit": "177364",
"PositionManager_increase_autocompoundExcessFeesCredit": "177414",
"PositionManager_increase_autocompound_clearExcess": "148040",
"PositionManager_mint_native": "364745",
"PositionManager_mint_nativeWithSweep_withClose": "373268",
"PositionManager_mint_nativeWithSweep_withSettlePair": "372491",
"PositionManager_mint_onSameTickLower": "317617",
"PositionManager_mint_onSameTickUpper": "318287",
"PositionManager_mint_sameRange": "243856",
"PositionManager_mint_settleWithBalance_sweep": "419060",
"PositionManager_mint_warmedPool_differentRange": "323648",
"PositionManager_mint_withClose": "420170",
"PositionManager_mint_withSettlePair": "419228",
"PositionManager_multicall_initialize_mint": "455975",
"PositionManager_mint_native": "364771",
"PositionManager_mint_nativeWithSweep_withClose": "373294",
"PositionManager_mint_nativeWithSweep_withSettlePair": "372529",
"PositionManager_mint_onSameTickLower": "317643",
"PositionManager_mint_onSameTickUpper": "318313",
"PositionManager_mint_sameRange": "243882",
"PositionManager_mint_settleWithBalance_sweep": "419098",
"PositionManager_mint_warmedPool_differentRange": "323674",
"PositionManager_mint_withClose": "420196",
"PositionManager_mint_withSettlePair": "419266",
"PositionManager_multicall_initialize_mint": "456001",
"PositionManager_permit": "79076",
"PositionManager_permit_secondPosition": "61976",
"PositionManager_permit_twice": "44852",
Expand Down
2 changes: 1 addition & 1 deletion snapshots/PositionDescriptorTest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"positionDescriptor bytecode size": "31074"
"positionDescriptor bytecode size": "31236"
}
48 changes: 24 additions & 24 deletions snapshots/V4RouterTest.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"V4Router_Bytecode": "7037",
"V4Router_ExactIn1Hop_nativeIn": "115708",
"V4Router_ExactIn1Hop_nativeOut": "116029",
"V4Router_ExactIn1Hop_oneForZero": "124847",
"V4Router_ExactIn1Hop_zeroForOne": "130570",
"V4Router_ExactIn2Hops": "185411",
"V4Router_ExactIn2Hops_nativeIn": "170549",
"V4Router_ExactIn3Hops": "240255",
"V4Router_ExactIn3Hops_nativeIn": "225393",
"V4Router_ExactInputSingle": "129601",
"V4Router_ExactInputSingle_nativeIn": "114739",
"V4Router_ExactInputSingle_nativeOut": "115028",
"V4Router_ExactOut1Hop_nativeIn_sweepETH": "121971",
"V4Router_ExactOut1Hop_nativeOut": "117093",
"V4Router_ExactOut1Hop_oneForZero": "125911",
"V4Router_ExactOut1Hop_zeroForOne": "129856",
"V4Router_ExactOut2Hops": "183759",
"V4Router_ExactOut2Hops_nativeIn": "175874",
"V4Router_ExactOut3Hops": "237693",
"V4Router_ExactOut3Hops_nativeIn": "229808",
"V4Router_ExactOut3Hops_nativeOut": "217048",
"V4Router_ExactOutputSingle": "128884",
"V4Router_ExactOutputSingle_nativeIn_sweepETH": "120999",
"V4Router_ExactOutputSingle_nativeOut": "116195"
"V4Router_Bytecode": "7063",
"V4Router_ExactIn1Hop_nativeIn": "115753",
"V4Router_ExactIn1Hop_nativeOut": "116070",
"V4Router_ExactIn1Hop_oneForZero": "124888",
"V4Router_ExactIn1Hop_zeroForOne": "130611",
"V4Router_ExactIn2Hops": "185452",
"V4Router_ExactIn2Hops_nativeIn": "170594",
"V4Router_ExactIn3Hops": "240296",
"V4Router_ExactIn3Hops_nativeIn": "225438",
"V4Router_ExactInputSingle": "129642",
"V4Router_ExactInputSingle_nativeIn": "114784",
"V4Router_ExactInputSingle_nativeOut": "115069",
"V4Router_ExactOut1Hop_nativeIn_sweepETH": "122016",
"V4Router_ExactOut1Hop_nativeOut": "117134",
"V4Router_ExactOut1Hop_oneForZero": "125952",
"V4Router_ExactOut1Hop_zeroForOne": "129897",
"V4Router_ExactOut2Hops": "183800",
"V4Router_ExactOut2Hops_nativeIn": "175919",
"V4Router_ExactOut3Hops": "237734",
"V4Router_ExactOut3Hops_nativeIn": "229853",
"V4Router_ExactOut3Hops_nativeOut": "217089",
"V4Router_ExactOutputSingle": "128925",
"V4Router_ExactOutputSingle_nativeIn_sweepETH": "121044",
"V4Router_ExactOutputSingle_nativeOut": "116236"
}

0 comments on commit 8065052

Please sign in to comment.