From d436eed82ce984e813d050802730d7c667a431a5 Mon Sep 17 00:00:00 2001 From: chefburger Date: Mon, 26 Aug 2024 17:12:29 +0800 Subject: [PATCH] chore: standardise pragma versions --- .../BinPositionManager_NativeTokenTest#test_addLiquidity.snap | 2 +- src/MixedQuoter.sol | 2 +- src/V4Router.sol | 2 +- src/base/BaseActionsRouter.sol | 2 +- src/base/BaseMigrator.sol | 2 +- src/base/DeltaResolver.sol | 2 +- src/base/ImmutableState.sol | 2 +- src/base/Multicall_v4.sol | 2 +- src/base/Permit2Forwarder.sol | 2 +- src/base/SafeCallback.sol | 2 +- src/base/SelfPermitERC721.sol | 2 +- src/interfaces/IBaseMigrator.sol | 2 +- src/interfaces/IMixedQuoter.sol | 2 +- src/interfaces/IMulticall_v4.sol | 2 +- src/interfaces/IPositionManagerPermit2.sol | 2 +- src/interfaces/ISelfPermit.sol | 2 +- src/interfaces/ISelfPermitERC721.sol | 2 +- src/interfaces/IV4Router.sol | 2 +- src/interfaces/external/IERC20PermitAllowed.sol | 2 +- src/interfaces/external/IPancakeFactory.sol | 2 +- src/interfaces/external/IPancakePair.sol | 2 +- src/interfaces/external/IPancakeV3Factory.sol | 2 +- src/interfaces/external/IPancakeV3Pool.sol | 2 +- src/interfaces/external/IPancakeV3SwapCallback.sol | 2 +- src/interfaces/external/IStableSwap.sol | 2 +- src/interfaces/external/IStableSwapFactory.sol | 2 +- src/interfaces/external/IV3NonfungiblePositionManager.sol | 3 +-- src/interfaces/external/IWETH9.sol | 2 +- src/libraries/ActionConstants.sol | 2 +- src/libraries/Actions.sol | 2 +- src/libraries/BipsLibrary.sol | 2 +- src/libraries/CalldataDecoder.sol | 2 +- src/libraries/MixedQuoterActions.sol | 2 +- src/libraries/PathKey.sol | 2 +- src/libraries/Planner.sol | 2 +- src/libraries/external/V3PoolTicksCounter.sol | 2 +- src/libraries/external/V3SmartRouterHelper.sol | 2 +- src/pool-bin/BinFungibleToken.sol | 2 +- src/pool-bin/BinMigrator.sol | 2 +- src/pool-bin/BinPositionManager.sol | 2 +- src/pool-bin/BinRouterBase.sol | 2 +- src/pool-bin/interfaces/IBinFungibleToken.sol | 2 +- src/pool-bin/interfaces/IBinMigrator.sol | 2 +- src/pool-bin/interfaces/IBinPositionManager.sol | 2 +- src/pool-bin/interfaces/IBinRouterBase.sol | 2 +- src/pool-bin/lens/BinQuoter.sol | 2 +- src/pool-bin/libraries/BinCalldataDecoder.sol | 2 +- src/pool-bin/libraries/BinTokenLibrary.sol | 2 +- src/pool-cl/CLMigrator.sol | 2 +- src/pool-cl/CLPositionManager.sol | 2 +- src/pool-cl/CLRouterBase.sol | 2 +- src/pool-cl/base/CLNotifier.sol | 2 +- src/pool-cl/base/EIP712_v4.sol | 2 +- src/pool-cl/base/ERC721Permit_v4.sol | 2 +- src/pool-cl/base/UnorderedNonce.sol | 2 +- src/pool-cl/interfaces/ICLMigrator.sol | 2 +- src/pool-cl/interfaces/ICLNotifier.sol | 2 +- src/pool-cl/interfaces/ICLPositionManager.sol | 2 +- src/pool-cl/interfaces/ICLRouterBase.sol | 2 +- src/pool-cl/interfaces/ICLSubscriber.sol | 2 +- src/pool-cl/interfaces/IEIP712_v4.sol | 2 +- src/pool-cl/interfaces/IERC721Permit.sol | 2 +- src/pool-cl/interfaces/IERC721Permit_v4.sol | 2 +- src/pool-cl/lens/CLQuoter.sol | 2 +- src/pool-cl/libraries/ERC721PermitHash.sol | 2 +- src/pool-cl/libraries/LiquidityAmounts.sol | 2 +- src/pool-cl/libraries/PoolTicksCounter.sol | 3 +-- src/pool-cl/libraries/PositionConfig.sol | 2 +- src/pool-cl/libraries/PositionConfigId.sol | 2 +- src/pool-cl/libraries/SlippageCheck.sol | 2 +- 70 files changed, 70 insertions(+), 72 deletions(-) diff --git a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap index 5d2ece3..76216c6 100644 --- a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap +++ b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap @@ -1 +1 @@ -867040 \ No newline at end of file +867039 \ No newline at end of file diff --git a/src/MixedQuoter.sol b/src/MixedQuoter.sol index 7c1074b..8aba6f0 100644 --- a/src/MixedQuoter.sol +++ b/src/MixedQuoter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.24; +pragma solidity 0.8.26; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {CurrencyLibrary, Currency, equals} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/V4Router.sol b/src/V4Router.sol index 817484c..6c11824 100644 --- a/src/V4Router.sol +++ b/src/V4Router.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; import {ICLPoolManager} from "pancake-v4-core/src/pool-cl/interfaces/ICLPoolManager.sol"; diff --git a/src/base/BaseActionsRouter.sol b/src/base/BaseActionsRouter.sol index 00d02b9..663189b 100644 --- a/src/base/BaseActionsRouter.sol +++ b/src/base/BaseActionsRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; import {SafeCallback} from "./SafeCallback.sol"; diff --git a/src/base/BaseMigrator.sol b/src/base/BaseMigrator.sol index 9f97af0..8f6ff53 100644 --- a/src/base/BaseMigrator.sol +++ b/src/base/BaseMigrator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; import {SafeTransferLib, ERC20} from "solmate/src/utils/SafeTransferLib.sol"; diff --git a/src/base/DeltaResolver.sol b/src/base/DeltaResolver.sol index f676f91..81a6119 100644 --- a/src/base/DeltaResolver.sol +++ b/src/base/DeltaResolver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; diff --git a/src/base/ImmutableState.sol b/src/base/ImmutableState.sol index 0dc83a9..b622a1d 100644 --- a/src/base/ImmutableState.sol +++ b/src/base/ImmutableState.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; diff --git a/src/base/Multicall_v4.sol b/src/base/Multicall_v4.sol index e648cca..8449f63 100644 --- a/src/base/Multicall_v4.sol +++ b/src/base/Multicall_v4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {IMulticall_v4} from "../interfaces/IMulticall_v4.sol"; diff --git a/src/base/Permit2Forwarder.sol b/src/base/Permit2Forwarder.sol index 41525c6..d6f28cc 100644 --- a/src/base/Permit2Forwarder.sol +++ b/src/base/Permit2Forwarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"; diff --git a/src/base/SafeCallback.sol b/src/base/SafeCallback.sol index 951b495..274fb21 100644 --- a/src/base/SafeCallback.sol +++ b/src/base/SafeCallback.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {ILockCallback} from "pancake-v4-core/src/interfaces/ILockCallback.sol"; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; diff --git a/src/base/SelfPermitERC721.sol b/src/base/SelfPermitERC721.sol index 745ef1b..48d55fa 100644 --- a/src/base/SelfPermitERC721.sol +++ b/src/base/SelfPermitERC721.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; import {IERC721Permit} from "../pool-cl/interfaces/IERC721Permit.sol"; diff --git a/src/interfaces/IBaseMigrator.sol b/src/interfaces/IBaseMigrator.sol index 5cc2b70..4c4661c 100644 --- a/src/interfaces/IBaseMigrator.sol +++ b/src/interfaces/IBaseMigrator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {IMulticall_v4} from "./IMulticall_v4.sol"; diff --git a/src/interfaces/IMixedQuoter.sol b/src/interfaces/IMixedQuoter.sol index bd8bc09..3c36b27 100644 --- a/src/interfaces/IMixedQuoter.sol +++ b/src/interfaces/IMixedQuoter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.19; +pragma solidity ^0.8.24; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/interfaces/IMulticall_v4.sol b/src/interfaces/IMulticall_v4.sol index f1629f1..2a88c09 100644 --- a/src/interfaces/IMulticall_v4.sol +++ b/src/interfaces/IMulticall_v4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; /// @title Multicall_v4 interface /// @notice Enables calling multiple methods in a single call to the contract diff --git a/src/interfaces/IPositionManagerPermit2.sol b/src/interfaces/IPositionManagerPermit2.sol index 713fb44..6abc37a 100644 --- a/src/interfaces/IPositionManagerPermit2.sol +++ b/src/interfaces/IPositionManagerPermit2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"; diff --git a/src/interfaces/ISelfPermit.sol b/src/interfaces/ISelfPermit.sol index 0f7cae1..95ca72d 100644 --- a/src/interfaces/ISelfPermit.sol +++ b/src/interfaces/ISelfPermit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.5.0; +pragma solidity ^0.8.0; /// @title Self Permit /// @notice Functionality to call permit on any EIP-2612-compliant token for use in the route diff --git a/src/interfaces/ISelfPermitERC721.sol b/src/interfaces/ISelfPermitERC721.sol index 29dd736..999ded5 100644 --- a/src/interfaces/ISelfPermitERC721.sol +++ b/src/interfaces/ISelfPermitERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; /// @title Self Permit For ERC721 /// @notice Functionality to call permit on any EIP-2612-compliant token diff --git a/src/interfaces/IV4Router.sol b/src/interfaces/IV4Router.sol index 434d49f..ce68da0 100644 --- a/src/interfaces/IV4Router.sol +++ b/src/interfaces/IV4Router.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/interfaces/external/IERC20PermitAllowed.sol b/src/interfaces/external/IERC20PermitAllowed.sol index 3ae5c00..1b71593 100644 --- a/src/interfaces/external/IERC20PermitAllowed.sol +++ b/src/interfaces/external/IERC20PermitAllowed.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; /// @title Interface for permit /// @notice Interface used by DAI/CHAI for permit diff --git a/src/interfaces/external/IPancakeFactory.sol b/src/interfaces/external/IPancakeFactory.sol index 2012b04..c789d9f 100644 --- a/src/interfaces/external/IPancakeFactory.sol +++ b/src/interfaces/external/IPancakeFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.5.0; +pragma solidity ^0.8.0; interface IPancakeFactory { function getPair(address tokenA, address tokenB) external view returns (address pair); diff --git a/src/interfaces/external/IPancakePair.sol b/src/interfaces/external/IPancakePair.sol index 99d5452..4a0e7f6 100644 --- a/src/interfaces/external/IPancakePair.sol +++ b/src/interfaces/external/IPancakePair.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.5.0; +pragma solidity ^0.8.0; /// @notice Copying from PancakeSwap V2 Pair /// https://github.com/pancakeswap/pancake-swap-core-v2/blob/master/contracts/interfaces/IPancakePair.sol diff --git a/src/interfaces/external/IPancakeV3Factory.sol b/src/interfaces/external/IPancakeV3Factory.sol index ebb432c..16fe02b 100644 --- a/src/interfaces/external/IPancakeV3Factory.sol +++ b/src/interfaces/external/IPancakeV3Factory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity >=0.5.0; +pragma solidity ^0.8.0; interface IPancakeV3Factory { /// @notice Returns the pool address for a given pair of tokens and a fee, or address 0 if it does not exist diff --git a/src/interfaces/external/IPancakeV3Pool.sol b/src/interfaces/external/IPancakeV3Pool.sol index 7a0219b..def41b5 100644 --- a/src/interfaces/external/IPancakeV3Pool.sol +++ b/src/interfaces/external/IPancakeV3Pool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; interface IPancakeV3Pool { /// @notice The 0th storage slot in the pool stores many values, and is exposed as a single method to save gas diff --git a/src/interfaces/external/IPancakeV3SwapCallback.sol b/src/interfaces/external/IPancakeV3SwapCallback.sol index 57b4d62..79106f1 100644 --- a/src/interfaces/external/IPancakeV3SwapCallback.sol +++ b/src/interfaces/external/IPancakeV3SwapCallback.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity >=0.5.0; +pragma solidity ^0.8.0; /// @title Callback for IPancakeV3PoolActions#swap /// @notice Any contract that calls IPancakeV3PoolActions#swap must implement this interface diff --git a/src/interfaces/external/IStableSwap.sol b/src/interfaces/external/IStableSwap.sol index 1dfe8b2..61ce63d 100644 --- a/src/interfaces/external/IStableSwap.sol +++ b/src/interfaces/external/IStableSwap.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; interface IStableSwap { // solium-disable-next-line mixedcase diff --git a/src/interfaces/external/IStableSwapFactory.sol b/src/interfaces/external/IStableSwapFactory.sol index 09f7254..51cc5ea 100644 --- a/src/interfaces/external/IStableSwapFactory.sol +++ b/src/interfaces/external/IStableSwapFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; interface IStableSwapFactory { struct StableSwapPairInfo { diff --git a/src/interfaces/external/IV3NonfungiblePositionManager.sol b/src/interfaces/external/IV3NonfungiblePositionManager.sol index 6c5fe1d..590a882 100644 --- a/src/interfaces/external/IV3NonfungiblePositionManager.sol +++ b/src/interfaces/external/IV3NonfungiblePositionManager.sol @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity >=0.7.5; -pragma abicoder v2; +pragma solidity ^0.8.0; import {IERC721Permit} from "../../pool-cl/interfaces/IERC721Permit.sol"; diff --git a/src/interfaces/external/IWETH9.sol b/src/interfaces/external/IWETH9.sol index 3c59287..ba23bc0 100644 --- a/src/interfaces/external/IWETH9.sol +++ b/src/interfaces/external/IWETH9.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; diff --git a/src/libraries/ActionConstants.sol b/src/libraries/ActionConstants.sol index 8d0d730..b93c64e 100644 --- a/src/libraries/ActionConstants.sol +++ b/src/libraries/ActionConstants.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; library ActionConstants { /// @notice used to signal that an action should use the input value of the open delta on the vault diff --git a/src/libraries/Actions.sol b/src/libraries/Actions.sol index d650876..957d90a 100644 --- a/src/libraries/Actions.sol +++ b/src/libraries/Actions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; /// @notice Library to define different pool actions. /// @dev These are suggested common commands, however additional commands should be defined as required diff --git a/src/libraries/BipsLibrary.sol b/src/libraries/BipsLibrary.sol index f0fd86a..5521c60 100644 --- a/src/libraries/BipsLibrary.sol +++ b/src/libraries/BipsLibrary.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; /// @title For calculating a percentage of an amount, using bips // TODO: Post-audit move to core, as core will use something similar. diff --git a/src/libraries/CalldataDecoder.sol b/src/libraries/CalldataDecoder.sol index 8287fc8..76a67cc 100644 --- a/src/libraries/CalldataDecoder.sol +++ b/src/libraries/CalldataDecoder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/libraries/MixedQuoterActions.sol b/src/libraries/MixedQuoterActions.sol index 746a16d..5351877 100644 --- a/src/libraries/MixedQuoterActions.sol +++ b/src/libraries/MixedQuoterActions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; /// @notice Library to define different mixed quoter actions. library MixedQuoterActions { diff --git a/src/libraries/PathKey.sol b/src/libraries/PathKey.sol index 078b9aa..46dd4ee 100644 --- a/src/libraries/PathKey.sol +++ b/src/libraries/PathKey.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/libraries/Planner.sol b/src/libraries/Planner.sol index 54ffcee..81dc0af 100644 --- a/src/libraries/Planner.sol +++ b/src/libraries/Planner.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {Actions} from "../../src/libraries/Actions.sol"; diff --git a/src/libraries/external/V3PoolTicksCounter.sol b/src/libraries/external/V3PoolTicksCounter.sol index 37c7bff..781c35d 100644 --- a/src/libraries/external/V3PoolTicksCounter.sol +++ b/src/libraries/external/V3PoolTicksCounter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity >=0.6.0; +pragma solidity ^0.8.0; import {IPancakeV3Pool} from "../../interfaces/external/IPancakeV3Pool.sol"; diff --git a/src/libraries/external/V3SmartRouterHelper.sol b/src/libraries/external/V3SmartRouterHelper.sol index 94ac59c..484986f 100644 --- a/src/libraries/external/V3SmartRouterHelper.sol +++ b/src/libraries/external/V3SmartRouterHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {IStableSwapFactory} from "../../interfaces/external/IStableSwapFactory.sol"; import {IPancakePair} from "../../interfaces/external/IPancakePair.sol"; diff --git a/src/pool-bin/BinFungibleToken.sol b/src/pool-bin/BinFungibleToken.sol index 3391352..cf0f17f 100644 --- a/src/pool-bin/BinFungibleToken.sol +++ b/src/pool-bin/BinFungibleToken.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {IBinFungibleToken} from "./interfaces/IBinFungibleToken.sol"; diff --git a/src/pool-bin/BinMigrator.sol b/src/pool-bin/BinMigrator.sol index 2b72d12..45eec67 100644 --- a/src/pool-bin/BinMigrator.sol +++ b/src/pool-bin/BinMigrator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.24; +pragma solidity 0.8.26; import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol"; import {BaseMigrator, IV3NonfungiblePositionManager} from "../base/BaseMigrator.sol"; diff --git a/src/pool-bin/BinPositionManager.sol b/src/pool-bin/BinPositionManager.sol index b1fce2d..25a65be 100644 --- a/src/pool-bin/BinPositionManager.sol +++ b/src/pool-bin/BinPositionManager.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.20; +pragma solidity 0.8.26; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; import {BalanceDelta} from "pancake-v4-core/src/types/BalanceDelta.sol"; diff --git a/src/pool-bin/BinRouterBase.sol b/src/pool-bin/BinRouterBase.sol index 5b63d03..7f30616 100644 --- a/src/pool-bin/BinRouterBase.sol +++ b/src/pool-bin/BinRouterBase.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {CurrencyLibrary, Currency} from "pancake-v4-core/src/types/Currency.sol"; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/pool-bin/interfaces/IBinFungibleToken.sol b/src/pool-bin/interfaces/IBinFungibleToken.sol index 527b884..bd50167 100644 --- a/src/pool-bin/interfaces/IBinFungibleToken.sol +++ b/src/pool-bin/interfaces/IBinFungibleToken.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; interface IBinFungibleToken { error BinFungibleToken_AddressThisOrZero(); diff --git a/src/pool-bin/interfaces/IBinMigrator.sol b/src/pool-bin/interfaces/IBinMigrator.sol index e7ff093..115fa29 100644 --- a/src/pool-bin/interfaces/IBinMigrator.sol +++ b/src/pool-bin/interfaces/IBinMigrator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.24; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {IBaseMigrator} from "../../interfaces/IBaseMigrator.sol"; diff --git a/src/pool-bin/interfaces/IBinPositionManager.sol b/src/pool-bin/interfaces/IBinPositionManager.sol index 359f8ff..6f7d703 100644 --- a/src/pool-bin/interfaces/IBinPositionManager.sol +++ b/src/pool-bin/interfaces/IBinPositionManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {PoolId} from "pancake-v4-core/src/types/PoolId.sol"; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/pool-bin/interfaces/IBinRouterBase.sol b/src/pool-bin/interfaces/IBinRouterBase.sol index 8067ee5..37eb243 100644 --- a/src/pool-bin/interfaces/IBinRouterBase.sol +++ b/src/pool-bin/interfaces/IBinRouterBase.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/pool-bin/lens/BinQuoter.sol b/src/pool-bin/lens/BinQuoter.sol index 1461b3e..da0dcc5 100644 --- a/src/pool-bin/lens/BinQuoter.sol +++ b/src/pool-bin/lens/BinQuoter.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.24; +pragma solidity 0.8.26; import {TickMath} from "pancake-v4-core/src/pool-cl/libraries/TickMath.sol"; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; diff --git a/src/pool-bin/libraries/BinCalldataDecoder.sol b/src/pool-bin/libraries/BinCalldataDecoder.sol index ef98100..7e1c80c 100644 --- a/src/pool-bin/libraries/BinCalldataDecoder.sol +++ b/src/pool-bin/libraries/BinCalldataDecoder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {IBinPositionManager} from "../interfaces/IBinPositionManager.sol"; import {IV4Router} from "../../interfaces/IV4Router.sol"; diff --git a/src/pool-bin/libraries/BinTokenLibrary.sol b/src/pool-bin/libraries/BinTokenLibrary.sol index b22510e..2fe21b7 100644 --- a/src/pool-bin/libraries/BinTokenLibrary.sol +++ b/src/pool-bin/libraries/BinTokenLibrary.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {PoolId} from "pancake-v4-core/src/types/PoolId.sol"; diff --git a/src/pool-cl/CLMigrator.sol b/src/pool-cl/CLMigrator.sol index 879b28a..9ff7136 100644 --- a/src/pool-cl/CLMigrator.sol +++ b/src/pool-cl/CLMigrator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.24; +pragma solidity 0.8.26; import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol"; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/pool-cl/CLPositionManager.sol b/src/pool-cl/CLPositionManager.sol index 0c366d4..d7a8bf9 100644 --- a/src/pool-cl/CLPositionManager.sol +++ b/src/pool-cl/CLPositionManager.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.20; +pragma solidity 0.8.26; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/pool-cl/CLRouterBase.sol b/src/pool-cl/CLRouterBase.sol index 8cc260e..b846a3f 100644 --- a/src/pool-cl/CLRouterBase.sol +++ b/src/pool-cl/CLRouterBase.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {CurrencyLibrary, Currency} from "pancake-v4-core/src/types/Currency.sol"; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/pool-cl/base/CLNotifier.sol b/src/pool-cl/base/CLNotifier.sol index 3bbaa7b..f0ca2f4 100644 --- a/src/pool-cl/base/CLNotifier.sol +++ b/src/pool-cl/base/CLNotifier.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {ICLSubscriber} from "../interfaces/ICLSubscriber.sol"; import {PositionConfig} from "../libraries/PositionConfig.sol"; diff --git a/src/pool-cl/base/EIP712_v4.sol b/src/pool-cl/base/EIP712_v4.sol index 5fcd06d..b60f328 100644 --- a/src/pool-cl/base/EIP712_v4.sol +++ b/src/pool-cl/base/EIP712_v4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {IEIP712_v4} from "../interfaces/IEIP712_v4.sol"; diff --git a/src/pool-cl/base/ERC721Permit_v4.sol b/src/pool-cl/base/ERC721Permit_v4.sol index fa56f17..0bdffe2 100644 --- a/src/pool-cl/base/ERC721Permit_v4.sol +++ b/src/pool-cl/base/ERC721Permit_v4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {ERC721} from "solmate/src/tokens/ERC721.sol"; import {ERC721PermitHashLibrary} from "../libraries/ERC721PermitHash.sol"; diff --git a/src/pool-cl/base/UnorderedNonce.sol b/src/pool-cl/base/UnorderedNonce.sol index 7b614bf..907f2ed 100644 --- a/src/pool-cl/base/UnorderedNonce.sol +++ b/src/pool-cl/base/UnorderedNonce.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; /// @title Unordered Nonce /// @notice Contract state and methods for using unordered nonces in signatures diff --git a/src/pool-cl/interfaces/ICLMigrator.sol b/src/pool-cl/interfaces/ICLMigrator.sol index a179bbe..9e8bd15 100644 --- a/src/pool-cl/interfaces/ICLMigrator.sol +++ b/src/pool-cl/interfaces/ICLMigrator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.24; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {IBaseMigrator} from "../../interfaces/IBaseMigrator.sol"; diff --git a/src/pool-cl/interfaces/ICLNotifier.sol b/src/pool-cl/interfaces/ICLNotifier.sol index 529c986..659f345 100644 --- a/src/pool-cl/interfaces/ICLNotifier.sol +++ b/src/pool-cl/interfaces/ICLNotifier.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {PositionConfig} from "../libraries/PositionConfig.sol"; diff --git a/src/pool-cl/interfaces/ICLPositionManager.sol b/src/pool-cl/interfaces/ICLPositionManager.sol index 5959114..c059aa0 100644 --- a/src/pool-cl/interfaces/ICLPositionManager.sol +++ b/src/pool-cl/interfaces/ICLPositionManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; diff --git a/src/pool-cl/interfaces/ICLRouterBase.sol b/src/pool-cl/interfaces/ICLRouterBase.sol index b93808b..fc6314c 100644 --- a/src/pool-cl/interfaces/ICLRouterBase.sol +++ b/src/pool-cl/interfaces/ICLRouterBase.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {Currency} from "pancake-v4-core/src/types/Currency.sol"; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/pool-cl/interfaces/ICLSubscriber.sol b/src/pool-cl/interfaces/ICLSubscriber.sol index 134f7cf..77dc807 100644 --- a/src/pool-cl/interfaces/ICLSubscriber.sol +++ b/src/pool-cl/interfaces/ICLSubscriber.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {PositionConfig} from "../libraries/PositionConfig.sol"; import {BalanceDelta} from "pancake-v4-core/src/types/BalanceDelta.sol"; diff --git a/src/pool-cl/interfaces/IEIP712_v4.sol b/src/pool-cl/interfaces/IEIP712_v4.sol index 35f790b..622f7c0 100644 --- a/src/pool-cl/interfaces/IEIP712_v4.sol +++ b/src/pool-cl/interfaces/IEIP712_v4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; interface IEIP712_v4 { function DOMAIN_SEPARATOR() external view returns (bytes32); diff --git a/src/pool-cl/interfaces/IERC721Permit.sol b/src/pool-cl/interfaces/IERC721Permit.sol index 02422c3..e4afb8b 100644 --- a/src/pool-cl/interfaces/IERC721Permit.sol +++ b/src/pool-cl/interfaces/IERC721Permit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import "@openzeppelin/contracts/token/ERC721/IERC721.sol"; diff --git a/src/pool-cl/interfaces/IERC721Permit_v4.sol b/src/pool-cl/interfaces/IERC721Permit_v4.sol index 7fb2e97..6cafbe5 100644 --- a/src/pool-cl/interfaces/IERC721Permit_v4.sol +++ b/src/pool-cl/interfaces/IERC721Permit_v4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; /// @title ERC721 with permit /// @notice Extension to ERC721 that includes a permit function for signature based approvals diff --git a/src/pool-cl/lens/CLQuoter.sol b/src/pool-cl/lens/CLQuoter.sol index 7513930..e3f38c2 100644 --- a/src/pool-cl/lens/CLQuoter.sol +++ b/src/pool-cl/lens/CLQuoter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.24; +pragma solidity 0.8.26; import {TickMath} from "pancake-v4-core/src/pool-cl/libraries/TickMath.sol"; import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol"; diff --git a/src/pool-cl/libraries/ERC721PermitHash.sol b/src/pool-cl/libraries/ERC721PermitHash.sol index 8ba8766..296c265 100644 --- a/src/pool-cl/libraries/ERC721PermitHash.sol +++ b/src/pool-cl/libraries/ERC721PermitHash.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; library ERC721PermitHashLibrary { /// @dev Value is equal to keccak256("Permit(address spender,uint256 tokenId,uint256 nonce,uint256 deadline)"); diff --git a/src/pool-cl/libraries/LiquidityAmounts.sol b/src/pool-cl/libraries/LiquidityAmounts.sol index 7f336c7..ead46b0 100644 --- a/src/pool-cl/libraries/LiquidityAmounts.sol +++ b/src/pool-cl/libraries/LiquidityAmounts.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2024 PancakeSwap -pragma solidity ^0.8.19; +pragma solidity ^0.8.0; import {FullMath} from "pancake-v4-core/src/pool-cl/libraries/FullMath.sol"; import {FixedPoint96} from "pancake-v4-core/src/pool-cl/libraries/FixedPoint96.sol"; diff --git a/src/pool-cl/libraries/PoolTicksCounter.sol b/src/pool-cl/libraries/PoolTicksCounter.sol index 5ba38e2..9fae9c2 100644 --- a/src/pool-cl/libraries/PoolTicksCounter.sol +++ b/src/pool-cl/libraries/PoolTicksCounter.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity >=0.8.24; +pragma solidity ^0.8.24; -//import {PoolGetters} from "./PoolGetters.sol"; import {CLPoolParametersHelper} from "pancake-v4-core/src/pool-cl/libraries/CLPoolParametersHelper.sol"; import {ICLPoolManager} from "pancake-v4-core/src/pool-cl/interfaces/ICLPoolManager.sol"; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/pool-cl/libraries/PositionConfig.sol b/src/pool-cl/libraries/PositionConfig.sol index 50af872..9f645ff 100644 --- a/src/pool-cl/libraries/PositionConfig.sol +++ b/src/pool-cl/libraries/PositionConfig.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; import {PoolKey} from "pancake-v4-core/src/types/PoolKey.sol"; diff --git a/src/pool-cl/libraries/PositionConfigId.sol b/src/pool-cl/libraries/PositionConfigId.sol index 4012710..4e31c76 100644 --- a/src/pool-cl/libraries/PositionConfigId.sol +++ b/src/pool-cl/libraries/PositionConfigId.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.24; +pragma solidity ^0.8.0; /// @notice A configId is set per tokenId /// The lower 255 bits are used to store the truncated hash of the corresponding PositionConfig diff --git a/src/pool-cl/libraries/SlippageCheck.sol b/src/pool-cl/libraries/SlippageCheck.sol index 8127ea2..f9c4482 100644 --- a/src/pool-cl/libraries/SlippageCheck.sol +++ b/src/pool-cl/libraries/SlippageCheck.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -pragma solidity ^0.8.20; +pragma solidity ^0.8.0; import {BalanceDelta} from "pancake-v4-core/src/types/BalanceDelta.sol"; import {SafeCastTemp} from "../../libraries/SafeCast.sol";