From 7193dd5fa45436032b14c1126f08da2644172558 Mon Sep 17 00:00:00 2001 From: luke miles Date: Wed, 12 Feb 2025 11:48:15 -0500 Subject: [PATCH 1/2] misc: update solc to 0.8.28 --- foundry.toml | 2 +- src/PositionDescriptor.sol | 2 +- src/PositionManager.sol | 2 +- src/UniswapV4DeployerCompetition.sol | 2 +- src/V4Router.sol | 2 +- src/interfaces/IUniswapV4DeployerCompetition.sol | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/foundry.toml b/foundry.toml index 55eaaa171..8bd858764 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,6 +1,6 @@ [profile.default] out = 'foundry-out' -solc_version = '0.8.26' +solc_version = '0.8.28' optimizer_runs = 44444444 via_ir = true ffi = true diff --git a/src/PositionDescriptor.sol b/src/PositionDescriptor.sol index 3aa744eee..ed451d5d8 100644 --- a/src/PositionDescriptor.sol +++ b/src/PositionDescriptor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.28; import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; import {Currency} from "@uniswap/v4-core/src/types/Currency.sol"; diff --git a/src/PositionManager.sol b/src/PositionManager.sol index 583701cab..493248be6 100644 --- a/src/PositionManager.sol +++ b/src/PositionManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.28; import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol"; diff --git a/src/UniswapV4DeployerCompetition.sol b/src/UniswapV4DeployerCompetition.sol index deec4177e..270279340 100644 --- a/src/UniswapV4DeployerCompetition.sol +++ b/src/UniswapV4DeployerCompetition.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.28; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; import {VanityAddressLib} from "./libraries/VanityAddressLib.sol"; diff --git a/src/V4Router.sol b/src/V4Router.sol index 1def436ec..abbf122bd 100644 --- a/src/V4Router.sol +++ b/src/V4Router.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.28; import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol"; import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol"; diff --git a/src/interfaces/IUniswapV4DeployerCompetition.sol b/src/interfaces/IUniswapV4DeployerCompetition.sol index 7e3489b52..670945217 100644 --- a/src/interfaces/IUniswapV4DeployerCompetition.sol +++ b/src/interfaces/IUniswapV4DeployerCompetition.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.28; /// @title IUniswapV4DeployerCompetition /// @notice Interface for the UniswapV4DeployerCompetition contract From 9526cfe2f38630d388b538724cbf55e35743c5bc Mon Sep 17 00:00:00 2001 From: luke miles Date: Wed, 12 Feb 2025 12:06:41 -0500 Subject: [PATCH 2/2] check in snapshots --- snapshots/BaseActionsRouterTest.json | 2 +- snapshots/PaymentsTests.json | 6 -- snapshots/PosMGasTest.json | 80 +++++++++++++-------------- snapshots/PositionDescriptorTest.json | 4 +- snapshots/QuoterTest.json | 15 ----- snapshots/StateViewTest.json | 12 ---- snapshots/V4RouterTest.json | 48 ++++++++-------- 7 files changed, 67 insertions(+), 100 deletions(-) delete mode 100644 snapshots/PaymentsTests.json delete mode 100644 snapshots/QuoterTest.json delete mode 100644 snapshots/StateViewTest.json diff --git a/snapshots/BaseActionsRouterTest.json b/snapshots/BaseActionsRouterTest.json index d7241dbe2..50ad3b1d1 100644 --- a/snapshots/BaseActionsRouterTest.json +++ b/snapshots/BaseActionsRouterTest.json @@ -1,3 +1,3 @@ { - "BaseActionsRouter_mock10commands": "63076" + "BaseActionsRouter_mock10commands": "63062" } \ No newline at end of file diff --git a/snapshots/PaymentsTests.json b/snapshots/PaymentsTests.json deleted file mode 100644 index c3e810d19..000000000 --- a/snapshots/PaymentsTests.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Payments_swap_settleFromCaller_takeAllToMsgSender": "133006", - "Payments_swap_settleFromCaller_takeAllToSpecifiedAddress": "134475", - "Payments_swap_settleWithBalance_takeAllToMsgSender": "126957", - "Payments_swap_settleWithBalance_takeAllToSpecifiedAddress": "127095" -} \ No newline at end of file diff --git a/snapshots/PosMGasTest.json b/snapshots/PosMGasTest.json index 579fa6642..c8aebebf2 100644 --- a/snapshots/PosMGasTest.json +++ b/snapshots/PosMGasTest.json @@ -1,43 +1,43 @@ { - "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": "79163", - "PositionManager_permit_secondPosition": "62075", - "PositionManager_permit_twice": "44975", - "PositionManager_subscribe": "87968", + "PositionManager_burn_empty": "51100", + "PositionManager_burn_empty_native": "51100", + "PositionManager_burn_nonEmpty_native_withClose": "127684", + "PositionManager_burn_nonEmpty_native_withTakePair": "127127", + "PositionManager_burn_nonEmpty_withClose": "134591", + "PositionManager_burn_nonEmpty_withTakePair": "134033", + "PositionManager_collect_native": "147721", + "PositionManager_collect_sameRange": "156354", + "PositionManager_collect_withClose": "156354", + "PositionManager_collect_withTakePair": "155669", + "PositionManager_decreaseLiquidity_native": "113671", + "PositionManager_decreaseLiquidity_withClose": "121921", + "PositionManager_decreaseLiquidity_withTakePair": "121236", + "PositionManager_decrease_burnEmpty": "137491", + "PositionManager_decrease_burnEmpty_native": "130584", + "PositionManager_decrease_sameRange_allLiquidity": "134637", + "PositionManager_decrease_take_take": "122478", + "PositionManager_increaseLiquidity_erc20_withClose": "160642", + "PositionManager_increaseLiquidity_erc20_withSettlePair": "159553", + "PositionManager_increaseLiquidity_native": "143523", + "PositionManager_increase_autocompoundExactUnclaimedFees": "138223", + "PositionManager_increase_autocompoundExcessFeesCredit": "179581", + "PositionManager_increase_autocompound_clearExcess": "149501", + "PositionManager_mint_native": "367541", + "PositionManager_mint_nativeWithSweep_withClose": "376144", + "PositionManager_mint_nativeWithSweep_withSettlePair": "375339", + "PositionManager_mint_onSameTickLower": "319288", + "PositionManager_mint_onSameTickUpper": "319930", + "PositionManager_mint_sameRange": "245512", + "PositionManager_mint_settleWithBalance_sweep": "420748", + "PositionManager_mint_warmedPool_differentRange": "325306", + "PositionManager_mint_withClose": "421900", + "PositionManager_mint_withSettlePair": "420929", + "PositionManager_multicall_initialize_mint": "458225", + "PositionManager_permit": "79175", + "PositionManager_permit_secondPosition": "62063", + "PositionManager_permit_twice": "44963", + "PositionManager_subscribe": "87967", "PositionManager_unsubscribe": "62697", - "position manager initcode hash (without constructor params, as uint256)": "81827502601055975118808937107769364319765058198432540518516360048852193272922", - "positionManager bytecode size": "23877" + "position manager initcode hash (without constructor params, as uint256)": "16849313585573942656357380918713937130885258120975441288701273909606764574034", + "positionManager bytecode size": "23875" } \ No newline at end of file diff --git a/snapshots/PositionDescriptorTest.json b/snapshots/PositionDescriptorTest.json index a9f6400b3..5f009f9ac 100644 --- a/snapshots/PositionDescriptorTest.json +++ b/snapshots/PositionDescriptorTest.json @@ -1,5 +1,5 @@ { - "position descriptor initcode hash (without constructor params, as uint256)": "62242073579002066175147720437850721791653757771535856244007756965162378120375", - "positionDescriptor bytecode size": "24069", + "position descriptor initcode hash (without constructor params, as uint256)": "37195973998998764862337934415051299645404063430957787644591274446399664899027", + "positionDescriptor bytecode size": "24071", "proxy bytecode size": "1488" } \ No newline at end of file diff --git a/snapshots/QuoterTest.json b/snapshots/QuoterTest.json deleted file mode 100644 index a3c80a4fd..000000000 --- a/snapshots/QuoterTest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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" -} \ No newline at end of file diff --git a/snapshots/StateViewTest.json b/snapshots/StateViewTest.json deleted file mode 100644 index dc141e39f..000000000 --- a/snapshots/StateViewTest.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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" -} \ No newline at end of file diff --git a/snapshots/V4RouterTest.json b/snapshots/V4RouterTest.json index 952f619d9..1ac108097 100644 --- a/snapshots/V4RouterTest.json +++ b/snapshots/V4RouterTest.json @@ -1,27 +1,27 @@ { "V4Router_Bytecode": "8975", - "V4Router_ExactIn1Hop_nativeIn": "121653", - "V4Router_ExactIn1Hop_nativeOut": "120119", - "V4Router_ExactIn1Hop_oneForZero": "128991", - "V4Router_ExactIn1Hop_zeroForOne": "135517", - "V4Router_ExactIn2Hops": "192843", - "V4Router_ExactIn2Hops_nativeIn": "178979", - "V4Router_ExactIn3Hops": "250218", - "V4Router_ExactIn3Hops_nativeIn": "236354", - "V4Router_ExactInputSingle": "134001", - "V4Router_ExactInputSingle_nativeIn": "120137", - "V4Router_ExactInputSingle_nativeOut": "118581", - "V4Router_ExactOut1Hop_nativeIn_sweepETH": "127940", - "V4Router_ExactOut1Hop_nativeOut": "121329", - "V4Router_ExactOut1Hop_oneForZero": "130201", - "V4Router_ExactOut1Hop_zeroForOne": "134858", - "V4Router_ExactOut2Hops": "191291", - "V4Router_ExactOut2Hops_nativeIn": "184373", - "V4Router_ExactOut3Hops": "247788", - "V4Router_ExactOut3Hops_nativeIn": "240870", - "V4Router_ExactOut3Hops_nativeOut": "224943", - "V4Router_ExactOutputSingle": "133337", - "V4Router_ExactOutputSingle_nativeIn_sweepETH": "126419", - "V4Router_ExactOutputSingle_nativeOut": "119821", - "router initcode hash (without constructor params, as uint256)": "27545762869727400677117557485685740862616789454191614676777323590122002226479" + "V4Router_ExactIn1Hop_nativeIn": "121629", + "V4Router_ExactIn1Hop_nativeOut": "120093", + "V4Router_ExactIn1Hop_oneForZero": "128966", + "V4Router_ExactIn1Hop_zeroForOne": "135492", + "V4Router_ExactIn2Hops": "192810", + "V4Router_ExactIn2Hops_nativeIn": "178947", + "V4Router_ExactIn3Hops": "250177", + "V4Router_ExactIn3Hops_nativeIn": "236314", + "V4Router_ExactInputSingle": "133978", + "V4Router_ExactInputSingle_nativeIn": "120115", + "V4Router_ExactInputSingle_nativeOut": "118557", + "V4Router_ExactOut1Hop_nativeIn_sweepETH": "127915", + "V4Router_ExactOut1Hop_nativeOut": "121304", + "V4Router_ExactOut1Hop_oneForZero": "130177", + "V4Router_ExactOut1Hop_zeroForOne": "134834", + "V4Router_ExactOut2Hops": "191260", + "V4Router_ExactOut2Hops_nativeIn": "184341", + "V4Router_ExactOut3Hops": "247750", + "V4Router_ExactOut3Hops_nativeIn": "240831", + "V4Router_ExactOut3Hops_nativeOut": "224904", + "V4Router_ExactOutputSingle": "133315", + "V4Router_ExactOutputSingle_nativeIn_sweepETH": "126396", + "V4Router_ExactOutputSingle_nativeOut": "119798", + "router initcode hash (without constructor params, as uint256)": "62372135275657248938241348240506139257617876737139502018490669086511582556785" } \ No newline at end of file