Merge branch 'development' into breakUp0xjs

* development: (38 commits)
  Add fallback image support to relayer grid tile
  Clear relayer grid state when fetching
  Configure the compiler to generate artifacts with deployedBytecode
  Implement loading and error state for relayer grid
  Fallback image for relayer grid tile
  Change relayer grid tile to link on header
  Display top tokens from backend
  Remove overflowZ property from portal
  Suggestions and fix bad merge
  Fix typo
  Only show untracked tokens
  Make wallet scrollable
  Add token flow
  Update The Ocean logo
  Fix artifacts paths
  Create an artifacts folder
  Introduce a var
  Add removeHexPrefix util method
  CHeck if ABI exists
  Improve the readability of the check for should compile
  ...

# Conflicts:
#	.gitignore
#	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

1 files changed, 12 insertions, 12 deletions

diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/util/artifacts.ts
index f427c6d9a..d262b8058 100644
--- a/packages/contracts/util/artifacts.ts
+++ b/packages/contracts/util/artifacts.ts
@@ -1,3 +1,5 @@
+import { ContractArtifact } from '@0xproject/deployer';
+
 import * as DummyToken from '../src/artifacts/DummyToken.json';
 import * as Exchange from '../src/artifacts/Exchange.json';
 import * as MaliciousToken from '../src/artifacts/MaliciousToken.json';
@@ -9,17 +11,15 @@ import * as TokenTransferProxy from '../src/artifacts/TokenTransferProxy.json';
 import * as EtherToken from '../src/artifacts/WETH9.json';
 import * as ZRX from '../src/artifacts/ZRXToken.json';
 
-import { Artifact } from './types';
-
 export const artifacts = {
-    ZRX: (ZRX as any) as Artifact,
-    DummyToken: (DummyToken as any) as Artifact,
-    Token: (Token as any) as Artifact,
-    Exchange: (Exchange as any) as Artifact,
-    EtherToken: (EtherToken as any) as Artifact,
-    TokenRegistry: (TokenRegistry as any) as Artifact,
-    MaliciousToken: (MaliciousToken as any) as Artifact,
-    TokenTransferProxy: (TokenTransferProxy as any) as Artifact,
-    MultiSigWalletWithTimeLock: (MultiSigWalletWithTimeLock as any) as Artifact,
-    MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: (MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress as any) as Artifact,
+    ZRX: (ZRX as any) as ContractArtifact,
+    DummyToken: (DummyToken as any) as ContractArtifact,
+    Token: (Token as any) as ContractArtifact,
+    Exchange: (Exchange as any) as ContractArtifact,
+    EtherToken: (EtherToken as any) as ContractArtifact,
+    TokenRegistry: (TokenRegistry as any) as ContractArtifact,
+    MaliciousToken: (MaliciousToken as any) as ContractArtifact,
+    TokenTransferProxy: (TokenTransferProxy as any) as ContractArtifact,
+    MultiSigWalletWithTimeLock: (MultiSigWalletWithTimeLock as any) as ContractArtifact,
+    MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: (MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress as any) as ContractArtifact,
 };