Merge pull request #5 from Stacktical/migrate-token-to-dedicated-repo

Migrate token to dedicated repo

contracts/Crowdsale/DSLACrowdsale.sol

@@ -1,10 +1,10 @@
 pragma solidity 0.4.24;
 
-import "../DSLA/DSLA.sol";
 import "./PullPayment.sol";
 import "./VestedCrowdsale.sol";
 import "./Whitelist.sol";
 import "openzeppelin-solidity/contracts/lifecycle/Pausable.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/ERC20Burnable.sol";
 
 
 /**
@@ -25,7 +25,7 @@ contract DSLACrowdsale is VestedCrowdsale, Whitelist, Pausable, PullPayment {
     // mapping ico rounds
     mapping (uint256 => IcoRound) public icoRounds;
     // The token being sold
-    DSLA private _token;
+    ERC20Burnable private _token;
     // Address where funds are collected
     address private _wallet;
     // Amount of wei raised
@@ -63,7 +63,7 @@ contract DSLACrowdsale is VestedCrowdsale, Whitelist, Pausable, PullPayment {
       * @param wallet Address where collected funds will be forwarded to
       * @param token Address of the token being sold
       */
-    constructor(address wallet, DSLA token) public {
+    constructor(address wallet, ERC20Burnable token) public {
         require(wallet != address(0) && token != address(0));
 
         icoRounds[1] = IcoRound(
@@ -254,7 +254,7 @@ contract DSLACrowdsale is VestedCrowdsale, Whitelist, Pausable, PullPayment {
       * @dev returns the token being sold
       * @return the token being sold
       */
-    function token() public view returns(DSLA) {
+    function token() public view returns(ERC20Burnable) {
         return _token;
     }
 

contracts/Mocks/DSLAMock.sol

@@ -0,0 +1,14 @@
+pragma solidity 0.4.24;
+
+import "openzeppelin-solidity/contracts/token/ERC20/ERC20Burnable.sol";
+
+contract DSLAMock is ERC20Burnable {
+    uint256 public constant INITIAL_SUPPLY = 10000000000000000000000000000;
+
+    /**
+      * @dev Constructor
+      */
+    constructor() public {
+        _mint(msg.sender, INITIAL_SUPPLY);
+    }
+}

migrations/2_deploy_contracts.js

@@ -1,21 +1,13 @@
-const DSLA = artifacts.require('./DSLA.sol');
 const DSLACrowdsale = artifacts.require('./DSLACrowdsale.sol');
 
 module.exports =  function(deployer, network) {
-    // Dec 31th 2018 8AM GMT
-    const releaseDate = 1546243200;
-    let wallet = "0xaf13f12ebe00cd02f486e000927408148e768802";
-    let dsla;
-    let crowdsale;
+    let wallet;
+    let DSLATokenAddress;
 
-    return deployer.deploy(DSLA, releaseDate).then(function(instance){
-        dsla = instance;
-        return deployer.deploy(DSLACrowdsale, wallet, dsla.address).then(function(instance){
-            crowdsale = instance;
-            return dsla.setCrowdsaleAddress(crowdsale.address).then(async function(){
-                const adr = await dsla.crowdsaleAddress.call();
-                console.log("Crowdsale address set to " + adr);
-            });
-        });
-    });
+    if (network === 'development') {
+        wallet = "0x1234567890";
+        DSLATokenAddress = "0x1234567891"
+    }
+
+    return deployer.deploy(DSLACrowdsale, wallet, DSLATokenAddress)
 }

test/presale.test.js

@@ -2,14 +2,13 @@ import assertRevert from './helpers/assertRevert';
 import latestTime from './helpers/latestTime';
 import { increaseTimeTo, duration } from './helpers/increaseTime';
 
-const Token = artifacts.require('./DSLA.sol');
+const Token = artifacts.require('./DSLAMock.sol');
 const Crowdsale = artifacts.require('./DSLACrowdsale.sol');
 const BigNumber = web3.BigNumber;
 
 contract('ROUND 2', function ([owner, project, anotherAccount, user1, user2, wallet]) {
     let token;
     let crowdsale;
-    const releaseDate = 1546243200;
     const tokensToSell = new BigNumber('5e27');
     const rate = 312500;
     const individualFloor = web3.toWei('12', 'ether');
@@ -18,19 +17,12 @@ contract('ROUND 2', function ([owner, project, anotherAccount, user1, user2, wal
     const hardCap = web3.toWei('6000', 'ether');
 
     beforeEach('redeploy', async function () {
-        token = await Token.new(releaseDate, {from : owner});
+        token = await Token.new({from : owner});
         crowdsale = await Crowdsale.new(wallet, token.address, {from : owner});
 
-        await token.setCrowdsaleAddress(crowdsale.address, {from : owner});
         await token.transfer(crowdsale.address, tokensToSell, {from : owner});
     });
 
-    describe('Check if the crowdsale address is set', function () {
-        it('return the same address', async function () {
-            assert.equal(await token.crowdsaleAddress.call(), crowdsale.address);
-        });
-    });
-
     describe('Pre-sale period', function () {
         it('rejects a contribution made when pre sale not yet starting', async function () {
             const paymentAmount = web3.toWei('12', 'ether');

test/presale.vesting.js

@@ -2,7 +2,7 @@ import assertRevert from './helpers/assertRevert';
 import latestTime from './helpers/latestTime';
 import { increaseTimeTo, duration } from './helpers/increaseTime';
 
-const Token = artifacts.require('./DSLA.sol');
+const Token = artifacts.require('./DSLAMock.sol');
 const Crowdsale = artifacts.require('./DSLACrowdsale.sol');
 const BigNumber = web3.BigNumber;
 
@@ -13,14 +13,11 @@ contract('Vesting', function ([owner, project, anotherAccount, user1, user2, wal
     const april30 = 1556611200;
     const july31 =  1564560000;
 
-
     describe('Vesting process for presale period', function () {
         beforeEach('redeploy', async function () {
-            var releaseDate = latestTime() + duration.days(30);
-            token = await Token.new(releaseDate, {from : owner});
+            token = await Token.new({from : owner});
             crowdsale = await Crowdsale.new(wallet, token.address, {from : owner});
 
-            await token.setCrowdsaleAddress(crowdsale.address, {from : owner});
             await token.transfer(crowdsale.address, tokensToSell, {from : owner});
         });
         it('rejects claiming tokens from a conntributor of the presale before april30', async function () {

test/privatesale.test.js

@@ -2,36 +2,27 @@ import assertRevert from './helpers/assertRevert';
 import latestTime from './helpers/latestTime';
 import { increaseTimeTo, duration } from './helpers/increaseTime';
 
-const Token = artifacts.require('./DSLA.sol');
+const Token = artifacts.require('./DSLAMock.sol');
 const Crowdsale = artifacts.require('./DSLACrowdsale.sol');
 const BigNumber = web3.BigNumber;
 
 contract('ROUND 1', function ([owner, project, anotherAccount, user1, user2, wallet]) {
     let token;
     let crowdsale;
-    const releaseDate = 1546243200;
     const tokensToSell = new BigNumber('5e27');
     const rate = 416700;
     const individualFloor = web3.toWei('3', 'ether');
     const individualCap = web3.toWei('120', 'ether');
     const softCap = 0;
     const hardCap = web3.toWei('1200', 'ether');
 
-
     beforeEach('redeploy', async function () {
-        token = await Token.new(releaseDate, {from : owner});
+        token = await Token.new({from : owner});
         crowdsale = await Crowdsale.new(wallet, token.address, {from : owner});
 
-        await token.setCrowdsaleAddress(crowdsale.address, {from : owner});
         await token.transfer(crowdsale.address, tokensToSell, {from : owner});
     });
 
-    describe('Check if the crowdsale address is set', function () {
-        it('return the same address', async function () {
-            assert.equal(await token.crowdsaleAddress.call(), crowdsale.address);
-        });
-    });
-
     describe('Private sale period', function () {
         it('rejects a contribution made when private sale not yet starting', async function () {
             const paymentAmount = web3.toWei('3', 'ether');

test/privatesale.vesting.js

@@ -2,7 +2,7 @@ import assertRevert from './helpers/assertRevert';
 import latestTime from './helpers/latestTime';
 import { increaseTimeTo, duration } from './helpers/increaseTime';
 
-const Token = artifacts.require('./DSLA.sol');
+const Token = artifacts.require('./DSLAMock.sol');
 const Crowdsale = artifacts.require('./DSLACrowdsale.sol');
 const BigNumber = web3.BigNumber;
 
@@ -14,14 +14,11 @@ contract('Vesting', function ([owner, project, anotherAccount, user1, user2, wal
     const june30 =  1561881600;
     const sept30 =  1569830400;
 
-
     describe('Vesting process for private sale period', function () {
         beforeEach('redeploy', async function () {
-            var releaseDate = latestTime() + duration.days(30);
-            token = await Token.new(releaseDate, {from : owner});
+            token = await Token.new({from : owner});
             crowdsale = await Crowdsale.new(wallet, token.address, {from : owner});
 
-            await token.setCrowdsaleAddress(crowdsale.address, {from : owner});
             await token.transfer(crowdsale.address, tokensToSell, {from : owner});
         });
         it('rejects claiming tokens from a conntributor of the privatesale before march31', async function () {

test/refund.test.js

@@ -2,14 +2,13 @@ import assertRevert from './helpers/assertRevert';
 import latestTime from './helpers/latestTime';
 import { increaseTimeTo, duration } from './helpers/increaseTime';
 
-const Token = artifacts.require('./DSLA.sol');
+const Token = artifacts.require('./DSLAMock.sol');
 const Crowdsale = artifacts.require('./DSLACrowdsale.sol');
 const BigNumber = web3.BigNumber;
 
 contract('Refund', function ([owner, project, anotherAccount, user1, user2, wallet]) {
     let token;
     let crowdsale;
-    const releaseDate = 1546243200;
     const tokensToSell = new BigNumber('5e27');
     const rate = 250000;
     const individualFloor = web3.toWei('3', 'ether');
@@ -18,19 +17,12 @@ contract('Refund', function ([owner, project, anotherAccount, user1, user2, wall
     const hardCap = web3.toWei('17200', 'ether');
 
     beforeEach('redeploy', async function () {
-        token = await Token.new(releaseDate, {from : owner});
+        token = await Token.new({from : owner});
         crowdsale = await Crowdsale.new(wallet, token.address, {from : owner});
 
-        await token.setCrowdsaleAddress(crowdsale.address, {from : owner});
         await token.transfer(crowdsale.address, tokensToSell, {from : owner});
     });
 
-    describe('Check if the crowdsale address is set', function () {
-        it('return the same address', async function () {
-            assert.equal(await token.crowdsaleAddress.call(), crowdsale.address);
-        });
-    });
-
     describe('Refund period', function () {
         it('rejects refunding a conntributor of the privatesale period', async function () {
             const paymentAmount = web3.toWei('3', 'ether');

test/sale.test.js

@@ -2,14 +2,13 @@ import assertRevert from './helpers/assertRevert';
 import latestTime from './helpers/latestTime';
 import { increaseTimeTo, duration } from './helpers/increaseTime';
 
-const Token = artifacts.require('./DSLA.sol');
+const Token = artifacts.require('./DSLAMock.sol');
 const Crowdsale = artifacts.require('./DSLACrowdsale.sol');
 const BigNumber = web3.BigNumber;
 
 contract('ROUND 3', function ([owner, project, anotherAccount, user1, user2, wallet]) {
     let token;
     let crowdsale;
-    const releaseDate = 1546243200;
     const tokensToSell = new BigNumber('5e27');
     const rate = 250000;
     const individualFloor = web3.toWei('3', 'ether');
@@ -18,19 +17,12 @@ contract('ROUND 3', function ([owner, project, anotherAccount, user1, user2, wal
     const hardCap = web3.toWei('17200', 'ether');
 
     beforeEach('redeploy', async function () {
-        token = await Token.new(releaseDate, {from : owner});
+        token = await Token.new({from : owner});
         crowdsale = await Crowdsale.new(wallet, token.address, {from : owner});
 
-        await token.setCrowdsaleAddress(crowdsale.address, {from : owner});
         await token.transfer(crowdsale.address, tokensToSell, {from : owner});
     });
 
-    describe('Check if the crowdsale address is set', function () {
-        it('return the same address', async function () {
-            assert.equal(await token.crowdsaleAddress.call(), crowdsale.address);
-        });
-    });
-
     describe('Sale period', function () {
         it('rejects a contribution made when sale not yet starting', async function () {
             const paymentAmount = web3.toWei('3', 'ether');