Merge pull request #313 from windingtree/add-deployer

Add TGEDeployer contract with tests

Author: AugustoL

contracts/LifCrowdsale.sol

@@ -82,9 +82,6 @@ contract LifCrowdsale is Ownable, Pausable {
   // Amount of lif minted and transferred during the TGE
   uint256 public tokensSold;
 
-  // Amount of wei received as private presale payments
-  uint256 public totalPresaleWei;
-
   // Address of the vesting schedule for the foundation created at the
   // end of the crowdsale
   VestedPayment public foundationVestedPayment;
@@ -257,7 +254,7 @@ contract LifCrowdsale is Ownable, Pausable {
 
     uint256 tokens = weiSent.mul(rate);
 
-    totalPresaleWei = totalPresaleWei.add(weiSent);
+    weiRaised = weiRaised.add(weiSent);
 
     token.mint(beneficiary, tokens);
 
@@ -268,17 +265,18 @@ contract LifCrowdsale is Ownable, Pausable {
      @dev Internal. Forwards funds to the foundation wallet and in case the soft
      cap was exceeded it also creates and funds the Market Validation Mechanism.
    */
-  function forwardFunds() internal {
+  function forwardFunds(bool deployMVM) internal {
 
     // calculate the max amount of wei for the foundation
     uint256 foundationBalanceCapWei = maxFoundationCapUSD.mul(weiPerUSDinTGE);
 
-    // If the minimiun cap for the MVM is not reached transfer all funds to foundation
-    // else if the min cap for the MVM is reached, create it and send the remaining funds.
+    // If the minimiun cap for the MVM is not reached or the MVM cant be deployed
+    // transfer all funds to foundation else if the min cap for the MVM is reached,
+    // create it and send the remaining funds.
     // We use weiRaised to compare becuase that is the total amount of wei raised in all TGE
     // but we have to distribute the balance using `this.balance` because thats the amount
     // raised by the crowdsale
-    if (weiRaised <= foundationBalanceCapWei) {
+    if ((weiRaised <= foundationBalanceCapWei) || !deployMVM) {
 
       foundationWallet.transfer(this.balance);
 
@@ -332,7 +330,8 @@ contract LifCrowdsale is Ownable, Pausable {
     foundersVestedPayment.transferOwnership(foundersWallet);
 
     // create the vested payment schedule for the foundation
-    uint256 foundationPaymentStart = foundationMonthsStart.mul(30 days);
+    uint256 foundationPaymentStart = foundationMonthsStart.mul(30 days)
+      .add(30 days);
     foundationVestedPayment = new VestedPayment(
       block.timestamp.add(foundationPaymentStart), 30 days,
       foundationMonthsStart, 0, foundationTokens, token
@@ -418,13 +417,13 @@ contract LifCrowdsale is Ownable, Pausable {
      Mechanism in case the soft cap was exceeded. It also unpauses the token to
      enable transfers. It can be called only once, after `end2Timestamp`
    */
-  function finalize() public onlyOwner hasEnded {
+  function finalize(bool deployMVM) public onlyOwner hasEnded {
     require(!isFinalized);
 
     // foward founds and unpause token only if minCap is reached
     if (funded()) {
 
-      forwardFunds();
+      forwardFunds(deployMVM);
 
       // finish the minting of the token
       token.finishMinting();

contracts/LifMarketValidationMechanism.sol

@@ -121,6 +121,13 @@ contract LifMarketValidationMechanism is Ownable {
     funded = true;
   }
 
+  /**
+     @dev Change the LifToken address
+    */
+  function changeToken(address newToken) public onlyOwner {
+    lifToken = LifToken(newToken);
+  }
+
   /**
      @dev calculates the exponential distribution curve. It determines how much
      wei can be distributed back to the foundation every month. It starts with

contracts/VestedPayment.sol

@@ -69,6 +69,13 @@ contract VestedPayment is Ownable {
     token = LifToken(tokenAddress);
   }
 
+  /**
+     @dev Change the LifToken address
+    */
+  function changeToken(address newToken) public onlyOwner {
+    token = LifToken(newToken);
+  }
+
   /**
      @dev Get how many tokens are available to be claimed
    */

contracts/deploy/TGEDeployer.sol

@@ -0,0 +1,52 @@
+pragma solidity ^0.4.18;
+
+import "../LifCrowdsale.sol";
+
+/**
+   @title TGEDeployer, A deployer contract for the Winding Tree TGE
+
+   This contract is used to create a crowdsale and issue presale tokens in batches
+   it will also set the weiPerUSD and transfer ownership, after that everything is
+   ready for the TGE to succed.
+ */
+contract TGEDeployer {
+
+  LifCrowdsale public crowdsale;
+  address public wallet;
+  address public owner;
+
+  function TGEDeployer(
+    uint256 startTimestamp,
+    uint256 end1Timestamp,
+    uint256 end2Timestamp,
+    uint256 rate1,
+    uint256 rate2,
+    uint256 setWeiLockSeconds,
+    address foundationWallet,
+    address foundersWallet
+  ) public {
+    crowdsale = new LifCrowdsale(
+      startTimestamp, end1Timestamp, end2Timestamp, rate1, rate2,
+      setWeiLockSeconds, foundationWallet, foundersWallet
+    );
+    wallet = foundationWallet;
+    owner = msg.sender;
+  }
+
+  // Mint a batch of presale tokens
+  function addPresaleTokens(address[] contributors, uint256[] values, uint256 rate) public {
+    require(msg.sender == owner);
+    require(contributors.length == values.length);
+    for (uint32 i = 0; i < contributors.length; i ++) {
+      crowdsale.addPrivatePresaleTokens(contributors[i], values[i], rate);
+    }
+  }
+
+  // Set the wei per USD in the crowdsale and then transfer ownership to foundation
+  function finish(uint256 weiPerUSDinTGE) public {
+    require(msg.sender == owner);
+    crowdsale.setWeiPerUSDinTGE(weiPerUSDinTGE);
+    crowdsale.transferOwnership(wallet);
+  }
+
+}

scripts/test.sh

@@ -35,7 +35,7 @@ start_testrpc() {
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501210,1000000000000000000000000"
   )
 
-  node_modules/.bin/testrpc --gasLimit 0xfffffffffff "${accounts[@]}" > /dev/null &
+  node_modules/.bin/testrpc --gasLimit 8000000 --gasPrice 41000000000 "${accounts[@]}" > /dev/null &
 
   testrpc_pid=$!
 }

test/Crowdsale.js

@@ -281,7 +281,7 @@ contract('LifToken Crowdsale', function (accounts) {
     await crowdsale.buyTokens(beneficiary, { value: weiAmount, from: accounts[5] });
 
     await increaseTimeTestRPCTo(end2 + 2);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
 
     // TO DO: Find out why the balance difference in this assert
     // const balanceBeforeClaim = web3.eth.getBalance(beneficiary);
@@ -307,7 +307,7 @@ contract('LifToken Crowdsale', function (accounts) {
     await crowdsale.buyTokens(accounts[6], { value: weiAmount, from: accounts[5] });
 
     await increaseTimeTestRPCTo(end2 + 2);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
 
     try {
       await crowdsale.claimEth({ from: accounts[6] });
@@ -361,7 +361,7 @@ contract('LifToken Crowdsale', function (accounts) {
     await crowdsale.buyTokens(beneficiary, { value: weiAmount, from: accounts[5] });
 
     await increaseTimeTestRPCTo(end2 + 2);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
 
     try {
       await crowdsale.claimEth({ from: accounts[8] });
@@ -390,10 +390,10 @@ contract('LifToken Crowdsale', function (accounts) {
     await crowdsale.buyTokens(beneficiary, { value: weiAmount, from: accounts[5] });
 
     await increaseTimeTestRPCTo(end2 + 2);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
 
     try {
-      await crowdsale.finalize();
+      await crowdsale.finalize(true);
       assert(false, 'should have thrown');
     } catch (e) {
       assert(help.isInvalidOpcodeEx(e));
@@ -419,7 +419,7 @@ contract('LifToken Crowdsale', function (accounts) {
     await crowdsale.buyTokens(beneficiary, { value: weiAmount, from: accounts[5] });
 
     await increaseTimeTestRPCTo(end2 + 2);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
 
     const MVMAddress = await crowdsale.MVM.call();
     assert(MVMAddress !== help.zeroAddress);
@@ -447,7 +447,7 @@ contract('LifToken Crowdsale', function (accounts) {
     await crowdsale.buyTokens(beneficiary, { value: weiAmount, from: accounts[5] });
 
     await increaseTimeTestRPCTo(end2 + 2);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
 
     const MVMAddress = await crowdsale.MVM.call();
     assert(MVMAddress === help.zeroAddress, 'no MVM should have been created: ' + MVMAddress);

test/CrowdsaleGenTest.js

@@ -37,16 +37,11 @@ contract('LifCrowdsale Property-based test', function (accounts) {
     let tokensInPurchases = sumBigNumbers(_.map(state.purchases, (p) => p.tokens));
     tokensInPurchases.should.be.bignumber.equal(help.lifWei2Lif(await crowdsale.tokensSold()));
 
-    let presaleWei = sumBigNumbers(_.map(state.presalePurchases, (p) => p.wei));
-
-    presaleWei.should.be.bignumber.equal(await crowdsale.totalPresaleWei.call());
-
     help.debug('checking purchases total wei, purchases:', JSON.stringify(state.purchases));
     let weiInPurchases = sumBigNumbers(_.map(state.purchases, (p) => p.wei));
-    weiInPurchases.should.be.bignumber.equal(await crowdsale.weiRaised());
+    if (state.crowdsaleFinalized) { new BigNumber(0).should.be.bignumber.equal(await web3.eth.getBalance(crowdsale.address)); } else { weiInPurchases.should.be.bignumber.equal(await web3.eth.getBalance(crowdsale.address)); }
 
     // Check presale tokens sold
-    state.totalPresaleWei.should.be.bignumber.equal(await crowdsale.totalPresaleWei.call());
     assert.equal(state.crowdsaleFinalized, await crowdsale.isFinalized.call());
     if (state.crowdsaleFinalized && state.weiPerUSDinTGE > 0) {
       assert.equal(state.crowdsaleFunded, await crowdsale.funded());
@@ -179,7 +174,6 @@ contract('LifCrowdsale Property-based test', function (accounts) {
         presalePurchases: [],
         claimedEth: {},
         weiRaised: zero,
-        totalPresaleWei: zero,
         crowdsalePaused: false,
         tokenPaused: true,
         crowdsaleFinalized: false,

test/commands.js

@@ -283,8 +283,7 @@ async function runFinalizeCrowdsaleCommand (command, state) {
     let crowdsaleFunded = (state.weiRaised >= state.crowdsaleData.minCapUSD * state.weiPerUSDinTGE);
 
     help.debug('finishing crowdsale on block', nextTimestamp, ', from address:', gen.getAccount(command.fromAccount), ', funded:', crowdsaleFunded);
-
-    let tx = await state.crowdsaleContract.finalize({ from: account });
+    let tx = await state.crowdsaleContract.finalize(true, { from: account });
     help.debug('gas used in finalize:', tx.receipt.gasUsed);
 
     if (!help.inCoverage()) { // gas cannot be measured correctly when running coverage
@@ -375,7 +374,7 @@ async function runFinalizeCrowdsaleCommand (command, state) {
 async function runAddPrivatePresalePaymentCommand (command, state) {
   let { startTimestamp } = state.crowdsaleData,
     nextTimestamp = latestTime(),
-    weiToSend = web3.toWei(command.eth, 'ether'),
+    weiSent = web3.toWei(command.eth, 'ether'),
     account = gen.getAccount(command.fromAccount),
     beneficiary = gen.getAccount(command.beneficiaryAccount),
     hasZeroAddress = _.some([account, beneficiary], isZeroAddress);
@@ -385,20 +384,20 @@ async function runAddPrivatePresalePaymentCommand (command, state) {
     (account !== gen.getAccount(state.owner)) ||
     (state.crowdsaleFinalized) ||
     hasZeroAddress ||
-    (weiToSend === 0) ||
+    (weiSent === 0) ||
     (command.rate <= state.crowdsaleData.rate1);
 
   try {
     help.debug('Adding presale private tokens for account:', command.beneficiaryAccount, 'eth:', command.eth, 'fromAccount:', command.fromAccount, 'blockTimestamp:', nextTimestamp);
 
-    const tx = await state.crowdsaleContract.addPrivatePresaleTokens(beneficiary, weiToSend, command.rate, { from: account });
+    const tx = await state.crowdsaleContract.addPrivatePresaleTokens(beneficiary, weiSent, command.rate, { from: account });
 
     assert.equal(false, shouldThrow, 'buyTokens should have thrown but it did not');
 
-    state.totalSupply = state.totalSupply.plus(weiToSend * command.rate);
-    state.totalPresaleWei = state.totalPresaleWei.plus(weiToSend);
+    state.totalSupply = state.totalSupply.plus(weiSent * command.rate);
+    state.weiRaised = state.weiRaised.plus(weiSent);
     state.presalePurchases = _.concat(state.presalePurchases,
-      { rate: command.rate, wei: weiToSend, beneficiary: command.beneficiary, account: command.fromAccount }
+      { rate: command.rate, wei: weiSent, beneficiary: command.beneficiary, account: command.fromAccount }
     );
     state = decreaseEthBalance(state, command.fromAccount, help.txGasCost(tx));
   } catch (e) {