37 files changed, 122 insertions, 16 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 1cf716f92..7b8f219e3 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -11,14 +11,17 @@
         "build":
             "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;",
         "test": "npm run build; truffle test",
-        "compile": "npm run build; node lib/deploy/cli.js compile",
+        "compile": "node ../deployer/lib/cli.js compile",
         "clean": "rm -rf ./lib",
-        "migrate:truffle": "npm run build; truffle migrate",
-        "migrate": "npm run build; node lib/deploy/cli.js migrate",
+        "migrate": "node ../deployer/lib/cli.js migrate",
         "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
+<<<<<<< HEAD
         "test:circleci:contracts": "yarn test",
         "test:circleci:deployer": "yarn test:deployer",
         "test:deployer": "npm run build; mocha lib/deploy/test/*_test.js"
+=======
+        "test:circleci": "yarn test"
+>>>>>>> Move deployer to a separate package
     },
     "repository": {
         "type": "git",
@@ -57,10 +60,18 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
+<<<<<<< HEAD
         "0x.js": "^0.30.0",
         "@0xproject/json-schemas": "^0.7.3",
         "@0xproject/utils": "^0.2.0",
         "@0xproject/web3-wrapper": "^0.1.5",
+=======
+        "0x.js": "^0.29.2",
+        "@0xproject/deployer": "^0.0.1",
+        "@0xproject/json-schemas": "^0.7.2",
+        "@0xproject/utils": "^0.1.3",
+        "@0xproject/web3-wrapper": "^0.1.4",
+>>>>>>> Move deployer to a separate package
         "bluebird": "^3.5.0",
         "bn.js": "^4.11.8",
         "ethereumjs-abi": "^0.6.4",
diff --git a/packages/contracts/util/types.ts b/packages/contracts/util/types.ts
index 58a7e6a2d..e511ca9f4 100644
--- a/packages/contracts/util/types.ts
+++ b/packages/contracts/util/types.ts
@@ -84,15 +84,6 @@ export interface TransactionDataParams {
     args: any[];
 }
 
-export interface Token {
-    address?: string;
-    name: string;
-    symbol: string;
-    decimals: number;
-    ipfsHash: string;
-    swarmHash: string;
-}
-
 export interface MultiSigConfig {
     owners: string[];
     confirmationsRequired: number;
@@ -103,6 +94,15 @@ export interface MultiSigConfigByNetwork {
     [networkName: string]: MultiSigConfig;
 }
 
+export interface Token {
+    address?: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+    ipfsHash: string;
+    swarmHash: string;
+}
+
 export interface TokenInfoByNetwork {
     development: Token[];
     live: Token[];
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
new file mode 100644
index 000000000..56e5551ca
--- /dev/null
+++ b/packages/deployer/package.json
@@ -0,0 +1,40 @@
+{
+    "name": "@0xproject/deployer",
+    "version": "0.0.1",
+    "description": "Smart contract deployer of 0x protocol",
+    "main": "lib/cli.js",
+    "scripts": {
+        "build": "yarn clean && copyfiles -u 1 'src/test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc",
+        "test": "npm run build; mocha lib/test/*_test.js",
+        "compile": "npm run build; node lib/cli.js compile",
+        "clean": "rm -rf ./lib",
+        "migrate": "npm run build; node lib/cli.js migrate",
+        "lint": "tslint --project . 'src/**/*.ts'",
+        "test:circleci": "yarn test"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/0xProject/0x.js.git"
+    },
+    "author": "Amir Bandeali",
+    "license": "Apache-2.0",
+    "bugs": {
+        "url": "https://github.com/0xProject/0x.js/issues"
+    },
+    "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
+    "devDependencies": {
+        "copyfiles": "^1.2.0",
+        "web3-typescript-typings": "^0.9.3",
+        "types-bn": "^0.0.1",
+        "typescript": "~2.6.1"
+    },
+    "dependencies": {
+        "@0xproject/utils": "^0.1.3",
+        "@0xproject/web3-wrapper": "^0.1.4",
+        "lodash": "^4.17.4",
+        "solc": "^0.4.18",
+        "yargs": "^10.0.3",
+        "web3-eth-abi": "^1.0.0-beta.24",
+        "web3": "^0.20.0"
+    }
+}
diff --git a/packages/contracts/deploy/cli.ts b/packages/deployer/src/cli.ts
index 53ae3bcfa..53ae3bcfa 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/deployer/src/cli.ts
diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts
new file mode 100644
index 000000000..0a35002da
--- /dev/null
+++ b/packages/deployer/src/globals.d.ts
@@ -0,0 +1,8 @@
+declare module 'solc' {
+    export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any;
+    export function setupMethods(solcBin: any): any;
+}
+
+declare module 'web3-eth-abi' {
+    export function encodeParameters(typesArray: string[], parameters: any[]): string;
+}
diff --git a/packages/deployer/src/migrations/config/multisig_sample.ts b/packages/deployer/src/migrations/config/multisig_sample.ts
new file mode 100644
index 000000000..dabeb7a4f
--- /dev/null
+++ b/packages/deployer/src/migrations/config/multisig_sample.ts
@@ -0,0 +1,10 @@
+import { MultiSigConfigByNetwork } from '../../types';
+
+// Make a copy of this file named `multisig.js` and input custom params as needed
+export const multiSig: MultiSigConfigByNetwork = {
+    kovan: {
+        owners: [],
+        confirmationsRequired: 0,
+        secondsRequired: 0,
+    },
+};
diff --git a/packages/contracts/deploy/migrations/config/token_info.ts b/packages/deployer/src/migrations/config/token_info.ts
index 751150c03..ec0ed3c0e 100644
--- a/packages/contracts/deploy/migrations/config/token_info.ts
+++ b/packages/deployer/src/migrations/config/token_info.ts
@@ -1,5 +1,5 @@
-import { constants } from './../../src/utils/constants';
-import { Token } from './../../src/utils/types';
+import { constants } from '../../src/utils/constants';
+import { Token } from '../../types';
 
 export const tokenInfo: Token[] = [
     {
diff --git a/packages/contracts/deploy/migrations/migrate.ts b/packages/deployer/src/migrations/migrate.ts
index 3efd1f9a6..3efd1f9a6 100644
--- a/packages/contracts/deploy/migrations/migrate.ts
+++ b/packages/deployer/src/migrations/migrate.ts
diff --git a/packages/contracts/deploy/solc/bin_paths.ts b/packages/deployer/src/solc/bin_paths.ts
index e5b107101..e5b107101 100644
--- a/packages/contracts/deploy/solc/bin_paths.ts
+++ b/packages/deployer/src/solc/bin_paths.ts
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.10+commit.f0d539ae.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.10+commit.f0d539ae.js
index abeaeef1a..abeaeef1a 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.10+commit.f0d539ae.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.10+commit.f0d539ae.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.11+commit.68ef5810.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.11+commit.68ef5810.js
index 522ad2afe..522ad2afe 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.11+commit.68ef5810.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.11+commit.68ef5810.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.12+commit.194ff033.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.12+commit.194ff033.js
index 959545448..959545448 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.12+commit.194ff033.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.12+commit.194ff033.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.13+commit.fb4cb1a.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.13+commit.fb4cb1a.js
index 73705304e..73705304e 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.13+commit.fb4cb1a.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.13+commit.fb4cb1a.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.14+commit.c2215d46.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.14+commit.c2215d46.js
index 56bba18f2..56bba18f2 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.14+commit.c2215d46.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.14+commit.c2215d46.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.15+commit.bbb8e64f.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.15+commit.bbb8e64f.js
index c01807a87..c01807a87 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.15+commit.bbb8e64f.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.15+commit.bbb8e64f.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.16+commit.d7661dd9.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.16+commit.d7661dd9.js
index 5a8b08af9..5a8b08af9 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.16+commit.d7661dd9.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.16+commit.d7661dd9.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.17+commit.bdeb9e52.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.17+commit.bdeb9e52.js
index b91555a9f..b91555a9f 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.17+commit.bdeb9e52.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.17+commit.bdeb9e52.js
diff --git a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.18+commit.9cf6e910.js b/packages/deployer/src/solc/solc_bin/soljson-v0.4.18+commit.9cf6e910.js
index 5b99e8c72..5b99e8c72 100644
--- a/packages/contracts/deploy/solc/solc_bin/soljson-v0.4.18+commit.9cf6e910.js
+++ b/packages/deployer/src/solc/solc_bin/soljson-v0.4.18+commit.9cf6e910.js
diff --git a/packages/contracts/deploy/src/commands.ts b/packages/deployer/src/src/commands.ts
index b87b9e632..b87b9e632 100644
--- a/packages/contracts/deploy/src/commands.ts
+++ b/packages/deployer/src/src/commands.ts
diff --git a/packages/contracts/deploy/src/compiler.ts b/packages/deployer/src/src/compiler.ts
index 8b99371fa..dbcaed707 100644
--- a/packages/contracts/deploy/src/compiler.ts
+++ b/packages/deployer/src/src/compiler.ts
@@ -113,7 +113,6 @@ export class Compiler {
     public async compileAllAsync(): Promise<void> {
         await this._createArtifactsDirIfDoesNotExistAsync();
         this._contractSourcesIfExists = await Compiler._getContractSourcesAsync(this._contractsDir);
-
         const contractBaseNames = _.keys(this._contractSourcesIfExists);
         const compiledContractPromises = _.map(contractBaseNames, async (contractBaseName: string): Promise<void> => {
             return this._compileContractAsync(contractBaseName);
@@ -167,7 +166,7 @@ export class Compiler {
         };
         const solcVersion = Compiler._parseSolidityVersion(source);
         const fullSolcVersion = binPaths[solcVersion];
-        const solcBinPath = `./../solc/solc_bin/${fullSolcVersion}`;
+        const solcBinPath = `../solc/solc_bin/${fullSolcVersion}`;
         const solcBin = require(solcBinPath);
         const solcInstance = solc.setupMethods(solcBin);
 
diff --git a/packages/contracts/deploy/src/deployer.ts b/packages/deployer/src/src/deployer.ts
index 6f03581e8..6f03581e8 100644
--- a/packages/contracts/deploy/src/deployer.ts
+++ b/packages/deployer/src/src/deployer.ts
diff --git a/packages/contracts/deploy/src/utils/constants.ts b/packages/deployer/src/src/utils/constants.ts
index 8871a470d..8871a470d 100644
--- a/packages/contracts/deploy/src/utils/constants.ts
+++ b/packages/deployer/src/src/utils/constants.ts
diff --git a/packages/contracts/deploy/src/utils/contract.ts b/packages/deployer/src/src/utils/contract.ts
index 546e82dfb..546e82dfb 100644
--- a/packages/contracts/deploy/src/utils/contract.ts
+++ b/packages/deployer/src/src/utils/contract.ts
diff --git a/packages/contracts/deploy/src/utils/encoder.ts b/packages/deployer/src/src/utils/encoder.ts
index d5f807774..d5f807774 100644
--- a/packages/contracts/deploy/src/utils/encoder.ts
+++ b/packages/deployer/src/src/utils/encoder.ts
diff --git a/packages/contracts/deploy/src/utils/fs_wrapper.ts b/packages/deployer/src/src/utils/fs_wrapper.ts
index 34c7caa0e..34c7caa0e 100644
--- a/packages/contracts/deploy/src/utils/fs_wrapper.ts
+++ b/packages/deployer/src/src/utils/fs_wrapper.ts
diff --git a/packages/contracts/deploy/src/utils/types.ts b/packages/deployer/src/src/utils/types.ts
index e054b9cc2..e054b9cc2 100644
--- a/packages/contracts/deploy/src/utils/types.ts
+++ b/packages/deployer/src/src/utils/types.ts
diff --git a/packages/contracts/deploy/src/utils/utils.ts b/packages/deployer/src/src/utils/utils.ts
index 4390d8813..4390d8813 100644
--- a/packages/contracts/deploy/src/utils/utils.ts
+++ b/packages/deployer/src/src/utils/utils.ts
diff --git a/packages/contracts/deploy/test/deploy_test.ts b/packages/deployer/src/test/deploy_test.ts
index 51dbf0e5b..51dbf0e5b 100644
--- a/packages/contracts/deploy/test/deploy_test.ts
+++ b/packages/deployer/src/test/deploy_test.ts
diff --git a/packages/contracts/deploy/test/fixtures/contracts/Exchange.sol b/packages/deployer/src/test/fixtures/contracts/Exchange.sol
index 1b6819700..1b6819700 100644
--- a/packages/contracts/deploy/test/fixtures/contracts/Exchange.sol
+++ b/packages/deployer/src/test/fixtures/contracts/Exchange.sol
diff --git a/packages/contracts/deploy/test/fixtures/contracts/TokenTransferProxy.sol b/packages/deployer/src/test/fixtures/contracts/TokenTransferProxy.sol
index 90c8e7d66..90c8e7d66 100644
--- a/packages/contracts/deploy/test/fixtures/contracts/TokenTransferProxy.sol
+++ b/packages/deployer/src/test/fixtures/contracts/TokenTransferProxy.sol
diff --git a/packages/contracts/deploy/test/fixtures/contracts/base/Ownable.sol b/packages/deployer/src/test/fixtures/contracts/base/Ownable.sol
index 2a74c3717..2a74c3717 100644
--- a/packages/contracts/deploy/test/fixtures/contracts/base/Ownable.sol
+++ b/packages/deployer/src/test/fixtures/contracts/base/Ownable.sol
diff --git a/packages/contracts/deploy/test/fixtures/contracts/base/SafeMath.sol b/packages/deployer/src/test/fixtures/contracts/base/SafeMath.sol
index 7414684a8..7414684a8 100644
--- a/packages/contracts/deploy/test/fixtures/contracts/base/SafeMath.sol
+++ b/packages/deployer/src/test/fixtures/contracts/base/SafeMath.sol
diff --git a/packages/contracts/deploy/test/fixtures/contracts/base/Token.sol b/packages/deployer/src/test/fixtures/contracts/base/Token.sol
index c03f8c567..c03f8c567 100644
--- a/packages/contracts/deploy/test/fixtures/contracts/base/Token.sol
+++ b/packages/deployer/src/test/fixtures/contracts/base/Token.sol
diff --git a/packages/contracts/deploy/test/fixtures/exchange_bin.ts b/packages/deployer/src/test/fixtures/exchange_bin.ts
index a6eae515e..a6eae515e 100644
--- a/packages/contracts/deploy/test/fixtures/exchange_bin.ts
+++ b/packages/deployer/src/test/fixtures/exchange_bin.ts
diff --git a/packages/contracts/deploy/test/util/constants.ts b/packages/deployer/src/test/util/constants.ts
index d52076607..d52076607 100644
--- a/packages/contracts/deploy/test/util/constants.ts
+++ b/packages/deployer/src/test/util/constants.ts
diff --git a/packages/deployer/src/types.ts b/packages/deployer/src/types.ts
new file mode 100644
index 000000000..58d1e5b4f
--- /dev/null
+++ b/packages/deployer/src/types.ts
@@ -0,0 +1,23 @@
+export interface MultiSigConfig {
+    owners: string[];
+    confirmationsRequired: number;
+    secondsRequired: number;
+}
+
+export interface MultiSigConfigByNetwork {
+    [networkName: string]: MultiSigConfig;
+}
+
+export interface Token {
+    address?: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+    ipfsHash: string;
+    swarmHash: string;
+}
+
+export interface TokenInfoByNetwork {
+    development: Token[];
+    live: Token[];
+}
diff --git a/packages/deployer/tsconfig.json b/packages/deployer/tsconfig.json
new file mode 100644
index 000000000..25c28b72a
--- /dev/null
+++ b/packages/deployer/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "extends": "../../tsconfig",
+    "compilerOptions": {
+        "outDir": "lib",
+        "strictFunctionTypes": false,
+        "strictNullChecks": false
+    },
+    "include": [
+        "./src/**/*",
+        "../../node_modules/types-bn/index.d.ts",
+        "../../node_modules/types-ethereumjs-util/index.d.ts",
+        "../../node_modules/chai-typescript-typings/index.d.ts",
+        "../../node_modules/web3-typescript-typings/index.d.ts"
+    ]
+}