Merge pull request #972 from JoinColony/maint/post-7-release

Bumps / cleanups / updates for next release

Author: area

contracts/colony/Colony.sol

@@ -26,10 +26,10 @@ import "./ColonyStorage.sol";
 
 contract Colony is ColonyStorage, PatriciaTreeProofs, MultiChain {
 
-  // V6: Cerulean Lightweight Spaceship
+  // V8: Ebony 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 7; }
+  function version() public pure returns (uint256 colonyVersion) { return 8; }
 
   function getColonyNetwork() public view returns (address) {
     return colonyNetworkAddress;
@@ -460,17 +460,10 @@ contract Colony is ColonyStorage, PatriciaTreeProofs, MultiChain {
     emit ColonyUpgraded(msg.sender, currentVersion, _newVersion);
   }
 
-  // v5 to v6
+  // v7 to v8
   function finishUpgrade() public always {
     ColonyAuthority colonyAuthority = ColonyAuthority(address(authority));
     bytes4 sig;
-
-    sig = bytes4(keccak256("setUserRoles(uint256,uint256,address,uint256,bytes32)"));
-    colonyAuthority.setRoleCapability(uint8(ColonyRole.Root), address(this), sig, true);
-
-    sig = bytes4(keccak256("moveFundsBetweenPots(uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,address)"));
-    colonyAuthority.setRoleCapability(uint8(ColonyRole.Funding), address(this), sig, true);
-
   }
 
   function checkNotAdditionalProtectedVariable(uint256 _slot) public view recovery {

contracts/colony/ColonyAuthority.sol

@@ -111,8 +111,10 @@ contract ColonyAuthority is CommonAuthority {
     addRoleCapability(ROOT_ROLE, "burnTokens(address,uint256)");
     addRoleCapability(ROOT_ROLE, "unlockToken()");
 
-    // Added in colony v6 (d-lwss)
+    // Added in colony v7 (d-lwss)
     addRoleCapability(FUNDING_ROLE, "moveFundsBetweenPots(uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,address)");
+
+    // Added in colony v8 (e-lwss)
   }
 
   function addRoleCapability(uint8 role, bytes memory sig) private {

helpers/constants.js

@@ -9,7 +9,7 @@ const INT256_MIN = new BN(2).pow(new BN(255)).mul(new BN(-1));
 const INT128_MAX = new BN(2).pow(new BN(127)).sub(new BN(1));
 const INT128_MIN = new BN(2).pow(new BN(127)).mul(new BN(-1));
 
-const CURR_VERSION = 7;
+const CURR_VERSION = 8;
 
 const RECOVERY_ROLE = 0;
 const ROOT_ROLE = 1;

scripts/deployUnmockedColonyVersions.js

@@ -24,6 +24,7 @@ module.exports = async (callback) => {
   let v4ResolverAddress;
   let v5ResolverAddress;
   let v6ResolverAddress;
+  let v7ResolverAddress;
   const colonyNetwork = await IColonyNetwork.at(cnAddress);
   const metaColonyAddress = await colonyNetwork.getMetaColony();
   const metaColony = await IMetaColony.at(metaColonyAddress);
@@ -96,6 +97,23 @@ module.exports = async (callback) => {
     index = res.indexOf("Colony version 6 set to Resolver");
     v6ResolverAddress = res.substring(index + RESOLVER_LOG_OFFSET, index + RESOLVER_LOG_OFFSET + ADDRESS_LENGTH);
     await metaColony.addNetworkColonyVersion(6, v6ResolverAddress);
+
+    await exec("git checkout -f dlwss && git submodule update");
+
+    // Comment out uneeded parts of file
+    await exec("sed -i'' -e '29,30 s|^|//|' ./migrations/4_setup_colony_version_resolver.js");
+    await exec("sed -i'' -e '34 s|^|//|' ./migrations/4_setup_colony_version_resolver.js");
+    await exec("sed -i'' -e 's|await ContractRecovery.deployed()|await ContractRecovery.new()|' ./migrations/4_setup_colony_version_resolver.js");
+    await exec("rm -rf ./build");
+    res = await exec("yarn run truffle migrate --reset -f 4 --to 4");
+
+    if (res.stdout) {
+      // How this response looks changes node 10->12
+      res = res.stdout;
+    }
+    index = res.indexOf("Colony version 7 set to Resolver");
+    v7ResolverAddress = res.substring(index + RESOLVER_LOG_OFFSET, index + RESOLVER_LOG_OFFSET + ADDRESS_LENGTH);
+    await metaColony.addNetworkColonyVersion(7, v7ResolverAddress);
   } catch (err) {
     console.log(err);
   }

test-smoke/colony-storage-consistent.js

@@ -154,7 +154,7 @@ contract("Contract Storage", (accounts) => {
       console.log("miningCycleStateHash:", miningCycleAccount.stateRoot.toString("hex"));
       console.log("tokenLockingStateHash:", tokenLockingAccount.stateRoot.toString("hex"));
 
-      expect(colonyNetworkAccount.stateRoot.toString("hex")).to.equal("2d8b407a3d5d1a48b07a00c968942ee7cb384961a5f166035a194cf7f8bd3245");
+      expect(colonyNetworkAccount.stateRoot.toString("hex")).to.equal("ae7b69103eaaa0555222e8f2e4e9a66e002f27e9cffbb8952e12701725d63ef2");
       expect(colonyAccount.stateRoot.toString("hex")).to.equal("36096952d464e6c70a0a3aa2ecf068dff7bc6af70ffe022d57d8e2342d39f989");
       expect(metaColonyAccount.stateRoot.toString("hex")).to.equal("6bee0085d000fc929e06c1281c162eaa7ac22ff9e2dcc520066e5e7720de6394");
       expect(miningCycleAccount.stateRoot.toString("hex")).to.equal("bcfee6939c375d042704e338652a1e2d1e6f7b0e69587b79e72bde08ca777927");