From c47a3e34a1700f057333c6c17c40a96e51f0721d Mon Sep 17 00:00:00 2001 From: Rox Date: Fri, 16 Sep 2022 11:08:14 +0300 Subject: [PATCH] Updated solidity version from ^0.8.9 to ^0.8.16 --- contracts/abstract/LegacyMasterAware_sol0_8.sol | 2 +- contracts/abstract/MasterAwareV2.sol | 2 +- contracts/external/Deployer.sol | 2 +- contracts/external/cow/GPv2Order.sol | 2 +- contracts/libraries/Math.sol | 2 +- contracts/libraries/SafeUintCast.sol | 2 +- contracts/libraries/UncheckedMath.sol | 2 +- contracts/mocks/Assessment/ASMockIndividualClaims.sol | 2 +- contracts/mocks/Assessment/ASMockMemberRoles.sol | 2 +- contracts/mocks/Assessment/ASMockYieldTokenIncidents.sol | 2 +- contracts/mocks/ChainlinkAggregatorMock.sol | 2 +- contracts/mocks/Claims/CLMockAssessment.sol | 2 +- contracts/mocks/Claims/CLMockCover.sol | 2 +- contracts/mocks/Claims/CLMockDistributor.sol | 2 +- contracts/mocks/Claims/CLMockPool.sol | 2 +- contracts/mocks/Claims/CLMockUnknownNFT.sol | 2 +- contracts/mocks/Cover/CoverMockMCR.sol | 2 +- contracts/mocks/Cover/CoverMockPool.sol | 2 +- contracts/mocks/Cover/CoverMockQuotationData.sol | 2 +- contracts/mocks/Cover/CoverMockStakingPool.sol | 2 +- contracts/mocks/CowSwap/CSMockQuotationData.sol | 2 +- contracts/mocks/CowSwap/CSMockSettlement.sol | 2 +- contracts/mocks/CowSwap/CSMockVaultRelayer.sol | 2 +- contracts/mocks/CowSwap/CSMockWeth.sol | 2 +- contracts/mocks/Disposables/DisposableCover.sol | 2 +- contracts/mocks/Disposables/DisposableIndividualClaims.sol | 2 +- contracts/mocks/Disposables/DisposableMCR.sol | 2 +- contracts/mocks/Disposables/DisposableTokenController.sol | 2 +- contracts/mocks/Incidents/ICMockAssessment.sol | 2 +- contracts/mocks/Incidents/ICMockCover.sol | 2 +- contracts/mocks/Incidents/ICMockPool.sol | 2 +- contracts/mocks/Incidents/ICMockUnknownNFT.sol | 2 +- contracts/mocks/Master/MMockNewContract.sol | 2 +- contracts/mocks/Master/MSMockGovernance.sol | 2 +- contracts/mocks/MasterMock.sol | 2 +- contracts/mocks/MemberRoles/MRMockCover.sol | 2 +- contracts/mocks/MemberRoles/MRMockCoverNFT.sol | 2 +- contracts/mocks/MemberRoles/MRMockGovernance.sol | 2 +- contracts/mocks/MemberRoles/MRMockPool.sol | 2 +- contracts/mocks/MemberRoles/MRMockStkaingPool.sol | 2 +- contracts/mocks/ReentrancyExploiter.sol | 2 +- contracts/mocks/Tokens/ERC20PermitMock.sol | 2 +- contracts/mocks/integration/IntegrationMockStakingPool.sol | 2 +- contracts/modules/assessment/Assessment.sol | 2 +- contracts/modules/assessment/AssessmentViews.sol | 2 +- contracts/modules/assessment/IndividualClaims.sol | 2 +- contracts/modules/assessment/YieldTokenIncidents.sol | 2 +- contracts/modules/capital/MCR.sol | 2 +- contracts/modules/capital/Pool.sol | 2 +- contracts/modules/cover/MinimalBeaconProxy.sol | 2 +- contracts/modules/governance/MemberRoles.sol | 2 +- contracts/modules/governance/VotePower.sol | 2 +- contracts/modules/legacy/LegacyClaimProofs.sol | 2 +- contracts/modules/legacy/LegacyGateway.sol | 2 +- contracts/modules/token/TokenController.sol | 2 +- contracts/modules/token/external/LockHandler.sol | 2 +- contracts/utils/Monitor.sol | 2 +- hardhat.config.js/solidity.js | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/contracts/abstract/LegacyMasterAware_sol0_8.sol b/contracts/abstract/LegacyMasterAware_sol0_8.sol index b10cfbfa57..0d19a54059 100644 --- a/contracts/abstract/LegacyMasterAware_sol0_8.sol +++ b/contracts/abstract/LegacyMasterAware_sol0_8.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../interfaces/INXMMaster.sol"; diff --git a/contracts/abstract/MasterAwareV2.sol b/contracts/abstract/MasterAwareV2.sol index 8e14d033aa..06e873fc14 100644 --- a/contracts/abstract/MasterAwareV2.sol +++ b/contracts/abstract/MasterAwareV2.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../interfaces/INXMMaster.sol"; import "../interfaces/IMasterAwareV2.sol"; diff --git a/contracts/external/Deployer.sol b/contracts/external/Deployer.sol index 96cbf9f74b..88759cf089 100644 --- a/contracts/external/Deployer.sol +++ b/contracts/external/Deployer.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract Deployer { diff --git a/contracts/external/cow/GPv2Order.sol b/contracts/external/cow/GPv2Order.sol index 7022beacc6..e4db926f33 100644 --- a/contracts/external/cow/GPv2Order.sol +++ b/contracts/external/cow/GPv2Order.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; diff --git a/contracts/libraries/Math.sol b/contracts/libraries/Math.sol index 4565549343..fa229f733b 100644 --- a/contracts/libraries/Math.sol +++ b/contracts/libraries/Math.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; /** * @dev Simple library that defines min, max and babylonian sqrt functions diff --git a/contracts/libraries/SafeUintCast.sol b/contracts/libraries/SafeUintCast.sol index 2183265a8e..440157253f 100644 --- a/contracts/libraries/SafeUintCast.sol +++ b/contracts/libraries/SafeUintCast.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; /** * @dev Wrappers over Solidity's uintXX casting operators with added overflow diff --git a/contracts/libraries/UncheckedMath.sol b/contracts/libraries/UncheckedMath.sol index 9631727865..22b15b7c1c 100644 --- a/contracts/libraries/UncheckedMath.sol +++ b/contracts/libraries/UncheckedMath.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; /** * @dev Simple library that defines basic math functions that allow overflow diff --git a/contracts/mocks/Assessment/ASMockIndividualClaims.sol b/contracts/mocks/Assessment/ASMockIndividualClaims.sol index 623278a900..c36f473476 100644 --- a/contracts/mocks/Assessment/ASMockIndividualClaims.sol +++ b/contracts/mocks/Assessment/ASMockIndividualClaims.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/INXMToken.sol"; import "../../interfaces/IIndividualClaims.sol"; diff --git a/contracts/mocks/Assessment/ASMockMemberRoles.sol b/contracts/mocks/Assessment/ASMockMemberRoles.sol index 441a03735c..73e16b36c1 100644 --- a/contracts/mocks/Assessment/ASMockMemberRoles.sol +++ b/contracts/mocks/Assessment/ASMockMemberRoles.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/INXMMaster.sol"; import "../../interfaces/IMemberRoles.sol"; diff --git a/contracts/mocks/Assessment/ASMockYieldTokenIncidents.sol b/contracts/mocks/Assessment/ASMockYieldTokenIncidents.sol index fc692c274d..1d70423348 100644 --- a/contracts/mocks/Assessment/ASMockYieldTokenIncidents.sol +++ b/contracts/mocks/Assessment/ASMockYieldTokenIncidents.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/IYieldTokenIncidents.sol"; import "../../interfaces/IAssessment.sol"; diff --git a/contracts/mocks/ChainlinkAggregatorMock.sol b/contracts/mocks/ChainlinkAggregatorMock.sol index f54a8a3f69..14aca395fd 100644 --- a/contracts/mocks/ChainlinkAggregatorMock.sol +++ b/contracts/mocks/ChainlinkAggregatorMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract ChainlinkAggregatorMock { diff --git a/contracts/mocks/Claims/CLMockAssessment.sol b/contracts/mocks/Claims/CLMockAssessment.sol index 4aa84092a9..0ebd0bc444 100644 --- a/contracts/mocks/Claims/CLMockAssessment.sol +++ b/contracts/mocks/Claims/CLMockAssessment.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/INXMToken.sol"; import "../../interfaces/ITokenController.sol"; diff --git a/contracts/mocks/Claims/CLMockCover.sol b/contracts/mocks/Claims/CLMockCover.sol index 45478e6f11..d00967eec7 100644 --- a/contracts/mocks/Claims/CLMockCover.sol +++ b/contracts/mocks/Claims/CLMockCover.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/ICover.sol"; import "../../interfaces/IERC721Mock.sol"; diff --git a/contracts/mocks/Claims/CLMockDistributor.sol b/contracts/mocks/Claims/CLMockDistributor.sol index 7d045306ca..3c558c87e5 100644 --- a/contracts/mocks/Claims/CLMockDistributor.sol +++ b/contracts/mocks/Claims/CLMockDistributor.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/ICoverMigrator.sol"; diff --git a/contracts/mocks/Claims/CLMockPool.sol b/contracts/mocks/Claims/CLMockPool.sol index dd58194e0d..619c17e1d2 100644 --- a/contracts/mocks/Claims/CLMockPool.sol +++ b/contracts/mocks/Claims/CLMockPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/mocks/Claims/CLMockUnknownNFT.sol b/contracts/mocks/Claims/CLMockUnknownNFT.sol index 95dd36201b..0899d0af2d 100644 --- a/contracts/mocks/Claims/CLMockUnknownNFT.sol +++ b/contracts/mocks/Claims/CLMockUnknownNFT.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "solmate/src/tokens/ERC721.sol"; diff --git a/contracts/mocks/Cover/CoverMockMCR.sol b/contracts/mocks/Cover/CoverMockMCR.sol index 748da88e91..6f2f1697d7 100644 --- a/contracts/mocks/Cover/CoverMockMCR.sol +++ b/contracts/mocks/Cover/CoverMockMCR.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/IMCR.sol"; diff --git a/contracts/mocks/Cover/CoverMockPool.sol b/contracts/mocks/Cover/CoverMockPool.sol index b31ef768ad..9a040f205e 100644 --- a/contracts/mocks/Cover/CoverMockPool.sol +++ b/contracts/mocks/Cover/CoverMockPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/IPool.sol"; diff --git a/contracts/mocks/Cover/CoverMockQuotationData.sol b/contracts/mocks/Cover/CoverMockQuotationData.sol index 1182ae7c38..3054947894 100644 --- a/contracts/mocks/Cover/CoverMockQuotationData.sol +++ b/contracts/mocks/Cover/CoverMockQuotationData.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract CoverMockQuotationData { diff --git a/contracts/mocks/Cover/CoverMockStakingPool.sol b/contracts/mocks/Cover/CoverMockStakingPool.sol index cbbd252067..3ca38cd1bd 100644 --- a/contracts/mocks/Cover/CoverMockStakingPool.sol +++ b/contracts/mocks/Cover/CoverMockStakingPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../Tokens/ERC721Mock.sol"; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; diff --git a/contracts/mocks/CowSwap/CSMockQuotationData.sol b/contracts/mocks/CowSwap/CSMockQuotationData.sol index 05e9417843..41ae3d0150 100644 --- a/contracts/mocks/CowSwap/CSMockQuotationData.sol +++ b/contracts/mocks/CowSwap/CSMockQuotationData.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract CSMockQuotationData { diff --git a/contracts/mocks/CowSwap/CSMockSettlement.sol b/contracts/mocks/CowSwap/CSMockSettlement.sol index 69bc084d80..d04c6990a5 100644 --- a/contracts/mocks/CowSwap/CSMockSettlement.sol +++ b/contracts/mocks/CowSwap/CSMockSettlement.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import './CSMockVaultRelayer.sol'; import '../../external/cow/GPv2Order.sol'; diff --git a/contracts/mocks/CowSwap/CSMockVaultRelayer.sol b/contracts/mocks/CowSwap/CSMockVaultRelayer.sol index 35b53b1ea1..3e8d5f0959 100644 --- a/contracts/mocks/CowSwap/CSMockVaultRelayer.sol +++ b/contracts/mocks/CowSwap/CSMockVaultRelayer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import '@openzeppelin/contracts-v4/token/ERC20/IERC20.sol'; diff --git a/contracts/mocks/CowSwap/CSMockWeth.sol b/contracts/mocks/CowSwap/CSMockWeth.sol index 8cf8d691ac..bc01866947 100644 --- a/contracts/mocks/CowSwap/CSMockWeth.sol +++ b/contracts/mocks/CowSwap/CSMockWeth.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import '@openzeppelin/contracts-v4/token/ERC20/ERC20.sol'; diff --git a/contracts/mocks/Disposables/DisposableCover.sol b/contracts/mocks/Disposables/DisposableCover.sol index 5813470e41..f63bc9d8f9 100644 --- a/contracts/mocks/Disposables/DisposableCover.sol +++ b/contracts/mocks/Disposables/DisposableCover.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/security/ReentrancyGuard.sol"; diff --git a/contracts/mocks/Disposables/DisposableIndividualClaims.sol b/contracts/mocks/Disposables/DisposableIndividualClaims.sol index 88f3ebd312..1cd090ad04 100644 --- a/contracts/mocks/Disposables/DisposableIndividualClaims.sol +++ b/contracts/mocks/Disposables/DisposableIndividualClaims.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../abstract/MasterAwareV2.sol"; import "../../interfaces/IIndividualClaims.sol"; diff --git a/contracts/mocks/Disposables/DisposableMCR.sol b/contracts/mocks/Disposables/DisposableMCR.sol index 1fb99060d2..bddd4dd5fd 100644 --- a/contracts/mocks/Disposables/DisposableMCR.sol +++ b/contracts/mocks/Disposables/DisposableMCR.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/IMasterAware.sol"; import "../../interfaces/IMCR.sol"; diff --git a/contracts/mocks/Disposables/DisposableTokenController.sol b/contracts/mocks/Disposables/DisposableTokenController.sol index ffb6ab7105..ccb45c8375 100644 --- a/contracts/mocks/Disposables/DisposableTokenController.sol +++ b/contracts/mocks/Disposables/DisposableTokenController.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/INXMToken.sol"; import "../../modules/token/TokenController.sol"; diff --git a/contracts/mocks/Incidents/ICMockAssessment.sol b/contracts/mocks/Incidents/ICMockAssessment.sol index 260b8d0743..ff99bc657c 100644 --- a/contracts/mocks/Incidents/ICMockAssessment.sol +++ b/contracts/mocks/Incidents/ICMockAssessment.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/INXMToken.sol"; import "../../interfaces/ITokenController.sol"; diff --git a/contracts/mocks/Incidents/ICMockCover.sol b/contracts/mocks/Incidents/ICMockCover.sol index 9e8aa60a02..907cc03f3a 100644 --- a/contracts/mocks/Incidents/ICMockCover.sol +++ b/contracts/mocks/Incidents/ICMockCover.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/ICover.sol"; import "../../interfaces/IERC721Mock.sol"; diff --git a/contracts/mocks/Incidents/ICMockPool.sol b/contracts/mocks/Incidents/ICMockPool.sol index 678b4b572c..3538869a96 100644 --- a/contracts/mocks/Incidents/ICMockPool.sol +++ b/contracts/mocks/Incidents/ICMockPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/mocks/Incidents/ICMockUnknownNFT.sol b/contracts/mocks/Incidents/ICMockUnknownNFT.sol index d7b1d0d2c8..7d6bb5b693 100644 --- a/contracts/mocks/Incidents/ICMockUnknownNFT.sol +++ b/contracts/mocks/Incidents/ICMockUnknownNFT.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "solmate/src/tokens/ERC721.sol"; diff --git a/contracts/mocks/Master/MMockNewContract.sol b/contracts/mocks/Master/MMockNewContract.sol index 44bb2f9c07..2e3fabb676 100644 --- a/contracts/mocks/Master/MMockNewContract.sol +++ b/contracts/mocks/Master/MMockNewContract.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../abstract/MasterAware.sol"; import "../../interfaces/ITokenController.sol"; diff --git a/contracts/mocks/Master/MSMockGovernance.sol b/contracts/mocks/Master/MSMockGovernance.sol index 24547be0ff..ca5820b6b9 100644 --- a/contracts/mocks/Master/MSMockGovernance.sol +++ b/contracts/mocks/Master/MSMockGovernance.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../abstract/MasterAware.sol"; import "../../interfaces/ITokenController.sol"; diff --git a/contracts/mocks/MasterMock.sol b/contracts/mocks/MasterMock.sol index 4c4588cb6f..2268ae420b 100644 --- a/contracts/mocks/MasterMock.sol +++ b/contracts/mocks/MasterMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../interfaces/INXMMaster.sol"; import "../interfaces/IMasterAwareV2.sol"; diff --git a/contracts/mocks/MemberRoles/MRMockCover.sol b/contracts/mocks/MemberRoles/MRMockCover.sol index 2dd3978ab0..922b813498 100644 --- a/contracts/mocks/MemberRoles/MRMockCover.sol +++ b/contracts/mocks/MemberRoles/MRMockCover.sol @@ -3,7 +3,7 @@ import "../../interfaces/IStakingPool.sol"; import "../../interfaces/ICoverNFT.sol"; -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract MRMockCover { ICoverNFT immutable public coverNFT; diff --git a/contracts/mocks/MemberRoles/MRMockCoverNFT.sol b/contracts/mocks/MemberRoles/MRMockCoverNFT.sol index dc8ba1ff52..532ba6c512 100644 --- a/contracts/mocks/MemberRoles/MRMockCoverNFT.sol +++ b/contracts/mocks/MemberRoles/MRMockCoverNFT.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../Tokens/ERC721Mock.sol"; diff --git a/contracts/mocks/MemberRoles/MRMockGovernance.sol b/contracts/mocks/MemberRoles/MRMockGovernance.sol index 406ca692f9..e94a37f3cb 100644 --- a/contracts/mocks/MemberRoles/MRMockGovernance.sol +++ b/contracts/mocks/MemberRoles/MRMockGovernance.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract MRMockGovernance { function removeDelegation(address) public {} diff --git a/contracts/mocks/MemberRoles/MRMockPool.sol b/contracts/mocks/MemberRoles/MRMockPool.sol index 6ac5fb8f7c..ca978d0fe8 100644 --- a/contracts/mocks/MemberRoles/MRMockPool.sol +++ b/contracts/mocks/MemberRoles/MRMockPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract MRMockPool { bool public revertOnTransfers; diff --git a/contracts/mocks/MemberRoles/MRMockStkaingPool.sol b/contracts/mocks/MemberRoles/MRMockStkaingPool.sol index 3689e6aa82..6f6a05410a 100644 --- a/contracts/mocks/MemberRoles/MRMockStkaingPool.sol +++ b/contracts/mocks/MemberRoles/MRMockStkaingPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../Tokens/ERC721Mock.sol"; diff --git a/contracts/mocks/ReentrancyExploiter.sol b/contracts/mocks/ReentrancyExploiter.sol index 37de98d1ca..fa2119faac 100644 --- a/contracts/mocks/ReentrancyExploiter.sol +++ b/contracts/mocks/ReentrancyExploiter.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; pragma experimental ABIEncoderV2; contract ReentrancyExploiter { diff --git a/contracts/mocks/Tokens/ERC20PermitMock.sol b/contracts/mocks/Tokens/ERC20PermitMock.sol index ede622e278..71b8b3e5c9 100644 --- a/contracts/mocks/Tokens/ERC20PermitMock.sol +++ b/contracts/mocks/Tokens/ERC20PermitMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/extensions/draft-ERC20Permit.sol"; diff --git a/contracts/mocks/integration/IntegrationMockStakingPool.sol b/contracts/mocks/integration/IntegrationMockStakingPool.sol index 1c93401258..4f2b302ad7 100644 --- a/contracts/mocks/integration/IntegrationMockStakingPool.sol +++ b/contracts/mocks/integration/IntegrationMockStakingPool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "solmate/src/tokens/ERC721.sol"; diff --git a/contracts/modules/assessment/Assessment.sol b/contracts/modules/assessment/Assessment.sol index 859edd7098..7d8e7eba31 100644 --- a/contracts/modules/assessment/Assessment.sol +++ b/contracts/modules/assessment/Assessment.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/utils/cryptography/MerkleProof.sol"; diff --git a/contracts/modules/assessment/AssessmentViews.sol b/contracts/modules/assessment/AssessmentViews.sol index a8307f8e8b..920f9b91b3 100644 --- a/contracts/modules/assessment/AssessmentViews.sol +++ b/contracts/modules/assessment/AssessmentViews.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../abstract/MasterAwareV2.sol"; import "../../interfaces/IAssessment.sol"; diff --git a/contracts/modules/assessment/IndividualClaims.sol b/contracts/modules/assessment/IndividualClaims.sol index 5ce3fc5e75..db42473374 100644 --- a/contracts/modules/assessment/IndividualClaims.sol +++ b/contracts/modules/assessment/IndividualClaims.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../abstract/MasterAwareV2.sol"; import "../../interfaces/IAssessment.sol"; diff --git a/contracts/modules/assessment/YieldTokenIncidents.sol b/contracts/modules/assessment/YieldTokenIncidents.sol index f07127c2c3..e43d80e44a 100644 --- a/contracts/modules/assessment/YieldTokenIncidents.sol +++ b/contracts/modules/assessment/YieldTokenIncidents.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts-v4/token/ERC20/extensions/draft-IERC20Permit.sol"; diff --git a/contracts/modules/capital/MCR.sol b/contracts/modules/capital/MCR.sol index 8a31d3b68f..35c844e20a 100644 --- a/contracts/modules/capital/MCR.sol +++ b/contracts/modules/capital/MCR.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "../../abstract/MasterAware.sol"; diff --git a/contracts/modules/capital/Pool.sol b/contracts/modules/capital/Pool.sol index 48a21c0c06..27c2b10a05 100644 --- a/contracts/modules/capital/Pool.sol +++ b/contracts/modules/capital/Pool.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts-v4/utils/Address.sol"; diff --git a/contracts/modules/cover/MinimalBeaconProxy.sol b/contracts/modules/cover/MinimalBeaconProxy.sol index dc0d59f733..8c56566406 100644 --- a/contracts/modules/cover/MinimalBeaconProxy.sol +++ b/contracts/modules/cover/MinimalBeaconProxy.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity =0.8.9; +pragma solidity =0.8.16; import "@openzeppelin/contracts-v4/proxy/Proxy.sol"; import "../../interfaces/IStakingPoolBeacon.sol"; diff --git a/contracts/modules/governance/MemberRoles.sol b/contracts/modules/governance/MemberRoles.sol index a9c0c99501..7e9bde3342 100644 --- a/contracts/modules/governance/MemberRoles.sol +++ b/contracts/modules/governance/MemberRoles.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts-v4/utils/cryptography/ECDSA.sol"; diff --git a/contracts/modules/governance/VotePower.sol b/contracts/modules/governance/VotePower.sol index b78cac4850..729f6d9d4c 100644 --- a/contracts/modules/governance/VotePower.sol +++ b/contracts/modules/governance/VotePower.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../interfaces/IGovernance.sol"; import "../../interfaces/IMemberRoles.sol"; diff --git a/contracts/modules/legacy/LegacyClaimProofs.sol b/contracts/modules/legacy/LegacyClaimProofs.sol index fa12c59ad6..fb35e4ed8a 100644 --- a/contracts/modules/legacy/LegacyClaimProofs.sol +++ b/contracts/modules/legacy/LegacyClaimProofs.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; contract LegacyClaimProofs { diff --git a/contracts/modules/legacy/LegacyGateway.sol b/contracts/modules/legacy/LegacyGateway.sol index 842975ee5d..9aae2c87fd 100644 --- a/contracts/modules/legacy/LegacyGateway.sol +++ b/contracts/modules/legacy/LegacyGateway.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "../../abstract/MasterAware.sol"; diff --git a/contracts/modules/token/TokenController.sol b/contracts/modules/token/TokenController.sol index bf5e3c0a82..3fcd56dd04 100644 --- a/contracts/modules/token/TokenController.sol +++ b/contracts/modules/token/TokenController.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../../abstract/LegacyMasterAware.sol"; import "../../interfaces/IAssessment.sol"; diff --git a/contracts/modules/token/external/LockHandler.sol b/contracts/modules/token/external/LockHandler.sol index b8d71e04d0..dbcc036a39 100644 --- a/contracts/modules/token/external/LockHandler.sol +++ b/contracts/modules/token/external/LockHandler.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; /** * @title ERC1132 interface diff --git a/contracts/utils/Monitor.sol b/contracts/utils/Monitor.sol index ceb5f8c05e..3cf90fd647 100644 --- a/contracts/utils/Monitor.sol +++ b/contracts/utils/Monitor.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only -pragma solidity ^0.8.9; +pragma solidity ^0.8.16; import "../interfaces/INXMMaster.sol"; import "../interfaces/IMCR.sol"; diff --git a/hardhat.config.js/solidity.js b/hardhat.config.js/solidity.js index ca84c27491..1bb914f7c8 100644 --- a/hardhat.config.js/solidity.js +++ b/hardhat.config.js/solidity.js @@ -4,7 +4,7 @@ const compilerSettings = process.env.ENABLE_OPTIMIZER ? { optimizer } : {}; const compilers = { '0.5.7': { settings: compilerSettings, version: '0.5.7' }, // nexus mutual v1 '0.5.17': { settings: compilerSettings, version: '0.5.17' }, // nexus mutual v1 - '0.8.9': { settings: compilerSettings, version: '0.8.9' }, // nexus mutual v2 + '0.8.16': { settings: compilerSettings, version: '0.8.16' }, // nexus mutual v2 }; const contracts = {