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

packages/deployer/test/compiler_test.ts

@@ -19,9 +19,7 @@ describe('#Compiler', function() {
     const compilerOpts: CompilerOptions = {
         artifactsDir,
         contractsDir,
-        networkId: constants.networkId,
-        optimizerEnabled: constants.optimizerEnabled,
-        specifiedContracts: new Set(constants.specifiedContracts),
+        contracts: constants.contracts,
     };
     const compiler = new Compiler(compilerOpts);
     beforeEach((done: DoneCallback) => {
@@ -39,9 +37,8 @@ describe('#Compiler', function() {
         };
         const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
         const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
-        const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
         // The last 43 bytes of the binaries are metadata which may not be equivalent
-        const unlinkedBinaryWithoutMetadata = exchangeContractData.bytecode.slice(0, -86);
+        const unlinkedBinaryWithoutMetadata = exchangeArtifact.compilerOutput.evm.bytecode.object.slice(0, -86);
         const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, -86);
         expect(unlinkedBinaryWithoutMetadata).to.equal(exchangeBinaryWithoutMetadata);
     });

packages/deployer/test/deployer_test.ts

@@ -20,9 +20,7 @@ describe('#Deployer', () => {
     const compilerOpts: CompilerOptions = {
         artifactsDir,
         contractsDir,
-        networkId: constants.networkId,
-        optimizerEnabled: constants.optimizerEnabled,
-        specifiedContracts: new Set(constants.specifiedContracts),
+        contracts: constants.contracts,
     };
     const compiler = new Compiler(compilerOpts);
     const deployerOpts = {
@@ -56,8 +54,7 @@ describe('#Deployer', () => {
             const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
             const exchangeAddress = exchangeContractInstance.address;
             expect(exchangeAddress).to.not.equal(undefined);
-            expect(exchangeContractData.address).to.equal(undefined);
-            expect(exchangeContractData.constructor_args).to.equal(undefined);
+            expect(exchangeContractData).to.equal(undefined);
         });
     });
     describe('#deployAndSaveAsync', () => {
@@ -72,7 +69,7 @@ describe('#Deployer', () => {
             const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
             const exchangeAddress = exchangeContractInstance.address;
             expect(exchangeAddress).to.be.equal(exchangeContractData.address);
-            expect(constructor_args).to.be.equal(exchangeContractData.constructor_args);
+            expect(constructor_args).to.be.equal(exchangeContractData.constructorArgs);
         });
     });
 });

packages/deployer/test/util/constants.ts

@@ -7,5 +7,5 @@ export const constants = {
     timeoutMs: 30000,
     zrxTokenAddress: '0xe41d2489571d322189246dafa5ebde1f4699f498',
     tokenTransferProxyAddress: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4',
-    specifiedContracts: '*',
+    contracts: '*' as '*',
 };