Skip to content

Commit

Permalink
pragma set to 0.6.12 for PrizePool contracts (#303)
Browse files Browse the repository at this point in the history
* pragma set to 0.6.12 for PrizePool contracts

* remove carat from pragma solidity versions

* update pragma for all contracts
  • Loading branch information
kamescg authored Jul 12, 2021
1 parent c0da60a commit f824f6a
Show file tree
Hide file tree
Showing 79 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion contracts/Constants.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/introspection/IERC1820RegistryUpgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/builders/ControlledTokenBuilder.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;
pragma experimental ABIEncoderV2;

import "../token/ControlledTokenProxyFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/builders/MultipleWinnersBuilder.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;
pragma experimental ABIEncoderV2;

import "./ControlledTokenBuilder.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/builders/PoolWithMultipleWinnersBuilder.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;
pragma experimental ABIEncoderV2;

import "@openzeppelin/contracts-upgradeable/utils/SafeCastUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/comptroller/Comptroller.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;
pragma experimental ABIEncoderV2;

import "@openzeppelin/contracts-upgradeable/utils/SafeCastUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/comptroller/ComptrollerStorage.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/drip/BalanceDrip.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/utils/SafeCastUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/drip/BalanceDripManager.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/drip/VolumeDrip.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/utils/SafeCastUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/drip/VolumeDripManager.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/external/compound/CTokenInterface.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/external/compound/ICompLike.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/external/maker/DaiInterface.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

interface OpenZeppelinProxyFactoryInterface {
function deploy(uint256 _salt, address _logic, address _admin, bytes calldata _data) external returns (address);
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/openzeppelin/ProxyFactory.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

// solium-disable security/no-inline-assembly
// solium-disable security/no-low-level-calls
Expand Down
2 changes: 1 addition & 1 deletion contracts/permit/PermitAndDepositDai.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/SafeERC20Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-pool/PrizePool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/utils/SafeCastUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-pool/PrizePoolInterface.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../token/TokenListenerInterface.sol";
import "../token/ControlledTokenInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-pool/compound/CompoundPrizePool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/proxy/Initializable.sol";
import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "./CompoundPrizePool.sol";
import "../../external/openzeppelin/ProxyFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-pool/stake/StakePrizePool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-pool/stake/StakePrizePoolProxyFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "./StakePrizePool.sol";
import "../../external/openzeppelin/ProxyFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-pool/yield-source/YieldSourcePrizePool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/SafeERC20Upgradeable.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "./YieldSourcePrizePool.sol";
import "../../external/openzeppelin/ProxyFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-strategy/BeforeAwardListener.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

import "./BeforeAwardListenerInterface.sol";
import "../Constants.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-strategy/BeforeAwardListenerInterface.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/introspection/IERC165Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-strategy/BeforeAwardListenerLibrary.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

library BeforeAwardListenerLibrary {
/*
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-strategy/PeriodicPrizeStrategy.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/prize-strategy/PeriodicPrizeStrategyListener.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

import "./PeriodicPrizeStrategyListenerInterface.sol";
import "./PeriodicPrizeStrategyListenerLibrary.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/introspection/IERC165Upgradeable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

library PeriodicPrizeStrategyListenerLibrary {
/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

import "../PeriodicPrizeStrategy.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "./MultipleWinners.sol";
import "../../external/openzeppelin/ProxyFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/BalanceDripExposed.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../drip/BalanceDrip.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/BalanceDripManagerExposed.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../drip/BalanceDripManager.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/BeforeAwardListenerStub.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-strategy/BeforeAwardListener.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/CTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
along with PoolTogether. If not, see <https://www.gnu.org/licenses/>.
*/

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
import "@pooltogether/fixed-point/contracts/FixedPoint.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/CompoundPrizePoolHarness.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-pool/compound/CompoundPrizePool.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/CompoundPrizePoolHarnessProxyFactory.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "./CompoundPrizePoolHarness.sol";
import "../external/openzeppelin/ProxyFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ComptrollerHarness.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;
pragma experimental ABIEncoderV2;

import "../comptroller/Comptroller.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/Dai.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity ^0.6.12;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/DoppelgangerWithExec.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

/* solium-disable security/no-inline-assembly */
contract DoppelgangerWithExec {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ERC1820ImplementerMock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/introspection/IERC1820ImplementerUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC777/IERC777RecipientUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ERC20Mintable.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ERC721Mintable.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/EchidnaTokenFaucet.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../token-faucet/TokenFaucet.sol";
import "./ERC20Mintable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ExtendedSafeCastExposed.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../utils/ExtendedSafeCast.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/MappedSinglyLinkedListExposed.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../utils/MappedSinglyLinkedList.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/MultipleWinnersHarness.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-strategy/multiple-winners/MultipleWinners.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/MultipleWinnersHarnessProxyFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "./MultipleWinnersHarness.sol";
import "../external/openzeppelin/ProxyFactory.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-strategy/PeriodicPrizeStrategy.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/PeriodicPrizeStrategyHarness.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-strategy/PeriodicPrizeStrategy.sol";
import "./PeriodicPrizeStrategyDistributorInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/PeriodicPrizeStrategyListenerStub.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-strategy/PeriodicPrizeStrategyListener.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/PrizePoolHarness.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.6.0 <0.7.0;
pragma solidity 0.6.12;

import "../prize-pool/PrizePool.sol";
import "./YieldSourceStub.sol";
Expand Down
Loading

0 comments on commit f824f6a

Please sign in to comment.