Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils

* v2-prototype: (66 commits)
  Run prettier
  Remove unused variable
  Fix linting issues
  Change shouldRenderHeader prop to shouldHideHeader
  Get build and tests to pass
  typo
  Apply prettier
  Update contracts tests after rebase
  Apply various fixes based on PR feedback
  Document debug_increaseTime method and fix typo in devnet README
  Use an enum for ProviderType in contracts/src/utils/web3_wrapper
  Update contracts package README
  Update relevant changelogs
  Remove global gas estimate buffer
  Add Async suffix to relevant assertions
  Fix linter errors
  Update package.json and yarn.lock
  Update more things to work with both Geth and Ganache
  Small fixes and cleanup
  Add additional gas to calls to fillOrderNoThrow
  ...

# Conflicts:
#	packages/order-watcher/src/order_watcher/order_watcher.ts
#	packages/react-docs/src/components/type.tsx
#	packages/website/ts/components/ui/lifecycle_raised_button.tsx
#	packages/website/ts/components/wallet/wallet.tsx

6 files changed, 5 insertions, 29 deletions

diff --git a/packages/sol-compiler/src/cli.ts b/packages/sol-compiler/src/cli.ts
index b97cf4cab..8901c0a31 100644
--- a/packages/sol-compiler/src/cli.ts
+++ b/packages/sol-compiler/src/cli.ts
@@ -1,16 +1,11 @@
 #!/usr/bin/env node
 // We need the above pragma since this script will be run as a command-line tool.
 
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { logUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
-import * as path from 'path';
-import * as Web3 from 'web3';
 import * as yargs from 'yargs';
 
 import { Compiler } from './compiler';
-import { constants } from './utils/constants';
-import { CompilerOptions } from './utils/types';
 
 const DEFAULT_CONTRACTS_LIST = '*';
 const SEPARATOR = ',';
diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts
index d2dda75ea..bb701a8ce 100644
--- a/packages/sol-compiler/src/compiler.ts
+++ b/packages/sol-compiler/src/compiler.ts
@@ -1,8 +1,5 @@
 import { assert } from '@0xproject/assert';
 import {
-    ContractSource,
-    ContractSources,
-    EnumerableResolver,
     FallthroughResolver,
     FSResolver,
     NameResolver,
@@ -11,9 +8,8 @@ import {
     Resolver,
     URLResolver,
 } from '@0xproject/sol-resolver';
-import { logUtils, promisify } from '@0xproject/utils';
+import { logUtils } from '@0xproject/utils';
 import chalk from 'chalk';
-import { ContractAbi } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as fs from 'fs';
 import 'isomorphic-fetch';
@@ -34,15 +30,7 @@ import {
 } from './utils/compiler';
 import { constants } from './utils/constants';
 import { fsWrapper } from './utils/fs_wrapper';
-import {
-    CompilerOptions,
-    ContractArtifact,
-    ContractNetworkData,
-    ContractNetworks,
-    ContractSourceData,
-    ContractSpecificSourceData,
-    ContractVersionData,
-} from './utils/types';
+import { CompilerOptions, ContractArtifact, ContractVersionData } from './utils/types';
 import { utils } from './utils/utils';
 
 type TYPE_ALL_FILES_IDENTIFIER = '*';
@@ -172,7 +160,6 @@ export class Compiler {
         const solcInstance = solc.setupMethods(requireFromString(solcjs, compilerBinFilename));
 
         logUtils.log(`Compiling ${contractName} with Solidity v${solcVersion}...`);
-        const source = contractSource.source;
         const standardInput: solc.StandardInput = {
             language: 'Solidity',
             sources: {
diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts
index 715ecd6f0..08e2d999a 100644
--- a/packages/sol-compiler/src/utils/compiler.ts
+++ b/packages/sol-compiler/src/utils/compiler.ts
@@ -1,10 +1,8 @@
-import { ContractSource, ContractSources } from '@0xproject/sol-resolver';
+import { ContractSource } from '@0xproject/sol-resolver';
 import { logUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as path from 'path';
-import * as solc from 'solc';
 
-import { constants } from './constants';
 import { fsWrapper } from './fs_wrapper';
 import { ContractArtifact } from './types';
 
diff --git a/packages/sol-compiler/src/utils/types.ts b/packages/sol-compiler/src/utils/types.ts
index 759a7a555..4321a2235 100644
--- a/packages/sol-compiler/src/utils/types.ts
+++ b/packages/sol-compiler/src/utils/types.ts
@@ -1,7 +1,4 @@
-import { ContractAbi, Provider, TxData } from 'ethereum-types';
 import * as solc from 'solc';
-import * as Web3 from 'web3';
-import * as yargs from 'yargs';
 
 export enum AbiType {
     Function = 'function',
diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts
index 991965caa..54a117c5a 100644
--- a/packages/sol-compiler/test/compiler_test.ts
+++ b/packages/sol-compiler/test/compiler_test.ts
@@ -5,7 +5,7 @@ import 'mocha';
 
 import { Compiler } from '../src/compiler';
 import { fsWrapper } from '../src/utils/fs_wrapper';
-import { CompilerOptions, ContractArtifact, ContractNetworkData } from '../src/utils/types';
+import { CompilerOptions, ContractArtifact } from '../src/utils/types';
 
 import { exchange_binary } from './fixtures/exchange_bin';
 import { constants } from './util/constants';
diff --git a/packages/sol-compiler/test/util/provider.ts b/packages/sol-compiler/test/util/provider.ts
index 7215ffae7..cc372b2eb 100644
--- a/packages/sol-compiler/test/util/provider.ts
+++ b/packages/sol-compiler/test/util/provider.ts
@@ -1,6 +1,5 @@
 import { web3Factory } from '@0xproject/dev-utils';
 import { Provider } from 'ethereum-types';
-import * as Web3 from 'web3';
 
 const providerConfigs = { shouldUseInProcessGanache: true };
 const provider: Provider = web3Factory.getRpcProvider(providerConfigs);