Make deploy of MVM optional

Author: AugustoL

contracts/LifCrowdsale.sol

@@ -265,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);
 
@@ -415,13 +416,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();

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/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

test/deploy/TGEDeployer.js

@@ -16,13 +16,13 @@ const _ = require('lodash');
 const TGEDistribution = require('./TGEDistribution');
 
 contract('TGE Deployer', function ([deployAddress, foundationWallet, foundersWallet]) {
-  it('Deploy a TGE correctly', async function () {
-    const startTimestamp = new Date('Sun, 28 Jan 2018 8:0:00 GMT').getTime() / 1000;
-    const end1Timestamp = new Date('Sun, 28 Jan 2018 9:0:00 GMT').getTime() / 1000;
-    const end2Timestamp = new Date('Sun, 28 Jan 2018 10:0:00 GMT').getTime() / 1000;
+  it.only('Deploy a TGE correctly', async function () {
+    const startTimestamp = new Date('Sun, 28 Jan 2018 15:00:00 GMT-3').getTime() / 1000;
+    const end1Timestamp = new Date('Sun, 28 Jan 2018 24:00:00 GMT-3').getTime() / 1000;
+    const end2Timestamp = new Date('Mon, 29 Jan 2018 12:00:00 GMT-3').getTime() / 1000;
     const rate1 = 1000;
     const rate2 = 900;
-    const setWeiLockSeconds = duration.hours(1);
+    const setWeiLockSeconds = duration.minutes(30);
     var totalSupply = new BigNumber(0);
     const weiPerUSDinTGE = web3.toWei(1 / 1000);
 

test/helpers.js

@@ -91,7 +91,7 @@ module.exports = {
       if (balances[i] > 0) { await crowdsale.sendTransaction({ value: web3.toWei(balances[i] / rate, 'ether'), from: accounts[i + 1] }); }
     }
     await increaseTimeTestRPCTo(endTime + 1);
-    await crowdsale.finalize();
+    await crowdsale.finalize(true);
     let token = LifToken.at(await crowdsale.token());
     await token.unpause();
     return crowdsale;