Merge branch 'development' into createWethPage

* development: (54 commits)
  Fix redundant spaces
  Fix tests
  Fix website unused vars
  Fix connect unused vars
  Fix 0x.js unused vars
  Dissallow unused vars/imports
  Implement first custom linter rule async-suffix
  Reuse intervalutils in website
  Add a newline
  Name a variable
  Add a comment
  Fix a conditional
  Make migrations deterministic
  Fix linter error
  Fix linter errors
  Add a function to init token balances
  Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens
  Add DummyToken to gitignore
  Add DummyToken to artifacts list
  Increase mocha timeout
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/packages/contracts/migrations/2_deploy_independent_contracts.ts b/packages/contracts/migrations/2_deploy_independent_contracts.ts
index 878860eb6..4bf316be6 100644
--- a/packages/contracts/migrations/2_deploy_independent_contracts.ts
+++ b/packages/contracts/migrations/2_deploy_independent_contracts.ts
@@ -1,9 +1,10 @@
 import {Artifacts} from '../util/artifacts';
-import {ContractInstance, MultiSigConfigByNetwork} from '../util/types';
+import {MultiSigConfigByNetwork} from '../util/types';
 const {
     MultiSigWalletWithTimeLock,
     TokenTransferProxy,
     EtherToken,
+    EtherTokenV2,
     TokenRegistry,
 } = new Artifacts(artifacts);
 
@@ -28,11 +29,13 @@ module.exports = (deployer: any, network: string, accounts: string[]) => {
             deployer.deploy(MultiSigWalletWithTimeLock, config.owners,
                             config.confirmationsRequired, config.secondsRequired)
             .then(() => {
-                    return deployer.deploy(TokenTransferProxy);
+                return deployer.deploy(TokenTransferProxy);
             }).then(() => {
-                    return deployer.deploy(TokenRegistry);
+                return deployer.deploy(TokenRegistry);
             }).then(() => {
-                    return deployer.deploy(EtherToken);
+                return deployer.deploy(EtherToken);
+            }).then(() => {
+                return deployer.deploy(EtherTokenV2);
             });
     } else {
         deployer.deploy([