diff --git a/contracts/Colony.sol b/contracts/Colony.sol index 0ce3109083..de38c17303 100755 --- a/contracts/Colony.sol +++ b/contracts/Colony.sol @@ -18,12 +18,8 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; -import "./ERC20Extended.sol"; -import "./IColonyNetwork.sol"; -import "./IColony.sol"; import "./ColonyStorage.sol"; import "./PatriciaTree/PatriciaTreeProofs.sol"; -import "./Authority.sol"; import "./EtherRouter.sol"; diff --git a/contracts/ColonyFunding.sol b/contracts/ColonyFunding.sol index 8c760ef8f8..aa4e0522ae 100755 --- a/contracts/ColonyFunding.sol +++ b/contracts/ColonyFunding.sol @@ -18,14 +18,11 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; -import "../lib/dappsys/math.sol"; -import "./ERC20Extended.sol"; -import "./IColonyNetwork.sol"; import "./ColonyStorage.sol"; import "./ITokenLocking.sol"; -contract ColonyFunding is ColonyStorage, DSMath { +contract ColonyFunding is ColonyStorage { event RewardPayoutCycleStarted(uint256 indexed id); event RewardPayoutCycleEnded(uint256 indexed id); event TaskWorkerPayoutChanged(uint256 indexed id, address token, uint256 amount); diff --git a/contracts/ColonyNetwork.sol b/contracts/ColonyNetwork.sol index a5cc76fef2..c8c741d3a1 100644 --- a/contracts/ColonyNetwork.sol +++ b/contracts/ColonyNetwork.sol @@ -18,11 +18,8 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; -import "../lib/dappsys/auth.sol"; import "./Authority.sol"; -import "./IColony.sol"; import "./EtherRouter.sol"; -import "./Token.sol"; import "./ColonyNetworkStorage.sol"; import "./IReputationMiningCycle.sol"; diff --git a/contracts/ColonyNetworkAuction.sol b/contracts/ColonyNetworkAuction.sol index 75b1d973fc..45079e3168 100644 --- a/contracts/ColonyNetworkAuction.sol +++ b/contracts/ColonyNetworkAuction.sol @@ -18,10 +18,7 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; -import "../lib/dappsys/math.sol"; import "./ColonyNetworkStorage.sol"; -import "./ERC20Extended.sol"; -import "./IColony.sol"; contract ColonyNetworkAuction is ColonyNetworkStorage { @@ -49,7 +46,7 @@ contract DutchAuction is DSMath { uint public endTime; uint public minPrice; uint public constant TOKEN_MULTIPLIER = 10 ** 18; - + // Keep track of all CLNY wei received uint public receivedTotal; uint public bidCount; @@ -58,7 +55,7 @@ contract DutchAuction is DSMath { // Final price in CLNY per 10**18 Tokens (min 1, max 1e18) uint public finalPrice; bool public finalized; - + mapping (address => uint256) public bids; modifier auctionNotStarted { @@ -87,7 +84,7 @@ contract DutchAuction is DSMath { modifier auctionFinalized { require(finalized); _; - } + } modifier allBidsClaimed { require(claimCount == bidCount); @@ -119,7 +116,7 @@ contract DutchAuction is DSMath { started = true; } - function totalToEndAuction() public view + function totalToEndAuction() public view auctionStartedAndOpen returns (uint) { @@ -156,7 +153,7 @@ contract DutchAuction is DSMath { amount = remainingToEndAuction; endTime = now; } - + if (bids[msg.sender] == 0) { bidCount += 1; } @@ -164,7 +161,7 @@ contract DutchAuction is DSMath { clnyToken.transferFrom(msg.sender, this, amount); bids[msg.sender] = add(bids[msg.sender], amount); receivedTotal = add(receivedTotal, amount); - + emit AuctionBid(msg.sender, amount, sub(remainingToEndAuction, amount)); } @@ -180,7 +177,7 @@ contract DutchAuction is DSMath { emit AuctionFinalized(finalPrice); } - function claim() public + function claim() public auctionFinalized returns (bool) { @@ -189,7 +186,7 @@ contract DutchAuction is DSMath { uint tokens = mul(amount, TOKEN_MULTIPLIER) / finalPrice; claimCount += 1; - + // Set receiver bid to 0 before transferring the tokens bids[msg.sender] = 0; uint beforeClaimBalance = token.balanceOf(msg.sender); @@ -213,4 +210,4 @@ contract DutchAuction is DSMath { assert(token.balanceOf(this) == 0); selfdestruct(colonyNetwork); } -} \ No newline at end of file +} diff --git a/contracts/ColonyNetworkStaking.sol b/contracts/ColonyNetworkStaking.sol index c1b7dcda9c..b938b6d062 100644 --- a/contracts/ColonyNetworkStaking.sol +++ b/contracts/ColonyNetworkStaking.sol @@ -18,17 +18,11 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; -import "../lib/dappsys/auth.sol"; -import "./Authority.sol"; -import "./IColony.sol"; -import "./EtherRouter.sol"; -import "./ERC20Extended.sol"; import "./ColonyNetworkStorage.sol"; -import "./IColonyNetwork.sol"; import "./ReputationMiningCycle.sol"; -contract ColonyNetworkStaking is ColonyNetworkStorage, DSMath { +contract ColonyNetworkStaking is ColonyNetworkStorage { // TODO: Can we handle a dispute regarding the very first hash that should be set? modifier onlyReputationMiningCycle () { diff --git a/contracts/ColonyNetworkStorage.sol b/contracts/ColonyNetworkStorage.sol index 705100eb75..630d4609f0 100644 --- a/contracts/ColonyNetworkStorage.sol +++ b/contracts/ColonyNetworkStorage.sol @@ -19,14 +19,12 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; import "../lib/dappsys/auth.sol"; -import "../lib/dappsys/roles.sol"; -import "./Authority.sol"; +import "../lib/dappsys/math.sol"; +import "./ERC20Extended.sol"; import "./IColony.sol"; -import "./EtherRouter.sol"; -import "./Token.sol"; -contract ColonyNetworkStorage is DSAuth { +contract ColonyNetworkStorage is DSAuth, DSMath { // Address of the Resolver contract used by EtherRouter for lookups and routing address resolver; // Number of colonies in the network diff --git a/contracts/ColonyStorage.sol b/contracts/ColonyStorage.sol index e0b60fd3eb..56e74a3126 100755 --- a/contracts/ColonyStorage.sol +++ b/contracts/ColonyStorage.sol @@ -19,12 +19,13 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; import "../lib/dappsys/auth.sol"; +import "../lib/dappsys/math.sol"; import "./ERC20Extended.sol"; import "./IColonyNetwork.sol"; import "./Authority.sol"; -contract ColonyStorage is DSAuth { +contract ColonyStorage is DSAuth, DSMath { // When adding variables, do not make them public, otherwise all contracts that inherit from // this one will have the getters. Make custom getters in the contract that seems most appropriate, // and add it to IColony.sol @@ -38,7 +39,7 @@ contract ColonyStorage is DSAuth { // Mapping function signature to 2 task roles whose approval is needed to execute mapping (bytes4 => uint8[2]) reviewers; - + // Role assignment functions require special type of sign-off. // This keeps track of which functions are related to role assignment mapping (bytes4 => bool) roleAssignmentSigs; diff --git a/contracts/ColonyTask.sol b/contracts/ColonyTask.sol index 9884e67f5d..7b27c2a6db 100755 --- a/contracts/ColonyTask.sol +++ b/contracts/ColonyTask.sol @@ -18,13 +18,11 @@ pragma solidity ^0.4.23; pragma experimental "v0.5.0"; -import "../lib/dappsys/math.sol"; import "./ColonyStorage.sol"; -import "./IColony.sol"; import "./SafeMath.sol"; -contract ColonyTask is ColonyStorage, DSMath { +contract ColonyTask is ColonyStorage { uint256 constant RATING_COMMIT_TIMEOUT = 432000; uint256 constant RATING_REVEAL_TIMEOUT = 432000;