Skip to content

Commit

Permalink
update solc and truffle versions (#52)
Browse files Browse the repository at this point in the history
* solc 0.5.4

* use node 10.15.1

* bump version to 0.0.1-rc.10
  • Loading branch information
orenyodfat authored Feb 17, 2019
1 parent ccb73fa commit 0009853
Show file tree
Hide file tree
Showing 20 changed files with 26 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dist: trusty
language: node_js

node_js:
- "10.14.2"
- "10.15.1"

before_install:

Expand Down
2 changes: 1 addition & 1 deletion contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;


contract Migrations {
Expand Down
2 changes: 1 addition & 1 deletion contracts/Reputation.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "openzeppelin-solidity/contracts/ownership/Ownable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/libs/RealMath.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/AbsoluteVoteExecuteMock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "../votingMachines/ProposalExecuteInterface.sol";
import "../votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/Debug.sol
Original file line number Diff line number Diff line change
@@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ERC827TokenMock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "../token/ERC827/ERC827Token.sol";// mock class using ERC827 Token

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/GenesisProtocolCallbacksMock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "../votingMachines/VotingMachineCallbacksInterface.sol";
import "../votingMachines/ProposalExecuteInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC827/ERC827.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC827/ERC827Token.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/AbsoluteVote.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "../Reputation.sol";
import "./IntVoteInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/GenesisProtocol.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "openzeppelin-solidity/contracts/cryptography/ECDSA.sol";
import "./GenesisProtocolLogic.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/GenesisProtocolLogic.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "./IntVoteInterface.sol";
import { RealMath } from "../libs/RealMath.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/IntVoteInterface.sol
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/ProposalExecuteInterface.sol
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/QuorumVote.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "./AbsoluteVote.sol";
import "./ProposalExecuteInterface.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";

Expand Down
18 changes: 6 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand Down Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion truffle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0009853

Please sign in to comment.