Merge pull request #1110 from JoinColony/develop

Merge develop in to master to prepare for release

Author: area

.circleci/config.yml

@@ -142,6 +142,9 @@ jobs:
       - run:
           name: "Running network contracts unit tests"
           command: npm run test:contracts
+      - run:
+          name: "Check contract sizes"
+          command: npx truffle run contract-size --checkMaxSize
       - run:
           name: "Cleanup ganache leftovers"
           command: npm run clean:ganache

contracts/colony/Colony.sol

@@ -19,17 +19,17 @@ pragma solidity 0.7.3;
 pragma experimental ABIEncoderV2;
 
 import "./../common/ERC20Extended.sol";
+import "./../common/Multicall.sol";
 import "./../common/IEtherRouter.sol";
 import "./../common/BasicMetaTransaction.sol";
 import "./../tokenLocking/ITokenLocking.sol";
 import "./ColonyStorage.sol";
 
-contract Colony is BasicMetaTransaction, ColonyStorage, PatriciaTreeProofs {
+contract Colony is BasicMetaTransaction, Multicall, ColonyStorage, PatriciaTreeProofs {
 
-  // V10: G Lightweight Spaceship
   // This function, exactly as defined, is used in build scripts. Take care when updating.
   // Version number should be upped with every change in Colony or its dependency contracts or libraries.
-  function version() public pure returns (uint256 colonyVersion) { return 10; }
+  function version() public pure returns (uint256 colonyVersion) { return 11; }
 
   function getColonyNetwork() public view returns (address) {
     return colonyNetworkAddress;

contracts/colony/ColonyArbitraryTransaction.sol

@@ -94,6 +94,8 @@ contract ColonyArbitraryTransaction is ColonyStorage {
 
     if (sig == APPROVE_SIG) { approveTransactionCleanup(_to, _action); }
 
+    emit ArbitraryTransaction(_to, _action, res);
+
     return res;
   }
 

contracts/colony/ColonyDataTypes.sol

@@ -347,6 +347,8 @@ interface ColonyDataTypes {
   /// @param amount The (maximum) amount the address is having its reputation changed by
   event ArbitraryReputationUpdate(address agent, address user, uint256 skillId, int256 amount);
 
+  event ArbitraryTransaction(address target, bytes data, bool success);
+
   struct RewardPayoutCycle {
     // Reputation root hash at the time of reward payout creation
     bytes32 reputationState;

contracts/colony/ColonyTask.sol

@@ -570,6 +570,7 @@ contract ColonyTask is ColonyStorage {
       }
 
       reviewerAddresses[i] = ecrecover(txHash, _sigV[i], _sigR[i], _sigS[i]);
+      require(reviewerAddresses[i] != address(0), "colony-task-invalid-signature");
     }
     return reviewerAddresses;
   }

contracts/colony/IColony.sol

@@ -20,12 +20,11 @@ pragma experimental ABIEncoderV2;
 
 import "./../common/IRecovery.sol";
 import "./../common/IBasicMetaTransaction.sol";
+import "./../common/IMulticall.sol";
 import "./ColonyDataTypes.sol";
 
 
-/// @title Colony interface
-/// @notice All externally available functions are available here and registered to work with EtherRouter Network contract
-interface IColony is ColonyDataTypes, IRecovery, IBasicMetaTransaction {
+interface IColony is ColonyDataTypes, IRecovery, IBasicMetaTransaction, IMulticall {
   // Implemented in DSAuth.sol
   /// @notice Get the `ColonyAuthority` for the colony.
   /// @return colonyAuthority The `ColonyAuthority` contract address

contracts/colony/IMetaColony.sol

@@ -21,8 +21,6 @@ pragma experimental "ABIEncoderV2";
 import "./IColony.sol";
 
 
-/// @title MetaColony interface
-/// @notice All externally available functions are available here and registered to work with EtherRouter Network contract
 interface IMetaColony is IColony {
   /// @notice Mints CLNY in the Meta Colony and transfers them to the colony network.
   /// Only allowed to be called on the Meta Colony by the colony network.

contracts/colonyNetwork/ColonyNetwork.sol

@@ -21,9 +21,10 @@ pragma experimental "ABIEncoderV2";
 import "./../common/BasicMetaTransaction.sol";
 import "./../reputationMiningCycle/IReputationMiningCycle.sol";
 import "./ColonyNetworkStorage.sol";
+import "./../common/Multicall.sol";
 
 
-contract ColonyNetwork is BasicMetaTransaction, ColonyNetworkStorage {
+contract ColonyNetwork is BasicMetaTransaction, ColonyNetworkStorage, Multicall {
 
   function isColony(address _colony) public view returns (bool) {
     return _isColony[_colony];

contracts/colonyNetwork/ColonyNetworkDeployer.sol

@@ -23,6 +23,7 @@ import "./../colony/ColonyAuthority.sol";
 import "./../colony/IColony.sol";
 import "./ColonyNetworkStorage.sol";
 import "./IColonyNetwork.sol";
+import "./../metaTxToken/MetaTxToken.sol";
 
 
 contract ColonyNetworkDeployer is ColonyNetworkStorage {
@@ -93,6 +94,43 @@ contract ColonyNetworkDeployer is ColonyNetworkStorage {
     return colonyAddress;
   }
 
+  function createColonyForFrontend(
+    address _tokenAddress,
+    string memory _name,
+    string memory _symbol,
+    uint8 _decimals,
+    uint256 _version,
+    string memory _colonyName,
+    string memory _metadata
+  )
+  public stoppable
+  returns (address token, address colony)
+  {
+    // Create Token
+    MetaTxToken token;
+    if (_tokenAddress == address(0x0)){
+      token = MetaTxToken(IColonyNetwork(address(this)).deployTokenViaNetwork(_name, _symbol, _decimals));
+      emit TokenDeployed(address(token));
+    } else {
+      token = MetaTxToken(_tokenAddress);
+    }
+
+    // Create Colony
+    address colonyAddress = createColony(address(token), _version, _colonyName, _metadata);
+
+    // Extra token bookkeeping if we deployed it
+    if (_tokenAddress == address(0x0)){
+      // Deploy Authority
+      address[] memory allowedToTransfer;
+      address tokenAuthorityAddress = IColonyNetwork(address(this)).deployTokenAuthority(address(token), colonyAddress, allowedToTransfer);
+      // Set Authority
+      token.setAuthority(DSAuthority(tokenAuthorityAddress));
+      token.setOwner(msgSender());
+    }
+
+    return (address(token), colonyAddress);
+  }
+
   function deployColony(address _tokenAddress, uint256 _version) internal returns (address) {
     require(_tokenAddress != address(0x0), "colony-token-invalid-address");
     require(colonyVersionResolver[_version] != address(0x00), "colony-network-invalid-version");

contracts/colonyNetwork/ColonyNetworkENS.sol

@@ -22,9 +22,6 @@ import "./ColonyNetworkStorage.sol";
 import "./../common/MultiChain.sol";
 
 
-/// @title First-In-First-Served ENS Registrar
-/// @notice A registrar that allocates subdomains to the first person to claim them.
-/// @notice Source modified from https://github.com/ensdomains/ens/blob/master/contracts/FIFSRegistrar.sol
 contract ColonyNetworkENS is ColonyNetworkStorage, MultiChain {
 
   bytes32 constant USER_HASH = keccak256("user");