Merge branch 'development' into breakUp0xjs

* development:
  Fix ganache subprovider config
  Fix a bug in compiler config precedence
  Fix linter errors
  Fix templates
  Remove unused deployer docs configs
  Add a legacy endpoint for the deployer
  Add a check for compiler output
  Add a comment
  Put ARTIFACTS_VERSION in a config
  Improve a comment
  Remove _applyDefaultsToDeployTxDataAsync
  Add a HACK comment
  Fix linter issues
  Rename deployer to sol-compiler
  Remove deployer
  Remove deployer from 0x.js and migrations
  Configure migrations with a compiler.json
  Remove deployer from metacoin and contract tests
  Update wallet footer and add remove token functionality

# Conflicts:
#	.gitignore
#	packages/0x.js/package.json
#	packages/0x.js/src/0x.ts
#	packages/contracts/package.json
#	packages/contracts/test/multi_sig_with_time_lock.ts
#	packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
#	packages/contracts/util/artifacts.ts
#	packages/deployer/test/deployer_test.ts
#	packages/migrations/package.json

1 files changed, 7 insertions, 1 deletions

diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/util/artifacts.ts
index d262b8058..8511b0082 100644
--- a/packages/contracts/util/artifacts.ts
+++ b/packages/contracts/util/artifacts.ts
@@ -1,6 +1,9 @@
-import { ContractArtifact } from '@0xproject/deployer';
+import { ContractArtifact } from '@0xproject/sol-compiler';
 
+import * as AccountLevels from '../src/artifacts/AccountLevels.json';
+import * as Arbitrage from '../src/artifacts/Arbitrage.json';
 import * as DummyToken from '../src/artifacts/DummyToken.json';
+import * as EtherDelta from '../src/artifacts/EtherDelta.json';
 import * as Exchange from '../src/artifacts/Exchange.json';
 import * as MaliciousToken from '../src/artifacts/MaliciousToken.json';
 import * as MultiSigWalletWithTimeLock from '../src/artifacts/MultiSigWalletWithTimeLock.json';
@@ -12,6 +15,9 @@ import * as EtherToken from '../src/artifacts/WETH9.json';
 import * as ZRX from '../src/artifacts/ZRXToken.json';
 
 export const artifacts = {
+    AccountLevels: (AccountLevels as any) as ContractArtifact,
+    Arbitrage: (Arbitrage as any) as ContractArtifact,
+    EtherDelta: (EtherDelta as any) as ContractArtifact,
     ZRX: (ZRX as any) as ContractArtifact,
     DummyToken: (DummyToken as any) as ContractArtifact,
     Token: (Token as any) as ContractArtifact,