Upgrade to latest solc 0.5.8

.circleci/config.yml

@@ -23,7 +23,7 @@ step_setup_global_packages: &step_setup_global_packages
 step_pull_solc_docker: &step_pull_solc_docker
     run:
       name: "Pull solc docker image"
-      command: docker pull ethereum/solc:0.5.6
+      command: docker pull ethereum/solc:0.5.8
 
 jobs:
   lint-and-unit-test:

helpers/test-data-generator.js

@@ -402,6 +402,7 @@ export async function setupColonyNetwork() {
 export async function setupRandomColony(colonyNetwork) {
   const tokenArgs = getTokenArgs();
   const token = await Token.new(...tokenArgs);
+  await token.unlock();
 
   const { logs } = await colonyNetwork.createColony(token.address);
   const { colonyAddress } = logs[0].args;

package.json

@@ -15,7 +15,7 @@
     "generate:test:contracts": "bash ./scripts/generate-test-contracts.sh",
     "clean:test:contracts": "rimraf ./contracts/*Updated*.*",
     "clean:contracts": "rimraf ./build/contracts/*",
-    "provision:token:contracts": "truffle compile && truffle compile --contracts_directory 'lib/dappsys/[!proxy][!exec]*.sol' && bash ./scripts/provision-token-contracts.sh",
+    "provision:token:contracts": "truffle compile && truffle compile --contracts_directory 'lib/dappsys/[!note][!stop][!proxy][!thing][!token]*.sol' && bash ./scripts/provision-token-contracts.sh",
     "start:blockchain:client": "bash ./scripts/start-blockchain-client.sh",
     "stop:blockchain:client": "bash ./scripts/stop-blockchain-client.sh",
     "test:contracts": "npm run start:blockchain:client & truffle migrate --reset --compile-all && truffle test --network development",

test-gas-costs/gasCosts.js

@@ -46,7 +46,7 @@ import {
 import ReputationMinerTestWrapper from "../packages/reputation-miner/test/ReputationMinerTestWrapper";
 import MaliciousReputationMinerExtraRep from "../packages/reputation-miner/test/MaliciousReputationMinerExtraRep";
 
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 const IColony = artifacts.require("IColony");
 const IMetaColony = artifacts.require("IMetaColony");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
@@ -88,7 +88,8 @@ contract("All", function(accounts) {
     await IColony.defaults({ gasPrice });
 
     const otherTokenArgs = getTokenArgs();
-    otherToken = await DSToken.new(otherTokenArgs[1]);
+    otherToken = await Token.new(...otherTokenArgs);
+    await otherToken.unlock();
 
     await fundColonyWithTokens(colony, token, INITIAL_FUNDING);
   });
@@ -97,7 +98,8 @@ contract("All", function(accounts) {
   describe("Gas costs", function() {
     it("when working with the Colony Network", async function() {
       const tokenArgs = getTokenArgs();
-      const colonyToken = await DSToken.new(tokenArgs[1]);
+      const colonyToken = await Token.new(...tokenArgs);
+      await colonyToken.unlock();
       await colonyNetwork.createColony(colonyToken.address);
     });
 
@@ -281,7 +283,8 @@ contract("All", function(accounts) {
       const managerReputation = WAD.muln(100);
 
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
       const { logs } = await colonyNetwork.createColony(newToken.address);
       const { colonyAddress } = logs[0].args;
       const newColony = await IColony.at(colonyAddress);

test-upgrade/colony-network-upgrade.js

@@ -2,7 +2,7 @@
 /* eslint-disable prefer-arrow-callback */
 import { getTokenArgs } from "../helpers/test-helper";
 
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
 const EtherRouter = artifacts.require("EtherRouter");
 const Resolver = artifacts.require("Resolver");
@@ -20,12 +20,14 @@ contract("ColonyNetwork contract upgrade", function() {
 
     // Setup 2 test colonies
     const tokenArgs1 = getTokenArgs();
-    const newToken = await DSToken.new(tokenArgs1[1]);
+    const newToken = await Token.new(...tokenArgs1);
+    await newToken.unlock();
     let { logs } = await colonyNetwork.createColony(newToken.address);
     colonyAddress1 = logs[0].args.colonyAddress;
 
     const tokenArgs2 = getTokenArgs();
-    const newToken2 = await DSToken.new(tokenArgs2[1]);
+    const newToken2 = await Token.new(...tokenArgs2);
+    await newToken2.unlock();
     ({ logs } = await colonyNetwork.createColony(newToken2.address));
     colonyAddress2 = logs[0].args.colonyAddress;
 

test-upgrade/colony-upgrade.js

@@ -15,7 +15,7 @@ const ColonyPayment = artifacts.require("ColonyPayment");
 const ColonyFunding = artifacts.require("ColonyFunding");
 const UpdatedColony = artifacts.require("UpdatedColony");
 const IUpdatedColony = artifacts.require("IUpdatedColony");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 const ContractRecovery = artifacts.require("ContractRecovery");
 
 contract("Colony contract upgrade", accounts => {
@@ -43,7 +43,8 @@ contract("Colony contract upgrade", accounts => {
     dueDate = await currentBlockTime();
 
     const tokenArgs = getTokenArgs();
-    const colonyToken = await DSToken.new(tokenArgs[1]);
+    const colonyToken = await Token.new(...tokenArgs);
+    await colonyToken.unlock();
     const { logs } = await colonyNetwork.createColony(colonyToken.address);
     const { colonyAddress } = logs[0].args;
     colony = await IColony.at(colonyAddress);
@@ -52,7 +53,7 @@ contract("Colony contract upgrade", accounts => {
     colonyFunding = await ColonyFunding.new();
     contractRecovery = await ContractRecovery.new();
     const tokenAddress = await colony.getToken();
-    token = await DSToken.at(tokenAddress);
+    token = await Token.at(tokenAddress);
 
     await makeTask({ colony, dueDate });
     await makeTask({ colony, dueDate: dueDate + 1, hash: SPECIFICATION_HASH_UPDATED });

test/colony-funding.js

@@ -30,7 +30,7 @@ chai.use(bnChai(web3.utils.BN));
 
 const EtherRouter = artifacts.require("EtherRouter");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 
 contract("Colony Funding", accounts => {
   const MANAGER = accounts[0];
@@ -51,7 +51,8 @@ contract("Colony Funding", accounts => {
     await colony.setRewardInverse(100);
 
     const otherTokenArgs = getTokenArgs();
-    otherToken = await DSToken.new(otherTokenArgs[0]);
+    otherToken = await Token.new(...otherTokenArgs);
+    await otherToken.unlock();
   });
 
   describe("when receiving tokens", () => {

test/colony-network-auction.js

@@ -12,7 +12,7 @@ const { expect } = chai;
 chai.use(bnChai(web3.utils.BN));
 
 const DutchAuction = artifacts.require("DutchAuction");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 
 contract("Colony Network Auction", accounts => {
   const BIDDER_1 = accounts[1];
@@ -42,7 +42,8 @@ contract("Colony Network Auction", accounts => {
     await colonyNetwork.startNextCycle();
 
     const args = getTokenArgs();
-    token = await DSToken.new(args[1]);
+    token = await Token.new(...args);
+    await token.unlock();
     await token.mint(colonyNetwork.address, quantity);
     const { logs, receipt } = await colonyNetwork.startTokenAuction(token.address);
     createAuctionTxReceipt = receipt;
@@ -77,7 +78,8 @@ contract("Colony Network Auction", accounts => {
 
     it("should fail with zero quantity", async () => {
       const args = getTokenArgs();
-      const otherToken = await DSToken.new(args[1]);
+      const otherToken = await Token.new(...args);
+      await otherToken.unlock();
       await checkErrorRevert(colonyNetwork.startTokenAuction(otherToken.address));
     });
 
@@ -104,7 +106,8 @@ contract("Colony Network Auction", accounts => {
 
     it("should set the minimum price correctly for quantity < 1e18", async () => {
       const args = getTokenArgs();
-      const otherToken = await DSToken.new(args[1]);
+      const otherToken = await Token.new(...args);
+      await otherToken.unlock();
       await otherToken.mint(colonyNetwork.address, WAD.divn(10));
       const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
       const auctionAddress = logs[0].args.auction;
@@ -353,7 +356,8 @@ contract("Colony Network Auction", accounts => {
     let otherToken;
     beforeEach(async () => {
       const args = getTokenArgs();
-      otherToken = await DSToken.new(args[1]);
+      otherToken = await Token.new(...args);
+      await otherToken.unlock();
     });
 
     const auctionPropsLowQuantitiesLowPrice = [

test/colony-network.js

@@ -16,7 +16,7 @@ const ENSRegistry = artifacts.require("ENSRegistry");
 const EtherRouter = artifacts.require("EtherRouter");
 const Resolver = artifacts.require("Resolver");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 
 contract("Colony Network", accounts => {
   const SAMPLE_RESOLVER = "0x65a760e7441cf435086ae45e14a0c8fc1080f54c";
@@ -115,7 +115,8 @@ contract("Colony Network", accounts => {
     });
 
     it("should maintain correct count of colonies", async () => {
-      const token = await DSToken.new(getTokenArgs()[1]);
+      const token = await Token.new(...getTokenArgs());
+      await token.unlock();
       await colonyNetwork.createColony(token.address);
       await colonyNetwork.createColony(token.address);
       await colonyNetwork.createColony(token.address);
@@ -146,7 +147,7 @@ contract("Colony Network", accounts => {
     });
 
     it("should fail to create meta colony if it already exists", async () => {
-      const token = await DSToken.new(TOKEN_ARGS[1]);
+      const token = await Token.new(...TOKEN_ARGS);
       await checkErrorRevert(colonyNetwork.createMetaColony(token.address), "colony-meta-colony-exists-already");
     });
 
@@ -174,22 +175,22 @@ contract("Colony Network", accounts => {
     });
 
     it("should fail if ETH is sent", async () => {
-      const token = await DSToken.new(TOKEN_ARGS[1]);
+      const token = await Token.new(...TOKEN_ARGS);
       await checkErrorRevert(colonyNetwork.createColony(token.address, { value: 1, gas: createColonyGas }));
 
       const colonyNetworkBalance = await web3GetBalance(colonyNetwork.address);
       expect(colonyNetworkBalance).to.be.zero;
     });
 
     it("should log a ColonyAdded event", async () => {
-      const token = await DSToken.new(TOKEN_ARGS[1]);
+      const token = await Token.new(...TOKEN_ARGS);
       await expectEvent(colonyNetwork.createColony(token.address), "ColonyAdded");
     });
   });
 
   describe("when getting existing colonies", () => {
     it("should allow users to get the address of a colony by its index", async () => {
-      const token = await DSToken.new(TOKEN_ARGS[1]);
+      const token = await Token.new(...TOKEN_ARGS);
       await colonyNetwork.createColony(token.address);
       await colonyNetwork.createColony(token.address);
       await colonyNetwork.createColony(token.address);

test/colony-payment.js

@@ -14,7 +14,7 @@ chai.use(bnChai(web3.utils.BN));
 const EtherRouter = artifacts.require("EtherRouter");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
 const IMetaColony = artifacts.require("IMetaColony");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 
 contract("Colony Payment", accounts => {
   const RECIPIENT = accounts[3];
@@ -38,7 +38,8 @@ contract("Colony Payment", accounts => {
     await fundColonyWithTokens(colony, token, WAD.muln(20));
 
     const tokenArgs = getTokenArgs();
-    otherToken = await DSToken.new(tokenArgs[1]);
+    otherToken = await Token.new(...tokenArgs);
+    await otherToken.unlock();
   });
 
   describe("when adding payments", () => {

test/colony-reward-payouts.js

@@ -32,7 +32,7 @@ const IColony = artifacts.require("IColony");
 const IMetaColony = artifacts.require("IMetaColony");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
 const ITokenLocking = artifacts.require("ITokenLocking");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 const DSRoles = artifacts.require("DSRoles");
 
 const contractLoader = new TruffleLoader({
@@ -75,7 +75,8 @@ contract("Colony Reward Payouts", accounts => {
     await colony.setRewardInverse(100);
 
     const otherTokenArgs = getTokenArgs();
-    otherToken = await DSToken.new(otherTokenArgs[0]);
+    otherToken = await Token.new(...otherTokenArgs);
+    await otherToken.unlock();
 
     await fundColonyWithTokens(colony, otherToken, initialFunding);
     await colony.mintTokens(initialFunding.muln(100).divn(99)); // Tke in to account 1% being siphoned off for rewards
@@ -144,7 +145,8 @@ contract("Colony Reward Payouts", accounts => {
 
     it("should not be able to create reward payout if passed reputation is not from the correct colony", async () => {
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
       const { logs } = await colonyNetwork.createColony(newToken.address);
       const { colonyAddress } = logs[0].args;
       const newColony = await IColony.at(colonyAddress);
@@ -262,7 +264,8 @@ contract("Colony Reward Payouts", accounts => {
 
     it("should not be able to start a reward payout if no one holds colony tokens", async () => {
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
       const { logs } = await colonyNetwork.createColony(newToken.address);
       const { colonyAddress } = logs[0].args;
       const newColony = await IColony.at(colonyAddress);
@@ -298,7 +301,8 @@ contract("Colony Reward Payouts", accounts => {
 
     it("should be able to collect rewards from multiple payouts of different token", async () => {
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
       await fundColonyWithTokens(colony, newToken, initialFunding);
 
       const tx1 = await colony.startNextRewardPayout(newToken.address, ...colonyWideReputationProof);
@@ -313,7 +317,8 @@ contract("Colony Reward Payouts", accounts => {
 
     it("should not be able to claim payout if colony-wide reputation is 0", async () => {
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
       const { logs } = await colonyNetwork.createColony(newToken.address);
       const { colonyAddress } = logs[0].args;
       const newColony = await IColony.at(colonyAddress);
@@ -456,7 +461,8 @@ contract("Colony Reward Payouts", accounts => {
 
     it("should not be able to claim funds if previous payout is not claimed", async () => {
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
       await fundColonyWithTokens(colony, newToken, initialFunding);
 
       await colony.startNextRewardPayout(otherToken.address, ...colonyWideReputationProof);
@@ -559,7 +565,8 @@ contract("Colony Reward Payouts", accounts => {
     it("should be able to collect payout from two colonies at the same time", async () => {
       // Setting up a new token and two colonies
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
 
       let { logs } = await colonyNetwork.createColony(newToken.address);
       let { colonyAddress } = logs[0].args;
@@ -676,7 +683,8 @@ contract("Colony Reward Payouts", accounts => {
     it("should not be able to claim reward payout from a colony that didn't create it", async () => {
       // Setting up a new token and two colonies
       const tokenArgs = getTokenArgs();
-      const newToken = await DSToken.new(tokenArgs[1]);
+      const newToken = await Token.new(...tokenArgs);
+      await newToken.unlock();
 
       let { logs } = await colonyNetwork.createColony(newToken.address);
       let { colonyAddress } = logs[0].args;
@@ -815,14 +823,16 @@ contract("Colony Reward Payouts", accounts => {
         total reputation/tokens: ${data.totalReputation.toString()}`, async () => {
         // Setting up a new token and colony
         const tokenArgs = getTokenArgs();
-        const newToken = await DSToken.new(tokenArgs[1]);
+        const newToken = await Token.new(...tokenArgs);
+        await newToken.unlock();
         let { logs } = await colonyNetwork.createColony(newToken.address);
         const { colonyAddress } = logs[0].args;
         await newToken.setOwner(colonyAddress);
         const newColony = await IColony.at(colonyAddress);
 
         const payoutTokenArgs = getTokenArgs();
-        const payoutToken = await DSToken.new(payoutTokenArgs[0]);
+        const payoutToken = await Token.new(...payoutTokenArgs);
+        await payoutToken.unlock();
         await fundColonyWithTokens(newColony, payoutToken, data.totalAmountOfPayoutTokens);
         // Issuing colony's internal tokens so they can be given to users in `bootstrapColony`
         await newColony.mintTokens(data.totalReputation);

test/colony-task.js

@@ -62,7 +62,7 @@ chai.use(bnChai(web3.utils.BN));
 const EtherRouter = artifacts.require("EtherRouter");
 const IMetaColony = artifacts.require("IMetaColony");
 const IColonyNetwork = artifacts.require("IColonyNetwork");
-const DSToken = artifacts.require("DSToken");
+const Token = artifacts.require("Token");
 const TaskSkillEditing = artifacts.require("TaskSkillEditing");
 
 contract("ColonyTask", accounts => {
@@ -89,7 +89,8 @@ contract("ColonyTask", accounts => {
     await colony.setAdministrationRole(1, 0, COLONY_ADMIN, 1, true);
 
     const otherTokenArgs = getTokenArgs();
-    otherToken = await DSToken.new(otherTokenArgs[1]);
+    otherToken = await Token.new(...otherTokenArgs);
+    await otherToken.unlock();
   });
 
   describe("when creating tasks", () => {