diff --git a/.travis.yml b/.travis.yml index 2d5ae0e..91fbdc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: trusty language: node_js node_js: - - "10.14.2" + - "10.15.1" before_install: diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index 137745f..c30e3b9 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; contract Migrations { diff --git a/contracts/Reputation.sol b/contracts/Reputation.sol index 952e0e7..481445e 100644 --- a/contracts/Reputation.sol +++ b/contracts/Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; diff --git a/contracts/libs/RealMath.sol b/contracts/libs/RealMath.sol index 26ab450..12b5092 100644 --- a/contracts/libs/RealMath.sol +++ b/contracts/libs/RealMath.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; /** * RealMath: fixed-point math library, based on fractional and integer parts. diff --git a/contracts/test/AbsoluteVoteExecuteMock.sol b/contracts/test/AbsoluteVoteExecuteMock.sol index 48bfde8..49561f7 100644 --- a/contracts/test/AbsoluteVoteExecuteMock.sol +++ b/contracts/test/AbsoluteVoteExecuteMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "../votingMachines/ProposalExecuteInterface.sol"; import "../votingMachines/VotingMachineCallbacksInterface.sol"; diff --git a/contracts/test/Debug.sol b/contracts/test/Debug.sol index 7658630..81d5380 100644 --- a/contracts/test/Debug.sol +++ b/contracts/test/Debug.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; /* 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 index a4274d8..4174eb6 100644 --- a/contracts/test/ERC827TokenMock.sol +++ b/contracts/test/ERC827TokenMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "../token/ERC827/ERC827Token.sol";// mock class using ERC827 Token diff --git a/contracts/test/GenesisProtocolCallbacksMock.sol b/contracts/test/GenesisProtocolCallbacksMock.sol index acd0e5b..8b11e3f 100644 --- a/contracts/test/GenesisProtocolCallbacksMock.sol +++ b/contracts/test/GenesisProtocolCallbacksMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "../votingMachines/VotingMachineCallbacksInterface.sol"; import "../votingMachines/ProposalExecuteInterface.sol"; diff --git a/contracts/token/ERC827/ERC827.sol b/contracts/token/ERC827/ERC827.sol index 0d3aa0c..b72f52c 100644 --- a/contracts/token/ERC827/ERC827.sol +++ b/contracts/token/ERC827/ERC827.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827/ERC827Token.sol index f0d65ce..04ee46a 100644 --- a/contracts/token/ERC827/ERC827Token.sol +++ b/contracts/token/ERC827/ERC827Token.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "./ERC827.sol"; import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/votingMachines/AbsoluteVote.sol b/contracts/votingMachines/AbsoluteVote.sol index 6be01af..525381d 100644 --- a/contracts/votingMachines/AbsoluteVote.sol +++ b/contracts/votingMachines/AbsoluteVote.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "../Reputation.sol"; import "./IntVoteInterface.sol"; diff --git a/contracts/votingMachines/GenesisProtocol.sol b/contracts/votingMachines/GenesisProtocol.sol index 2242e1b..1bf630a 100644 --- a/contracts/votingMachines/GenesisProtocol.sol +++ b/contracts/votingMachines/GenesisProtocol.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "openzeppelin-solidity/contracts/cryptography/ECDSA.sol"; import "./GenesisProtocolLogic.sol"; diff --git a/contracts/votingMachines/GenesisProtocolLogic.sol b/contracts/votingMachines/GenesisProtocolLogic.sol index 596382e..a858e04 100644 --- a/contracts/votingMachines/GenesisProtocolLogic.sol +++ b/contracts/votingMachines/GenesisProtocolLogic.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "./IntVoteInterface.sol"; import { RealMath } from "../libs/RealMath.sol"; diff --git a/contracts/votingMachines/IntVoteInterface.sol b/contracts/votingMachines/IntVoteInterface.sol index 41b8a78..5bf6985 100644 --- a/contracts/votingMachines/IntVoteInterface.sol +++ b/contracts/votingMachines/IntVoteInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; interface IntVoteInterface { //When implementing this interface please do not only override function and modifier, diff --git a/contracts/votingMachines/ProposalExecuteInterface.sol b/contracts/votingMachines/ProposalExecuteInterface.sol index 4097098..58c35c7 100644 --- a/contracts/votingMachines/ProposalExecuteInterface.sol +++ b/contracts/votingMachines/ProposalExecuteInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; interface ProposalExecuteInterface { function executeProposal(bytes32 _proposalId, int _decision) external returns(bool); diff --git a/contracts/votingMachines/QuorumVote.sol b/contracts/votingMachines/QuorumVote.sol index db2b3b3..a65ad96 100644 --- a/contracts/votingMachines/QuorumVote.sol +++ b/contracts/votingMachines/QuorumVote.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "./AbsoluteVote.sol"; import "./ProposalExecuteInterface.sol"; diff --git a/contracts/votingMachines/VotingMachineCallbacksInterface.sol b/contracts/votingMachines/VotingMachineCallbacksInterface.sol index df38dc6..036514f 100644 --- a/contracts/votingMachines/VotingMachineCallbacksInterface.sol +++ b/contracts/votingMachines/VotingMachineCallbacksInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.2; +pragma solidity ^0.5.4; import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; diff --git a/package-lock.json b/package-lock.json index 4a8362f..3e71477 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@daostack/infra", - "version": "0.0.1-rc.9", + "version": "0.0.1-rc.10", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -8331,9 +8331,9 @@ "dev": true }, "truffle": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.0.0.tgz", - "integrity": "sha512-la0TJu+E59Ut62i6cGY0sugeubglDqH5w49a7IrpxZ1nnsDqv6qWB3ibiyYiCp/jr+iI0bLtcr3DKkfQjVDd+g==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.0.4.tgz", + "integrity": "sha512-pZYFbU10Hb6PiTalJm+dB6s1qIZjE5qc0ux5fIgQ7Nj24zDrlYmOYruP3yhuqywwzr3PUHGPxr6hXuje0BFYoA==", "dev": true, "requires": { "app-module-path": "^2.2.0", @@ -8344,7 +8344,7 @@ "dependencies": { "fs-extra": { "version": "0.30.0", - "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "dev": true, "requires": { @@ -8357,7 +8357,7 @@ }, "jsonfile": { "version": "2.4.0", - "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, "requires": { @@ -8499,12 +8499,6 @@ "dev": true, "optional": true }, - "uint32": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/uint32/-/uint32-0.2.1.tgz", - "integrity": "sha1-5hjYAtf//Si3CPzOzHMVYIusR/I=", - "dev": true - }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", diff --git a/package.json b/package.json index 30d1691..a289f09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@daostack/infra", - "version": "0.0.1-rc.9", + "version": "0.0.1-rc.10", "description": "Base layer DAO's components", "files": [ "contracts/", @@ -52,8 +52,7 @@ "pug": "^2.0.0-rc.4", "rimraf": "^2.6.2", "run-with-ganache": "^0.1.1", - "truffle": "5.0.0", - "uint32": "^0.2.1", + "truffle": "5.0.4", "web3-utils": "^1.0.0-beta.37", "solhint": "^1.5.0" }, diff --git a/truffle.js b/truffle.js index c4c6d8f..fea142f 100644 --- a/truffle.js +++ b/truffle.js @@ -45,7 +45,7 @@ module.exports = { }, compilers: { solc: { - version: "0.5.2", // Fetch exact version from solc-bin (default: truffle's version) + version: "0.5.4", // Fetch exact version from solc-bin (default: truffle's version) optimizer: { enabled: true, runs: 200