change to istanbul

leapdao · May 20, 2020 · f7a520a · f7a520a
1 parent 459672b
commit f7a520a
Show file tree

Hide file tree

Showing 47 changed files with 48 additions and 48 deletions.
diff --git a/contracts/Adminable.sol b/contracts/Adminable.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./zos/Initializable.sol";
 

diff --git a/contracts/Bridge.sol b/contracts/Bridge.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "./Adminable.sol";

diff --git a/contracts/DepositHandler.sol b/contracts/DepositHandler.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./Vault.sol";
 import "./Bridge.sol";

diff --git a/contracts/ERC1948Mint.sol b/contracts/ERC1948Mint.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "openzeppelin-solidity/contracts/token/ERC721/ERC721.sol";
 import "./IERC1948.sol";

diff --git a/contracts/ERC1949.sol b/contracts/ERC1949.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC721/ERC721Metadata.sol";
 import "./ERC1948.sol";

diff --git a/contracts/ERC1949Breed.sol b/contracts/ERC1949Breed.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./ERC1948Mint.sol";
 

diff --git a/contracts/ERC20Mint.sol b/contracts/ERC20Mint.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/ERC721Mint.sol b/contracts/ERC721Mint.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "openzeppelin-solidity/contracts/token/ERC721/ERC721.sol";
 

diff --git a/contracts/ExitHandler.sol b/contracts/ExitHandler.sol
@@ -8,7 +8,7 @@
 
 /* solium-disable security/no-block-members */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/math/Math.sol";
 

diff --git a/contracts/FastExitHandler.sol b/contracts/FastExitHandler.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./ExitHandler.sol";
 import "./Bridge.sol";

diff --git a/contracts/HeartbeatToken.sol b/contracts/HeartbeatToken.sol
@@ -5,7 +5,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC721/ERC721Full.sol";
 import "../node_modules/openzeppelin-solidity/contracts/access/roles/MinterRole.sol";

diff --git a/contracts/IERC1949.sol b/contracts/IERC1949.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 /**
  * @dev Interface of the ERC1949 contract.

diff --git a/contracts/IExitHandler.sol b/contracts/IExitHandler.sol
@@ -8,7 +8,7 @@
 
 /* solium-disable security/no-block-members */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 contract IExitHandler {
 

diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 
 contract Migrations {

diff --git a/contracts/MinGov.sol b/contracts/MinGov.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/ownership/Ownable.sol";
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";

diff --git a/contracts/NativeToken.sol b/contracts/NativeToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC20/ERC20Detailed.sol";
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC20/ERC20Mintable.sol";

diff --git a/contracts/PoaOperator.sol b/contracts/PoaOperator.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./Adminable.sol";
 import "./ExitHandler.sol";

diff --git a/contracts/PosOperator.sol b/contracts/PosOperator.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "./PoaOperator.sol";

diff --git a/contracts/PriorityQueue.sol b/contracts/PriorityQueue.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts/RollupBridge.sol b/contracts/RollupBridge.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./Bridge.sol";
 

diff --git a/contracts/SwapExchange.sol b/contracts/SwapExchange.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 contract SwapExchange {
 

diff --git a/contracts/SwapRegistry.sol b/contracts/SwapRegistry.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./Bridge.sol";
 import "./Vault.sol";

diff --git a/contracts/TokenGovernance.sol b/contracts/TokenGovernance.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
 import "../node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol";

diff --git a/contracts/TransferrableToken.sol b/contracts/TransferrableToken.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../node_modules/openzeppelin-solidity/contracts/introspection/ERC165.sol";
 

diff --git a/contracts/TxLib.sol b/contracts/TxLib.sol
@@ -4,7 +4,7 @@
  * This source code is licensed under the Mozilla Public License, version 2,
  * found in the LICENSE file in the root directory of this source tree.
  */
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 library TxLib {
   uint constant internal WORD_SIZE = 32;
   uint constant internal ONES = ~uint(0);

diff --git a/contracts/Vault.sol b/contracts/Vault.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./Bridge.sol";
 import "./Adminable.sol";

diff --git a/contracts/misc/BountyPayout.sol b/contracts/misc/BountyPayout.sol
@@ -4,7 +4,7 @@
  * This source code is licensed under the Mozilla Public License, version 2,
  * found in the LICENSE file in the root directory of this source tree.
  */
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 pragma experimental ABIEncoderV2; // solium-disable-line no-experimental
 
 

diff --git a/contracts/misc/ERC20PaymentSplitter.sol b/contracts/misc/ERC20PaymentSplitter.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 interface IERC20 {
     function transferFrom(address from, address to, uint256 value) external returns (bool);

diff --git a/contracts/misc/IColony.sol b/contracts/misc/IColony.sol
@@ -5,7 +5,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 pragma experimental ABIEncoderV2; // solium-disable-line no-experimental
 
 

diff --git a/contracts/mocks/BridgeMock.sol b/contracts/mocks/BridgeMock.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../Adminable.sol";
 

diff --git a/contracts/mocks/Colony.sol b/contracts/mocks/Colony.sol
@@ -4,7 +4,7 @@
  * This source code is licensed under the Mozilla Public License, version 2,
  * found in the LICENSE file in the root directory of this source tree.
  */
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 pragma experimental ABIEncoderV2; // solium-disable-line no-experimental
 
 

diff --git a/contracts/mocks/ERC1949BreedMock.sol b/contracts/mocks/ERC1949BreedMock.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../ERC1949Breed.sol";
 

diff --git a/contracts/mocks/OperatorMock.sol b/contracts/mocks/OperatorMock.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../Adminable.sol";
 

diff --git a/contracts/mocks/PoaOperatorMock.sol b/contracts/mocks/PoaOperatorMock.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../PoaOperator.sol";
 

diff --git a/contracts/mocks/SimpleToken.sol b/contracts/mocks/SimpleToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../../node_modules/openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
 import "../NativeToken.sol";

diff --git a/contracts/mocks/SpaceDustNFT.sol b/contracts/mocks/SpaceDustNFT.sol
@@ -4,7 +4,7 @@
  * This source code is licensed under the Mozilla Public License, version 2,
  * found in the LICENSE file in the root directory of this source tree.
  */
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../../node_modules/openzeppelin-solidity/contracts/token/ERC721/ERC721Full.sol";
 import "../../node_modules/openzeppelin-solidity/contracts/access/roles/MinterRole.sol";

diff --git a/contracts/mocks/TxMock.sol b/contracts/mocks/TxMock.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 pragma experimental ABIEncoderV2; // solium-disable-line no-experimental
 import "../TxLib.sol";
 

diff --git a/contracts/mocks/VaultMock.sol b/contracts/mocks/VaultMock.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../Adminable.sol";
 

diff --git a/contracts/proxies/AdminableProxy.sol b/contracts/proxies/AdminableProxy.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 //import "zos-lib/contracts/upgradeability/AdminUpgradeabilityProxy.sol"; - should be changed back once zos-lib will update import
 import "../zos/AdminUpgradeabilityProxy.sol";

diff --git a/contracts/proxies/BridgeProxy.sol b/contracts/proxies/BridgeProxy.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./AdminableProxy.sol";
 import "../Bridge.sol";

diff --git a/contracts/proxies/ExitHandlerProxy.sol b/contracts/proxies/ExitHandlerProxy.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./AdminableProxy.sol";
 import "../ExitHandler.sol";

diff --git a/contracts/proxies/OperatorProxy.sol b/contracts/proxies/OperatorProxy.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "./AdminableProxy.sol";
 import "../PosOperator.sol";

diff --git a/contracts/test/BridgeUpgradeTest.sol b/contracts/test/BridgeUpgradeTest.sol
@@ -6,7 +6,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 import "../Bridge.sol";
 

diff --git a/contracts/zos/AdminUpgradeabilityProxy.sol b/contracts/zos/AdminUpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 //Copied from zos-lib due to import fix needed in UpgradeabilityProxy.sol
 

diff --git a/contracts/zos/Proxy.sol b/contracts/zos/Proxy.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 /**
  * @title Proxy

diff --git a/contracts/zos/UpgradeabilityProxy.sol b/contracts/zos/UpgradeabilityProxy.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.2;
+pragma solidity ^0.5.12;
 
 //copied from zos-lib due to import fix needed:
 //import "openzeppelin-solidity/contracts/AddressUtils.sol" -> import "openzeppelin-solidity/contracts/utils/Address.sol"

diff --git a/truffle-config.js b/truffle-config.js
@@ -13,14 +13,14 @@ module.exports = {
   // Configure your compilers
   compilers: {
     solc: {
-      version: '0.5.2',
+      version: '0.5.12',
       settings: {
         optimizer: {
           enabled: true,
           runs: 2,
         },
         // TODO: the code is supposed to work on constantinople EVM but fails if this is switched on
-        evmVersion: 'byzantium',
+        evmVersion: 'istanbul',
       },
     },
   },