Merge branch 'v2-prototype' into feature/website/wallet-flex-box

* v2-prototype: (95 commits)
  Add missing dep to website
  Upgrade solidity parser
  Fix trace test
  Fix linter issues
  Move contract utils
  Fix prettier
  Fix NameResolver
  Fix prettier
  Remove 0x.js as a dependency from website
  Enable 0x.js tests
  Fix small bug in order-utils
  Address feedback
  Fix Tslint error caused by "PromiseLike" value
  Fix Tslint error caused by "PromiseLike" value
  Update dogfood url
  fix contract-wrappers version
  Parse compiler.json in SolCompilerArtifactsAdapter
  Fix TokenTransferProxy artifact name since it's now suffixed with _v1
  Update yarn.lock
  Fix signature verification test
  ...

3 files changed, 5 insertions, 5 deletions

diff --git a/packages/migrations/src/artifacts.ts b/packages/migrations/src/artifacts.ts
index 61b0c3085..acc267256 100644
--- a/packages/migrations/src/artifacts.ts
+++ b/packages/migrations/src/artifacts.ts
@@ -5,7 +5,7 @@ import * as Exchange from '../artifacts/1.0.0/Exchange_v1.json';
 import * as MultiSigWalletWithTimeLock from '../artifacts/1.0.0/MultiSigWalletWithTimeLock.json';
 import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress from '../artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json';
 import * as TokenRegistry from '../artifacts/1.0.0/TokenRegistry.json';
-import * as TokenTransferProxy from '../artifacts/1.0.0/TokenTransferProxy.json';
+import * as TokenTransferProxy from '../artifacts/1.0.0/TokenTransferProxy_v1.json';
 import * as EtherToken from '../artifacts/1.0.0/WETH9.json';
 import * as ZRX from '../artifacts/1.0.0/ZRXToken.json';
 
diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts
index b00ba698f..1230f376e 100644
--- a/packages/migrations/src/migrate.ts
+++ b/packages/migrations/src/migrate.ts
@@ -11,8 +11,7 @@ import { runMigrationsAsync } from './migration';
         from: devConstants.TESTRPC_FIRST_ADDRESS,
     };
     const providerConfigs = { shouldUseInProcessGanache: false };
-    const web3 = web3Factory.create(providerConfigs);
-    const provider = web3.currentProvider;
+    const provider: Provider = web3Factory.getRpcProvider(providerConfigs);
     const artifactsDir = 'artifacts/1.0.0';
     await runMigrationsAsync(provider, artifactsDir, txDefaults);
     process.exit(0);
diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts
index 57ac311d7..e29414a57 100644
--- a/packages/migrations/src/migration.ts
+++ b/packages/migrations/src/migration.ts
@@ -80,11 +80,12 @@ export const runMigrationsAsync = async (provider: Provider, artifactsDir: strin
         tokenInfo[0].swarmHash,
         { from: owner },
     );
+    const decimals = 18;
     await tokenReg.addToken.sendTransactionAsync(
         zrxToken.address,
         '0x Protocol Token',
         'ZRX',
-        18,
+        decimals,
         NULL_BYTES,
         NULL_BYTES,
         {
@@ -96,7 +97,7 @@ export const runMigrationsAsync = async (provider: Provider, artifactsDir: strin
         etherToken.address,
         'Ether Token',
         'WETH',
-        18,
+        decimals,
         NULL_BYTES,
         NULL_BYTES,
         {