From 218876ac196a1b1bf7eba096a7bc6a2b3b8556bf Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Mon, 5 Feb 2018 16:25:52 -0800
Subject: Fix artifacts path

---
 packages/abi-gen/src/index.ts             |  2 +-
 packages/contracts/package.json           |  2 +-
 packages/contracts/test/utils/deployer.ts |  2 +-
 packages/contracts/util/artifacts.ts      | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/abi-gen/src/index.ts b/packages/abi-gen/src/index.ts
index b6aaa03ca..6b5119ca4 100644
--- a/packages/abi-gen/src/index.ts
+++ b/packages/abi-gen/src/index.ts
@@ -99,7 +99,7 @@ for (const abiFileName of abiFileNames) {
     } else if (!_.isUndefined(parsedContent.abi)) {
         ABI = parsedContent.abi; // Truffle artifact
     } else if (!_.isUndefined(parsedContent.networks) && !_.isUndefined(parsedContent.networks[args.networkId])) {
-        ABI = parsedContent.networks[args.networkId]; // 0x contracts package artifact
+        ABI = parsedContent.networks[args.networkId].abi; // 0x contracts package artifact
     }
     if (_.isUndefined(ABI)) {
         utils.log(`${chalk.red(`ABI not found in ${abiFileName}.`)}`);
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 4bdbf3f41..4b5d64742 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -10,7 +10,7 @@
     "scripts": {
         "build:watch": "tsc -w",
         "prebuild": "run-s clean copy_artifacts",
-        "copy_artifacts": "copyfiles './artifacts/**/*' ./lib",
+        "copy_artifacts": "copyfiles './src/artifacts/**/*' ./lib",
         "build": "tsc",
         "test": "run-s compile build run_mocha",
         "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit",
diff --git a/packages/contracts/test/utils/deployer.ts b/packages/contracts/test/utils/deployer.ts
index dc41e41e2..4e7f35c72 100644
--- a/packages/contracts/test/utils/deployer.ts
+++ b/packages/contracts/test/utils/deployer.ts
@@ -5,7 +5,7 @@ import * as path from 'path';
 import { constants } from '../../util/constants';
 
 const deployerOpts = {
-    artifactsDir: path.resolve('artifacts'),
+    artifactsDir: path.resolve('src', 'artifacts'),
     jsonrpcPort: devConstants.RPC_PORT,
     networkId: constants.TESTRPC_NETWORK_ID,
     defaults: {
diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/util/artifacts.ts
index fd9380d1d..7c375c1b7 100644
--- a/packages/contracts/util/artifacts.ts
+++ b/packages/contracts/util/artifacts.ts
@@ -1,13 +1,13 @@
-import * as DummyTokenArtifact from '../artifacts/DummyToken.json';
-import * as ExchangeArtifact from '../artifacts/Exchange.json';
-import * as MaliciousTokenArtifact from '../artifacts/MaliciousToken.json';
-import * as MultiSigWalletWithTimeLockArtifact from '../artifacts/MultiSigWalletWithTimeLock.json';
-import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json';
-import * as TokenArtifact from '../artifacts/Token.json';
-import * as TokenRegistryArtifact from '../artifacts/TokenRegistry.json';
-import * as TokenTransferProxyArtifact from '../artifacts/TokenTransferProxy.json';
-import * as EtherTokenArtifact from '../artifacts/WETH9.json';
-import * as ZRXArtifact from '../artifacts/ZRXToken.json';
+import * as DummyTokenArtifact from '../src/artifacts/DummyToken.json';
+import * as ExchangeArtifact from '../src/artifacts/Exchange.json';
+import * as MaliciousTokenArtifact from '../src/artifacts/MaliciousToken.json';
+import * as MultiSigWalletWithTimeLockArtifact from '../src/artifacts/MultiSigWalletWithTimeLock.json';
+import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../src/artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json';
+import * as TokenArtifact from '../src/artifacts/Token.json';
+import * as TokenRegistryArtifact from '../src/artifacts/TokenRegistry.json';
+import * as TokenTransferProxyArtifact from '../src/artifacts/TokenTransferProxy.json';
+import * as EtherTokenArtifact from '../src/artifacts/WETH9.json';
+import * as ZRXArtifact from '../src/artifacts/ZRXToken.json';
 
 import { Artifact } from './types';
 
-- 
cgit