Transpile 289e15ab

.solhint.json

@@ -4,8 +4,9 @@
     "func-order": "off",
     "mark-callable-contracts": "off",
     "no-empty-blocks": "off",
-    "compiler-version": ["error", "^0.6.0"],
+    "compiler-version": "off",
     "private-vars-leading-underscore": "error",
-    "reason-string": "off"
+    "reason-string": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }]
   }
 }

CHANGELOG.md

@@ -22,7 +22,7 @@
 
  * `Address`: added `functionStaticCall` and `functionDelegateCall`, similar to the existing `functionCall`. ([#2333](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2333))
  * `TimelockController`: added a contract to augment access control schemes with a delay. ([#2364](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2364))
- * `EnumerableSet`: added `BytesSet`, for sets of `bytes32`. ([#2395](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2395))
+ * `EnumerableSet`: added `Bytes32Set`, for sets of `bytes32`. ([#2395](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2395))
 
 ## 3.2.0 (2020-09-10)
 

contracts/GSN/ContextUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 import "../proxy/Initializable.sol";
 
 /*

contracts/GSN/GSNRecipientERC20FeeUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./GSNRecipientUpgradeable.sol";
 import "../math/SafeMathUpgradeable.sol";
@@ -94,6 +94,8 @@ contract GSNRecipientERC20FeeUpgradeable is Initializable, GSNRecipientUpgradeab
 
         // The maximum token charge is pre-charged from the user
         _token.safeTransferFrom(from, address(this), maxPossibleCharge);
+
+        return 0;
     }
 
     /**

contracts/GSN/GSNRecipientSignatureUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./GSNRecipientUpgradeable.sol";
 import "../cryptography/ECDSAUpgradeable.sol";

contracts/GSN/GSNRecipientUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./IRelayRecipientUpgradeable.sol";
 import "./IRelayHubUpgradeable.sol";

contracts/GSN/IRelayHubUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Interface for `RelayHub`, the core contract of the GSN. Users should not need to interact with this contract

contracts/GSN/IRelayRecipientUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Base interface for a contract that will be called via the GSN from {IRelayHub}.

contracts/access/AccessControlUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/EnumerableSetUpgradeable.sol";
 import "../utils/AddressUpgradeable.sol";

contracts/access/OwnableUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../proxy/Initializable.sol";
@@ -16,7 +16,7 @@ import "../proxy/Initializable.sol";
  * `onlyOwner`, which can be applied to your functions to restrict their use to
  * the owner.
  */
-contract OwnableUpgradeable is Initializable, ContextUpgradeable {
+abstract contract OwnableUpgradeable is Initializable, ContextUpgradeable {
     address private _owner;
 
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);

contracts/access/TimelockControllerUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.9 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 import "./../math/SafeMathUpgradeable.sol";

contracts/cryptography/ECDSAUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Elliptic Curve Digital Signature Algorithm (ECDSA) operations.

contracts/cryptography/MerkleProofUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev These functions deal with verification of Merkle trees (hash trees),

contracts/introspection/ERC165CheckerUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.2;
+pragma solidity >=0.6.2 <0.8.0;
 
 /**
  * @dev Library used to query support of an interface declared via {IERC165}.

contracts/introspection/ERC165Upgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./IERC165Upgradeable.sol";
 import "../proxy/Initializable.sol";
@@ -11,7 +11,7 @@ import "../proxy/Initializable.sol";
  * Contracts may inherit from this and call {_registerInterface} to declare
  * their support of an interface.
  */
-contract ERC165Upgradeable is Initializable, IERC165Upgradeable {
+abstract contract ERC165Upgradeable is Initializable, IERC165Upgradeable {
     /*
      * bytes4(keccak256('supportsInterface(bytes4)')) == 0x01ffc9a7
      */

contracts/introspection/ERC1820ImplementerUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./IERC1820ImplementerUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/introspection/IERC165Upgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Interface of the ERC165 standard, as defined in the

contracts/introspection/IERC1820ImplementerUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Interface for an ERC1820 implementer, as defined in the

contracts/introspection/IERC1820RegistryUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Interface of the global ERC1820 Registry, as defined in the
@@ -59,7 +59,7 @@ interface IERC1820RegistryUpgradeable {
      * queried for support, unless `implementer` is the caller. See
      * {IERC1820Implementer-canImplementInterfaceForAddress}.
      */
-    function setInterfaceImplementer(address account, bytes32 interfaceHash, address implementer) external;
+    function setInterfaceImplementer(address account, bytes32 _interfaceHash, address implementer) external;
 
     /**
      * @dev Returns the implementer of `interfaceHash` for `account`. If no such
@@ -70,7 +70,7 @@ interface IERC1820RegistryUpgradeable {
      *
      * `account` being the zero address is an alias for the caller's address.
      */
-    function getInterfaceImplementer(address account, bytes32 interfaceHash) external view returns (address);
+    function getInterfaceImplementer(address account, bytes32 _interfaceHash) external view returns (address);
 
     /**
      * @dev Returns the interface hash for an `interfaceName`, as defined in the

contracts/math/MathUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Standard math utilities missing in the Solidity language.

contracts/math/SafeMathUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @dev Wrappers over Solidity's arithmetic operations with added overflow

contracts/math/SignedSafeMathUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @title SignedSafeMath

contracts/mocks/AccessControlMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../access/AccessControlUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/AddressImplUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/AddressUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ArraysImplUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/ArraysUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/CallReceiverMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 import "../proxy/Initializable.sol";
 
 contract CallReceiverMockUpgradeable is Initializable {

contracts/mocks/ClashingImplementationUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 import "../proxy/Initializable.sol";
 
 

contracts/mocks/ConditionalEscrowMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../payment/escrow/ConditionalEscrowUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ContextMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/CountersImplUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/CountersUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/Create2ImplUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/Create2Upgradeable.sol";
 import "../introspection/ERC1820ImplementerUpgradeable.sol";

contracts/mocks/DummyImplementationUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 import "../proxy/Initializable.sol";
 
 abstract contract ImplUpgradeable is Initializable {

contracts/mocks/ECDSAMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../cryptography/ECDSAUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC1155BurnableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC1155/ERC1155BurnableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC1155MockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC1155/ERC1155Upgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC1155PausableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ERC1155MockUpgradeable.sol";
 import "../token/ERC1155/ERC1155PausableUpgradeable.sol";

contracts/mocks/ERC1155ReceiverMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC1155/IERC1155ReceiverUpgradeable.sol";
 import "./ERC165MockUpgradeable.sol";

contracts/mocks/ERC165/ERC165InterfacesSupportedUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../introspection/IERC165Upgradeable.sol";
 import "../../proxy/Initializable.sol";

contracts/mocks/ERC165/ERC165NotSupportedUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 import "../../proxy/Initializable.sol";
 
 contract ERC165NotSupportedUpgradeable is Initializable {    function __ERC165NotSupported_init() internal initializer {

contracts/mocks/ERC165CheckerMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../introspection/ERC165CheckerUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC165MockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../introspection/ERC165Upgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC1820ImplementerMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../introspection/ERC1820ImplementerUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC20BurnableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC20/ERC20BurnableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC20CappedMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC20/ERC20CappedUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC20DecimalsMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC20/ERC20Upgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC20MockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC20/ERC20Upgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC20PausableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC20/ERC20PausableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC20SnapshotMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC20/ERC20SnapshotUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC721BurnableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC721/ERC721BurnableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC721GSNRecipientMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC721/ERC721Upgradeable.sol";
 import "../GSN/GSNRecipientUpgradeable.sol";

contracts/mocks/ERC721MockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC721/ERC721Upgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC721PausableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC721/ERC721PausableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC721ReceiverMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/ERC721/IERC721ReceiverUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ERC777MockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../token/ERC777/ERC777Upgradeable.sol";

contracts/mocks/ERC777SenderRecipientMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../token/ERC777/IERC777Upgradeable.sol";

contracts/mocks/EnumerableMapMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/EnumerableMapUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/EnumerableSetMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/EnumerableSetUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/EtherReceiverMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 import "../proxy/Initializable.sol";
 
 contract EtherReceiverMockUpgradeable is Initializable {

contracts/mocks/GSNRecipientERC20FeeMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/GSNRecipientUpgradeable.sol";
 import "../GSN/GSNRecipientERC20FeeUpgradeable.sol";

contracts/mocks/GSNRecipientMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ContextMockUpgradeable.sol";
 import "../GSN/GSNRecipientUpgradeable.sol";

contracts/mocks/GSNRecipientSignatureMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/GSNRecipientUpgradeable.sol";
 import "../GSN/GSNRecipientSignatureUpgradeable.sol";

contracts/mocks/InitializableMock.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../proxy/Initializable.sol";
 

contracts/mocks/MathMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../math/MathUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/MerkleProofWrapperUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import { MerkleProofUpgradeable } from "../cryptography/MerkleProofUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/MultipleInheritanceInitializableMocks.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../proxy/Initializable.sol";
 

contracts/mocks/OwnableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../access/OwnableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/PausableMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/PausableUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/PullPaymentMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../payment/PullPaymentUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ReentrancyAttackUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/ReentrancyMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/ReentrancyGuardUpgradeable.sol";
 import "./ReentrancyAttackUpgradeable.sol";

contracts/mocks/RegressionImplementation.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../proxy/Initializable.sol";
 

contracts/mocks/SafeCastMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/SafeCastUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/SafeERC20HelperUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../token/ERC20/IERC20Upgradeable.sol";

contracts/mocks/SafeMathMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../math/SafeMathUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/SignedSafeMathMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../math/SignedSafeMathUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/SingleInheritanceInitializableMocks.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../proxy/Initializable.sol";
 

contracts/mocks/StringsMockUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../utils/StringsUpgradeable.sol";
 import "../proxy/Initializable.sol";

contracts/mocks/WithInit.sol

 pragma solidity >=0.6 <0.8;
 pragma experimental ABIEncoderV2;
 
-import "../access/OwnableUpgradeable.sol";
-
-contract OwnableUpgradeableWithInit is OwnableUpgradeable {
-    constructor() public payable {
-        __Ownable_init();
-    }
-}
 import "../access/TimelockControllerUpgradeable.sol";
 
 contract TimelockControllerUpgradeableWithInit is TimelockControllerUpgradeable {
@@ -32,8 +25,8 @@ contract __unstable__ERC20OwnedUpgradeableWithInit is __unstable__ERC20OwnedUpgr
 import "../token/ERC20/ERC20Upgradeable.sol";
 
 contract ERC20UpgradeableWithInit is ERC20Upgradeable {
-    constructor(string memory name, string memory symbol) public payable {
-        __ERC20_init(name, symbol);
+    constructor(string memory name_, string memory symbol_) public payable {
+        __ERC20_init(name_, symbol_);
     }
 }
 import "../GSN/GSNRecipientSignatureUpgradeable.sol";
@@ -43,13 +36,6 @@ contract GSNRecipientSignatureUpgradeableWithInit is GSNRecipientSignatureUpgrad
         __GSNRecipientSignature_init(trustedSigner);
     }
 }
-import "../introspection/ERC165Upgradeable.sol";
-
-contract ERC165UpgradeableWithInit is ERC165Upgradeable {
-    constructor() public payable {
-        __ERC165_init();
-    }
-}
 import "../introspection/ERC1820ImplementerUpgradeable.sol";
 
 contract ERC1820ImplementerUpgradeableWithInit is ERC1820ImplementerUpgradeable {
@@ -193,8 +179,8 @@ contract ERC1155BurnableMockUpgradeableWithInit is ERC1155BurnableMockUpgradeabl
 import "../token/ERC1155/ERC1155Upgradeable.sol";
 
 contract ERC1155UpgradeableWithInit is ERC1155Upgradeable {
-    constructor(string memory uri) public payable {
-        __ERC1155_init(uri);
+    constructor(string memory uri_) public payable {
+        __ERC1155_init(uri_);
     }
 }
 import "./ERC1155MockUpgradeable.sol";
@@ -211,13 +197,6 @@ contract ERC1155PausableMockUpgradeableWithInit is ERC1155PausableMockUpgradeabl
         __ERC1155PausableMock_init(uri);
     }
 }
-import "../utils/PausableUpgradeable.sol";
-
-contract PausableUpgradeableWithInit is PausableUpgradeable {
-    constructor() public payable {
-        __Pausable_init();
-    }
-}
 import "./ERC1155ReceiverMockUpgradeable.sol";
 
 contract ERC1155ReceiverMockUpgradeableWithInit is ERC1155ReceiverMockUpgradeable {
@@ -344,8 +323,8 @@ contract ERC721BurnableMockUpgradeableWithInit is ERC721BurnableMockUpgradeable
 import "../token/ERC721/ERC721Upgradeable.sol";
 
 contract ERC721UpgradeableWithInit is ERC721Upgradeable {
-    constructor(string memory name, string memory symbol) public payable {
-        __ERC721_init(name, symbol);
+    constructor(string memory name_, string memory symbol_) public payable {
+        __ERC721_init(name_, symbol_);
     }
 }
 import "./ERC721GSNRecipientMockUpgradeable.sol";
@@ -393,11 +372,11 @@ import "../token/ERC777/ERC777Upgradeable.sol";
 
 contract ERC777UpgradeableWithInit is ERC777Upgradeable {
     constructor(
-        string memory name,
-        string memory symbol,
-        address[] memory defaultOperators
+        string memory name_,
+        string memory symbol_,
+        address[] memory defaultOperators_
     ) public payable {
-        __ERC777_init(name, symbol, defaultOperators);
+        __ERC777_init(name_, symbol_, defaultOperators_);
     }
 }
 import "./ERC777SenderRecipientMockUpgradeable.sol";
@@ -470,13 +449,6 @@ contract PullPaymentMockUpgradeableWithInit is PullPaymentMockUpgradeable {
         __PullPaymentMock_init();
     }
 }
-import "../payment/PullPaymentUpgradeable.sol";
-
-contract PullPaymentUpgradeableWithInit is PullPaymentUpgradeable {
-    constructor() public payable {
-        __PullPayment_init();
-    }
-}
 import "./ReentrancyAttackUpgradeable.sol";
 
 contract ReentrancyAttackUpgradeableWithInit is ReentrancyAttackUpgradeable {
@@ -491,13 +463,6 @@ contract ReentrancyMockUpgradeableWithInit is ReentrancyMockUpgradeable {
         __ReentrancyMock_init();
     }
 }
-import "../utils/ReentrancyGuardUpgradeable.sol";
-
-contract ReentrancyGuardUpgradeableWithInit is ReentrancyGuardUpgradeable {
-    constructor() public payable {
-        __ReentrancyGuard_init();
-    }
-}
 import "./SafeCastMockUpgradeable.sol";
 
 contract SafeCastMockUpgradeableWithInit is SafeCastMockUpgradeable {
@@ -557,15 +522,15 @@ contract StringsMockUpgradeableWithInit is StringsMockUpgradeable {
 import "../payment/escrow/RefundEscrowUpgradeable.sol";
 
 contract RefundEscrowUpgradeableWithInit is RefundEscrowUpgradeable {
-    constructor(address payable beneficiary) public payable {
-        __RefundEscrow_init(beneficiary);
+    constructor(address payable beneficiary_) public payable {
+        __RefundEscrow_init(beneficiary_);
     }
 }
 import "../payment/PaymentSplitterUpgradeable.sol";
 
 contract PaymentSplitterUpgradeableWithInit is PaymentSplitterUpgradeable {
-    constructor(address[] memory payees, uint256[] memory shares) public payable {
-        __PaymentSplitter_init(payees, shares);
+    constructor(address[] memory payees, uint256[] memory shares_) public payable {
+        __PaymentSplitter_init(payees, shares_);
     }
 }
 import "../presets/ERC1155PresetMinterPauserUpgradeable.sol";
@@ -599,8 +564,8 @@ contract ERC1155HolderUpgradeableWithInit is ERC1155HolderUpgradeable {
 import "../token/ERC20/TokenTimelockUpgradeable.sol";
 
 contract TokenTimelockUpgradeableWithInit is TokenTimelockUpgradeable {
-    constructor(IERC20Upgradeable token, address beneficiary, uint256 releaseTime) public payable {
-        __TokenTimelock_init(token, beneficiary, releaseTime);
+    constructor(IERC20Upgradeable token_, address beneficiary_, uint256 releaseTime_) public payable {
+        __TokenTimelock_init(token_, beneficiary_, releaseTime_);
     }
 }
 import "../token/ERC721/ERC721HolderUpgradeable.sol";

contracts/payment/PaymentSplitterUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../GSN/ContextUpgradeable.sol";
 import "../math/SafeMathUpgradeable.sol";
@@ -40,18 +40,18 @@ contract PaymentSplitterUpgradeable is Initializable, ContextUpgradeable {
      * All addresses in `payees` must be non-zero. Both arrays must have the same non-zero length, and there must be no
      * duplicates in `payees`.
      */
-    function __PaymentSplitter_init(address[] memory payees, uint256[] memory shares) internal initializer {
+    function __PaymentSplitter_init(address[] memory payees, uint256[] memory shares_) internal initializer {
         __Context_init_unchained();
-        __PaymentSplitter_init_unchained(payees, shares);
+        __PaymentSplitter_init_unchained(payees, shares_);
     }
 
-    function __PaymentSplitter_init_unchained(address[] memory payees, uint256[] memory shares) internal initializer {
+    function __PaymentSplitter_init_unchained(address[] memory payees, uint256[] memory shares_) internal initializer {
         // solhint-disable-next-line max-line-length
-        require(payees.length == shares.length, "PaymentSplitter: payees and shares length mismatch");
+        require(payees.length == shares_.length, "PaymentSplitter: payees and shares length mismatch");
         require(payees.length > 0, "PaymentSplitter: no payees");
 
         for (uint256 i = 0; i < payees.length; i++) {
-            _addPayee(payees[i], shares[i]);
+            _addPayee(payees[i], shares_[i]);
         }
     }
 

contracts/payment/PullPaymentUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.2;
+pragma solidity >=0.6.2 <0.8.0;
 
 import "./escrow/EscrowUpgradeable.sol";
 import "../proxy/Initializable.sol";
@@ -23,7 +23,7 @@ import "../proxy/Initializable.sol";
  * instead of Solidity's `transfer` function. Payees can query their due
  * payments with {payments}, and retrieve them with {withdrawPayments}.
  */
-contract PullPaymentUpgradeable is Initializable {
+abstract contract PullPaymentUpgradeable is Initializable {
     EscrowUpgradeable private _escrow;
 
     function __PullPayment_init() internal initializer {

contracts/payment/escrow/ConditionalEscrowUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./EscrowUpgradeable.sol";
 import "../../proxy/Initializable.sol";

contracts/payment/escrow/EscrowUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../math/SafeMathUpgradeable.sol";
 import "../../access/OwnableUpgradeable.sol";

contracts/payment/escrow/RefundEscrowUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ConditionalEscrowUpgradeable.sol";
 import "../../proxy/Initializable.sol";
@@ -26,19 +26,19 @@ contract RefundEscrowUpgradeable is Initializable, ConditionalEscrowUpgradeable
 
     /**
      * @dev Constructor.
-     * @param beneficiary The beneficiary of the deposits.
+     * @param beneficiary_ The beneficiary of the deposits.
      */
-    function __RefundEscrow_init(address payable beneficiary) internal initializer {
+    function __RefundEscrow_init(address payable beneficiary_) internal initializer {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __Escrow_init_unchained();
         __ConditionalEscrow_init_unchained();
-        __RefundEscrow_init_unchained(beneficiary);
+        __RefundEscrow_init_unchained(beneficiary_);
     }
 
-    function __RefundEscrow_init_unchained(address payable beneficiary) internal initializer {
-        require(beneficiary != address(0), "RefundEscrow: beneficiary is the zero address");
-        _beneficiary = beneficiary;
+    function __RefundEscrow_init_unchained(address payable beneficiary_) internal initializer {
+        require(beneficiary_ != address(0), "RefundEscrow: beneficiary is the zero address");
+        _beneficiary = beneficiary_;
         _state = State.Active;
     }
 

contracts/presets/ERC1155PresetMinterPauserUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../access/AccessControlUpgradeable.sol";
 import "../GSN/ContextUpgradeable.sol";

contracts/presets/ERC20PresetMinterPauserUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../access/AccessControlUpgradeable.sol";
 import "../GSN/ContextUpgradeable.sol";

contracts/presets/ERC721PresetMinterPauserAutoIdUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../access/AccessControlUpgradeable.sol";
 import "../GSN/ContextUpgradeable.sol";

contracts/proxy/Initializable.sol

 // SPDX-License-Identifier: MIT
 
 // solhint-disable-next-line compiler-version
-pragma solidity >=0.4.24 <0.7.0;
+pragma solidity >=0.4.24 <0.8.0;
 
 
 /**

contracts/token/ERC1155/ERC1155BurnableUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ERC1155Upgradeable.sol";
 import "../../proxy/Initializable.sol";

contracts/token/ERC1155/ERC1155HolderUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ERC1155ReceiverUpgradeable.sol";
 import "../../proxy/Initializable.sol";

contracts/token/ERC1155/ERC1155PausableUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ERC1155Upgradeable.sol";
 import "../../utils/PausableUpgradeable.sol";

contracts/token/ERC1155/ERC1155ReceiverUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./IERC1155ReceiverUpgradeable.sol";
 import "../../introspection/ERC165Upgradeable.sol";

contracts/token/ERC1155/ERC1155Upgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./IERC1155Upgradeable.sol";
 import "./IERC1155MetadataURIUpgradeable.sol";
@@ -53,14 +53,14 @@ contract ERC1155Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradea
     /**
      * @dev See {_setURI}.
      */
-    function __ERC1155_init(string memory uri) internal initializer {
+    function __ERC1155_init(string memory uri_) internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __ERC1155_init_unchained(uri);
+        __ERC1155_init_unchained(uri_);
     }
 
-    function __ERC1155_init_unchained(string memory uri) internal initializer {
-        _setURI(uri);
+    function __ERC1155_init_unchained(string memory uri_) internal initializer {
+        _setURI(uri_);
 
         // register the supported interfaces to conform to ERC1155 via ERC165
         _registerInterface(_INTERFACE_ID_ERC1155);

contracts/token/ERC1155/IERC1155MetadataURIUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.2;
+pragma solidity >=0.6.2 <0.8.0;
 
 import "./IERC1155Upgradeable.sol";
 

contracts/token/ERC1155/IERC1155ReceiverUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../introspection/IERC165Upgradeable.sol";
 

contracts/token/ERC1155/IERC1155Upgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.2;
+pragma solidity >=0.6.2 <0.8.0;
 
 import "../../introspection/IERC165Upgradeable.sol";
 

contracts/token/ERC20/ERC20BurnableUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../GSN/ContextUpgradeable.sol";
 import "./ERC20Upgradeable.sol";
@@ -19,6 +19,8 @@ abstract contract ERC20BurnableUpgradeable is Initializable, ContextUpgradeable,
 
     function __ERC20Burnable_init_unchained() internal initializer {
     }
+    using SafeMathUpgradeable for uint256;
+
     /**
      * @dev Destroys `amount` tokens from the caller.
      *

contracts/token/ERC20/ERC20CappedUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ERC20Upgradeable.sol";
 import "../../proxy/Initializable.sol";
@@ -9,20 +9,22 @@ import "../../proxy/Initializable.sol";
  * @dev Extension of {ERC20} that adds a cap to the supply of tokens.
  */
 abstract contract ERC20CappedUpgradeable is Initializable, ERC20Upgradeable {
+    using SafeMathUpgradeable for uint256;
+
     uint256 private _cap;
 
     /**
      * @dev Sets the value of the `cap`. This value is immutable, it can only be
      * set once during construction.
      */
-    function __ERC20Capped_init(uint256 cap) internal initializer {
+    function __ERC20Capped_init(uint256 cap_) internal initializer {
         __Context_init_unchained();
-        __ERC20Capped_init_unchained(cap);
+        __ERC20Capped_init_unchained(cap_);
     }
 
-    function __ERC20Capped_init_unchained(uint256 cap) internal initializer {
-        require(cap > 0, "ERC20Capped: cap is 0");
-        _cap = cap;
+    function __ERC20Capped_init_unchained(uint256 cap_) internal initializer {
+        require(cap_ > 0, "ERC20Capped: cap is 0");
+        _cap = cap_;
     }
 
     /**

contracts/token/ERC20/ERC20PausableUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./ERC20Upgradeable.sol";
 import "../../utils/PausableUpgradeable.sol";

contracts/token/ERC20/ERC20SnapshotUpgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../math/SafeMathUpgradeable.sol";
 import "../../utils/ArraysUpgradeable.sol";

contracts/token/ERC20/ERC20Upgradeable.sol

 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../GSN/ContextUpgradeable.sol";
 import "./IERC20Upgradeable.sol";
@@ -53,14 +53,14 @@ contract ERC20Upgradeable is Initializable, ContextUpgradeable, IERC20Upgradeabl
      * All three of these values are immutable: they can only be set once during
      * construction.
      */
-    function __ERC20_init(string memory name, string memory symbol) internal initializer {
+    function __ERC20_init(string memory name_, string memory symbol_) internal initializer {
         __Context_init_unchained();
-        __ERC20_init_unchained(name, symbol);
+        __ERC20_init_unchained(name_, symbol_);
     }
 
-    function __ERC20_init_unchained(string memory name, string memory symbol) internal initializer {
-        _name = name;
-        _symbol = symbol;
+    function __ERC20_init_unchained(string memory name_, string memory symbol_) internal initializer {
+        _name = name_;
+        _symbol = symbol_;
         _decimals = 18;
     }