solc 0.6.12 (#91)

daostack · Jul 30, 2020 · 57ed9a5 · 57ed9a5
1 parent e9a0fb3
commit 57ed9a5
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 1,559 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -7,7 +7,7 @@
       "no-simple-event-func-name": "off",
       "two-lines-top-level-separator": "off",
       "mark-callable-contracts": "off",
-      "compiler-version": ["error","^0.6.10"],
+      "compiler-version": ["error","^0.6.12"],
       "reason-string": ["error",{"maxLength":64}]
     }
   }
diff --git a/buidler.config.js b/buidler.config.js
@@ -123,7 +123,7 @@ module.exports = {
   }
 },
   solc: {
-    version: "0.6.10",    // Fetch exact version from solc-bin (default: truffle's version)
+    version: "0.6.12",    // Fetch exact version from solc-bin (default: truffle's version)
     optimizer: {
       enabled: true,
       runs: 200

diff --git a/contracts/Reputation.sol b/contracts/Reputation.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
 

diff --git a/contracts/libs/RealMath.sol b/contracts/libs/RealMath.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 /**
  * RealMath: fixed-point math library, based on fractional and integer parts.

diff --git a/contracts/test/AbsoluteVoteExecuteMock.sol b/contracts/test/AbsoluteVoteExecuteMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "../votingMachines/ProposalExecuteInterface.sol";
 import "../votingMachines/VotingMachineCallbacksInterface.sol";

diff --git a/contracts/test/Debug.sol b/contracts/test/Debug.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 /*
     A contract you can inherit from that has some useful Events to print statements.
 */

diff --git a/contracts/test/ERC827TokenMock.sol b/contracts/test/ERC827TokenMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "../token/ERC827/ERC827Token.sol";// mock class using ERC827 Token
 

diff --git a/contracts/test/GenesisProtocolCallbacksMock.sol b/contracts/test/GenesisProtocolCallbacksMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
 import "../votingMachines/VotingMachineCallbacksInterface.sol";

diff --git a/contracts/test/RealMathTester.sol b/contracts/test/RealMathTester.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "../libs/RealMath.sol";
 

diff --git a/contracts/test/ReputationTestHelper.sol b/contracts/test/ReputationTestHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "../Reputation.sol";
 

diff --git a/contracts/token/ERC827/ERC827.sol b/contracts/token/ERC827/ERC827.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827/ERC827Token.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 
 import "./ERC827.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts/votingMachines/AbsoluteVote.sol b/contracts/votingMachines/AbsoluteVote.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 import "../Reputation.sol";
 import "./IntVoteInterface.sol";

diff --git a/contracts/votingMachines/GenesisProtocol.sol b/contracts/votingMachines/GenesisProtocol.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 import "./IntVoteInterface.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/cryptography/ECDSA.sol";

diff --git a/contracts/votingMachines/GenesisProtocolLogic.sol b/contracts/votingMachines/GenesisProtocolLogic.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 import "./IntVoteInterfaceEvents.sol";
 import { RealMath } from "../libs/RealMath.sol";

diff --git a/contracts/votingMachines/IntVoteInterface.sol b/contracts/votingMachines/IntVoteInterface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 interface IntVoteInterface {
     //When implementing this interface please do not only override function and modifier,

diff --git a/contracts/votingMachines/IntVoteInterfaceEvents.sol b/contracts/votingMachines/IntVoteInterfaceEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 
 interface IntVoteInterfaceEvents {

diff --git a/contracts/votingMachines/ProposalExecuteInterface.sol b/contracts/votingMachines/ProposalExecuteInterface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 interface ProposalExecuteInterface {
     function executeProposal(bytes32 _proposalId, int _decision) external returns(bool);

diff --git a/contracts/votingMachines/QuorumVote.sol b/contracts/votingMachines/QuorumVote.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 import "./AbsoluteVote.sol";
 import "./ProposalExecuteInterface.sol";

diff --git a/contracts/votingMachines/VotingMachineCallbacksInterface.sol b/contracts/votingMachines/VotingMachineCallbacksInterface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@daostack/infra-experimental",
-  "version": "0.1.1-rc.21",
+  "version": "0.1.1-rc.22",
   "description": "Base layer DAO's components",
   "files": [
     "contracts/",
@@ -42,7 +42,7 @@
     "pug": "^2.0.0-rc.4",
     "rimraf": "^2.6.2",
     "run-with-ganache": "^0.1.1",
-    "solidity-coverage": "^0.7.0-beta.3",
+    "solidity-coverage": "^0.7.9",
     "uint32": "^0.2.1"
   },
   "repository": {

diff --git a/release-experimental.sh b/release-experimental.sh
@@ -6,7 +6,7 @@ git checkout origin/arc-hive
 echo "npm install ..."
 npm i
 echo "buidler compile ..."
-npm buidler clean
+npx buidler clean
 npx buidler compile
 # publish npm
 echo "Publishing to npm..."