Skip to content

Commit

Permalink
bump version to 0.0.1-rc.15 (#71)
Browse files Browse the repository at this point in the history
solc v 0.5.11
openzeppelin v 2.3.0
solhint 2.2.0
truffle 5.0.34
  • Loading branch information
orenyodfat authored Oct 22, 2019
1 parent 9b45fc0 commit 33860d0
Show file tree
Hide file tree
Showing 23 changed files with 3,618 additions and 4,127 deletions.
10 changes: 6 additions & 4 deletions .solhint.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"extends": "default",
"extends": "solhint:all",
"rules": {
"indent": ["error", 4],

"compiler-fixed": false,
"no-simple-event-func-name": false,
"two-lines-top-level-separator": false
"compiler-fixed": "off",
"no-simple-event-func-name": "off",
"two-lines-top-level-separator": "off",
"mark-callable-contracts": "off",
"reason-string": "off"
}
}
5 changes: 1 addition & 4 deletions .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.15.1"
- "10.16.3"

before_install:

Expand All @@ -25,6 +25,3 @@ jobs:
- stage: tests
name: "JS Lint"
script: npm run lint

notifications:
slack: daostack:fGuaFPsiQiV5mgmzRcSzbYqw
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.4;
pragma solidity ^0.5.11;


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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

/**
* 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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;
/*
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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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

import "../libs/RealMath.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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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.4;
pragma solidity ^0.5.11;

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

Expand Down
Loading

0 comments on commit 33860d0

Please sign in to comment.