From fc01c536996c50018d44d504920925e6479984c5 Mon Sep 17 00:00:00 2001 From: Alexander Biryukov Date: Wed, 12 Jun 2024 12:15:04 +0400 Subject: [PATCH] pragma solidity 0.8.24 --- contracts/@openzeppelin/contracts/interfaces/IERC1155.sol | 2 +- contracts/@openzeppelin/contracts/interfaces/IERC165.sol | 2 +- contracts/@openzeppelin/contracts/interfaces/IERC20.sol | 2 +- contracts/@openzeppelin/contracts/interfaces/IERC721.sol | 2 +- contracts/@openzeppelin/contracts/proxy/Clones.sol | 2 +- .../@openzeppelin/contracts/security/ReentrancyGuard.sol | 2 +- contracts/@openzeppelin/contracts/token/ERC1155/IERC1155.sol | 2 +- contracts/@openzeppelin/contracts/token/ERC20/IERC20.sol | 2 +- .../contracts/token/ERC20/extensions/draft-IERC20Permit.sol | 2 +- .../@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol | 2 +- contracts/@openzeppelin/contracts/token/ERC721/IERC721.sol | 2 +- contracts/@openzeppelin/contracts/utils/Address.sol | 2 +- contracts/@openzeppelin/contracts/utils/Context.sol | 2 +- contracts/@openzeppelin/contracts/utils/Strings.sol | 2 +- .../@openzeppelin/contracts/utils/cryptography/ECDSA.sol | 2 +- .../contracts/utils/cryptography/MerkleProof.sol | 2 +- .../@openzeppelin/contracts/utils/introspection/ERC165.sol | 2 +- .../contracts/utils/introspection/ERC165Checker.sol | 2 +- .../@openzeppelin/contracts/utils/introspection/IERC165.sol | 2 +- contracts/access/IOwnable.sol | 4 ++-- contracts/access/IOwnableWithOperator.sol | 4 ++-- contracts/access/Ownable.sol | 4 ++-- contracts/access/Ownable2Step.sol | 4 ++-- contracts/access/OwnableBase.sol | 4 ++-- contracts/access/OwnableWithOperator.sol | 4 ++-- contracts/assetRecovering/AssetRecoverer.sol | 4 ++-- contracts/assetRecovering/OwnableAssetRecoverer.sol | 4 ++-- contracts/assetRecovering/OwnableTokenRecoverer.sol | 4 ++-- contracts/assetRecovering/TokenRecoverer.sol | 4 ++-- contracts/constants/P2pConstants.sol | 4 ++-- contracts/erc4337/IAccount.sol | 2 +- contracts/erc4337/IEntryPointStakeManager.sol | 4 ++-- contracts/erc4337/UserOperation.sol | 2 +- contracts/feeDistributor/BaseFeeDistributor.sol | 4 ++-- contracts/feeDistributor/Erc4337Account.sol | 4 ++-- contracts/feeDistributor/FeeDistributorErrors.sol | 4 ++-- contracts/feeDistributor/IFeeDistributor.sol | 4 ++-- contracts/feeDistributor/OracleFeeDistributor.sol | 4 ++-- contracts/feeDistributorFactory/FeeDistributorFactory.sol | 4 ++-- contracts/feeDistributorFactory/IFeeDistributorFactory.sol | 4 ++-- contracts/lib/P2pAddressLib.sol | 4 ++-- contracts/mocks/IAggregator.sol | 2 +- contracts/mocks/IEntryPoint.sol | 2 +- contracts/mocks/INonceManager.sol | 2 +- contracts/mocks/IStakeManager.sol | 2 +- contracts/mocks/MockAlteringReceive.sol | 4 ++-- contracts/mocks/MockClientFeeDistributor.sol | 4 ++-- contracts/oracle/IOracle.sol | 4 ++-- contracts/oracle/Oracle.sol | 4 ++-- contracts/p2pEth2Depositor/IP2pOrgUnlimitedEthDepositor.sol | 4 ++-- contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol | 4 ++-- .../p2pEth2Depositor/P2pOrgUnlimitedEthDepositorErrors.sol | 4 ++-- contracts/p2pEth2Depositor/interfaces/IDepositContract.sol | 2 +- contracts/structs/P2pStructs.sol | 4 ++-- hardhat.config.ts | 2 +- test/foundry/Integration.t.sol | 4 ++-- 56 files changed, 85 insertions(+), 85 deletions(-) diff --git a/contracts/@openzeppelin/contracts/interfaces/IERC1155.sol b/contracts/@openzeppelin/contracts/interfaces/IERC1155.sol index 9f55964..b2b9d4a 100644 --- a/contracts/@openzeppelin/contracts/interfaces/IERC1155.sol +++ b/contracts/@openzeppelin/contracts/interfaces/IERC1155.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (interfaces/IERC1155.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../token/ERC1155/IERC1155.sol"; diff --git a/contracts/@openzeppelin/contracts/interfaces/IERC165.sol b/contracts/@openzeppelin/contracts/interfaces/IERC165.sol index ae00c48..0e954f5 100644 --- a/contracts/@openzeppelin/contracts/interfaces/IERC165.sol +++ b/contracts/@openzeppelin/contracts/interfaces/IERC165.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (interfaces/IERC165.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../utils/introspection/IERC165.sol"; diff --git a/contracts/@openzeppelin/contracts/interfaces/IERC20.sol b/contracts/@openzeppelin/contracts/interfaces/IERC20.sol index 5f4665b..3af34be 100644 --- a/contracts/@openzeppelin/contracts/interfaces/IERC20.sol +++ b/contracts/@openzeppelin/contracts/interfaces/IERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (interfaces/IERC20.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../token/ERC20/IERC20.sol"; diff --git a/contracts/@openzeppelin/contracts/interfaces/IERC721.sol b/contracts/@openzeppelin/contracts/interfaces/IERC721.sol index e2fc944..0768d5f 100644 --- a/contracts/@openzeppelin/contracts/interfaces/IERC721.sol +++ b/contracts/@openzeppelin/contracts/interfaces/IERC721.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (interfaces/IERC721.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../token/ERC721/IERC721.sol"; diff --git a/contracts/@openzeppelin/contracts/proxy/Clones.sol b/contracts/@openzeppelin/contracts/proxy/Clones.sol index 3ddc4db..3b8c65d 100644 --- a/contracts/@openzeppelin/contracts/proxy/Clones.sol +++ b/contracts/@openzeppelin/contracts/proxy/Clones.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.7.0) (proxy/Clones.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev https://eips.ethereum.org/EIPS/eip-1167[EIP 1167] is a standard for diff --git a/contracts/@openzeppelin/contracts/security/ReentrancyGuard.sol b/contracts/@openzeppelin/contracts/security/ReentrancyGuard.sol index aef4452..91b3ef0 100644 --- a/contracts/@openzeppelin/contracts/security/ReentrancyGuard.sol +++ b/contracts/@openzeppelin/contracts/security/ReentrancyGuard.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (security/ReentrancyGuard.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev Contract module that helps prevent reentrant calls to a function. diff --git a/contracts/@openzeppelin/contracts/token/ERC1155/IERC1155.sol b/contracts/@openzeppelin/contracts/token/ERC1155/IERC1155.sol index f1b708f..7c7de12 100644 --- a/contracts/@openzeppelin/contracts/token/ERC1155/IERC1155.sol +++ b/contracts/@openzeppelin/contracts/token/ERC1155/IERC1155.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC1155/IERC1155.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../../utils/introspection/IERC165.sol"; diff --git a/contracts/@openzeppelin/contracts/token/ERC20/IERC20.sol b/contracts/@openzeppelin/contracts/token/ERC20/IERC20.sol index 789ebe4..f29c707 100644 --- a/contracts/@openzeppelin/contracts/token/ERC20/IERC20.sol +++ b/contracts/@openzeppelin/contracts/token/ERC20/IERC20.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/IERC20.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev Interface of the ERC20 standard as defined in the EIP. diff --git a/contracts/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol b/contracts/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol index 86a41f7..9f13114 100644 --- a/contracts/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol +++ b/contracts/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (token/ERC20/extensions/draft-IERC20Permit.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev Interface of the ERC20 Permit extension allowing approvals to be made via signatures, as defined in diff --git a/contracts/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol b/contracts/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol index b06e34c..a6e593f 100644 --- a/contracts/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol +++ b/contracts/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC20/utils/SafeERC20.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../IERC20.sol"; import "../extensions/draft-IERC20Permit.sol"; diff --git a/contracts/@openzeppelin/contracts/token/ERC721/IERC721.sol b/contracts/@openzeppelin/contracts/token/ERC721/IERC721.sol index f516595..0a1d639 100644 --- a/contracts/@openzeppelin/contracts/token/ERC721/IERC721.sol +++ b/contracts/@openzeppelin/contracts/token/ERC721/IERC721.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC721/IERC721.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../../utils/introspection/IERC165.sol"; diff --git a/contracts/@openzeppelin/contracts/utils/Address.sol b/contracts/@openzeppelin/contracts/utils/Address.sol index 1e4f95c..b5c2659 100644 --- a/contracts/@openzeppelin/contracts/utils/Address.sol +++ b/contracts/@openzeppelin/contracts/utils/Address.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.7.0) (utils/Address.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev Collection of functions related to the address type diff --git a/contracts/@openzeppelin/contracts/utils/Context.sol b/contracts/@openzeppelin/contracts/utils/Context.sol index 5bb6c15..ede1f5a 100644 --- a/contracts/@openzeppelin/contracts/utils/Context.sol +++ b/contracts/@openzeppelin/contracts/utils/Context.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (utils/Context.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev Provides information about the current execution context, including the diff --git a/contracts/@openzeppelin/contracts/utils/Strings.sol b/contracts/@openzeppelin/contracts/utils/Strings.sol index 6685538..720ee60 100644 --- a/contracts/@openzeppelin/contracts/utils/Strings.sol +++ b/contracts/@openzeppelin/contracts/utils/Strings.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (utils/Strings.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev String operations. diff --git a/contracts/@openzeppelin/contracts/utils/cryptography/ECDSA.sol b/contracts/@openzeppelin/contracts/utils/cryptography/ECDSA.sol index 3aecb51..40bd497 100644 --- a/contracts/@openzeppelin/contracts/utils/cryptography/ECDSA.sol +++ b/contracts/@openzeppelin/contracts/utils/cryptography/ECDSA.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (utils/cryptography/ECDSA.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../Strings.sol"; diff --git a/contracts/@openzeppelin/contracts/utils/cryptography/MerkleProof.sol b/contracts/@openzeppelin/contracts/utils/cryptography/MerkleProof.sol index 95b0759..36d0a9b 100644 --- a/contracts/@openzeppelin/contracts/utils/cryptography/MerkleProof.sol +++ b/contracts/@openzeppelin/contracts/utils/cryptography/MerkleProof.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.8.0) (utils/cryptography/MerkleProof.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev These functions deal with verification of Merkle Tree proofs. diff --git a/contracts/@openzeppelin/contracts/utils/introspection/ERC165.sol b/contracts/@openzeppelin/contracts/utils/introspection/ERC165.sol index befab8d..2b17b18 100644 --- a/contracts/@openzeppelin/contracts/utils/introspection/ERC165.sol +++ b/contracts/@openzeppelin/contracts/utils/introspection/ERC165.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (utils/introspection/ERC165.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./IERC165.sol"; diff --git a/contracts/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol b/contracts/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol index 6d56521..16298c7 100644 --- a/contracts/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol +++ b/contracts/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.7.2) (utils/introspection/ERC165Checker.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./IERC165.sol"; diff --git a/contracts/@openzeppelin/contracts/utils/introspection/IERC165.sol b/contracts/@openzeppelin/contracts/utils/introspection/IERC165.sol index e75c5cd..45e0da0 100644 --- a/contracts/@openzeppelin/contracts/utils/introspection/IERC165.sol +++ b/contracts/@openzeppelin/contracts/utils/introspection/IERC165.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (utils/introspection/IERC165.sol) -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev Interface of the ERC165 standard, as defined in the diff --git a/contracts/access/IOwnable.sol b/contracts/access/IOwnable.sol index e4f825d..6ae0dd1 100644 --- a/contracts/access/IOwnable.sol +++ b/contracts/access/IOwnable.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @dev External interface of Ownable. diff --git a/contracts/access/IOwnableWithOperator.sol b/contracts/access/IOwnableWithOperator.sol index cdc5a37..6617280 100644 --- a/contracts/access/IOwnableWithOperator.sol +++ b/contracts/access/IOwnableWithOperator.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./IOwnable.sol"; diff --git a/contracts/access/Ownable.sol b/contracts/access/Ownable.sol index c8e022e..334a9a1 100644 --- a/contracts/access/Ownable.sol +++ b/contracts/access/Ownable.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator , OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol) +// SPDX-FileCopyrightText: 2024 P2P Validator , OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol) // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./OwnableBase.sol"; diff --git a/contracts/access/Ownable2Step.sol b/contracts/access/Ownable2Step.sol index 45e7ba3..e311293 100644 --- a/contracts/access/Ownable2Step.sol +++ b/contracts/access/Ownable2Step.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator , OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol) +// SPDX-FileCopyrightText: 2024 P2P Validator , OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol) // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./Ownable.sol"; diff --git a/contracts/access/OwnableBase.sol b/contracts/access/OwnableBase.sol index b761592..71e2b44 100644 --- a/contracts/access/OwnableBase.sol +++ b/contracts/access/OwnableBase.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/Context.sol"; import "./IOwnable.sol"; diff --git a/contracts/access/OwnableWithOperator.sol b/contracts/access/OwnableWithOperator.sol index fa9af5b..9eded4d 100644 --- a/contracts/access/OwnableWithOperator.sol +++ b/contracts/access/OwnableWithOperator.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./Ownable2Step.sol"; import "./IOwnableWithOperator.sol"; diff --git a/contracts/assetRecovering/AssetRecoverer.sol b/contracts/assetRecovering/AssetRecoverer.sol index 6a5689f..6ae652b 100644 --- a/contracts/assetRecovering/AssetRecoverer.sol +++ b/contracts/assetRecovering/AssetRecoverer.sol @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator , Lido +// SPDX-FileCopyrightText: 2024 P2P Validator , Lido // SPDX-License-Identifier: MIT // https://github.com/lidofinance/lido-otc-seller/blob/master/contracts/lib/AssetRecoverer.sol -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./TokenRecoverer.sol"; diff --git a/contracts/assetRecovering/OwnableAssetRecoverer.sol b/contracts/assetRecovering/OwnableAssetRecoverer.sol index 274cfd8..5cda252 100644 --- a/contracts/assetRecovering/OwnableAssetRecoverer.sol +++ b/contracts/assetRecovering/OwnableAssetRecoverer.sol @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator , Lido +// SPDX-FileCopyrightText: 2024 P2P Validator , Lido // SPDX-License-Identifier: MIT // https://github.com/lidofinance/lido-otc-seller/blob/master/contracts/lib/AssetRecoverer.sol -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./OwnableTokenRecoverer.sol"; import "./AssetRecoverer.sol"; diff --git a/contracts/assetRecovering/OwnableTokenRecoverer.sol b/contracts/assetRecovering/OwnableTokenRecoverer.sol index 5cd3a1f..51ce58a 100644 --- a/contracts/assetRecovering/OwnableTokenRecoverer.sol +++ b/contracts/assetRecovering/OwnableTokenRecoverer.sol @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator , Lido +// SPDX-FileCopyrightText: 2024 P2P Validator , Lido // SPDX-License-Identifier: MIT // https://github.com/lidofinance/lido-otc-seller/blob/master/contracts/lib/AssetRecoverer.sol -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./TokenRecoverer.sol"; import "../access/OwnableBase.sol"; diff --git a/contracts/assetRecovering/TokenRecoverer.sol b/contracts/assetRecovering/TokenRecoverer.sol index 355d35d..247dbb2 100644 --- a/contracts/assetRecovering/TokenRecoverer.sol +++ b/contracts/assetRecovering/TokenRecoverer.sol @@ -1,8 +1,8 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator , Lido +// SPDX-FileCopyrightText: 2024 P2P Validator , Lido // SPDX-License-Identifier: MIT // https://github.com/lidofinance/lido-otc-seller/blob/master/contracts/lib/AssetRecoverer.sol -pragma solidity 0.8.10; +pragma solidity 0.8.24; import {IERC20} from "../@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {IERC721} from "../@openzeppelin/contracts/token/ERC721/IERC721.sol"; diff --git a/contracts/constants/P2pConstants.sol b/contracts/constants/P2pConstants.sol index 017fb76..ab6332c 100644 --- a/contracts/constants/P2pConstants.sol +++ b/contracts/constants/P2pConstants.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; /// @dev Maximal number of ETH2 deposits within a single transaction /// @dev 400 deposits (12800 ETH) is determined by calldata size limit of 128 kb diff --git a/contracts/erc4337/IAccount.sol b/contracts/erc4337/IAccount.sol index 0cd3ef2..7e8bd8f 100644 --- a/contracts/erc4337/IAccount.sol +++ b/contracts/erc4337/IAccount.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "./UserOperation.sol"; diff --git a/contracts/erc4337/IEntryPointStakeManager.sol b/contracts/erc4337/IEntryPointStakeManager.sol index c9a219a..5b393c6 100644 --- a/contracts/erc4337/IEntryPointStakeManager.sol +++ b/contracts/erc4337/IEntryPointStakeManager.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; interface IEntryPointStakeManager { diff --git a/contracts/erc4337/UserOperation.sol b/contracts/erc4337/UserOperation.sol index cd5e603..38a9a16 100644 --- a/contracts/erc4337/UserOperation.sol +++ b/contracts/erc4337/UserOperation.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * User Operation struct diff --git a/contracts/feeDistributor/BaseFeeDistributor.sol b/contracts/feeDistributor/BaseFeeDistributor.sol index ad54313..9cfb79e 100644 --- a/contracts/feeDistributor/BaseFeeDistributor.sol +++ b/contracts/feeDistributor/BaseFeeDistributor.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/security/ReentrancyGuard.sol"; import "../@openzeppelin/contracts/utils/introspection/ERC165.sol"; diff --git a/contracts/feeDistributor/Erc4337Account.sol b/contracts/feeDistributor/Erc4337Account.sol index 14b67fd..e45256f 100644 --- a/contracts/feeDistributor/Erc4337Account.sol +++ b/contracts/feeDistributor/Erc4337Account.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import "../erc4337/IAccount.sol"; diff --git a/contracts/feeDistributor/FeeDistributorErrors.sol b/contracts/feeDistributor/FeeDistributorErrors.sol index 56b380f..5e17768 100644 --- a/contracts/feeDistributor/FeeDistributorErrors.sol +++ b/contracts/feeDistributor/FeeDistributorErrors.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../feeDistributorFactory/IFeeDistributorFactory.sol"; diff --git a/contracts/feeDistributor/IFeeDistributor.sol b/contracts/feeDistributor/IFeeDistributor.sol index e5872f5..a318d63 100644 --- a/contracts/feeDistributor/IFeeDistributor.sol +++ b/contracts/feeDistributor/IFeeDistributor.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/introspection/IERC165.sol"; import "../structs/P2pStructs.sol"; diff --git a/contracts/feeDistributor/OracleFeeDistributor.sol b/contracts/feeDistributor/OracleFeeDistributor.sol index 971d8b8..67a191f 100644 --- a/contracts/feeDistributor/OracleFeeDistributor.sol +++ b/contracts/feeDistributor/OracleFeeDistributor.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/security/ReentrancyGuard.sol"; import "../@openzeppelin/contracts/utils/introspection/ERC165.sol"; diff --git a/contracts/feeDistributorFactory/FeeDistributorFactory.sol b/contracts/feeDistributorFactory/FeeDistributorFactory.sol index 15a3f87..0b0c76b 100644 --- a/contracts/feeDistributorFactory/FeeDistributorFactory.sol +++ b/contracts/feeDistributorFactory/FeeDistributorFactory.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/proxy/Clones.sol"; import "../@openzeppelin/contracts/utils/introspection/ERC165.sol"; diff --git a/contracts/feeDistributorFactory/IFeeDistributorFactory.sol b/contracts/feeDistributorFactory/IFeeDistributorFactory.sol index 9bd2042..152e09f 100644 --- a/contracts/feeDistributorFactory/IFeeDistributorFactory.sol +++ b/contracts/feeDistributorFactory/IFeeDistributorFactory.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/introspection/IERC165.sol"; import "../access/IOwnable.sol"; diff --git a/contracts/lib/P2pAddressLib.sol b/contracts/lib/P2pAddressLib.sol index 0eb8f05..091988b 100644 --- a/contracts/lib/P2pAddressLib.sol +++ b/contracts/lib/P2pAddressLib.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; library P2pAddressLib { /// @notice Sends amount of ETH in wei to recipient diff --git a/contracts/mocks/IAggregator.sol b/contracts/mocks/IAggregator.sol index 6b89b5d..644820d 100644 --- a/contracts/mocks/IAggregator.sol +++ b/contracts/mocks/IAggregator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../erc4337/UserOperation.sol"; diff --git a/contracts/mocks/IEntryPoint.sol b/contracts/mocks/IEntryPoint.sol index 5f0a1d0..43be83c 100644 --- a/contracts/mocks/IEntryPoint.sol +++ b/contracts/mocks/IEntryPoint.sol @@ -3,7 +3,7 @@ ** Only one instance required on each chain. **/ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.10; +pragma solidity 0.8.24; /* solhint-disable avoid-low-level-calls */ /* solhint-disable no-inline-assembly */ diff --git a/contracts/mocks/INonceManager.sol b/contracts/mocks/INonceManager.sol index 347f67e..dfdbbbd 100644 --- a/contracts/mocks/INonceManager.sol +++ b/contracts/mocks/INonceManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.10; +pragma solidity 0.8.24; interface INonceManager { diff --git a/contracts/mocks/IStakeManager.sol b/contracts/mocks/IStakeManager.sol index b732126..bc80eb2 100644 --- a/contracts/mocks/IStakeManager.sol +++ b/contracts/mocks/IStakeManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * manage deposits and stakes. diff --git a/contracts/mocks/MockAlteringReceive.sol b/contracts/mocks/MockAlteringReceive.sol index f409ad5..2442fc3 100644 --- a/contracts/mocks/MockAlteringReceive.sol +++ b/contracts/mocks/MockAlteringReceive.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; /** * @title This is a mock for testing only. diff --git a/contracts/mocks/MockClientFeeDistributor.sol b/contracts/mocks/MockClientFeeDistributor.sol index 9b9edeb..531367c 100644 --- a/contracts/mocks/MockClientFeeDistributor.sol +++ b/contracts/mocks/MockClientFeeDistributor.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/security/ReentrancyGuard.sol"; import "../@openzeppelin/contracts/utils/introspection/ERC165.sol"; diff --git a/contracts/oracle/IOracle.sol b/contracts/oracle/IOracle.sol index 6dc5d10..bacc170 100644 --- a/contracts/oracle/IOracle.sol +++ b/contracts/oracle/IOracle.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/introspection/IERC165.sol"; import "../access/IOwnable.sol"; diff --git a/contracts/oracle/Oracle.sol b/contracts/oracle/Oracle.sol index 14921a0..e93be0c 100644 --- a/contracts/oracle/Oracle.sol +++ b/contracts/oracle/Oracle.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/cryptography/MerkleProof.sol"; import "../assetRecovering/OwnableAssetRecoverer.sol"; diff --git a/contracts/p2pEth2Depositor/IP2pOrgUnlimitedEthDepositor.sol b/contracts/p2pEth2Depositor/IP2pOrgUnlimitedEthDepositor.sol index 3394ce2..0fce407 100644 --- a/contracts/p2pEth2Depositor/IP2pOrgUnlimitedEthDepositor.sol +++ b/contracts/p2pEth2Depositor/IP2pOrgUnlimitedEthDepositor.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/utils/introspection/IERC165.sol"; import "../feeDistributor/IFeeDistributor.sol"; diff --git a/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol b/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol index ed7cb04..9a69485 100644 --- a/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol +++ b/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../@openzeppelin/contracts/proxy/Clones.sol"; import "../@openzeppelin/contracts/utils/introspection/ERC165.sol"; diff --git a/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositorErrors.sol b/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositorErrors.sol index ddb3338..3b28e5b 100644 --- a/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositorErrors.sol +++ b/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositorErrors.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; /// @notice Could not send ETH. Most likely, the receiver is a contract rejecting ETH. /// @param _receiver receiver address diff --git a/contracts/p2pEth2Depositor/interfaces/IDepositContract.sol b/contracts/p2pEth2Depositor/interfaces/IDepositContract.sol index 3874ef7..9648068 100644 --- a/contracts/p2pEth2Depositor/interfaces/IDepositContract.sol +++ b/contracts/p2pEth2Depositor/interfaces/IDepositContract.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: CC0-1.0 -pragma solidity 0.8.10; +pragma solidity 0.8.24; // This interface is designed to be compatible with the Vyper version. /// @notice This is the Ethereum 2.0 deposit contract interface. diff --git a/contracts/structs/P2pStructs.sol b/contracts/structs/P2pStructs.sol index 47bc98a..682fb45 100644 --- a/contracts/structs/P2pStructs.sol +++ b/contracts/structs/P2pStructs.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "../feeDistributor/IFeeDistributor.sol"; diff --git a/hardhat.config.ts b/hardhat.config.ts index c0addd6..8d9d5d6 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -49,7 +49,7 @@ const config: HardhatUserConfig = { solidity: { compilers: [ { - version: "0.8.10", + version: "0.8.24", }, ], settings: { diff --git a/test/foundry/Integration.t.sol b/test/foundry/Integration.t.sol index 61d84ec..dea5b2c 100644 --- a/test/foundry/Integration.t.sol +++ b/test/foundry/Integration.t.sol @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: 2023 P2P Validator +// SPDX-FileCopyrightText: 2024 P2P Validator // SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.24; import "forge-std/Test.sol"; import "forge-std/Vm.sol";