Merge pull request #574 from JoinColony/feature/559-default-locked-token

elenadimitrova · web-flow · commit b010dd518947 · 2019-04-02T19:17:31.000+03:00
Provision default locked token for colonies
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -37,11 +37,14 @@ jobs:
       - setup_remote_docker
       - <<: *step_pull_solc_docker
       - <<: *step_setup_global_packages
+      - run:
+          name: "Download parity"
+          command: wget https://releases.parity.io/ethereum/v2.3.8/x86_64-unknown-linux-gnu/parity
       - run:
           name: "Setup parity"
           command: |
-            wget https://releases.parity.io/ethereum/v1.11.8/x86_64-unknown-debian-gnu/parity_1.11.8_debian_amd64.deb
-            sudo dpkg -i parity_1.11.8_debian_amd64.deb
+            sudo mv parity /usr/bin
+            chmod 755 /usr/bin/parity
             echo "password" > parityPassword
             cp ./parity-genesis.template.json ./parity-genesis.json
             sed -i "s/000000000000000000000000000000deadbeef01/$(parity account new --chain ./parity-genesis.json --keys-path ./keys --password ./parityPassword)/g" ./parity-genesis.json
diff --git a/contracts/Colony.sol b/contracts/Colony.sol
@@ -146,11 +146,7 @@ contract Colony is ColonyStorage, PatriciaTreeProofs {
   stoppable
   auth
   {
-    if (address(this) == IColonyNetwork(colonyNetworkAddress).getMetaColony()) {
-      ERC20Extended(token).mint(_wad);
-    } else {
-      ERC20Extended(token).mint(address(this), _wad);
-    }
+    ERC20Extended(token).mint(address(this), _wad);
   }
 
   function mintTokensForColonyNetwork(uint _wad) public stoppable {
diff --git a/helpers/test-data-generator.js b/helpers/test-data-generator.js
@@ -288,8 +288,7 @@ export async function giveUserCLNYTokens(colonyNetwork, userAddress, amount) {
   const clnyToken = await Token.at(clnyAddress);
 
   const accounts = await web3GetAccounts();
-  await clnyToken.mint(amount, { from: accounts[11] });
-  await clnyToken.transfer(userAddress, amount, { from: accounts[11] });
+  await clnyToken.mint(userAddress, amount, { from: accounts[11] });
 }
 
 export async function giveUserCLNYTokensAndStake(colonyNetwork, user, _amount) {
@@ -325,8 +324,7 @@ export async function fundColonyWithTokens(colony, token, tokenAmount = INITIAL_
   if (colonyToken === token.address) {
     await colony.mintTokens(tokenAmountBN);
   } else {
-    await token.mint(tokenAmountBN);
-    await token.transfer(colony.address, tokenAmountBN);
+    await token.mint(colony.address, tokenAmountBN);
   }
   await colony.claimColonyFunds(token.address);
 }
diff --git a/lib/colonyToken b/lib/colonyToken
@@ -1 +1 @@
-Subproject commit 0c83869aa9f898752448fd085da23c84c9eddba2
+Subproject commit 2dc3136d71c0af9adb9b05e187885dd9dcae94c8
diff --git a/migrations/8_setup_meta_colony.js b/migrations/8_setup_meta_colony.js
@@ -44,8 +44,7 @@ module.exports = async function(deployer, network, accounts) {
 
   // These commands add MAIN_ACCOUNT as a reputation miner.
   // This is necessary because the first miner must have staked before the mining cycle begins.
-  await clnyToken.mint(DEFAULT_STAKE, { from: accounts[11] });
-  await clnyToken.transfer(MAIN_ACCOUNT, DEFAULT_STAKE, { from: accounts[11] });
+  await clnyToken.mint(MAIN_ACCOUNT, DEFAULT_STAKE, { from: accounts[11] });
   await clnyToken.approve(tokenLockingAddress, DEFAULT_STAKE, { from: MAIN_ACCOUNT });
   const mainAccountBalance = await clnyToken.balanceOf(MAIN_ACCOUNT);
   assert.equal(mainAccountBalance.toString(), DEFAULT_STAKE.toString());
diff --git a/packages/reputation-miner/package.json b/packages/reputation-miner/package.json
@@ -18,7 +18,7 @@
     "bn.js": "^4.11.8",
     "ethers": "^4.0.26",
     "express": "^4.16.3",
-    "ganache-core": "2.3.3",
+    "ganache-core": "^2.5.3",
     "sqlite": "^3.0.2",
     "web3-utils": "^1.0.0-beta.46",
     "yargs": "^13.1.0"
diff --git a/parity-genesis.template.json b/parity-genesis.template.json
@@ -16,13 +16,15 @@
         "eip161dTransition": "0x0",
         "eip155Transition": "0x0",
         "eip98Transition": "0x7fffffffffffff",
-        "eip86Transition": "0x7fffffffffffff",
         "maxCodeSize": 24576,
         "maxCodeSizeTransition": "0x0",
         "eip140Transition": "0x0",
         "eip211Transition": "0x0",
         "eip214Transition": "0x0",
         "eip658Transition": "0x0",
+        "eip145Transition": "0x0",
+        "eip1014Transition": "0x0",
+        "eip1052Transition": "0x0",
         "wasmActivationTransition": "0x0"
     },
     "genesis": {
diff --git a/scripts/resetParity.sh b/scripts/resetParity.sh
@@ -31,5 +31,4 @@ $SED -i "s/000000000000000000000000000000deadbeef08/$(parity account new --chain
 $SED -i "s/000000000000000000000000000000deadbeef09/$(parity account new --chain ./parity-genesis.json --keys-path ./keys --password ./parityPassword)/g" ./parity-genesis.json
 $SED -i "s/000000000000000000000000000000deadbeef10/$(parity account new --chain ./parity-genesis.json --keys-path ./keys --password ./parityPassword)/g" ./parity-genesis.json
 $SED -i "s/000000000000000000000000000000deadbeef11/$(parity account new --chain ./parity-genesis.json --keys-path ./keys --password ./parityPassword)/g" ./parity-genesis.json
-$SED -i "s/000000000000000000000000000000deadbeef12/$(parity account new --chain ./parity-genesis.json --keys-path ./keys --password ./parityPassword)/g" ./parity-genesis.json
-$SED -i "s/000000000000000000000000000000deadbeef13/$(parity --chain ./parity-genesis.json --keys-path ./keys account list | head -n1)/g" ./parity-genesis.json
+$SED -i "s/000000000000000000000000000000deadbeef12/$(parity --chain ./parity-genesis.json --keys-path ./keys account list | head -n1)/g" ./parity-genesis.json
diff --git a/scripts/start-blockchain-client.sh b/scripts/start-blockchain-client.sh
@@ -40,11 +40,9 @@ start_parity() {
     echo "No parity addresses found. Did you initialise it correctly?"
     exit 1;
   else
-    parity --chain ./parity-genesis.json \
-    --author ${addresses[0]} \
+    parity --chain ./parity-genesis.json --author ${addresses[0]} \
     --unlock ${addresses[0]},${addresses[1]},${addresses[2]},${addresses[3]},${addresses[4]},${addresses[5]},${addresses[6]},${addresses[7]},${addresses[8]},${addresses[9]},${addresses[10]},${addresses[11]} \
-    --keys-path ./keys --geth --no-dapps \
-    --tx-gas-limit 0x6691B7 --gasprice 0x0 --gas-floor-target 0x6691B7 \
+    --keys-path ./keys --geth --tx-gas-limit 0x6691B7 --gas-floor-target 0x6691B7 \
     --reseal-on-txs all --reseal-min-period 0 \
     --jsonrpc-interface all --jsonrpc-hosts all --jsonrpc-cors="http://localhost:3000" \
     --password ./parityPassword >/dev/null 2>&1
diff --git a/test/colony-funding.js b/test/colony-funding.js
@@ -56,8 +56,7 @@ contract("Colony Funding", accounts => {
 
   describe("when receiving tokens", () => {
     it("should not put the tokens straight in to the pot", async () => {
-      await otherToken.mint(100);
-      await otherToken.transfer(colony.address, 100);
+      await otherToken.mint(colony.address, 100);
       let colonyRewardPotBalance = await colony.getFundingPotBalance(0, otherToken.address);
       let colonyPotBalance = await colony.getFundingPotBalance(1, otherToken.address);
       let colonyTokenBalance = await otherToken.balanceOf(colony.address);
diff --git a/test/colony-network-auction.js b/test/colony-network-auction.js
@@ -42,8 +42,7 @@ contract("Colony Network Auction", accounts => {
 
     const args = getTokenArgs();
     token = await DSToken.new(args[1]);
-    await token.mint(quantity);
-    await token.transfer(colonyNetwork.address, quantity);
+    await token.mint(colonyNetwork.address, quantity);
     const { logs, receipt } = await colonyNetwork.startTokenAuction(token.address);
     createAuctionTxReceipt = receipt;
     const auctionAddress = logs[0].args.auction;
@@ -82,8 +81,7 @@ contract("Colony Network Auction", accounts => {
     });
 
     it("cannot bid if not started", async () => {
-      await token.mint(quantity);
-      await token.transfer(colonyNetwork.address, quantity);
+      await token.mint(colonyNetwork.address, quantity);
       tokenAuction = await DutchAuction.new(clnyToken.address, token.address, metaColony.address);
 
       await checkErrorRevert(tokenAuction.bid(1000, { from: BIDDER_1 }), "colony-auction-not-started");
@@ -106,8 +104,7 @@ 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]);
-      await otherToken.mint(WAD.divn(10));
-      await otherToken.transfer(colonyNetwork.address, WAD.divn(10));
+      await otherToken.mint(colonyNetwork.address, WAD.divn(10));
       const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
       const auctionAddress = logs[0].args.auction;
       tokenAuction = await DutchAuction.at(auctionAddress);
@@ -133,8 +130,7 @@ contract("Colony Network Auction", accounts => {
     });
 
     it("should fail if the last auction for the same token started less than 30 days", async () => {
-      await token.mint(quantity);
-      await token.transfer(colonyNetwork.address, quantity);
+      await token.mint(colonyNetwork.address, quantity);
       await checkErrorRevert(colonyNetwork.startTokenAuction(token.address), "colony-auction-start-too-soon");
     });
 
@@ -216,8 +212,7 @@ contract("Colony Network Auction", accounts => {
       const previousAuctionStartTime = await tokenAuction.startTime();
       await forwardTime(SECONDS_PER_DAY * 30, this);
 
-      await token.mint(quantity);
-      await token.transfer(colonyNetwork.address, quantity);
+      await token.mint(colonyNetwork.address, quantity);
 
       const { logs } = await colonyNetwork.startTokenAuction(token.address);
       const auctionAddress = logs[0].args.auction;
@@ -515,8 +510,7 @@ contract("Colony Network Auction", accounts => {
         const bidAmount = new BN(100000);
         await giveUserCLNYTokens(colonyNetwork, BIDDER_1, bidAmount);
 
-        await otherToken.mint(auctionProp.quantity);
-        await otherToken.transfer(colonyNetwork.address, auctionProp.quantity);
+        await otherToken.mint(colonyNetwork.address, auctionProp.quantity);
 
         const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
         const auctionAddress = logs[0].args.auction;
@@ -575,8 +569,7 @@ contract("Colony Network Auction", accounts => {
       it(`should correctly accept bids at high price and finalise auction for quantity ${auctionProp.quantity} at day open ${
         auctionProp.daysOpen
       }`, async () => {
-        await otherToken.mint(auctionProp.quantity);
-        await otherToken.transfer(colonyNetwork.address, auctionProp.quantity);
+        await otherToken.mint(colonyNetwork.address, auctionProp.quantity);
         const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
         const auctionAddress = logs[0].args.auction;
         tokenAuction = await DutchAuction.at(auctionAddress);
@@ -612,8 +605,7 @@ contract("Colony Network Auction", accounts => {
 
     it("auction closes when the receivedTotal goes over the total amount to end the auction", async () => {
       const totalAmount = new BN(10).pow(new BN(16));
-      await otherToken.mint(totalAmount);
-      await otherToken.transfer(colonyNetwork.address, totalAmount);
+      await otherToken.mint(colonyNetwork.address, totalAmount);
       const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
       const auctionAddress = logs[0].args.auction;
       tokenAuction = await DutchAuction.at(auctionAddress);
@@ -638,8 +630,7 @@ contract("Colony Network Auction", accounts => {
 
     it("functions correctly even when price has reached the near minimum", async () => {
       const totalAmount = new BN(10).pow(new BN(16));
-      await otherToken.mint(totalAmount);
-      await otherToken.transfer(colonyNetwork.address, totalAmount);
+      await otherToken.mint(colonyNetwork.address, totalAmount);
       const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
       const auctionAddress = logs[0].args.auction;
       tokenAuction = await DutchAuction.at(auctionAddress);
@@ -687,8 +678,7 @@ contract("Colony Network Auction", accounts => {
     // As the true distribution, if we had floats, should be 0.1 and 1.9
     it("functions correctly when there are two bids at the far ends of the price spectrum and one can't go over the claim threshold", async () => {
       const totalAmount = new BN(2);
-      await otherToken.mint(totalAmount);
-      await otherToken.transfer(colonyNetwork.address, totalAmount);
+      await otherToken.mint(colonyNetwork.address, totalAmount);
       const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
       const auctionAddress = logs[0].args.auction;
       tokenAuction = await DutchAuction.at(auctionAddress);
@@ -721,8 +711,7 @@ contract("Colony Network Auction", accounts => {
     // Here no bid gets any tokens
     it("functions correctly when there are three bids in a low quantity auction, and none gets over the claim threshold", async () => {
       const totalAmount = new BN(2);
-      await otherToken.mint(totalAmount);
-      await otherToken.transfer(colonyNetwork.address, totalAmount);
+      await otherToken.mint(colonyNetwork.address, totalAmount);
       const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
       const auctionAddress = logs[0].args.auction;
       tokenAuction = await DutchAuction.at(auctionAddress);
diff --git a/test/colony-reward-payouts.js b/test/colony-reward-payouts.js
@@ -317,8 +317,7 @@ contract("Colony Reward Payouts", accounts => {
       const { colonyAddress } = logs[0].args;
       const newColony = await IColony.at(colonyAddress);
       await newColony.setRewardInverse(100);
-      await newToken.mint(10);
-      await newToken.transfer(userAddress1, 10);
+      await newToken.mint(userAddress1, 10);
 
       const result = await newColony.getDomain(1);
       const rootDomainSkill = result.skillId;
diff --git a/test/colony-task.js b/test/colony-task.js
@@ -1362,8 +1362,7 @@ contract("ColonyTask", accounts => {
       await colony.moveFundsBetweenPots(1, 0, 0, 1, taskPotId, 100, ZERO_ADDRESS);
 
       // And another token
-      await otherToken.mint(101);
-      await otherToken.transfer(colony.address, 101);
+      await otherToken.mint(colony.address, 101);
       await colony.claimColonyFunds(otherToken.address);
       await colony.moveFundsBetweenPots(1, 0, 0, 1, taskPotId, 100, otherToken.address);
 
diff --git a/test/colony.js b/test/colony.js
@@ -72,7 +72,8 @@ contract("Colony", accounts => {
     it("should emit correct Mint event when minting tokens", async () => {
       const tokenArgs = getTokenArgs();
       const otherToken = await DSToken.new(tokenArgs[1]);
-      await expectAllEvents(otherToken.mint(100), ["Mint"]);
+
+      await expectAllEvents(otherToken.methods["mint(uint256)"](100), ["Mint"]);
     });
 
     it("should fail if a non-admin tries to mint tokens", async () => {
diff --git a/test/reputation-mining/basic-functionality.js b/test/reputation-mining/basic-functionality.js
@@ -85,7 +85,7 @@ contract("Reputation mining - basic functionality", accounts => {
       await giveUserCLNYTokens(colonyNetwork, MINER2, 9000);
       await clnyToken.approve(tokenLocking.address, 10000, { from: MINER2 });
 
-      await checkErrorRevert(tokenLocking.deposit(clnyToken.address, 10000, { from: MINER2 }));
+      await checkErrorRevert(tokenLocking.deposit(clnyToken.address, 10000, { from: MINER2 }), "ds-token-insufficient-balance");
 
       const userBalance = await clnyToken.balanceOf(MINER2);
       expect(userBalance).to.eq.BN(9000);
diff --git a/truffle.js b/truffle.js
@@ -44,7 +44,7 @@ module.exports = {
           enabled: true,
           runs: 200
         },
-        evmVersion: "byzantium"
+        evmVersion: "petersburg"
       }
     }
   }
diff --git a/yarn.lock b/yarn.lock
@@ -3156,7 +3156,7 @@ ethereumjs-block@2.1.0:
     ethereumjs-util "^5.0.0"
     merkle-patricia-tree "^2.1.2"
 
-ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0, ethereumjs-block@~1.7.0:
+ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz#78b88e6cc56de29a6b4884ee75379b6860333c3f"
   integrity sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==
@@ -3188,11 +3188,6 @@ ethereumjs-common@^1.1.0:
   resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.1.0.tgz#5ec9086c314d619d8f05e79a0525829fcb0e93cb"
   integrity sha512-LUmYkKV/HcZbWRyu3OU9YOevsH3VJDXtI6kEd8VZweQec+JjDGKCmAVKUyzhYUHqxRJu7JNALZ3A/b3NXOP6tA==
 
-ethereumjs-common@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-0.4.1.tgz#27690a24a817b058cc3a2aedef9392e8d7d63984"
-  integrity sha512-ywYGsOeGCsMNWso5Y4GhjWI24FJv9FK7+VyVKiQgXg8ZRDPXJ7F/kJ1CnjtkjTvDF4e0yqU+FWswlqR3bmZQ9Q==
-
 ethereumjs-testrpc-sc@6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/ethereumjs-testrpc-sc/-/ethereumjs-testrpc-sc-6.4.1.tgz#8772c52f50462ff4f30dc52ef0a973feaa9e7079"
@@ -3246,23 +3241,6 @@ ethereumjs-util@^6.0.0, ethereumjs-util@^6.1.0:
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
-ethereumjs-vm@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.4.0.tgz#244f1e35f2755e537a13546111d1a4c159d34b13"
-  integrity sha512-MJ4lCWa5c6LhahhhvoDKW+YGjK00ZQn0RHHLh4L+WaH1k6Qv7/q3uTluew6sJGNCZdlO0yYMDXYW9qyxLHKlgQ==
-  dependencies:
-    async "^2.1.2"
-    async-eventemitter "^0.2.2"
-    ethereumjs-account "^2.0.3"
-    ethereumjs-block "~1.7.0"
-    ethereumjs-common "~0.4.0"
-    ethereumjs-util "^5.2.0"
-    fake-merkle-patricia-tree "^1.0.1"
-    functional-red-black-tree "^1.0.1"
-    merkle-patricia-tree "^2.1.2"
-    rustbn.js "~0.2.0"
-    safe-buffer "^5.1.1"
-
 ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4, ethereumjs-vm@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz#76243ed8de031b408793ac33907fb3407fe400c6"
@@ -3844,10 +3822,10 @@ ganache-cli@^6.4.1:
     source-map-support "0.5.9"
     yargs "11.1.0"
 
-ganache-core@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.3.3.tgz#e35c76d405f0ffba5c48621596fdcc38b0a03136"
-  integrity sha512-MGmcDm27bMPeQvY5cZWK08AyiJj/18P0dgiCOhGyhX1LRCQD4Pj4tvpxd6w3dftn5iCBnzGwm9j3+WT0k+B0XQ==
+ganache-core@^2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.5.3.tgz#8c6f21d820a694826082dfbb2dc59f834a6874fc"
+  integrity sha512-lTqPSxgWS5p4zJ8yNbhhsBXMPfcuV+jjnnYtsbJTph9L6InA6UkNpO0hhHuDFWF3GpblP3LjvWPpqW+X6pdZGg==
   dependencies:
     abstract-leveldown "3.0.0"
     async "2.6.1"
@@ -3863,11 +3841,11 @@ ganache-core@2.3.3:
     ethereumjs-block "2.1.0"
     ethereumjs-tx "1.3.7"
     ethereumjs-util "5.2.0"
-    ethereumjs-vm "2.4.0"
+    ethereumjs-vm "^2.6.0"
     heap "0.2.6"
     level-sublevel "6.6.4"
     levelup "3.1.1"
-    lodash "4.17.10"
+    lodash "4.17.11"
     merkle-patricia-tree "2.3.1"
     rlp "2.1.0"
     seedrandom "2.4.4"
@@ -5172,21 +5150,16 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash@4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
+lodash@4.17.11, lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
 log-symbols@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,7 @@ contract Colony is ColonyStorage, PatriciaTreeProofs {`
`146`	`146`	`stoppable`
`147`	`147`	`auth`
`148`	`148`	`{`
`149`		`- if (address(this) == IColonyNetwork(colonyNetworkAddress).getMetaColony()) {`
`150`		`- ERC20Extended(token).mint(_wad);`
`151`		`- } else {`
`152`		`- ERC20Extended(token).mint(address(this), _wad);`
`153`		`- }`
	`149`	`+ ERC20Extended(token).mint(address(this), _wad);`
`154`	`150`	`}`
`155`	`151`
`156`	`152`	`function mintTokensForColonyNetwork(uint _wad) public stoppable {`
Original file line number	Diff line number	Diff line change
`@@ -288,8 +288,7 @@ export async function giveUserCLNYTokens(colonyNetwork, userAddress, amount) {`
`288`	`288`	`const clnyToken = await Token.at(clnyAddress);`
`289`	`289`
`290`	`290`	`const accounts = await web3GetAccounts();`
`291`		`- await clnyToken.mint(amount, { from: accounts[11] });`
`292`		`- await clnyToken.transfer(userAddress, amount, { from: accounts[11] });`
	`291`	`+ await clnyToken.mint(userAddress, amount, { from: accounts[11] });`
`293`	`292`	`}`
`294`	`293`
`295`	`294`	`export async function giveUserCLNYTokensAndStake(colonyNetwork, user, _amount) {`
`@@ -325,8 +324,7 @@ export async function fundColonyWithTokens(colony, token, tokenAmount = INITIAL_`
`325`	`324`	`if (colonyToken === token.address) {`
`326`	`325`	`await colony.mintTokens(tokenAmountBN);`
`327`	`326`	`} else {`
`328`		`- await token.mint(tokenAmountBN);`
`329`		`- await token.transfer(colony.address, tokenAmountBN);`
	`327`	`+ await token.mint(colony.address, tokenAmountBN);`
`330`	`328`	`}`
`331`	`329`	`await colony.claimColonyFunds(token.address);`
`332`	`330`	`}`