Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.15.0"
- "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/controller/Avatar.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 "@daostack/infra/contracts/Reputation.sol";
import "./DAOToken.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/controller/Controller.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 "./Avatar.sol";
import "../globalConstraints/GlobalConstraintInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/controller/ControllerInterface.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 "./Avatar.sol";
import "../globalConstraints/GlobalConstraintInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/controller/DAOToken.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/ERC20Burnable.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/controller/UController.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 "./Avatar.sol";
import "../globalConstraints/GlobalConstraintInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/globalConstraints/GlobalConstraintInterface.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 GlobalConstraintInterface {
Expand Down
2 changes: 1 addition & 1 deletion contracts/globalConstraints/TokenCapGC.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/IERC20.sol";
import "./GlobalConstraintInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/libs/SafeERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ REFERENCE & RELATED READING
- https://gist.github.com/BrendanChou/88a2eeb80947ff00bcf58ffdafeaeb61

*/
pragma solidity ^0.5.2;
pragma solidity ^0.5.4;

import "openzeppelin-solidity/contracts/utils/Address.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/Auction4Reputation.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/math/SafeMath.sol";
import "../controller/ControllerInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/ExternalLocking4Reputation.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 "./Locking4Reputation.sol";
import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/FixedReputationAllocation.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 "../controller/ControllerInterface.sol";
import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/Forwarder.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 "../controller/ControllerInterface.sol";
import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/Locking4Reputation.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 "../controller/ControllerInterface.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/LockingEth4Reputation.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 "./Locking4Reputation.sol";
import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/LockingToken4Reputation.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 "./Locking4Reputation.sol";
import "./PriceOracleInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/schemes/PriceOracleInterface.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 PriceOracleInterface {

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ARCDebug.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 "@daostack/infra/contracts/votingMachines/GenesisProtocol.sol";
import "@daostack/infra/contracts/votingMachines/AbsoluteVote.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ARCGenesisProtocolCallbacksMock.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/VotingMachineCallbacks.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ActionMock.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 "../controller/Avatar.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/BadERC20.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;

//this is a mock to simulate bad ERC20 token implementation as describe at
//https://github.com/ethereum/solidity/issues/4116
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/ERC20Mock.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/test/ExternalTokenLockerMock.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/test/GlobalConstraintMock.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 "../globalConstraints/GlobalConstraintInterface.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/PriceOracleMock.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 "../schemes/PriceOracleInterface.sol";
import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/SafeERC20Mock.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 "./BadERC20.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/UniversalSchemeMock.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 "../universalSchemes/UniversalScheme.sol";
import "../controller/ControllerInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/Wallet.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/universalSchemes/ContributionReward.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/DaoCreator.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 "./UniversalScheme.sol";
import "../controller/UController.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/GenericScheme.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/GlobalConstraintRegistrar.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/OrganizationRegister.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 "./UniversalScheme.sol";
import "../libs/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/SchemeRegistrar.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/UniversalScheme.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 "./UniversalSchemeInterface.sol";
import "../controller/ControllerInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/UniversalSchemeInterface.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 "../controller/Avatar.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/UpgradeScheme.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/ProposalExecuteInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/VestingScheme.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/universalSchemes/VoteInOrganizationScheme.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 "@daostack/infra/contracts/votingMachines/IntVoteInterface.sol";
import "@daostack/infra/contracts/votingMachines/VotingMachineCallbacksInterface.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/Redeemer.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 "../universalSchemes/ContributionReward.sol";
import "@daostack/infra/contracts/votingMachines/GenesisProtocol.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/votingMachines/VotingMachineCallbacks.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 "../universalSchemes/UniversalScheme.sol";
import "@daostack/infra/contracts/votingMachines/GenesisProtocol.sol";
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@daostack/arc",
"version": "0.0.1-rc.9",
"version": "0.0.1-rc.10",
"description": "A platform for building DAOs",
"files": [
"contracts/",
Expand Down Expand Up @@ -52,7 +52,7 @@
"pug": "^2.0.0-rc.4",
"rimraf": "^2.6.2",
"run-with-ganache": "^0.1.1",
"truffle": "5.0.0",
"truffle": "5.0.4",
"uint32": "^0.2.1"
},
"repository": {
Expand All @@ -69,7 +69,7 @@
"arc"
],
"engines": {
"node": ">=10.15.0"
"node": ">=10.15.1"
},
"author": "DAOstack (https://www.daostack.io)",
"license": "GPL-3.0",
Expand All @@ -78,7 +78,7 @@
},
"homepage": "https://daostack.io",
"dependencies": {
"@daostack/infra": "0.0.1-rc.9",
"@daostack/infra": "0.0.1-rc.10",
"ethereumjs-abi": "^0.6.5",
"openzeppelin-solidity": "2.1.1",
"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 @@ -56,7 +56,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)
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
optimizer: {
enabled: true,
Expand Down