diff --git a/markets/legacy-market/contracts/InitialModuleBundle.sol b/markets/legacy-market/contracts/InitialModuleBundle.sol index bf643776a4..594a309cc6 100644 --- a/markets/legacy-market/contracts/InitialModuleBundle.sol +++ b/markets/legacy-market/contracts/InitialModuleBundle.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/modules/OwnerModule.sol"; import "@synthetixio/core-modules/contracts/modules/UpgradeModule.sol"; diff --git a/markets/legacy-market/contracts/LegacyMarket.sol b/markets/legacy-market/contracts/LegacyMarket.sol index 31e9cfddde..ec0d131b16 100644 --- a/markets/legacy-market/contracts/LegacyMarket.sol +++ b/markets/legacy-market/contracts/LegacyMarket.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/interfaces/external/IMarket.sol"; import "synthetix/contracts/interfaces/ILiquidatorRewards.sol"; diff --git a/markets/legacy-market/contracts/Proxy.sol b/markets/legacy-market/contracts/Proxy.sol index 41b4805819..6da154b5d9 100644 --- a/markets/legacy-market/contracts/Proxy.sol +++ b/markets/legacy-market/contracts/Proxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UUPSProxy} from "@synthetixio/core-contracts/contracts/proxy/UUPSProxy.sol"; diff --git a/markets/legacy-market/contracts/interfaces/ILegacyMarket.sol b/markets/legacy-market/contracts/interfaces/ILegacyMarket.sol index bad8377174..7f14052ee6 100644 --- a/markets/legacy-market/contracts/interfaces/ILegacyMarket.sol +++ b/markets/legacy-market/contracts/interfaces/ILegacyMarket.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "synthetix/contracts/interfaces/IAddressResolver.sol"; import "./external/IV3CoreProxy.sol"; diff --git a/markets/legacy-market/contracts/interfaces/external/IRewardEscrowV2.sol b/markets/legacy-market/contracts/interfaces/external/IRewardEscrowV2.sol index 857b7dc84c..34a53227f2 100644 --- a/markets/legacy-market/contracts/interfaces/external/IRewardEscrowV2.sol +++ b/markets/legacy-market/contracts/interfaces/external/IRewardEscrowV2.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library VestingEntries { struct VestingEntry { diff --git a/markets/legacy-market/contracts/interfaces/external/ISynthetix.sol b/markets/legacy-market/contracts/interfaces/external/ISynthetix.sol index deefe03c0e..e511cc57ed 100644 --- a/markets/legacy-market/contracts/interfaces/external/ISynthetix.sol +++ b/markets/legacy-market/contracts/interfaces/external/ISynthetix.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // https://docs.synthetix.io/contracts/source/interfaces/isynthetix interface ISynthetix { @@ -20,20 +20,17 @@ interface ISynthetix { function maxIssuableSynths(address issuer) external view returns (uint maxIssuable); - function remainingIssuableSynths(address issuer) - external - view - returns ( - uint maxIssuable, - uint alreadyIssued, - uint totalSystemDebt - ); + function remainingIssuableSynths( + address issuer + ) external view returns (uint maxIssuable, uint alreadyIssued, uint totalSystemDebt); function synthsByAddress(address synthAddress) external view returns (bytes32); function totalIssuedSynths(bytes32 currencyKey) external view returns (uint); - function totalIssuedSynthsExcludeOtherCollateral(bytes32 currencyKey) external view returns (uint); + function totalIssuedSynthsExcludeOtherCollateral( + bytes32 currencyKey + ) external view returns (uint); function transferableSynthetix(address account) external view returns (uint transferable); @@ -104,18 +101,17 @@ interface ISynthetix { function mint() external returns (bool); - function settle(bytes32 currencyKey) - external - returns ( - uint reclaimed, - uint refunded, - uint numEntries - ); + function settle( + bytes32 currencyKey + ) external returns (uint reclaimed, uint refunded, uint numEntries); // Liquidations function liquidateDelinquentAccount(address account) external returns (bool); - function liquidateDelinquentAccountEscrowIndex(address account, uint escrowStartIndex) external returns (bool); + function liquidateDelinquentAccountEscrowIndex( + address account, + uint escrowStartIndex + ) external returns (bool); function liquidateSelf() external returns (bool); diff --git a/markets/legacy-market/contracts/interfaces/external/IV3CoreProxy.sol b/markets/legacy-market/contracts/interfaces/external/IV3CoreProxy.sol index 06948de820..c4d67c86ec 100644 --- a/markets/legacy-market/contracts/interfaces/external/IV3CoreProxy.sol +++ b/markets/legacy-market/contracts/interfaces/external/IV3CoreProxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IV3CoreProxy { function registerMarket(address market) external returns (uint128); diff --git a/markets/spot-market/contracts/Mocks.sol b/markets/spot-market/contracts/Mocks.sol index 1b2a0234c6..0b52524065 100644 --- a/markets/spot-market/contracts/Mocks.sol +++ b/markets/spot-market/contracts/Mocks.sol @@ -1,4 +1,4 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/mocks/AggregatorV3Mock.sol"; diff --git a/markets/spot-market/contracts/Proxy.sol b/markets/spot-market/contracts/Proxy.sol index 41b4805819..6da154b5d9 100644 --- a/markets/spot-market/contracts/Proxy.sol +++ b/markets/spot-market/contracts/Proxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UUPSProxy} from "@synthetixio/core-contracts/contracts/proxy/UUPSProxy.sol"; diff --git a/markets/spot-market/contracts/interfaces/IAsyncOrderClaimTokenModule.sol b/markets/spot-market/contracts/interfaces/IAsyncOrderClaimTokenModule.sol index bae4f0b6bd..d05221c1cc 100644 --- a/markets/spot-market/contracts/interfaces/IAsyncOrderClaimTokenModule.sol +++ b/markets/spot-market/contracts/interfaces/IAsyncOrderClaimTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/INftModule.sol"; diff --git a/markets/spot-market/contracts/interfaces/IAsyncOrderModule.sol b/markets/spot-market/contracts/interfaces/IAsyncOrderModule.sol index f04c3c428b..b7bd32ba00 100644 --- a/markets/spot-market/contracts/interfaces/IAsyncOrderModule.sol +++ b/markets/spot-market/contracts/interfaces/IAsyncOrderModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/AsyncOrderConfiguration.sol"; diff --git a/markets/spot-market/contracts/interfaces/IAtomicOrderModule.sol b/markets/spot-market/contracts/interfaces/IAtomicOrderModule.sol index 452f2bae0c..f31aa27fa0 100644 --- a/markets/spot-market/contracts/interfaces/IAtomicOrderModule.sol +++ b/markets/spot-market/contracts/interfaces/IAtomicOrderModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/interfaces/external/IMarket.sol"; diff --git a/markets/spot-market/contracts/interfaces/IFeeConfigurationModule.sol b/markets/spot-market/contracts/interfaces/IFeeConfigurationModule.sol index de30e559d8..f0b63f1519 100644 --- a/markets/spot-market/contracts/interfaces/IFeeConfigurationModule.sol +++ b/markets/spot-market/contracts/interfaces/IFeeConfigurationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for market-specific fee configuration diff --git a/markets/spot-market/contracts/interfaces/ISpotMarketFactoryModule.sol b/markets/spot-market/contracts/interfaces/ISpotMarketFactoryModule.sol index 53d06781dd..5383fd8d00 100644 --- a/markets/spot-market/contracts/interfaces/ISpotMarketFactoryModule.sol +++ b/markets/spot-market/contracts/interfaces/ISpotMarketFactoryModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/interfaces/external/IMarket.sol"; import "@synthetixio/core-modules/contracts/interfaces/ITokenModule.sol"; diff --git a/markets/spot-market/contracts/interfaces/ISynthTokenModule.sol b/markets/spot-market/contracts/interfaces/ISynthTokenModule.sol index b6602dc2c0..531588adb6 100644 --- a/markets/spot-market/contracts/interfaces/ISynthTokenModule.sol +++ b/markets/spot-market/contracts/interfaces/ISynthTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/IDecayTokenModule.sol"; diff --git a/markets/spot-market/contracts/interfaces/IWrapperModule.sol b/markets/spot-market/contracts/interfaces/IWrapperModule.sol index 1c99e7e599..d48b2e25db 100644 --- a/markets/spot-market/contracts/interfaces/IWrapperModule.sol +++ b/markets/spot-market/contracts/interfaces/IWrapperModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for synth wrappers diff --git a/markets/spot-market/contracts/interfaces/external/IChainlinkVerifier.sol b/markets/spot-market/contracts/interfaces/external/IChainlinkVerifier.sol index 7c31f54d9e..152ec45f7e 100644 --- a/markets/spot-market/contracts/interfaces/external/IChainlinkVerifier.sol +++ b/markets/spot-market/contracts/interfaces/external/IChainlinkVerifier.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IChainlinkVerifier { function verify(bytes memory chainlinkBlob) external returns (bytes memory verifierResponse); diff --git a/markets/spot-market/contracts/interfaces/external/IFeeCollector.sol b/markets/spot-market/contracts/interfaces/external/IFeeCollector.sol index 603699e9ac..89881d317d 100644 --- a/markets/spot-market/contracts/interfaces/external/IFeeCollector.sol +++ b/markets/spot-market/contracts/interfaces/external/IFeeCollector.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC165.sol"; diff --git a/markets/spot-market/contracts/interfaces/external/IPythVerifier.sol b/markets/spot-market/contracts/interfaces/external/IPythVerifier.sol index 9a7847bf93..1a0fe920d4 100644 --- a/markets/spot-market/contracts/interfaces/external/IPythVerifier.sol +++ b/markets/spot-market/contracts/interfaces/external/IPythVerifier.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IPythVerifier { // A price with a degree of uncertainty, represented as a price +- a confidence interval. diff --git a/markets/spot-market/contracts/modules/AsyncOrderModule.sol b/markets/spot-market/contracts/modules/AsyncOrderModule.sol index 99ff0261a1..5ecc2a30e9 100644 --- a/markets/spot-market/contracts/modules/AsyncOrderModule.sol +++ b/markets/spot-market/contracts/modules/AsyncOrderModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/interfaces/IMarketManagerModule.sol"; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; diff --git a/markets/spot-market/contracts/modules/AtomicOrderModule.sol b/markets/spot-market/contracts/modules/AtomicOrderModule.sol index d6283362d7..cc75ea1740 100644 --- a/markets/spot-market/contracts/modules/AtomicOrderModule.sol +++ b/markets/spot-market/contracts/modules/AtomicOrderModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/interfaces/IMarketManagerModule.sol"; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; diff --git a/markets/spot-market/contracts/modules/CoreModule.sol b/markets/spot-market/contracts/modules/CoreModule.sol index 2d540460f3..c5dd32bb82 100644 --- a/markets/spot-market/contracts/modules/CoreModule.sol +++ b/markets/spot-market/contracts/modules/CoreModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {CoreModule as BaseCoreModule} from "@synthetixio/core-modules/contracts/modules/CoreModule.sol"; diff --git a/markets/spot-market/contracts/modules/FeeConfigurationModule.sol b/markets/spot-market/contracts/modules/FeeConfigurationModule.sol index de4e836d5e..3f4bb11ce1 100644 --- a/markets/spot-market/contracts/modules/FeeConfigurationModule.sol +++ b/markets/spot-market/contracts/modules/FeeConfigurationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/modules/AssociatedSystemsModule.sol"; import "@synthetixio/core-contracts/contracts/utils/ERC165Helper.sol"; diff --git a/markets/spot-market/contracts/modules/SpotMarketFactoryModule.sol b/markets/spot-market/contracts/modules/SpotMarketFactoryModule.sol index 9f79f6bc96..ddb4d68242 100644 --- a/markets/spot-market/contracts/modules/SpotMarketFactoryModule.sol +++ b/markets/spot-market/contracts/modules/SpotMarketFactoryModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/interfaces/IMarketManagerModule.sol"; import "@synthetixio/core-modules/contracts/modules/AssociatedSystemsModule.sol"; diff --git a/markets/spot-market/contracts/modules/WrapperModule.sol b/markets/spot-market/contracts/modules/WrapperModule.sol index 295d58b5e6..8227df3de4 100644 --- a/markets/spot-market/contracts/modules/WrapperModule.sol +++ b/markets/spot-market/contracts/modules/WrapperModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; diff --git a/markets/spot-market/contracts/modules/token/AsyncOrderClaimTokenModule.sol b/markets/spot-market/contracts/modules/token/AsyncOrderClaimTokenModule.sol index df55ec16d3..f836bda2d3 100644 --- a/markets/spot-market/contracts/modules/token/AsyncOrderClaimTokenModule.sol +++ b/markets/spot-market/contracts/modules/token/AsyncOrderClaimTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/modules/NftModule.sol"; import "../../../contracts/interfaces/IAsyncOrderClaimTokenModule.sol"; diff --git a/markets/spot-market/contracts/modules/token/SynthTokenModule.sol b/markets/spot-market/contracts/modules/token/SynthTokenModule.sol index 5fc36f4702..b4440f0fd6 100644 --- a/markets/spot-market/contracts/modules/token/SynthTokenModule.sol +++ b/markets/spot-market/contracts/modules/token/SynthTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-modules/contracts/modules/DecayTokenModule.sol"; diff --git a/markets/spot-market/contracts/storage/AsyncOrderClaim.sol b/markets/spot-market/contracts/storage/AsyncOrderClaim.sol index 698e50fba2..7ee8ec590e 100644 --- a/markets/spot-market/contracts/storage/AsyncOrderClaim.sol +++ b/markets/spot-market/contracts/storage/AsyncOrderClaim.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./AsyncOrderConfiguration.sol"; import "./SpotMarketFactory.sol"; diff --git a/markets/spot-market/contracts/storage/AsyncOrderConfiguration.sol b/markets/spot-market/contracts/storage/AsyncOrderConfiguration.sol index ff6b902446..381ce6c208 100644 --- a/markets/spot-market/contracts/storage/AsyncOrderConfiguration.sol +++ b/markets/spot-market/contracts/storage/AsyncOrderConfiguration.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./AsyncOrderClaim.sol"; diff --git a/markets/spot-market/contracts/storage/Price.sol b/markets/spot-market/contracts/storage/Price.sol index 40e801f788..912e298f03 100644 --- a/markets/spot-market/contracts/storage/Price.sol +++ b/markets/spot-market/contracts/storage/Price.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/oracle-manager/contracts/interfaces/INodeModule.sol"; import "@synthetixio/oracle-manager/contracts/storage/NodeOutput.sol"; diff --git a/markets/spot-market/contracts/storage/SpotMarketFactory.sol b/markets/spot-market/contracts/storage/SpotMarketFactory.sol index 3cf1fb860c..88462344b3 100644 --- a/markets/spot-market/contracts/storage/SpotMarketFactory.sol +++ b/markets/spot-market/contracts/storage/SpotMarketFactory.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/ITokenModule.sol"; import "@synthetixio/oracle-manager/contracts/interfaces/INodeModule.sol"; diff --git a/markets/spot-market/contracts/storage/Wrapper.sol b/markets/spot-market/contracts/storage/Wrapper.sol index f4630561df..56666f91e8 100644 --- a/markets/spot-market/contracts/storage/Wrapper.sol +++ b/markets/spot-market/contracts/storage/Wrapper.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/ITokenModule.sol"; diff --git a/markets/spot-market/contracts/utils/AsyncOrderClaimTokenUtil.sol b/markets/spot-market/contracts/utils/AsyncOrderClaimTokenUtil.sol index b0a3875dbf..63d490f70b 100644 --- a/markets/spot-market/contracts/utils/AsyncOrderClaimTokenUtil.sol +++ b/markets/spot-market/contracts/utils/AsyncOrderClaimTokenUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/INftModule.sol"; import "@synthetixio/core-modules/contracts/storage/AssociatedSystem.sol"; diff --git a/markets/spot-market/contracts/utils/FeeUtil.sol b/markets/spot-market/contracts/utils/FeeUtil.sol index 6164a16750..9359f60954 100644 --- a/markets/spot-market/contracts/utils/FeeUtil.sol +++ b/markets/spot-market/contracts/utils/FeeUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; diff --git a/markets/spot-market/contracts/utils/SynthUtil.sol b/markets/spot-market/contracts/utils/SynthUtil.sol index ec103d2c80..e6bd5cbb17 100644 --- a/markets/spot-market/contracts/utils/SynthUtil.sol +++ b/markets/spot-market/contracts/utils/SynthUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/ITokenModule.sol"; import "@synthetixio/core-modules/contracts/storage/AssociatedSystem.sol"; diff --git a/markets/spot-market/storage.dump.sol b/markets/spot-market/storage.dump.sol new file mode 100644 index 0000000000..6e267ef844 --- /dev/null +++ b/markets/spot-market/storage.dump.sol @@ -0,0 +1,297 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity >=0.8.11 < 0.9.0; + +// @custom:artifact @synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol:OwnableStorage +library OwnableStorage { + bytes32 private constant _SLOT_OWNABLE_STORAGE = keccak256(abi.encode("io.synthetix.core-contracts.Ownable")); + struct Data { + bool initialized; + address owner; + address nominatedOwner; + } + function load() internal pure returns (Data storage store) { + bytes32 s = _SLOT_OWNABLE_STORAGE; + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-contracts/contracts/proxy/ProxyStorage.sol:ProxyStorage +contract ProxyStorage { + bytes32 private constant _SLOT_PROXY_STORAGE = keccak256(abi.encode("io.synthetix.core-contracts.Proxy")); + struct ProxyStore { + address implementation; + bool simulatingUpgrade; + } + function _proxyStore() internal pure returns (ProxyStore storage store) { + bytes32 s = _SLOT_PROXY_STORAGE; + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-contracts/contracts/token/ERC20Storage.sol:ERC20Storage +library ERC20Storage { + bytes32 private constant _SLOT_ERC20_STORAGE = keccak256(abi.encode("io.synthetix.core-contracts.ERC20")); + struct Data { + string name; + string symbol; + uint8 decimals; + mapping(address => uint256) balanceOf; + mapping(address => mapping(address => uint256)) allowance; + uint256 totalSupply; + } + function load() internal pure returns (Data storage store) { + bytes32 s = _SLOT_ERC20_STORAGE; + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-contracts/contracts/token/ERC721EnumerableStorage.sol:ERC721EnumerableStorage +library ERC721EnumerableStorage { + bytes32 private constant _SLOT_ERC721_ENUMERABLE_STORAGE = keccak256(abi.encode("io.synthetix.core-contracts.ERC721Enumerable")); + struct Data { + mapping(uint256 => uint256) ownedTokensIndex; + mapping(uint256 => uint256) allTokensIndex; + mapping(address => mapping(uint256 => uint256)) ownedTokens; + uint256[] allTokens; + } + function load() internal pure returns (Data storage store) { + bytes32 s = _SLOT_ERC721_ENUMERABLE_STORAGE; + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-contracts/contracts/token/ERC721Storage.sol:ERC721Storage +library ERC721Storage { + bytes32 private constant _SLOT_ERC721_STORAGE = keccak256(abi.encode("io.synthetix.core-contracts.ERC721")); + struct Data { + string name; + string symbol; + string baseTokenURI; + mapping(uint256 => address) ownerOf; + mapping(address => uint256) balanceOf; + mapping(uint256 => address) tokenApprovals; + mapping(address => mapping(address => bool)) operatorApprovals; + } + function load() internal pure returns (Data storage store) { + bytes32 s = _SLOT_ERC721_STORAGE; + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-contracts/contracts/utils/DecimalMath.sol:DecimalMath +library DecimalMath { + uint256 public constant UNIT = 1e18; + int256 public constant UNIT_INT = int256(UNIT); + uint128 public constant UNIT_UINT128 = uint128(UNIT); + int128 public constant UNIT_INT128 = int128(UNIT_INT); + uint256 public constant UNIT_PRECISE = 1e27; + int256 public constant UNIT_PRECISE_INT = int256(UNIT_PRECISE); + int128 public constant UNIT_PRECISE_INT128 = int128(UNIT_PRECISE_INT); + uint256 public constant PRECISION_FACTOR = 9; +} + +// @custom:artifact @synthetixio/core-modules/contracts/modules/NftModule.sol:NftModule +contract NftModule { + bytes32 internal constant _INITIALIZED_NAME = "NftModule"; +} + +// @custom:artifact @synthetixio/core-modules/contracts/storage/AssociatedSystem.sol:AssociatedSystem +library AssociatedSystem { + bytes32 public constant KIND_ERC20 = "erc20"; + bytes32 public constant KIND_ERC721 = "erc721"; + bytes32 public constant KIND_UNMANAGED = "unmanaged"; + struct Data { + address proxy; + address impl; + bytes32 kind; + } + function load(bytes32 id) internal pure returns (Data storage store) { + bytes32 s = keccak256(abi.encode("io.synthetix.core-modules.AssociatedSystem", id)); + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-modules/contracts/storage/DecayToken.sol:DecayToken +library DecayToken { + bytes32 private constant _SLOT_DECAY_TOKEN_STORAGE = keccak256(abi.encode("io.synthetix.core-modules.DecayToken")); + struct Data { + uint256 interestRate; + uint256 epochStart; + uint256 totalSupplyAtEpochStart; + } + function load() internal pure returns (Data storage store) { + bytes32 s = _SLOT_DECAY_TOKEN_STORAGE; + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/core-modules/contracts/storage/Initialized.sol:Initialized +library Initialized { + struct Data { + bool initialized; + } + function load(bytes32 id) internal pure returns (Data storage store) { + bytes32 s = keccak256(abi.encode("io.synthetix.code-modules.Initialized", id)); + assembly { + store.slot := s + } + } +} + +// @custom:artifact @synthetixio/oracle-manager/contracts/storage/NodeOutput.sol:Node +library Node { + struct Data { + int256 price; + uint timestamp; + uint volatilityScore; + uint liquidityScore; + } +} + +// @custom:artifact @synthetixio/oracle-manager/contracts/storage/NodeDefinition.sol:NodeDefinition +library NodeDefinition { + enum NodeType { + NONE, + REDUCER, + EXTERNAL, + CHAINLINK, + PYTH, + PriceDeviationCircuitBreaker, + UNISWAP, + StalenessCircuitBreaker + } + struct Data { + bytes32[] parents; + NodeType nodeType; + bytes parameters; + } + function load(bytes32 id) internal pure returns (Data storage data) { + bytes32 s = keccak256(abi.encode("io.synthetix.oracle-manager.Node", id)); + assembly { + data.slot := s + } + } +} + +// @custom:artifact contracts/storage/AsyncOrderConfiguration.sol:AsyncOrder +library AsyncOrder { + struct Data { + mapping(uint256 => AsyncOrderClaim.Data) asyncOrderClaims; + uint256 minimumOrderAge; + uint256 settlementWindowDuration; + uint256 livePriceSettlementWindowDuration; + mapping(address => uint256) escrowedSynthShares; + uint256 totalEscrowedSynthShares; + } + function load(uint128 marketId) internal pure returns (Data storage store) { + bytes32 s = keccak256(abi.encode("io.synthetix.spot-market.AsyncOrder", marketId)); + assembly { + store.slot := s + } + } +} + +// @custom:artifact contracts/storage/AsyncOrderClaim.sol:AsyncOrderClaim +library AsyncOrderClaim { + struct Data { + SpotMarketFactory.TransactionType orderType; + uint256 synthAmountEscrowed; + uint256 usdAmountEscrowed; + uint256 blockNumber; + uint256 timestamp; + } +} + +// @custom:artifact contracts/storage/Fee.sol:Fee +library Fee { + struct Data { + mapping(address => uint) atomicFixedFeeOverrides; + uint atomicFixedFee; + uint asyncFixedFee; + uint utilizationFeeRate; + int wrapFixedFee; + int unwrapFixedFee; + uint skewScale; + address feeCollector; + } + function load(uint128 marketId) internal pure returns (Data storage store) { + bytes32 s = keccak256(abi.encode("io.synthetix.spot-market.Fee", marketId)); + assembly { + store.slot := s + } + } +} + +// @custom:artifact contracts/storage/Price.sol:Price +library Price { + struct Data { + bytes32 buyFeedId; + bytes32 sellFeedId; + } + function load(uint128 marketId) internal pure returns (Data storage store) { + bytes32 s = keccak256(abi.encode("io.synthetix.spot-market.Price", marketId)); + assembly { + store.slot := s + } + } +} + +// @custom:artifact contracts/storage/SpotMarketFactory.sol:SpotMarketFactory +library SpotMarketFactory { + bytes32 private constant _SLOT_SPOT_MARKET_FACTORY = keccak256(abi.encode("io.synthetix.spot-market.SpotMarketFactory")); + enum TransactionType { + BUY, + SELL, + ASYNC_BUY, + ASYNC_SELL, + WRAP, + UNWRAP + } + struct Data { + address usdToken; + address oracle; + address synthetix; + address initialSynthImplementation; + address initialAsyncOrderClaimImplementation; + mapping(uint128 => address) synthOwners; + } + function load() internal pure returns (Data storage store) { + bytes32 s = _SLOT_SPOT_MARKET_FACTORY; + assembly { + store.slot := s + } + } +} + +// @custom:artifact contracts/storage/Wrapper.sol:Wrapper +library Wrapper { + struct Data { + address collateralType; + bool wrappingEnabled; + } + function load(uint128 marketId) internal pure returns (Data storage store) { + bytes32 s = keccak256(abi.encode("io.synthetix.spot-market.Wrapper", marketId)); + assembly { + store.slot := s + } + } +} + +// @custom:artifact hardhat/console.sol:console +library console { + address internal constant CONSOLE_ADDRESS = address(0x000000000000000000636F6e736F6c652e6c6f67); +} diff --git a/protocol/oracle-manager/contracts/Dependencies.sol b/protocol/oracle-manager/contracts/Dependencies.sol index 1b2a0234c6..0b52524065 100644 --- a/protocol/oracle-manager/contracts/Dependencies.sol +++ b/protocol/oracle-manager/contracts/Dependencies.sol @@ -1,4 +1,4 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/main/contracts/mocks/AggregatorV3Mock.sol"; diff --git a/protocol/oracle-manager/contracts/Proxy.sol b/protocol/oracle-manager/contracts/Proxy.sol index 10bf4f7ed7..b21a38e5ac 100644 --- a/protocol/oracle-manager/contracts/Proxy.sol +++ b/protocol/oracle-manager/contracts/Proxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UUPSProxyWithOwner} from "@synthetixio/core-contracts/contracts/proxy/UUPSProxyWithOwner.sol"; import {OwnableStorage} from "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; diff --git a/protocol/oracle-manager/contracts/interfaces/INodeModule.sol b/protocol/oracle-manager/contracts/interfaces/INodeModule.sol index 62c9054cd0..7836467938 100644 --- a/protocol/oracle-manager/contracts/interfaces/INodeModule.sol +++ b/protocol/oracle-manager/contracts/interfaces/INodeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/NodeOutput.sol"; import "../storage/NodeDefinition.sol"; diff --git a/protocol/oracle-manager/contracts/interfaces/external/IAggregatorV3Interface.sol b/protocol/oracle-manager/contracts/interfaces/external/IAggregatorV3Interface.sol index b3a53604ad..0cb6506e90 100644 --- a/protocol/oracle-manager/contracts/interfaces/external/IAggregatorV3Interface.sol +++ b/protocol/oracle-manager/contracts/interfaces/external/IAggregatorV3Interface.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /// @title Interface an aggregator needs to adhere. interface IAggregatorV3Interface { diff --git a/protocol/oracle-manager/contracts/interfaces/external/IExternalNode.sol b/protocol/oracle-manager/contracts/interfaces/external/IExternalNode.sol index 9f1f73284f..55d58f0dde 100644 --- a/protocol/oracle-manager/contracts/interfaces/external/IExternalNode.sol +++ b/protocol/oracle-manager/contracts/interfaces/external/IExternalNode.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC165.sol"; diff --git a/protocol/oracle-manager/contracts/interfaces/external/IPyth.sol b/protocol/oracle-manager/contracts/interfaces/external/IPyth.sol index 18f64b93d3..72e075ec8d 100644 --- a/protocol/oracle-manager/contracts/interfaces/external/IPyth.sol +++ b/protocol/oracle-manager/contracts/interfaces/external/IPyth.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /// @title Consume prices from the Pyth Network (https://pyth.network/). /// @dev Please refer to the guidance at https://docs.pyth.network/consumers/best-practices for how to consume prices safely. diff --git a/protocol/oracle-manager/contracts/interfaces/external/IUniswapV3Pool.sol b/protocol/oracle-manager/contracts/interfaces/external/IUniswapV3Pool.sol index 9155dc3cba..a1320fe2cf 100644 --- a/protocol/oracle-manager/contracts/interfaces/external/IUniswapV3Pool.sol +++ b/protocol/oracle-manager/contracts/interfaces/external/IUniswapV3Pool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IUniswapV3Pool { function observe( diff --git a/protocol/oracle-manager/contracts/mocks/MockChainlinkAggregator.sol b/protocol/oracle-manager/contracts/mocks/MockChainlinkAggregator.sol index 277f0e476a..494cab70b4 100644 --- a/protocol/oracle-manager/contracts/mocks/MockChainlinkAggregator.sol +++ b/protocol/oracle-manager/contracts/mocks/MockChainlinkAggregator.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/external/IAggregatorV3Interface.sol"; diff --git a/protocol/oracle-manager/contracts/mocks/MockV3Aggregator.sol b/protocol/oracle-manager/contracts/mocks/MockV3Aggregator.sol index 3f6d817d0a..73d1875265 100644 --- a/protocol/oracle-manager/contracts/mocks/MockV3Aggregator.sol +++ b/protocol/oracle-manager/contracts/mocks/MockV3Aggregator.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/external/IAggregatorV3Interface.sol"; diff --git a/protocol/oracle-manager/contracts/mocks/pyth/AbstractPyth.sol b/protocol/oracle-manager/contracts/mocks/pyth/AbstractPyth.sol index 2dfa04a9a1..c4b7464e1a 100644 --- a/protocol/oracle-manager/contracts/mocks/pyth/AbstractPyth.sol +++ b/protocol/oracle-manager/contracts/mocks/pyth/AbstractPyth.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./PythStructs.sol"; import "./IPyth.sol"; diff --git a/protocol/oracle-manager/contracts/mocks/pyth/IPyth.sol b/protocol/oracle-manager/contracts/mocks/pyth/IPyth.sol index cbcff81bce..bbb2999e7d 100644 --- a/protocol/oracle-manager/contracts/mocks/pyth/IPyth.sol +++ b/protocol/oracle-manager/contracts/mocks/pyth/IPyth.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./PythStructs.sol"; import "./IPythEvents.sol"; diff --git a/protocol/oracle-manager/contracts/mocks/pyth/IPythEvents.sol b/protocol/oracle-manager/contracts/mocks/pyth/IPythEvents.sol index 2ca4984b5b..b420b173ba 100644 --- a/protocol/oracle-manager/contracts/mocks/pyth/IPythEvents.sol +++ b/protocol/oracle-manager/contracts/mocks/pyth/IPythEvents.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /// @title IPythEvents contains the events that Pyth contract emits. /// @dev This interface can be used for listening to the updates for off-chain and testing purposes. diff --git a/protocol/oracle-manager/contracts/mocks/pyth/MockPyth.sol b/protocol/oracle-manager/contracts/mocks/pyth/MockPyth.sol index 69dfcfe821..adbeda7756 100644 --- a/protocol/oracle-manager/contracts/mocks/pyth/MockPyth.sol +++ b/protocol/oracle-manager/contracts/mocks/pyth/MockPyth.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./AbstractPyth.sol"; import "./PythStructs.sol"; diff --git a/protocol/oracle-manager/contracts/mocks/pyth/PythErrors.sol b/protocol/oracle-manager/contracts/mocks/pyth/PythErrors.sol index b134f9d8e8..46700bc466 100644 --- a/protocol/oracle-manager/contracts/mocks/pyth/PythErrors.sol +++ b/protocol/oracle-manager/contracts/mocks/pyth/PythErrors.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache 2 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library PythErrors { // Function arguments are invalid (e.g., the arguments lengths mismatch) diff --git a/protocol/oracle-manager/contracts/mocks/pyth/PythStructs.sol b/protocol/oracle-manager/contracts/mocks/pyth/PythStructs.sol index a0fa5290c0..a5088f75f8 100644 --- a/protocol/oracle-manager/contracts/mocks/pyth/PythStructs.sol +++ b/protocol/oracle-manager/contracts/mocks/pyth/PythStructs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract PythStructs { // A price with a degree of uncertainty, represented as a price +- a confidence interval. diff --git a/protocol/oracle-manager/contracts/modules/CoreModule.sol b/protocol/oracle-manager/contracts/modules/CoreModule.sol index 2d540460f3..c5dd32bb82 100644 --- a/protocol/oracle-manager/contracts/modules/CoreModule.sol +++ b/protocol/oracle-manager/contracts/modules/CoreModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {CoreModule as BaseCoreModule} from "@synthetixio/core-modules/contracts/modules/CoreModule.sol"; diff --git a/protocol/oracle-manager/contracts/modules/NodeModule.sol b/protocol/oracle-manager/contracts/modules/NodeModule.sol index 1d2473f59c..4e7541d6d6 100644 --- a/protocol/oracle-manager/contracts/modules/NodeModule.sol +++ b/protocol/oracle-manager/contracts/modules/NodeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/INodeModule.sol"; import "../nodes/ReducerNode.sol"; diff --git a/protocol/oracle-manager/contracts/nodes/ChainlinkNode.sol b/protocol/oracle-manager/contracts/nodes/ChainlinkNode.sol index 4a64d858e9..96ef1042ba 100644 --- a/protocol/oracle-manager/contracts/nodes/ChainlinkNode.sol +++ b/protocol/oracle-manager/contracts/nodes/ChainlinkNode.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; diff --git a/protocol/oracle-manager/contracts/nodes/ExternalNode.sol b/protocol/oracle-manager/contracts/nodes/ExternalNode.sol index 9405fdfab2..c37bb05dbf 100644 --- a/protocol/oracle-manager/contracts/nodes/ExternalNode.sol +++ b/protocol/oracle-manager/contracts/nodes/ExternalNode.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/ERC165Helper.sol"; diff --git a/protocol/oracle-manager/contracts/nodes/PriceDeviationCircuitBreakerNode.sol b/protocol/oracle-manager/contracts/nodes/PriceDeviationCircuitBreakerNode.sol index 9b05fbabab..10c5a3fda8 100644 --- a/protocol/oracle-manager/contracts/nodes/PriceDeviationCircuitBreakerNode.sol +++ b/protocol/oracle-manager/contracts/nodes/PriceDeviationCircuitBreakerNode.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; diff --git a/protocol/oracle-manager/contracts/nodes/PythNode.sol b/protocol/oracle-manager/contracts/nodes/PythNode.sol index 7de91580e9..dcbe6a5879 100644 --- a/protocol/oracle-manager/contracts/nodes/PythNode.sol +++ b/protocol/oracle-manager/contracts/nodes/PythNode.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/NodeDefinition.sol"; import "../storage/NodeOutput.sol"; diff --git a/protocol/oracle-manager/contracts/nodes/ReducerNode.sol b/protocol/oracle-manager/contracts/nodes/ReducerNode.sol index 66a2fcf2a0..63d292c250 100644 --- a/protocol/oracle-manager/contracts/nodes/ReducerNode.sol +++ b/protocol/oracle-manager/contracts/nodes/ReducerNode.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; diff --git a/protocol/oracle-manager/contracts/nodes/StalenessCircuitBreakerNode.sol b/protocol/oracle-manager/contracts/nodes/StalenessCircuitBreakerNode.sol index 5d3634f122..9a90e2ebcf 100644 --- a/protocol/oracle-manager/contracts/nodes/StalenessCircuitBreakerNode.sol +++ b/protocol/oracle-manager/contracts/nodes/StalenessCircuitBreakerNode.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/NodeDefinition.sol"; import "../storage/NodeOutput.sol"; diff --git a/protocol/oracle-manager/contracts/storage/NodeDefinition.sol b/protocol/oracle-manager/contracts/storage/NodeDefinition.sol index ee4b48fd23..f7d2c38af5 100644 --- a/protocol/oracle-manager/contracts/storage/NodeDefinition.sol +++ b/protocol/oracle-manager/contracts/storage/NodeDefinition.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library NodeDefinition { enum NodeType { diff --git a/protocol/oracle-manager/contracts/storage/NodeOutput.sol b/protocol/oracle-manager/contracts/storage/NodeOutput.sol index 272d1ee021..9fc04d5cde 100644 --- a/protocol/oracle-manager/contracts/storage/NodeOutput.sol +++ b/protocol/oracle-manager/contracts/storage/NodeOutput.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library NodeOutput { struct Data { diff --git a/protocol/synthetix/contracts/Proxy.sol b/protocol/synthetix/contracts/Proxy.sol index 10bf4f7ed7..b21a38e5ac 100644 --- a/protocol/synthetix/contracts/Proxy.sol +++ b/protocol/synthetix/contracts/Proxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UUPSProxyWithOwner} from "@synthetixio/core-contracts/contracts/proxy/UUPSProxyWithOwner.sol"; import {OwnableStorage} from "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; diff --git a/protocol/synthetix/contracts/interfaces/IAccountModule.sol b/protocol/synthetix/contracts/interfaces/IAccountModule.sol index 8a65996ad4..fef8f34116 100644 --- a/protocol/synthetix/contracts/interfaces/IAccountModule.sol +++ b/protocol/synthetix/contracts/interfaces/IAccountModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for managing accounts. diff --git a/protocol/synthetix/contracts/interfaces/IAccountTokenModule.sol b/protocol/synthetix/contracts/interfaces/IAccountTokenModule.sol index 455e587bad..c2ffa42e88 100644 --- a/protocol/synthetix/contracts/interfaces/IAccountTokenModule.sol +++ b/protocol/synthetix/contracts/interfaces/IAccountTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/INftModule.sol"; diff --git a/protocol/synthetix/contracts/interfaces/IAssociateDebtModule.sol b/protocol/synthetix/contracts/interfaces/IAssociateDebtModule.sol index 1a063e20cf..e1f8233841 100644 --- a/protocol/synthetix/contracts/interfaces/IAssociateDebtModule.sol +++ b/protocol/synthetix/contracts/interfaces/IAssociateDebtModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/INftModule.sol"; diff --git a/protocol/synthetix/contracts/interfaces/ICollateralConfigurationModule.sol b/protocol/synthetix/contracts/interfaces/ICollateralConfigurationModule.sol index 0f8f83c824..40781e960e 100644 --- a/protocol/synthetix/contracts/interfaces/ICollateralConfigurationModule.sol +++ b/protocol/synthetix/contracts/interfaces/ICollateralConfigurationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/CollateralConfiguration.sol"; diff --git a/protocol/synthetix/contracts/interfaces/ICollateralModule.sol b/protocol/synthetix/contracts/interfaces/ICollateralModule.sol index 20a079f30e..bd09a8113a 100644 --- a/protocol/synthetix/contracts/interfaces/ICollateralModule.sol +++ b/protocol/synthetix/contracts/interfaces/ICollateralModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/CollateralConfiguration.sol"; diff --git a/protocol/synthetix/contracts/interfaces/IIssueUSDModule.sol b/protocol/synthetix/contracts/interfaces/IIssueUSDModule.sol index 196a81ece6..5ac9251512 100644 --- a/protocol/synthetix/contracts/interfaces/IIssueUSDModule.sol +++ b/protocol/synthetix/contracts/interfaces/IIssueUSDModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for the minting and burning of stablecoins. diff --git a/protocol/synthetix/contracts/interfaces/ILiquidationModule.sol b/protocol/synthetix/contracts/interfaces/ILiquidationModule.sol index 9c7b43f1c7..de13adb62b 100644 --- a/protocol/synthetix/contracts/interfaces/ILiquidationModule.sol +++ b/protocol/synthetix/contracts/interfaces/ILiquidationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for liquidated positions and vaults that are below the liquidation ratio. diff --git a/protocol/synthetix/contracts/interfaces/IMarketCollateralModule.sol b/protocol/synthetix/contracts/interfaces/IMarketCollateralModule.sol index e0ad724783..ef81f0748b 100644 --- a/protocol/synthetix/contracts/interfaces/IMarketCollateralModule.sol +++ b/protocol/synthetix/contracts/interfaces/IMarketCollateralModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for allowing markets to directly increase their credit capacity by providing their own collateral. diff --git a/protocol/synthetix/contracts/interfaces/IMarketManagerModule.sol b/protocol/synthetix/contracts/interfaces/IMarketManagerModule.sol index d319790fd8..f35d8cac07 100644 --- a/protocol/synthetix/contracts/interfaces/IMarketManagerModule.sol +++ b/protocol/synthetix/contracts/interfaces/IMarketManagerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title System-wide entry point for the management of markets connected to the system. diff --git a/protocol/synthetix/contracts/interfaces/IMulticallModule.sol b/protocol/synthetix/contracts/interfaces/IMulticallModule.sol index 27abd1db75..89585c0ac8 100644 --- a/protocol/synthetix/contracts/interfaces/IMulticallModule.sol +++ b/protocol/synthetix/contracts/interfaces/IMulticallModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module that enables calling multiple methods of the system in a single transaction. diff --git a/protocol/synthetix/contracts/interfaces/IPoolConfigurationModule.sol b/protocol/synthetix/contracts/interfaces/IPoolConfigurationModule.sol index cc464accb7..d780d032cd 100644 --- a/protocol/synthetix/contracts/interfaces/IPoolConfigurationModule.sol +++ b/protocol/synthetix/contracts/interfaces/IPoolConfigurationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module that allows the system owner to mark official pools. diff --git a/protocol/synthetix/contracts/interfaces/IPoolModule.sol b/protocol/synthetix/contracts/interfaces/IPoolModule.sol index f33a519be0..7fb90d3190 100644 --- a/protocol/synthetix/contracts/interfaces/IPoolModule.sol +++ b/protocol/synthetix/contracts/interfaces/IPoolModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/MarketConfiguration.sol"; diff --git a/protocol/synthetix/contracts/interfaces/IRewardsManagerModule.sol b/protocol/synthetix/contracts/interfaces/IRewardsManagerModule.sol index 64acb2a5c4..0fa277d1e3 100644 --- a/protocol/synthetix/contracts/interfaces/IRewardsManagerModule.sol +++ b/protocol/synthetix/contracts/interfaces/IRewardsManagerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for connecting rewards distributors to vaults. diff --git a/protocol/synthetix/contracts/interfaces/IUSDTokenModule.sol b/protocol/synthetix/contracts/interfaces/IUSDTokenModule.sol index 3897337dfd..f1552965a2 100644 --- a/protocol/synthetix/contracts/interfaces/IUSDTokenModule.sol +++ b/protocol/synthetix/contracts/interfaces/IUSDTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/ITokenModule.sol"; diff --git a/protocol/synthetix/contracts/interfaces/IUtilsModule.sol b/protocol/synthetix/contracts/interfaces/IUtilsModule.sol index f6d26f9076..4e26e47c0b 100644 --- a/protocol/synthetix/contracts/interfaces/IUtilsModule.sol +++ b/protocol/synthetix/contracts/interfaces/IUtilsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module with assorted utility functions. diff --git a/protocol/synthetix/contracts/interfaces/IVaultModule.sol b/protocol/synthetix/contracts/interfaces/IVaultModule.sol index 4a599f3ee6..a7b586b49a 100644 --- a/protocol/synthetix/contracts/interfaces/IVaultModule.sol +++ b/protocol/synthetix/contracts/interfaces/IVaultModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Allows accounts to delegate collateral to a pool. diff --git a/protocol/synthetix/contracts/interfaces/external/IAggregatorV3Interface.sol b/protocol/synthetix/contracts/interfaces/external/IAggregatorV3Interface.sol index b3a53604ad..0cb6506e90 100644 --- a/protocol/synthetix/contracts/interfaces/external/IAggregatorV3Interface.sol +++ b/protocol/synthetix/contracts/interfaces/external/IAggregatorV3Interface.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /// @title Interface an aggregator needs to adhere. interface IAggregatorV3Interface { diff --git a/protocol/synthetix/contracts/interfaces/external/IAny2EVMMessageReceiverInterface.sol b/protocol/synthetix/contracts/interfaces/external/IAny2EVMMessageReceiverInterface.sol index b2b673c7f6..82a711e3b9 100644 --- a/protocol/synthetix/contracts/interfaces/external/IAny2EVMMessageReceiverInterface.sol +++ b/protocol/synthetix/contracts/interfaces/external/IAny2EVMMessageReceiverInterface.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; diff --git a/protocol/synthetix/contracts/interfaces/external/IEVM2AnySubscriptionOnRampRouterInterface.sol b/protocol/synthetix/contracts/interfaces/external/IEVM2AnySubscriptionOnRampRouterInterface.sol index fc6eb6f08d..d9fe5e2f7e 100644 --- a/protocol/synthetix/contracts/interfaces/external/IEVM2AnySubscriptionOnRampRouterInterface.sol +++ b/protocol/synthetix/contracts/interfaces/external/IEVM2AnySubscriptionOnRampRouterInterface.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; diff --git a/protocol/synthetix/contracts/interfaces/external/IMarket.sol b/protocol/synthetix/contracts/interfaces/external/IMarket.sol index cb8a4bfbf1..26e61a0d8e 100644 --- a/protocol/synthetix/contracts/interfaces/external/IMarket.sol +++ b/protocol/synthetix/contracts/interfaces/external/IMarket.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC165.sol"; diff --git a/protocol/synthetix/contracts/interfaces/external/IRewardDistributor.sol b/protocol/synthetix/contracts/interfaces/external/IRewardDistributor.sol index 77ce88c3ed..036ae0afdf 100644 --- a/protocol/synthetix/contracts/interfaces/external/IRewardDistributor.sol +++ b/protocol/synthetix/contracts/interfaces/external/IRewardDistributor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC165.sol"; diff --git a/protocol/synthetix/contracts/mocks/AggregatorV3Mock.sol b/protocol/synthetix/contracts/mocks/AggregatorV3Mock.sol index a377199226..ab39262f8b 100644 --- a/protocol/synthetix/contracts/mocks/AggregatorV3Mock.sol +++ b/protocol/synthetix/contracts/mocks/AggregatorV3Mock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/external/IAggregatorV3Interface.sol"; diff --git a/protocol/synthetix/contracts/mocks/CollateralMock.sol b/protocol/synthetix/contracts/mocks/CollateralMock.sol index 35703b60bf..4f14fb8902 100644 --- a/protocol/synthetix/contracts/mocks/CollateralMock.sol +++ b/protocol/synthetix/contracts/mocks/CollateralMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/token/ERC20.sol"; diff --git a/protocol/synthetix/contracts/mocks/MockMarket.sol b/protocol/synthetix/contracts/mocks/MockMarket.sol index 45f74f33df..5f4ac276b4 100644 --- a/protocol/synthetix/contracts/mocks/MockMarket.sol +++ b/protocol/synthetix/contracts/mocks/MockMarket.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; diff --git a/protocol/synthetix/contracts/mocks/RewardDistributorMock.sol b/protocol/synthetix/contracts/mocks/RewardDistributorMock.sol index b711e469aa..7e8e40a359 100644 --- a/protocol/synthetix/contracts/mocks/RewardDistributorMock.sol +++ b/protocol/synthetix/contracts/mocks/RewardDistributorMock.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; import "@synthetixio/core-contracts/contracts/errors/AccessError.sol"; diff --git a/protocol/synthetix/contracts/modules/InitialModuleBundle.sol b/protocol/synthetix/contracts/modules/InitialModuleBundle.sol index bf643776a4..594a309cc6 100644 --- a/protocol/synthetix/contracts/modules/InitialModuleBundle.sol +++ b/protocol/synthetix/contracts/modules/InitialModuleBundle.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/modules/OwnerModule.sol"; import "@synthetixio/core-modules/contracts/modules/UpgradeModule.sol"; diff --git a/protocol/synthetix/contracts/modules/account/AccountTokenModule.sol b/protocol/synthetix/contracts/modules/account/AccountTokenModule.sol index 75dd11213e..8795e54680 100644 --- a/protocol/synthetix/contracts/modules/account/AccountTokenModule.sol +++ b/protocol/synthetix/contracts/modules/account/AccountTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/modules/NftModule.sol"; import "../../../contracts/interfaces/IAccountTokenModule.sol"; diff --git a/protocol/synthetix/contracts/modules/associated-systems/AssociatedSystemsModule.sol b/protocol/synthetix/contracts/modules/associated-systems/AssociatedSystemsModule.sol index f45a0f371f..c86dc600fe 100644 --- a/protocol/synthetix/contracts/modules/associated-systems/AssociatedSystemsModule.sol +++ b/protocol/synthetix/contracts/modules/associated-systems/AssociatedSystemsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {AssociatedSystemsModule as BaseAssociatedSystemsModule} from "@synthetixio/core-modules/contracts/modules/AssociatedSystemsModule.sol"; diff --git a/protocol/synthetix/contracts/modules/common/OwnerModule.sol b/protocol/synthetix/contracts/modules/common/OwnerModule.sol index 34b4106c87..b02472f64a 100644 --- a/protocol/synthetix/contracts/modules/common/OwnerModule.sol +++ b/protocol/synthetix/contracts/modules/common/OwnerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {OwnerModule as BaseOwnerModule} from "@synthetixio/core-modules/contracts/modules/OwnerModule.sol"; diff --git a/protocol/synthetix/contracts/modules/common/UpgradeModule.sol b/protocol/synthetix/contracts/modules/common/UpgradeModule.sol index 70a5a94103..0d33b6725d 100644 --- a/protocol/synthetix/contracts/modules/common/UpgradeModule.sol +++ b/protocol/synthetix/contracts/modules/common/UpgradeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UpgradeModule as BaseUpgradeModule} from "@synthetixio/core-modules/contracts/modules/UpgradeModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/AccountModule.sol b/protocol/synthetix/contracts/modules/core/AccountModule.sol index c737d637d3..9ee2045d60 100644 --- a/protocol/synthetix/contracts/modules/core/AccountModule.sol +++ b/protocol/synthetix/contracts/modules/core/AccountModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-contracts/contracts/proxy/UUPSProxy.sol"; diff --git a/protocol/synthetix/contracts/modules/core/AssociateDebtModule.sol b/protocol/synthetix/contracts/modules/core/AssociateDebtModule.sol index 3f88ba6c4c..98bff18108 100644 --- a/protocol/synthetix/contracts/modules/core/AssociateDebtModule.sol +++ b/protocol/synthetix/contracts/modules/core/AssociateDebtModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IAssociateDebtModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/CollateralConfigurationModule.sol b/protocol/synthetix/contracts/modules/core/CollateralConfigurationModule.sol index 0cf956dae2..f976b0c674 100644 --- a/protocol/synthetix/contracts/modules/core/CollateralConfigurationModule.sol +++ b/protocol/synthetix/contracts/modules/core/CollateralConfigurationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; diff --git a/protocol/synthetix/contracts/modules/core/CollateralModule.sol b/protocol/synthetix/contracts/modules/core/CollateralModule.sol index 2ee8e1595b..2199f55fea 100644 --- a/protocol/synthetix/contracts/modules/core/CollateralModule.sol +++ b/protocol/synthetix/contracts/modules/core/CollateralModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-contracts/contracts/token/ERC20Helper.sol"; diff --git a/protocol/synthetix/contracts/modules/core/FeatureFlagModule.sol b/protocol/synthetix/contracts/modules/core/FeatureFlagModule.sol index 09cf93bff2..c6c9ebdb76 100644 --- a/protocol/synthetix/contracts/modules/core/FeatureFlagModule.sol +++ b/protocol/synthetix/contracts/modules/core/FeatureFlagModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {FeatureFlagModule as BaseFeatureFlagModule} from "@synthetixio/core-modules/contracts/modules/FeatureFlagModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/IssueUSDModule.sol b/protocol/synthetix/contracts/modules/core/IssueUSDModule.sol index f6b7fc3d96..30ecc2f42e 100644 --- a/protocol/synthetix/contracts/modules/core/IssueUSDModule.sol +++ b/protocol/synthetix/contracts/modules/core/IssueUSDModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IIssueUSDModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/LiquidationModule.sol b/protocol/synthetix/contracts/modules/core/LiquidationModule.sol index 02b71f314d..25e587acc9 100644 --- a/protocol/synthetix/contracts/modules/core/LiquidationModule.sol +++ b/protocol/synthetix/contracts/modules/core/LiquidationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/ILiquidationModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/MarketCollateralModule.sol b/protocol/synthetix/contracts/modules/core/MarketCollateralModule.sol index 97d2ee9b48..499f168779 100644 --- a/protocol/synthetix/contracts/modules/core/MarketCollateralModule.sol +++ b/protocol/synthetix/contracts/modules/core/MarketCollateralModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-contracts/contracts/token/ERC20Helper.sol"; diff --git a/protocol/synthetix/contracts/modules/core/MarketManagerModule.sol b/protocol/synthetix/contracts/modules/core/MarketManagerModule.sol index ed06eb4ea1..d5823ef3b1 100644 --- a/protocol/synthetix/contracts/modules/core/MarketManagerModule.sol +++ b/protocol/synthetix/contracts/modules/core/MarketManagerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IMarketManagerModule.sol"; import "../../interfaces/IUSDTokenModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/MulticallModule.sol b/protocol/synthetix/contracts/modules/core/MulticallModule.sol index 0daf82e8bf..caaf3c5baa 100644 --- a/protocol/synthetix/contracts/modules/core/MulticallModule.sol +++ b/protocol/synthetix/contracts/modules/core/MulticallModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IMulticallModule.sol"; diff --git a/protocol/synthetix/contracts/modules/core/PoolConfigurationModule.sol b/protocol/synthetix/contracts/modules/core/PoolConfigurationModule.sol index 437f57658c..0039c2f99d 100644 --- a/protocol/synthetix/contracts/modules/core/PoolConfigurationModule.sol +++ b/protocol/synthetix/contracts/modules/core/PoolConfigurationModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; diff --git a/protocol/synthetix/contracts/modules/core/PoolModule.sol b/protocol/synthetix/contracts/modules/core/PoolModule.sol index fd2db57661..888c95b33c 100644 --- a/protocol/synthetix/contracts/modules/core/PoolModule.sol +++ b/protocol/synthetix/contracts/modules/core/PoolModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-contracts/contracts/errors/AccessError.sol"; diff --git a/protocol/synthetix/contracts/modules/core/RewardsManagerModule.sol b/protocol/synthetix/contracts/modules/core/RewardsManagerModule.sol index 8adf7548cb..d9eaeca7ff 100644 --- a/protocol/synthetix/contracts/modules/core/RewardsManagerModule.sol +++ b/protocol/synthetix/contracts/modules/core/RewardsManagerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/errors/AccessError.sol"; import "@synthetixio/core-contracts/contracts/errors/ParameterError.sol"; diff --git a/protocol/synthetix/contracts/modules/core/UtilsModule.sol b/protocol/synthetix/contracts/modules/core/UtilsModule.sol index 4494992032..9eb73de686 100644 --- a/protocol/synthetix/contracts/modules/core/UtilsModule.sol +++ b/protocol/synthetix/contracts/modules/core/UtilsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-modules/contracts/interfaces/IAssociatedSystemsModule.sol"; import "@synthetixio/core-modules/contracts/storage/AssociatedSystem.sol"; diff --git a/protocol/synthetix/contracts/modules/core/VaultModule.sol b/protocol/synthetix/contracts/modules/core/VaultModule.sol index 4e58af8d2d..d453174ddc 100644 --- a/protocol/synthetix/contracts/modules/core/VaultModule.sol +++ b/protocol/synthetix/contracts/modules/core/VaultModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "@synthetixio/core-contracts/contracts/errors/AccessError.sol"; diff --git a/protocol/synthetix/contracts/modules/usd/USDTokenModule.sol b/protocol/synthetix/contracts/modules/usd/USDTokenModule.sol index dfb5510264..8cb939b925 100644 --- a/protocol/synthetix/contracts/modules/usd/USDTokenModule.sol +++ b/protocol/synthetix/contracts/modules/usd/USDTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/AuthorizableStorage.sol"; import "@synthetixio/core-modules/contracts/modules/TokenModule.sol"; diff --git a/protocol/synthetix/contracts/storage/Account.sol b/protocol/synthetix/contracts/storage/Account.sol index e69b672879..f68bfdd8e7 100644 --- a/protocol/synthetix/contracts/storage/Account.sol +++ b/protocol/synthetix/contracts/storage/Account.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./AccountRBAC.sol"; import "./Collateral.sol"; diff --git a/protocol/synthetix/contracts/storage/AccountRBAC.sol b/protocol/synthetix/contracts/storage/AccountRBAC.sol index 6b27ea8793..50bcf3834a 100644 --- a/protocol/synthetix/contracts/storage/AccountRBAC.sol +++ b/protocol/synthetix/contracts/storage/AccountRBAC.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./Account.sol"; diff --git a/protocol/synthetix/contracts/storage/Collateral.sol b/protocol/synthetix/contracts/storage/Collateral.sol index 7636fb1171..df8ba0690a 100644 --- a/protocol/synthetix/contracts/storage/Collateral.sol +++ b/protocol/synthetix/contracts/storage/Collateral.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; diff --git a/protocol/synthetix/contracts/storage/CollateralConfiguration.sol b/protocol/synthetix/contracts/storage/CollateralConfiguration.sol index f1d3384120..aff6368f3f 100644 --- a/protocol/synthetix/contracts/storage/CollateralConfiguration.sol +++ b/protocol/synthetix/contracts/storage/CollateralConfiguration.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; diff --git a/protocol/synthetix/contracts/storage/CollateralLock.sol b/protocol/synthetix/contracts/storage/CollateralLock.sol index 4b2bbd09c1..f467bd9fce 100644 --- a/protocol/synthetix/contracts/storage/CollateralLock.sol +++ b/protocol/synthetix/contracts/storage/CollateralLock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; diff --git a/protocol/synthetix/contracts/storage/Distribution.sol b/protocol/synthetix/contracts/storage/Distribution.sol index f1c2492802..256468bf52 100644 --- a/protocol/synthetix/contracts/storage/Distribution.sol +++ b/protocol/synthetix/contracts/storage/Distribution.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; diff --git a/protocol/synthetix/contracts/storage/DistributionActor.sol b/protocol/synthetix/contracts/storage/DistributionActor.sol index 8b6ae28dce..3787b7d36e 100644 --- a/protocol/synthetix/contracts/storage/DistributionActor.sol +++ b/protocol/synthetix/contracts/storage/DistributionActor.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Stores information for specific actors in a Distribution. diff --git a/protocol/synthetix/contracts/storage/Market.sol b/protocol/synthetix/contracts/storage/Market.sol index db5ec882e1..930529c41c 100644 --- a/protocol/synthetix/contracts/storage/Market.sol +++ b/protocol/synthetix/contracts/storage/Market.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; import "@synthetixio/core-contracts/contracts/utils/HeapUtil.sol"; diff --git a/protocol/synthetix/contracts/storage/MarketConfiguration.sol b/protocol/synthetix/contracts/storage/MarketConfiguration.sol index e1d86c2838..67361e661e 100644 --- a/protocol/synthetix/contracts/storage/MarketConfiguration.sol +++ b/protocol/synthetix/contracts/storage/MarketConfiguration.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; diff --git a/protocol/synthetix/contracts/storage/MarketCreator.sol b/protocol/synthetix/contracts/storage/MarketCreator.sol index c257671312..86f65fbd9a 100644 --- a/protocol/synthetix/contracts/storage/MarketCreator.sol +++ b/protocol/synthetix/contracts/storage/MarketCreator.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./Market.sol"; diff --git a/protocol/synthetix/contracts/storage/MarketPoolInfo.sol b/protocol/synthetix/contracts/storage/MarketPoolInfo.sol index 67a2dc45da..e6cff42378 100644 --- a/protocol/synthetix/contracts/storage/MarketPoolInfo.sol +++ b/protocol/synthetix/contracts/storage/MarketPoolInfo.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Stores information regarding a pool's relationship to a market, such that it can be added or removed from a distribution diff --git a/protocol/synthetix/contracts/storage/OracleManager.sol b/protocol/synthetix/contracts/storage/OracleManager.sol index 3559cb061b..c6fe89f27d 100644 --- a/protocol/synthetix/contracts/storage/OracleManager.sol +++ b/protocol/synthetix/contracts/storage/OracleManager.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Represents Oracle Manager diff --git a/protocol/synthetix/contracts/storage/Pool.sol b/protocol/synthetix/contracts/storage/Pool.sol index 6f2b128f56..99c489180c 100644 --- a/protocol/synthetix/contracts/storage/Pool.sol +++ b/protocol/synthetix/contracts/storage/Pool.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./Distribution.sol"; import "./MarketConfiguration.sol"; diff --git a/protocol/synthetix/contracts/storage/RewardDistribution.sol b/protocol/synthetix/contracts/storage/RewardDistribution.sol index 3804a42e45..ec248e1b6d 100644 --- a/protocol/synthetix/contracts/storage/RewardDistribution.sol +++ b/protocol/synthetix/contracts/storage/RewardDistribution.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; import "@synthetixio/core-contracts/contracts/errors/ParameterError.sol"; diff --git a/protocol/synthetix/contracts/storage/RewardDistributionClaimStatus.sol b/protocol/synthetix/contracts/storage/RewardDistributionClaimStatus.sol index 6b32ed43a6..24718e765f 100644 --- a/protocol/synthetix/contracts/storage/RewardDistributionClaimStatus.sol +++ b/protocol/synthetix/contracts/storage/RewardDistributionClaimStatus.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Tracks information per actor within a RewardDistribution. diff --git a/protocol/synthetix/contracts/storage/ScalableMapping.sol b/protocol/synthetix/contracts/storage/ScalableMapping.sol index ea7d1b32b8..1473a001ef 100644 --- a/protocol/synthetix/contracts/storage/ScalableMapping.sol +++ b/protocol/synthetix/contracts/storage/ScalableMapping.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; import "@synthetixio/core-contracts/contracts/utils/SafeCast.sol"; diff --git a/protocol/synthetix/contracts/storage/SystemPoolConfiguration.sol b/protocol/synthetix/contracts/storage/SystemPoolConfiguration.sol index d1cdd76ac0..0e5d582fbf 100644 --- a/protocol/synthetix/contracts/storage/SystemPoolConfiguration.sol +++ b/protocol/synthetix/contracts/storage/SystemPoolConfiguration.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; diff --git a/protocol/synthetix/contracts/storage/Vault.sol b/protocol/synthetix/contracts/storage/Vault.sol index 467faf5f80..4c0f45088b 100644 --- a/protocol/synthetix/contracts/storage/Vault.sol +++ b/protocol/synthetix/contracts/storage/Vault.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./VaultEpoch.sol"; import "./RewardDistribution.sol"; diff --git a/protocol/synthetix/contracts/storage/VaultEpoch.sol b/protocol/synthetix/contracts/storage/VaultEpoch.sol index f91761031d..5fd2de7e8f 100644 --- a/protocol/synthetix/contracts/storage/VaultEpoch.sol +++ b/protocol/synthetix/contracts/storage/VaultEpoch.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./Distribution.sol"; import "./ScalableMapping.sol"; diff --git a/protocol/synthetix/storage.dump.sol b/protocol/synthetix/storage.dump.sol index cf3d1e3cff..49aed064ea 100644 --- a/protocol/synthetix/storage.dump.sol +++ b/protocol/synthetix/storage.dump.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 < 0.9.0; // @custom:artifact @synthetixio/core-contracts/contracts/ownership/AuthorizableStorage.sol:AuthorizableStorage library AuthorizableStorage { diff --git a/utils/core-contracts/contracts/errors/AccessError.sol b/utils/core-contracts/contracts/errors/AccessError.sol index 1001aa3f6a..f0fba10aa4 100644 --- a/utils/core-contracts/contracts/errors/AccessError.sol +++ b/utils/core-contracts/contracts/errors/AccessError.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Library for access related errors. diff --git a/utils/core-contracts/contracts/errors/AddressError.sol b/utils/core-contracts/contracts/errors/AddressError.sol index 65b011ba66..5ea1aa5c9e 100644 --- a/utils/core-contracts/contracts/errors/AddressError.sol +++ b/utils/core-contracts/contracts/errors/AddressError.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Library for address related errors. diff --git a/utils/core-contracts/contracts/errors/ArrayError.sol b/utils/core-contracts/contracts/errors/ArrayError.sol index 59d002066a..3623d2ca52 100644 --- a/utils/core-contracts/contracts/errors/ArrayError.sol +++ b/utils/core-contracts/contracts/errors/ArrayError.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Library for array related errors. diff --git a/utils/core-contracts/contracts/errors/ChangeError.sol b/utils/core-contracts/contracts/errors/ChangeError.sol index e140a66ad7..6e043bb517 100644 --- a/utils/core-contracts/contracts/errors/ChangeError.sol +++ b/utils/core-contracts/contracts/errors/ChangeError.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Library for change related errors. diff --git a/utils/core-contracts/contracts/errors/InitError.sol b/utils/core-contracts/contracts/errors/InitError.sol index 25b01d7d27..5736456881 100644 --- a/utils/core-contracts/contracts/errors/InitError.sol +++ b/utils/core-contracts/contracts/errors/InitError.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Library for initialization related errors. diff --git a/utils/core-contracts/contracts/errors/ParameterError.sol b/utils/core-contracts/contracts/errors/ParameterError.sol index f7d25b11f1..6f0b7e707f 100644 --- a/utils/core-contracts/contracts/errors/ParameterError.sol +++ b/utils/core-contracts/contracts/errors/ParameterError.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Library for errors related with expected function parameters. diff --git a/utils/core-contracts/contracts/initializable/InitializableMixin.sol b/utils/core-contracts/contracts/initializable/InitializableMixin.sol index 0ac73eb08e..bc2949c5fe 100644 --- a/utils/core-contracts/contracts/initializable/InitializableMixin.sol +++ b/utils/core-contracts/contracts/initializable/InitializableMixin.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../errors/InitError.sol"; diff --git a/utils/core-contracts/contracts/interfaces/IERC165.sol b/utils/core-contracts/contracts/interfaces/IERC165.sol index 83e44d3cca..1a905f79f8 100644 --- a/utils/core-contracts/contracts/interfaces/IERC165.sol +++ b/utils/core-contracts/contracts/interfaces/IERC165.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title ERC165 interface for determining if a contract supports a given interface. diff --git a/utils/core-contracts/contracts/interfaces/IERC20.sol b/utils/core-contracts/contracts/interfaces/IERC20.sol index 37be6afdc9..e137f30804 100644 --- a/utils/core-contracts/contracts/interfaces/IERC20.sol +++ b/utils/core-contracts/contracts/interfaces/IERC20.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title ERC20 token implementation. diff --git a/utils/core-contracts/contracts/interfaces/IERC20Permit.sol b/utils/core-contracts/contracts/interfaces/IERC20Permit.sol index b62c93ca8f..87c944ac9c 100644 --- a/utils/core-contracts/contracts/interfaces/IERC20Permit.sol +++ b/utils/core-contracts/contracts/interfaces/IERC20Permit.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./IERC20.sol"; diff --git a/utils/core-contracts/contracts/interfaces/IERC721.sol b/utils/core-contracts/contracts/interfaces/IERC721.sol index 5d59f57da5..306a6bd82e 100644 --- a/utils/core-contracts/contracts/interfaces/IERC721.sol +++ b/utils/core-contracts/contracts/interfaces/IERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title ERC721 non-fungible token (NFT) contract. diff --git a/utils/core-contracts/contracts/interfaces/IERC721Enumerable.sol b/utils/core-contracts/contracts/interfaces/IERC721Enumerable.sol index 4bf49e2423..7f3e933fd3 100644 --- a/utils/core-contracts/contracts/interfaces/IERC721Enumerable.sol +++ b/utils/core-contracts/contracts/interfaces/IERC721Enumerable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./IERC721.sol"; diff --git a/utils/core-contracts/contracts/interfaces/IERC721Metadata.sol b/utils/core-contracts/contracts/interfaces/IERC721Metadata.sol index 29f28987f3..1d3fb26b8e 100644 --- a/utils/core-contracts/contracts/interfaces/IERC721Metadata.sol +++ b/utils/core-contracts/contracts/interfaces/IERC721Metadata.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./IERC165.sol"; diff --git a/utils/core-contracts/contracts/interfaces/IERC721Receiver.sol b/utils/core-contracts/contracts/interfaces/IERC721Receiver.sol index a46a3c249f..7a44e1224a 100644 --- a/utils/core-contracts/contracts/interfaces/IERC721Receiver.sol +++ b/utils/core-contracts/contracts/interfaces/IERC721Receiver.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title ERC721 extension that allows contracts to receive tokens with `safeTransferFrom`. diff --git a/utils/core-contracts/contracts/interfaces/IOwnable.sol b/utils/core-contracts/contracts/interfaces/IOwnable.sol index 5d71a88f91..0a8ef5d7c3 100644 --- a/utils/core-contracts/contracts/interfaces/IOwnable.sol +++ b/utils/core-contracts/contracts/interfaces/IOwnable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Contract for facilitating ownership by a single address. diff --git a/utils/core-contracts/contracts/interfaces/IUUPSImplementation.sol b/utils/core-contracts/contracts/interfaces/IUUPSImplementation.sol index 7db4fd7fde..822f8045eb 100644 --- a/utils/core-contracts/contracts/interfaces/IUUPSImplementation.sol +++ b/utils/core-contracts/contracts/interfaces/IUUPSImplementation.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Contract to be used as the implementation of a Universal Upgradeable Proxy Standard (UUPS) proxy. diff --git a/utils/core-contracts/contracts/mocks/initializable/InitializableMock.sol b/utils/core-contracts/contracts/mocks/initializable/InitializableMock.sol index 956e708509..b58ed36307 100644 --- a/utils/core-contracts/contracts/mocks/initializable/InitializableMock.sol +++ b/utils/core-contracts/contracts/mocks/initializable/InitializableMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../initializable/InitializableMixin.sol"; diff --git a/utils/core-contracts/contracts/mocks/proxy/ImplementationDestroyer.sol b/utils/core-contracts/contracts/mocks/proxy/ImplementationDestroyer.sol index 494c32dbfb..607cab5ba4 100644 --- a/utils/core-contracts/contracts/mocks/proxy/ImplementationDestroyer.sol +++ b/utils/core-contracts/contracts/mocks/proxy/ImplementationDestroyer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // solhint-disable-next-line no-empty-blocks contract ImplementationDestroyer { diff --git a/utils/core-contracts/contracts/mocks/proxy/ImplementationMockA.sol b/utils/core-contracts/contracts/mocks/proxy/ImplementationMockA.sol index dc6d99a7b0..a1005716e8 100644 --- a/utils/core-contracts/contracts/mocks/proxy/ImplementationMockA.sol +++ b/utils/core-contracts/contracts/mocks/proxy/ImplementationMockA.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./UUPSImplementationMock.sol"; diff --git a/utils/core-contracts/contracts/mocks/proxy/ImplementationMockB.sol b/utils/core-contracts/contracts/mocks/proxy/ImplementationMockB.sol index 2cbe2287d4..45981daeff 100644 --- a/utils/core-contracts/contracts/mocks/proxy/ImplementationMockB.sol +++ b/utils/core-contracts/contracts/mocks/proxy/ImplementationMockB.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./UUPSImplementationMock.sol"; diff --git a/utils/core-contracts/contracts/mocks/proxy/SterileImplementation.sol b/utils/core-contracts/contracts/mocks/proxy/SterileImplementation.sol index c4247cd9b1..028b830d5a 100644 --- a/utils/core-contracts/contracts/mocks/proxy/SterileImplementation.sol +++ b/utils/core-contracts/contracts/mocks/proxy/SterileImplementation.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // solhint-disable-next-line no-empty-blocks contract SterileImplementation { diff --git a/utils/core-contracts/contracts/mocks/proxy/UUPSImplementationMock.sol b/utils/core-contracts/contracts/mocks/proxy/UUPSImplementationMock.sol index 5ccaf8cb70..3ba0a7edd1 100644 --- a/utils/core-contracts/contracts/mocks/proxy/UUPSImplementationMock.sol +++ b/utils/core-contracts/contracts/mocks/proxy/UUPSImplementationMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../proxy/UUPSImplementation.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC20Mock.sol b/utils/core-contracts/contracts/mocks/token/ERC20Mock.sol index 4fd6f234d4..e3a8148201 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC20Mock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC20Mock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../token/ERC20.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC20PermitMock.sol b/utils/core-contracts/contracts/mocks/token/ERC20PermitMock.sol index 262427ceb9..11dd72dca3 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC20PermitMock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC20PermitMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../token/ERC20Permit.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC721EnumerableMock.sol b/utils/core-contracts/contracts/mocks/token/ERC721EnumerableMock.sol index 543122dcf6..7776644363 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC721EnumerableMock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC721EnumerableMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../token/ERC721Enumerable.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC721FailedReceiverMock.sol b/utils/core-contracts/contracts/mocks/token/ERC721FailedReceiverMock.sol index a5d66895ad..02904dd918 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC721FailedReceiverMock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC721FailedReceiverMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IERC721Receiver.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC721Mock.sol b/utils/core-contracts/contracts/mocks/token/ERC721Mock.sol index 8c4ef9976f..b727553004 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC721Mock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC721Mock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../token/ERC721.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC721OwnedMock.sol b/utils/core-contracts/contracts/mocks/token/ERC721OwnedMock.sol index d25cb05c99..d31f1a0ce9 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC721OwnedMock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC721OwnedMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../token/ERC721Owned.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC721ReceiverMock.sol b/utils/core-contracts/contracts/mocks/token/ERC721ReceiverMock.sol index 14dcf488bf..4f533f0206 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC721ReceiverMock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC721ReceiverMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IERC721Receiver.sol"; import "../../interfaces/IERC721.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/ERC721RevertingReceiverMock.sol b/utils/core-contracts/contracts/mocks/token/ERC721RevertingReceiverMock.sol index 8bf484e0ca..e834bb98c4 100644 --- a/utils/core-contracts/contracts/mocks/token/ERC721RevertingReceiverMock.sol +++ b/utils/core-contracts/contracts/mocks/token/ERC721RevertingReceiverMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IERC721Receiver.sol"; diff --git a/utils/core-contracts/contracts/mocks/token/VaultMock.sol b/utils/core-contracts/contracts/mocks/token/VaultMock.sol index 03d0f82258..d3fdcfc79c 100644 --- a/utils/core-contracts/contracts/mocks/token/VaultMock.sol +++ b/utils/core-contracts/contracts/mocks/token/VaultMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../token/ERC20.sol"; import "../../interfaces/IERC20Permit.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/AddressUtilMock.sol b/utils/core-contracts/contracts/mocks/utils/AddressUtilMock.sol index c3c20a70f8..d89ccc83b2 100644 --- a/utils/core-contracts/contracts/mocks/utils/AddressUtilMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/AddressUtilMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../utils/AddressUtil.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/DecimalMathMock.sol b/utils/core-contracts/contracts/mocks/utils/DecimalMathMock.sol index 63bf14eee9..386a5254ff 100644 --- a/utils/core-contracts/contracts/mocks/utils/DecimalMathMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/DecimalMathMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../utils/DecimalMath.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/ERC165HelperMock.sol b/utils/core-contracts/contracts/mocks/utils/ERC165HelperMock.sol index a96e8bef7e..6bdf313724 100644 --- a/utils/core-contracts/contracts/mocks/utils/ERC165HelperMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/ERC165HelperMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/IERC20.sol"; import "../../interfaces/IERC721.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/HeapUtilMock.sol b/utils/core-contracts/contracts/mocks/utils/HeapUtilMock.sol index 0d816035ef..8342c14cda 100644 --- a/utils/core-contracts/contracts/mocks/utils/HeapUtilMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/HeapUtilMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; pragma experimental ABIEncoderV2; import "../../utils/HeapUtil.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/MerkleProofMock.sol b/utils/core-contracts/contracts/mocks/utils/MerkleProofMock.sol index 511b4de9df..c0418012c9 100644 --- a/utils/core-contracts/contracts/mocks/utils/MerkleProofMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/MerkleProofMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../utils/MerkleProof.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/SafeCastMock.sol b/utils/core-contracts/contracts/mocks/utils/SafeCastMock.sol index 6ec44b9aab..3785f362a9 100644 --- a/utils/core-contracts/contracts/mocks/utils/SafeCastMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/SafeCastMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../utils/SafeCast.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/SetUtilMock.sol b/utils/core-contracts/contracts/mocks/utils/SetUtilMock.sol index 9adffb5fd4..b9d8bbfe91 100644 --- a/utils/core-contracts/contracts/mocks/utils/SetUtilMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/SetUtilMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../utils/SetUtil.sol"; diff --git a/utils/core-contracts/contracts/mocks/utils/StringUtilMock.sol b/utils/core-contracts/contracts/mocks/utils/StringUtilMock.sol index d07e08f9bb..2565a751a3 100644 --- a/utils/core-contracts/contracts/mocks/utils/StringUtilMock.sol +++ b/utils/core-contracts/contracts/mocks/utils/StringUtilMock.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../utils/StringUtil.sol"; diff --git a/utils/core-contracts/contracts/ownership/AuthorizableStorage.sol b/utils/core-contracts/contracts/ownership/AuthorizableStorage.sol index b6cf8a2788..b24be06276 100644 --- a/utils/core-contracts/contracts/ownership/AuthorizableStorage.sol +++ b/utils/core-contracts/contracts/ownership/AuthorizableStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../errors/AccessError.sol"; diff --git a/utils/core-contracts/contracts/ownership/Ownable.sol b/utils/core-contracts/contracts/ownership/Ownable.sol index 022bb0bb82..47c1ad2edc 100644 --- a/utils/core-contracts/contracts/ownership/Ownable.sol +++ b/utils/core-contracts/contracts/ownership/Ownable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./OwnableStorage.sol"; import "../interfaces/IOwnable.sol"; diff --git a/utils/core-contracts/contracts/ownership/OwnableStorage.sol b/utils/core-contracts/contracts/ownership/OwnableStorage.sol index fab9e2cbfe..3a9d4b0d0c 100644 --- a/utils/core-contracts/contracts/ownership/OwnableStorage.sol +++ b/utils/core-contracts/contracts/ownership/OwnableStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../errors/AccessError.sol"; diff --git a/utils/core-contracts/contracts/proxy/AbstractProxy.sol b/utils/core-contracts/contracts/proxy/AbstractProxy.sol index 98a3e401fa..cfa2dbc728 100644 --- a/utils/core-contracts/contracts/proxy/AbstractProxy.sol +++ b/utils/core-contracts/contracts/proxy/AbstractProxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; abstract contract AbstractProxy { fallback() external payable { diff --git a/utils/core-contracts/contracts/proxy/ProxyStorage.sol b/utils/core-contracts/contracts/proxy/ProxyStorage.sol index b6eef0de91..a83122c912 100644 --- a/utils/core-contracts/contracts/proxy/ProxyStorage.sol +++ b/utils/core-contracts/contracts/proxy/ProxyStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract ProxyStorage { bytes32 private constant _SLOT_PROXY_STORAGE = diff --git a/utils/core-contracts/contracts/proxy/UUPSImplementation.sol b/utils/core-contracts/contracts/proxy/UUPSImplementation.sol index 6274e6ed35..f6b9ce6672 100644 --- a/utils/core-contracts/contracts/proxy/UUPSImplementation.sol +++ b/utils/core-contracts/contracts/proxy/UUPSImplementation.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IUUPSImplementation.sol"; import "../errors/AddressError.sol"; diff --git a/utils/core-contracts/contracts/proxy/UUPSProxy.sol b/utils/core-contracts/contracts/proxy/UUPSProxy.sol index 12042b4bbe..4663d3de3f 100644 --- a/utils/core-contracts/contracts/proxy/UUPSProxy.sol +++ b/utils/core-contracts/contracts/proxy/UUPSProxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./AbstractProxy.sol"; import "./ProxyStorage.sol"; diff --git a/utils/core-contracts/contracts/proxy/UUPSProxyWithOwner.sol b/utils/core-contracts/contracts/proxy/UUPSProxyWithOwner.sol index feacdd0471..73709421b3 100644 --- a/utils/core-contracts/contracts/proxy/UUPSProxyWithOwner.sol +++ b/utils/core-contracts/contracts/proxy/UUPSProxyWithOwner.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UUPSProxy} from "./UUPSProxy.sol"; import {OwnableStorage} from "../ownership/OwnableStorage.sol"; diff --git a/utils/core-contracts/contracts/token/ERC20.sol b/utils/core-contracts/contracts/token/ERC20.sol index 21d94c21ad..b294195f9c 100644 --- a/utils/core-contracts/contracts/token/ERC20.sol +++ b/utils/core-contracts/contracts/token/ERC20.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IERC20.sol"; import "../errors/InitError.sol"; diff --git a/utils/core-contracts/contracts/token/ERC20Helper.sol b/utils/core-contracts/contracts/token/ERC20Helper.sol index 568bb86279..c0996d94a9 100644 --- a/utils/core-contracts/contracts/token/ERC20Helper.sol +++ b/utils/core-contracts/contracts/token/ERC20Helper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IERC20.sol"; diff --git a/utils/core-contracts/contracts/token/ERC20Permit.sol b/utils/core-contracts/contracts/token/ERC20Permit.sol index 958d4243da..363d23ad35 100644 --- a/utils/core-contracts/contracts/token/ERC20Permit.sol +++ b/utils/core-contracts/contracts/token/ERC20Permit.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./ERC20.sol"; import "./ERC20PermitStorage.sol"; diff --git a/utils/core-contracts/contracts/token/ERC20PermitStorage.sol b/utils/core-contracts/contracts/token/ERC20PermitStorage.sol index d7365ad066..ff9a1888dd 100644 --- a/utils/core-contracts/contracts/token/ERC20PermitStorage.sol +++ b/utils/core-contracts/contracts/token/ERC20PermitStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library ERC20PermitStorage { bytes32 private constant _SLOT_ERC20_PERMIT = diff --git a/utils/core-contracts/contracts/token/ERC20Storage.sol b/utils/core-contracts/contracts/token/ERC20Storage.sol index 9b18af3909..60cc0f334b 100644 --- a/utils/core-contracts/contracts/token/ERC20Storage.sol +++ b/utils/core-contracts/contracts/token/ERC20Storage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library ERC20Storage { bytes32 private constant _SLOT_ERC20_STORAGE = diff --git a/utils/core-contracts/contracts/token/ERC721.sol b/utils/core-contracts/contracts/token/ERC721.sol index f3888ced0a..e4278cb65b 100644 --- a/utils/core-contracts/contracts/token/ERC721.sol +++ b/utils/core-contracts/contracts/token/ERC721.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IERC721.sol"; import "../interfaces/IERC721Metadata.sol"; diff --git a/utils/core-contracts/contracts/token/ERC721Enumerable.sol b/utils/core-contracts/contracts/token/ERC721Enumerable.sol index ac2c99e789..b408f02491 100644 --- a/utils/core-contracts/contracts/token/ERC721Enumerable.sol +++ b/utils/core-contracts/contracts/token/ERC721Enumerable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./ERC721.sol"; import "./ERC721EnumerableStorage.sol"; diff --git a/utils/core-contracts/contracts/token/ERC721EnumerableStorage.sol b/utils/core-contracts/contracts/token/ERC721EnumerableStorage.sol index 8b2115abab..3150e206f8 100644 --- a/utils/core-contracts/contracts/token/ERC721EnumerableStorage.sol +++ b/utils/core-contracts/contracts/token/ERC721EnumerableStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library ERC721EnumerableStorage { bytes32 private constant _SLOT_ERC721_ENUMERABLE_STORAGE = diff --git a/utils/core-contracts/contracts/token/ERC721Owned.sol b/utils/core-contracts/contracts/token/ERC721Owned.sol index f91237c682..4d7639df05 100644 --- a/utils/core-contracts/contracts/token/ERC721Owned.sol +++ b/utils/core-contracts/contracts/token/ERC721Owned.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./ERC721.sol"; import "../ownership/Ownable.sol"; diff --git a/utils/core-contracts/contracts/token/ERC721Storage.sol b/utils/core-contracts/contracts/token/ERC721Storage.sol index aee615ac96..a2f9b62f70 100644 --- a/utils/core-contracts/contracts/token/ERC721Storage.sol +++ b/utils/core-contracts/contracts/token/ERC721Storage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library ERC721Storage { bytes32 private constant _SLOT_ERC721_STORAGE = diff --git a/utils/core-contracts/contracts/utils/AddressUtil.sol b/utils/core-contracts/contracts/utils/AddressUtil.sol index 30f96c0f35..cee824622a 100644 --- a/utils/core-contracts/contracts/utils/AddressUtil.sol +++ b/utils/core-contracts/contracts/utils/AddressUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library AddressUtil { function isContract(address account) internal view returns (bool) { diff --git a/utils/core-contracts/contracts/utils/DecimalMath.sol b/utils/core-contracts/contracts/utils/DecimalMath.sol index 11f3c1bff1..fcb4b1c4af 100644 --- a/utils/core-contracts/contracts/utils/DecimalMath.sol +++ b/utils/core-contracts/contracts/utils/DecimalMath.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./SafeCast.sol"; diff --git a/utils/core-contracts/contracts/utils/ERC165Helper.sol b/utils/core-contracts/contracts/utils/ERC165Helper.sol index f196e0ff6a..5283e88106 100644 --- a/utils/core-contracts/contracts/utils/ERC165Helper.sol +++ b/utils/core-contracts/contracts/utils/ERC165Helper.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IERC165.sol"; diff --git a/utils/core-contracts/contracts/utils/HeapUtil.sol b/utils/core-contracts/contracts/utils/HeapUtil.sol index edb0c33f22..212693695d 100644 --- a/utils/core-contracts/contracts/utils/HeapUtil.sol +++ b/utils/core-contracts/contracts/utils/HeapUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // Eth Heap // Author: Zac Mitton diff --git a/utils/core-contracts/contracts/utils/MerkleProof.sol b/utils/core-contracts/contracts/utils/MerkleProof.sol index 153617c497..cce1f6d637 100644 --- a/utils/core-contracts/contracts/utils/MerkleProof.sol +++ b/utils/core-contracts/contracts/utils/MerkleProof.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // Based on OpenZeppelin https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/MerkleProof.sol library MerkleProof { diff --git a/utils/core-contracts/contracts/utils/SafeCast.sol b/utils/core-contracts/contracts/utils/SafeCast.sol index 22406ff2ad..39fb3f8812 100644 --- a/utils/core-contracts/contracts/utils/SafeCast.sol +++ b/utils/core-contracts/contracts/utils/SafeCast.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * Utilities that convert numeric types avoiding silent overflows. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastAddress.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastAddress.sol index d701dd5557..c21f956583 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastAddress.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastAddress.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastBytes32.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastBytes32.sol index a00017e712..76e2613cb0 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastBytes32.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastBytes32.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI128.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI128.sol index e0c806b85e..98e12fcf41 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI128.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI128.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI24.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI24.sol index 834aafaeed..885a4c13fc 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI24.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI24.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI256.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI256.sol index 2afbd2e4be..0822630d65 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI256.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI256.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI32.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI32.sol index 31212ecef5..b1974e8e1b 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI32.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI32.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI56.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI56.sol index 1213019422..c6654eae0f 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastI56.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastI56.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU128.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU128.sol index d3dddaf0de..1fff2a2139 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU128.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU128.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU160.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU160.sol index acae4e3fe5..aefb05acc7 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU160.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU160.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU256.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU256.sol index 9d98c70a19..3610d2e05a 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU256.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU256.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU32.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU32.sol index f1665c188b..69826fbba1 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU32.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU32.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU56.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU56.sol index f91a11485a..a43e388ced 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU56.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU56.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU64.sol b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU64.sol index 52195e6c18..f6c180a75b 100644 --- a/utils/core-contracts/contracts/utils/SafeCast/SafeCastU64.sol +++ b/utils/core-contracts/contracts/utils/SafeCast/SafeCastU64.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title See SafeCast.sol. diff --git a/utils/core-contracts/contracts/utils/SetUtil.sol b/utils/core-contracts/contracts/utils/SetUtil.sol index 71c253346c..e2b99cc849 100644 --- a/utils/core-contracts/contracts/utils/SetUtil.sol +++ b/utils/core-contracts/contracts/utils/SetUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "./SafeCast.sol"; diff --git a/utils/core-contracts/contracts/utils/StringUtil.sol b/utils/core-contracts/contracts/utils/StringUtil.sol index c38318d909..eed8e3039c 100644 --- a/utils/core-contracts/contracts/utils/StringUtil.sol +++ b/utils/core-contracts/contracts/utils/StringUtil.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /* Reference implementations: diff --git a/utils/core-modules/contracts/Proxy.sol b/utils/core-modules/contracts/Proxy.sol index d9510835f3..242c12a2bd 100644 --- a/utils/core-modules/contracts/Proxy.sol +++ b/utils/core-modules/contracts/Proxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/proxy/UUPSProxy.sol"; diff --git a/utils/core-modules/contracts/interfaces/IAssociatedSystemsModule.sol b/utils/core-modules/contracts/interfaces/IAssociatedSystemsModule.sol index 0cf0dd756b..6e5ac747c1 100644 --- a/utils/core-modules/contracts/interfaces/IAssociatedSystemsModule.sol +++ b/utils/core-modules/contracts/interfaces/IAssociatedSystemsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for connecting a system with other associated systems. diff --git a/utils/core-modules/contracts/interfaces/IDecayTokenModule.sol b/utils/core-modules/contracts/interfaces/IDecayTokenModule.sol index 33c3e2a1cd..2863f7677b 100644 --- a/utils/core-modules/contracts/interfaces/IDecayTokenModule.sol +++ b/utils/core-modules/contracts/interfaces/IDecayTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; diff --git a/utils/core-modules/contracts/interfaces/IFeatureFlagModule.sol b/utils/core-modules/contracts/interfaces/IFeatureFlagModule.sol index f655721783..a664a71297 100644 --- a/utils/core-modules/contracts/interfaces/IFeatureFlagModule.sol +++ b/utils/core-modules/contracts/interfaces/IFeatureFlagModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for granular enabling and disabling of system features and functions. diff --git a/utils/core-modules/contracts/interfaces/INftModule.sol b/utils/core-modules/contracts/interfaces/INftModule.sol index 0845b68b00..ea824171d8 100644 --- a/utils/core-modules/contracts/interfaces/INftModule.sol +++ b/utils/core-modules/contracts/interfaces/INftModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC721Enumerable.sol"; diff --git a/utils/core-modules/contracts/interfaces/IOwnerModule.sol b/utils/core-modules/contracts/interfaces/IOwnerModule.sol index bcd5ea8fa0..c6a79fed93 100644 --- a/utils/core-modules/contracts/interfaces/IOwnerModule.sol +++ b/utils/core-modules/contracts/interfaces/IOwnerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; /** * @title Module for giving a system owner based access control. diff --git a/utils/core-modules/contracts/interfaces/ISampleFeatureFlagModule.sol b/utils/core-modules/contracts/interfaces/ISampleFeatureFlagModule.sol index 6ab6eff7aa..d6139e0a25 100644 --- a/utils/core-modules/contracts/interfaces/ISampleFeatureFlagModule.sol +++ b/utils/core-modules/contracts/interfaces/ISampleFeatureFlagModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISampleFeatureFlagModule { function setFeatureFlaggedValue(uint valueToSet) external; diff --git a/utils/core-modules/contracts/interfaces/ISampleOwnedModule.sol b/utils/core-modules/contracts/interfaces/ISampleOwnedModule.sol index 3957457c13..ef0a1c498a 100644 --- a/utils/core-modules/contracts/interfaces/ISampleOwnedModule.sol +++ b/utils/core-modules/contracts/interfaces/ISampleOwnedModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISampleOwnedModule { function setProtectedValue(uint newProtectedValue) external payable; diff --git a/utils/core-modules/contracts/interfaces/ITokenModule.sol b/utils/core-modules/contracts/interfaces/ITokenModule.sol index 9bfe2ac270..c7b633e242 100644 --- a/utils/core-modules/contracts/interfaces/ITokenModule.sol +++ b/utils/core-modules/contracts/interfaces/ITokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/interfaces/IERC20.sol"; diff --git a/utils/core-modules/contracts/modules/AssociatedSystemsModule.sol b/utils/core-modules/contracts/modules/AssociatedSystemsModule.sol index 9c1fbed42f..a38a2d9315 100644 --- a/utils/core-modules/contracts/modules/AssociatedSystemsModule.sol +++ b/utils/core-modules/contracts/modules/AssociatedSystemsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/errors/InitError.sol"; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; diff --git a/utils/core-modules/contracts/modules/CoreModule.sol b/utils/core-modules/contracts/modules/CoreModule.sol index 51c4514e8c..dc033d6cac 100644 --- a/utils/core-modules/contracts/modules/CoreModule.sol +++ b/utils/core-modules/contracts/modules/CoreModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {OwnerModule} from "./OwnerModule.sol"; import {UpgradeModule} from "./UpgradeModule.sol"; diff --git a/utils/core-modules/contracts/modules/DecayTokenModule.sol b/utils/core-modules/contracts/modules/DecayTokenModule.sol index f15fe6bd9b..8479305b80 100644 --- a/utils/core-modules/contracts/modules/DecayTokenModule.sol +++ b/utils/core-modules/contracts/modules/DecayTokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/DecimalMath.sol"; import "@synthetixio/core-contracts/contracts/token/ERC20.sol"; diff --git a/utils/core-modules/contracts/modules/FeatureFlagModule.sol b/utils/core-modules/contracts/modules/FeatureFlagModule.sol index f4cbb5e61b..d33b408dc5 100644 --- a/utils/core-modules/contracts/modules/FeatureFlagModule.sol +++ b/utils/core-modules/contracts/modules/FeatureFlagModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "../storage/FeatureFlag.sol"; diff --git a/utils/core-modules/contracts/modules/NftModule.sol b/utils/core-modules/contracts/modules/NftModule.sol index e6d45c6d49..10ede00c5e 100644 --- a/utils/core-modules/contracts/modules/NftModule.sol +++ b/utils/core-modules/contracts/modules/NftModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/token/ERC721Enumerable.sol"; import "@synthetixio/core-contracts/contracts/utils/AddressUtil.sol"; diff --git a/utils/core-modules/contracts/modules/OwnerModule.sol b/utils/core-modules/contracts/modules/OwnerModule.sol index 78b706acc6..29107177b5 100644 --- a/utils/core-modules/contracts/modules/OwnerModule.sol +++ b/utils/core-modules/contracts/modules/OwnerModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/Ownable.sol"; import "@synthetixio/core-contracts/contracts/initializable/InitializableMixin.sol"; diff --git a/utils/core-modules/contracts/modules/TokenModule.sol b/utils/core-modules/contracts/modules/TokenModule.sol index 614dd24534..11232af33e 100644 --- a/utils/core-modules/contracts/modules/TokenModule.sol +++ b/utils/core-modules/contracts/modules/TokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/initializable/InitializableMixin.sol"; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; diff --git a/utils/core-modules/contracts/modules/UpgradeModule.sol b/utils/core-modules/contracts/modules/UpgradeModule.sol index 126be847b9..0cfb1acb23 100644 --- a/utils/core-modules/contracts/modules/UpgradeModule.sol +++ b/utils/core-modules/contracts/modules/UpgradeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/proxy/UUPSImplementation.sol"; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; diff --git a/utils/core-modules/contracts/modules/mocks/GenericModule.sol b/utils/core-modules/contracts/modules/mocks/GenericModule.sol index 5d7b362eb6..b4bde60b8a 100644 --- a/utils/core-modules/contracts/modules/mocks/GenericModule.sol +++ b/utils/core-modules/contracts/modules/mocks/GenericModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract GenericModule { function getFortyTwo() public pure returns (uint) { diff --git a/utils/core-modules/contracts/modules/mocks/SampleFeatureFlagModule.sol b/utils/core-modules/contracts/modules/mocks/SampleFeatureFlagModule.sol index d1a4d9ec09..0f79d378f7 100644 --- a/utils/core-modules/contracts/modules/mocks/SampleFeatureFlagModule.sol +++ b/utils/core-modules/contracts/modules/mocks/SampleFeatureFlagModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../../interfaces/ISampleFeatureFlagModule.sol"; import "../../storage/SampleStorage.sol"; diff --git a/utils/core-modules/contracts/modules/mocks/SampleOwnedModule.sol b/utils/core-modules/contracts/modules/mocks/SampleOwnedModule.sol index 6ce4d1fa0d..8790f7043f 100644 --- a/utils/core-modules/contracts/modules/mocks/SampleOwnedModule.sol +++ b/utils/core-modules/contracts/modules/mocks/SampleOwnedModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "../../storage/SampleStorage.sol"; diff --git a/utils/core-modules/contracts/storage/AssociatedSystem.sol b/utils/core-modules/contracts/storage/AssociatedSystem.sol index 272615ecdd..3ae2c101c1 100644 --- a/utils/core-modules/contracts/storage/AssociatedSystem.sol +++ b/utils/core-modules/contracts/storage/AssociatedSystem.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/ITokenModule.sol"; import "../interfaces/INftModule.sol"; diff --git a/utils/core-modules/contracts/storage/DecayToken.sol b/utils/core-modules/contracts/storage/DecayToken.sol index dad50ce946..98a92ac016 100644 --- a/utils/core-modules/contracts/storage/DecayToken.sol +++ b/utils/core-modules/contracts/storage/DecayToken.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library DecayToken { bytes32 private constant _SLOT_DECAY_TOKEN_STORAGE = diff --git a/utils/core-modules/contracts/storage/FeatureFlag.sol b/utils/core-modules/contracts/storage/FeatureFlag.sol index 5f174fd550..1e8d25b04c 100644 --- a/utils/core-modules/contracts/storage/FeatureFlag.sol +++ b/utils/core-modules/contracts/storage/FeatureFlag.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; diff --git a/utils/core-modules/contracts/storage/Initialized.sol b/utils/core-modules/contracts/storage/Initialized.sol index 559008932a..ae45806e28 100644 --- a/utils/core-modules/contracts/storage/Initialized.sol +++ b/utils/core-modules/contracts/storage/Initialized.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library Initialized { struct Data { diff --git a/utils/core-modules/contracts/storage/SampleStorage.sol b/utils/core-modules/contracts/storage/SampleStorage.sol index fcfb7c660f..bc54db0447 100644 --- a/utils/core-modules/contracts/storage/SampleStorage.sol +++ b/utils/core-modules/contracts/storage/SampleStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; library SampleStorage { bytes32 private constant _SLOT_SAMPLE_STORAGE = diff --git a/utils/core-modules/storage.dump.sol b/utils/core-modules/storage.dump.sol index 0e4297d474..2f43f4abda 100644 --- a/utils/core-modules/storage.dump.sol +++ b/utils/core-modules/storage.dump.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 < 0.9.0; // @custom:artifact @synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol:OwnableStorage library OwnableStorage { diff --git a/utils/core-utils/test/fixtures/sample-project/contracts/AnotherModule.sol b/utils/core-utils/test/fixtures/sample-project/contracts/AnotherModule.sol index b033c0f9b2..50dd76815d 100644 --- a/utils/core-utils/test/fixtures/sample-project/contracts/AnotherModule.sol +++ b/utils/core-utils/test/fixtures/sample-project/contracts/AnotherModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // solhint-disable-next-line no-empty-blocks contract AnotherModule { diff --git a/utils/core-utils/test/fixtures/sample-project/contracts/ElectionStorage.sol b/utils/core-utils/test/fixtures/sample-project/contracts/ElectionStorage.sol index 7aa864fead..e453d62bfa 100644 --- a/utils/core-utils/test/fixtures/sample-project/contracts/ElectionStorage.sol +++ b/utils/core-utils/test/fixtures/sample-project/contracts/ElectionStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/utils/SetUtil.sol"; diff --git a/utils/core-utils/test/fixtures/sample-project/contracts/MultipleInheritance.sol b/utils/core-utils/test/fixtures/sample-project/contracts/MultipleInheritance.sol index 158d38112e..3cb41c1889 100644 --- a/utils/core-utils/test/fixtures/sample-project/contracts/MultipleInheritance.sol +++ b/utils/core-utils/test/fixtures/sample-project/contracts/MultipleInheritance.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {AnotherModule} from "./AnotherModule.sol"; import {SampleModule as AliasedModule} from "./SampleModule.sol"; diff --git a/utils/core-utils/test/fixtures/sample-project/contracts/SampleModule.sol b/utils/core-utils/test/fixtures/sample-project/contracts/SampleModule.sol index b97d560351..820911dc11 100644 --- a/utils/core-utils/test/fixtures/sample-project/contracts/SampleModule.sol +++ b/utils/core-utils/test/fixtures/sample-project/contracts/SampleModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; // solhint-disable-next-line no-empty-blocks contract SampleModule { diff --git a/utils/core-utils/test/fixtures/sample-project/contracts/Token.sol b/utils/core-utils/test/fixtures/sample-project/contracts/Token.sol index bead21c0eb..bcb3416b64 100644 --- a/utils/core-utils/test/fixtures/sample-project/contracts/Token.sol +++ b/utils/core-utils/test/fixtures/sample-project/contracts/Token.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/token/ERC20.sol"; import {ERC721 as ERC721Base} from "@synthetixio/core-contracts/contracts/token/ERC721.sol"; diff --git a/utils/core-utils/test/fixtures/sample-project/contracts/TokenModule.sol b/utils/core-utils/test/fixtures/sample-project/contracts/TokenModule.sol index f18562e1f9..99f56a89bd 100644 --- a/utils/core-utils/test/fixtures/sample-project/contracts/TokenModule.sol +++ b/utils/core-utils/test/fixtures/sample-project/contracts/TokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {Token as BaseToken} from "./Token.sol"; diff --git a/utils/core-utils/test/fixtures/sample-project/hardhat.config.ts b/utils/core-utils/test/fixtures/sample-project/hardhat.config.ts index 3a7da1b598..877788d729 100644 --- a/utils/core-utils/test/fixtures/sample-project/hardhat.config.ts +++ b/utils/core-utils/test/fixtures/sample-project/hardhat.config.ts @@ -1,3 +1,3 @@ export default { - solidity: '0.8.7', + solidity: '0.8.17', }; diff --git a/utils/hardhat-router/test/fixture-projects/missing-interface/contracts/modules/SomeModule.sol b/utils/hardhat-router/test/fixture-projects/missing-interface/contracts/modules/SomeModule.sol index 60c75c957e..7ff34725c4 100644 --- a/utils/hardhat-router/test/fixture-projects/missing-interface/contracts/modules/SomeModule.sol +++ b/utils/hardhat-router/test/fixture-projects/missing-interface/contracts/modules/SomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract SomeModule { function giveMeSomething() external pure returns (bool) { diff --git a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/IAnotherModule.sol b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/IAnotherModule.sol index adb94abe20..256ec518aa 100644 --- a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/IAnotherModule.sol +++ b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/IAnotherModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: Unlicense -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IAnotherModule { function getValue() external pure returns (uint); diff --git a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/ISomeModule.sol b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/ISomeModule.sol index a73c4369c6..e9e40e12d2 100644 --- a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/ISomeModule.sol +++ b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/interfaces/ISomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: Unlicense -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISomeModule { function getValue() external pure returns (uint); diff --git a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/AnotherModule.sol b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/AnotherModule.sol index c09fbebce3..c2333c1271 100644 --- a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/AnotherModule.sol +++ b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/AnotherModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: Unlicense -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IAnotherModule.sol"; diff --git a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/SomeModule.sol b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/SomeModule.sol index ffe3c33045..eff7d0a286 100644 --- a/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/SomeModule.sol +++ b/utils/hardhat-router/test/fixture-projects/namespace-collision/contracts/modules/SomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: Unlicense -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/ISomeModule.sol"; diff --git a/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/interfaces/ISomeModule.sol b/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/interfaces/ISomeModule.sol index 922ca9c663..f7980b1ea8 100644 --- a/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/interfaces/ISomeModule.sol +++ b/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/interfaces/ISomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISomeModule { function getValue() external view returns (uint); diff --git a/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/modules/SomeModule.sol b/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/modules/SomeModule.sol index 2e82a0df37..494ac3642a 100644 --- a/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/modules/SomeModule.sol +++ b/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/modules/SomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/GlobalStorage.sol"; import "../interfaces/ISomeModule.sol"; diff --git a/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/storage/GlobalStorage.sol b/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/storage/GlobalStorage.sol index 5f14635509..c6596de73f 100644 --- a/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/storage/GlobalStorage.sol +++ b/utils/hardhat-router/test/fixture-projects/sample-deploy/contracts/storage/GlobalStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract GlobalStorage { bytes32 private constant _SLOT_GLOBAL_STORAGE = diff --git a/utils/hardhat-router/test/fixture-projects/sample-deploy/storage.dump.sol b/utils/hardhat-router/test/fixture-projects/sample-deploy/storage.dump.sol index c47ba1536d..2d36ce6929 100644 --- a/utils/hardhat-router/test/fixture-projects/sample-deploy/storage.dump.sol +++ b/utils/hardhat-router/test/fixture-projects/sample-deploy/storage.dump.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 < 0.9.0; // @custom:artifact contracts/storage/GlobalStorage.sol:GlobalStorage contract GlobalStorage { diff --git a/utils/hardhat-router/test/fixtures/contracts/InterfacedModules.sol b/utils/hardhat-router/test/fixtures/contracts/InterfacedModules.sol index fca535a1a3..a9375b4d64 100644 --- a/utils/hardhat-router/test/fixtures/contracts/InterfacedModules.sol +++ b/utils/hardhat-router/test/fixtures/contracts/InterfacedModules.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IValidInterfacedModule { function getValue() external pure returns (uint); diff --git a/utils/hardhat-storage/test/fixtures/ExampleContract.sol b/utils/hardhat-storage/test/fixtures/ExampleContract.sol index a56a115cbd..6f73ea2db9 100644 --- a/utils/hardhat-storage/test/fixtures/ExampleContract.sol +++ b/utils/hardhat-storage/test/fixtures/ExampleContract.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract ExampleContract { bytes32 private constant _SLOT_EXAMPLE_CONTRACT = diff --git a/utils/sample-project/contracts/Proxy.sol b/utils/sample-project/contracts/Proxy.sol index 41b4805819..6da154b5d9 100644 --- a/utils/sample-project/contracts/Proxy.sol +++ b/utils/sample-project/contracts/Proxy.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {UUPSProxy} from "@synthetixio/core-contracts/contracts/proxy/UUPSProxy.sol"; diff --git a/utils/sample-project/contracts/interfaces/IAnotherModule.sol b/utils/sample-project/contracts/interfaces/IAnotherModule.sol index 5b7b93c5ff..2901ec898c 100644 --- a/utils/sample-project/contracts/interfaces/IAnotherModule.sol +++ b/utils/sample-project/contracts/interfaces/IAnotherModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IAnotherModule { function getAnotherValue() external pure returns (uint); diff --git a/utils/sample-project/contracts/interfaces/IInitializableModule.sol b/utils/sample-project/contracts/interfaces/IInitializableModule.sol index aae205731c..616b937670 100644 --- a/utils/sample-project/contracts/interfaces/IInitializableModule.sol +++ b/utils/sample-project/contracts/interfaces/IInitializableModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface IInitializableModule { function isInitializableModuleInitialized() external view returns (bool); diff --git a/utils/sample-project/contracts/interfaces/INewModule.sol b/utils/sample-project/contracts/interfaces/INewModule.sol index c7969019c3..dabc8e00d1 100644 --- a/utils/sample-project/contracts/interfaces/INewModule.sol +++ b/utils/sample-project/contracts/interfaces/INewModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface INewModule { function setSomeNewValue(uint newValue) external; diff --git a/utils/sample-project/contracts/interfaces/ISettingsModule.sol b/utils/sample-project/contracts/interfaces/ISettingsModule.sol index 998219d3ae..00e3a476fc 100644 --- a/utils/sample-project/contracts/interfaces/ISettingsModule.sol +++ b/utils/sample-project/contracts/interfaces/ISettingsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISettingsModule { function getASettingValue() external view returns (uint); diff --git a/utils/sample-project/contracts/interfaces/ISomeModule.sol b/utils/sample-project/contracts/interfaces/ISomeModule.sol index 922ca9c663..f7980b1ea8 100644 --- a/utils/sample-project/contracts/interfaces/ISomeModule.sol +++ b/utils/sample-project/contracts/interfaces/ISomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISomeModule { function getValue() external view returns (uint); diff --git a/utils/sample-project/contracts/interfaces/ISomeModuleModified.sol b/utils/sample-project/contracts/interfaces/ISomeModuleModified.sol index c389981547..8e3a4c32d2 100644 --- a/utils/sample-project/contracts/interfaces/ISomeModuleModified.sol +++ b/utils/sample-project/contracts/interfaces/ISomeModuleModified.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ISomeModuleModified { function setValue(uint newValue) external; diff --git a/utils/sample-project/contracts/interfaces/ITokenModule.sol b/utils/sample-project/contracts/interfaces/ITokenModule.sol index 3e0fe6b45f..84691787fa 100644 --- a/utils/sample-project/contracts/interfaces/ITokenModule.sol +++ b/utils/sample-project/contracts/interfaces/ITokenModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; interface ITokenModule { function createSampleToken(bytes32 name) external; diff --git a/utils/sample-project/contracts/modules/AnotherModule.sol b/utils/sample-project/contracts/modules/AnotherModule.sol index fb7133e538..03b92241e1 100644 --- a/utils/sample-project/contracts/modules/AnotherModule.sol +++ b/utils/sample-project/contracts/modules/AnotherModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../interfaces/IAnotherModule.sol"; diff --git a/utils/sample-project/contracts/modules/CoreModule.sol b/utils/sample-project/contracts/modules/CoreModule.sol index 2d540460f3..c5dd32bb82 100644 --- a/utils/sample-project/contracts/modules/CoreModule.sol +++ b/utils/sample-project/contracts/modules/CoreModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import {CoreModule as BaseCoreModule} from "@synthetixio/core-modules/contracts/modules/CoreModule.sol"; diff --git a/utils/sample-project/contracts/modules/InitializableModule.sol b/utils/sample-project/contracts/modules/InitializableModule.sol index 86c66af78a..61b0caab1b 100644 --- a/utils/sample-project/contracts/modules/InitializableModule.sol +++ b/utils/sample-project/contracts/modules/InitializableModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/initializable/InitializableMixin.sol"; import "../storage/InitializableStorage.sol"; diff --git a/utils/sample-project/contracts/modules/SettingsModule.sol b/utils/sample-project/contracts/modules/SettingsModule.sol index 9350c647aa..0b9c7ca6fd 100644 --- a/utils/sample-project/contracts/modules/SettingsModule.sol +++ b/utils/sample-project/contracts/modules/SettingsModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol"; import "../storage/SettingsStorage.sol"; diff --git a/utils/sample-project/contracts/modules/SomeModule.sol b/utils/sample-project/contracts/modules/SomeModule.sol index 2e82a0df37..494ac3642a 100644 --- a/utils/sample-project/contracts/modules/SomeModule.sol +++ b/utils/sample-project/contracts/modules/SomeModule.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "../storage/GlobalStorage.sol"; import "../interfaces/ISomeModule.sol"; diff --git a/utils/sample-project/contracts/storage/GlobalStorage.sol b/utils/sample-project/contracts/storage/GlobalStorage.sol index b719fa56eb..f3a96053fe 100644 --- a/utils/sample-project/contracts/storage/GlobalStorage.sol +++ b/utils/sample-project/contracts/storage/GlobalStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract GlobalStorage { bytes32 private constant _SLOT_GLOBAL_STORAGE = diff --git a/utils/sample-project/contracts/storage/InitializableStorage.sol b/utils/sample-project/contracts/storage/InitializableStorage.sol index 617c081ac4..4be694851f 100644 --- a/utils/sample-project/contracts/storage/InitializableStorage.sol +++ b/utils/sample-project/contracts/storage/InitializableStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract InitializableStorage { bytes32 private constant _SLOT_INITIALIZABLE_STORAGE = diff --git a/utils/sample-project/contracts/storage/SettingsStorage.sol b/utils/sample-project/contracts/storage/SettingsStorage.sol index ee6dd0e2fa..6b2c39e934 100644 --- a/utils/sample-project/contracts/storage/SettingsStorage.sol +++ b/utils/sample-project/contracts/storage/SettingsStorage.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; contract SettingsStorage { bytes32 private constant _SLOT_SETTINGS_STORAGE = diff --git a/utils/sample-project/contracts/test/Destroyer.sol b/utils/sample-project/contracts/test/Destroyer.sol index 0cad18170d..3e45ead9b4 100644 --- a/utils/sample-project/contracts/test/Destroyer.sol +++ b/utils/sample-project/contracts/test/Destroyer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 <0.9.0; import "@synthetixio/core-contracts/contracts/proxy/ProxyStorage.sol"; diff --git a/utils/sample-project/storage.dump.sol b/utils/sample-project/storage.dump.sol index 57dc3486a3..06200ee22d 100644 --- a/utils/sample-project/storage.dump.sol +++ b/utils/sample-project/storage.dump.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.0; +pragma solidity >=0.8.11 < 0.9.0; // @custom:artifact @synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol:OwnableStorage library OwnableStorage {