Fix module versions, cleanup scripts

6 files changed, 51 insertions, 59 deletions

diff --git a/.gitignore b/.gitignore
index a8e03b687..2ccd467e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,4 +68,4 @@ generated_docs/
 TODO.md
 
 packages/website/public/bundle*
-transpiled/
+packages/contracts/lib/*
diff --git a/packages/contracts/README.md b/packages/contracts/README.md
index 1aa62b25d..57c75cb85 100644
--- a/packages/contracts/README.md
+++ b/packages/contracts/README.md
@@ -13,7 +13,7 @@ Contracts
 
 ### Installing Dependencies
 
-Install [Node v6.9.1](https://nodejs.org/en/download/releases/)
+Install [Node](https://nodejs.org/en/download/releases/)
 
 Install [yarn](https://yarnpkg.com/lang/en/docs/install/) in order to install the project dependencies more deterministically.
 
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index bddf01956..346add2ae 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,62 +1,60 @@
 {
-  "name": "0x-smart-contracts",
+  "name": "contracts",
   "version": "1.0.0",
-  "description": "",
+  "description": "Smart contract components of 0x protocol",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "transpile": "rm -rf ./transpiled; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./transpiled; tsc;",
-    "test": "npm run transpile; truffle test",
-    "compile": "npm run transpile; node transpiled/deploy/cli.js compile",
-    "migrate": "npm run transpile; truffle migrate",
-    "migrateCustom": "npm run transpile; node transpiled/deploy/cli.js migrate",
-    "deploy": "npm run migrate --network kovan",
+    "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",
+    "clean": "rm -rf ./lib",
+    "migrate:truffle": "npm run build; truffle migrate",
+    "migrate": "npm run build; node lib/deploy/cli.js migrate",
     "lint": "tslint --project . 'migrations/*.ts' 'test/**/*.ts' 'util/*.ts' 'deploy/**/*.ts'",
-    "testrpc": "testrpc --networkId 50",
-    "mocha": "npm run transpile; mocha transpiled/deploy/test/*_test.js"
+    "mocha": "npm run build; mocha lib/deploy/test/*_test.js"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/0xProject/0x-Smart-Contracts.git"
+    "url": "https://github.com/0xProject/0x.js.git"
   },
-  "author": "abandeali1@gmail.com",
-  "license": "ISC",
+  "author": "Amir Bandeali",
+  "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/0xProject/0x-Smart-Contracts/issues"
+    "url": "https://github.com/0xProject/0x.js/issues"
   },
-  "homepage": "https://github.com/0xProject/0x-Smart-Contracts#readme",
+  "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
   "devDependencies": {
+    "@0xproject/tslint-config": "^0.2.0",
     "@types/bluebird": "^3.5.3",
     "@types/isomorphic-fetch": "^0.0.34",
-    "@types/lodash": "^4.14.63",
-    "@types/node": "^8.0.51",
+    "@types/lodash": "^4.14.64",
+    "@types/node": "^8.0.1",
     "@types/request-promise-native": "^1.0.2",
     "@types/yargs": "^8.0.2",
-    "chai": "^4.1.2",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^4.0.1",
+    "chai-as-promised": "^7.1.0",
     "chai-as-promised-typescript-typings": "^0.0.3",
     "chai-bignumber": "^2.0.1",
-    "chai-typescript-typings": "^0.0.0",
+    "chai-typescript-typings": "^0.0.1",
     "copyfiles": "^1.2.0",
     "dirty-chai": "^2.0.1",
-    "ethereumjs-testrpc": "4.0.1",
-    "mocha": "^4.0.1",
+    "mocha": "^4.0.0",
     "solc": "^0.4.18",
     "truffle": "3.4.3",
     "tslint": "5.8.0",
-    "tslint-config-0xproject": "^0.0.2",
     "types-bn": "^0.0.1",
-    "types-ethereumjs-util": "machinomy/types-ethereumjs-util",
+    "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
     "typescript": "^2.6.1",
-    "web3-typescript-typings": "^0.7.1",
+    "web3-typescript-typings": "^0.7.2",
     "yargs": "^10.0.3"
   },
   "dependencies": {
     "@0xproject/json-schemas": "^0.6.9",
     "0x.js": "^0.22.6",
-    "bignumber.js": "^4.1.0",
+    "bignumber.js": "~4.1.0",
     "bluebird": "^3.5.0",
     "bn.js": "^4.11.6",
     "es6-promisify": "^5.0.0",
@@ -65,7 +63,7 @@
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.17.4",
     "request": "^2.81.0",
-    "web3": "0.20.2",
+    "web3": "0.20.0",
     "web3-eth-abi": "^1.0.0-beta.24"
   }
 }
diff --git a/packages/contracts/truffle.js b/packages/contracts/truffle.js
index 3f804b15c..630f4cf8b 100644
--- a/packages/contracts/truffle.js
+++ b/packages/contracts/truffle.js
@@ -12,6 +12,6 @@ module.exports = {
             gas: 4612388,
         },
     },
-    test_directory: "transpiled/test",
-    migrations_directory: "transpiled/migrations",
+    test_directory: "lib/test",
+    migrations_directory: "lib/migrations",
 };
diff --git a/packages/contracts/tsconfig.json b/packages/contracts/tsconfig.json
index 97e7b6790..c51d5acc4 100644
--- a/packages/contracts/tsconfig.json
+++ b/packages/contracts/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "outDir": "./transpiled/",
+        "outDir": "./lib/",
         "sourceMap": true,
         "noImplicitAny": true,
         "module": "commonjs",
diff --git a/yarn.lock b/yarn.lock
index 8c525cdcb..da6dc8ec0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -128,10 +128,6 @@
   version "4.14.85"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.85.tgz#a16fbf942422f6eca5622b6910492c496c35069b"
 
-"@types/lodash@^4.14.63":
-  version "4.14.86"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.86.tgz#6788d3d75032c46322ff1c144c948cf8117c405b"
-
 "@types/marked@0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.0.28.tgz#44ba754e9fa51432583e8eb30a7c4dd249b52faa"
@@ -169,10 +165,6 @@
   version "7.0.48"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.48.tgz#24bfdc0aa82e8f6dbd017159c58094a2e06d0abb"
 
-"@types/node@^8.0.51":
-  version "8.0.53"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
-
 "@types/query-string@^5.0.0", "@types/query-string@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/query-string/-/query-string-5.0.1.tgz#6cb41c724cb1644d56c2d1dae7c7b204e706b39e"
@@ -1654,7 +1646,7 @@ chai-as-promised-typescript-typings@0.0.3, chai-as-promised-typescript-typings@^
   dependencies:
     chai-typescript-typings "^0.0.0"
 
-chai-as-promised@^7.1.0, chai-as-promised@^7.1.1:
+chai-as-promised@^7.1.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
   dependencies:
@@ -1672,7 +1664,7 @@ chai-typescript-typings@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/chai-typescript-typings/-/chai-typescript-typings-0.0.1.tgz#433dee303b0b2978ad0dd03129df0a5afb791274"
 
-chai@^4.0.1, chai@^4.1.1, chai@^4.1.2:
+chai@^4.0.1, chai@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
   dependencies:
@@ -3025,12 +3017,6 @@ ethereumjs-blockstream@^2.0.6:
     source-map-support "0.4.14"
     uuid "3.0.1"
 
-ethereumjs-testrpc@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-4.0.1.tgz#af23babff4c36008418bc6de4c80f81606896cad"
-  dependencies:
-    webpack "^3.0.0"
-
 ethereumjs-testrpc@6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/ethereumjs-testrpc/-/ethereumjs-testrpc-6.0.3.tgz#7a0b87bf3670f92f607f98fa6a78801d9741b124"
@@ -8376,14 +8362,6 @@ types-ethereumjs-util@0xProject/types-ethereumjs-util:
     buffer "^5.0.6"
     rlp "^2.0.0"
 
-types-ethereumjs-util@machinomy/types-ethereumjs-util:
-  version "0.0.5"
-  resolved "https://codeload.github.com/machinomy/types-ethereumjs-util/tar.gz/b89e8b21d022f4bff1c2bb1922db30931efdb842"
-  dependencies:
-    bn.js "^4.11.7"
-    buffer "^5.0.6"
-    rlp "^2.0.0"
-
 typescript@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
@@ -8730,6 +8708,12 @@ web3-typescript-typings@^0.7.1:
   dependencies:
     bignumber.js "^4.0.2"
 
+web3-typescript-typings@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.7.2.tgz#5312bb786936a9c91381eee7af3d02ac21cf13b3"
+  dependencies:
+    bignumber.js "^4.0.2"
+
 web3-utils@^1.0.0-beta.26:
   version "1.0.0-beta.26"
   resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.26.tgz#f04ad8c144b1781c6b20c2818e0532cb9e6dca15"
@@ -8742,9 +8726,9 @@ web3-utils@^1.0.0-beta.26:
     underscore "1.8.3"
     utf8 "2.1.1"
 
-web3@0.20.2, web3@^0.20.0:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.2.tgz#c54dac5fc0e377399c04c1a6ecbb12e4513278d6"
+web3@0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.0.tgz#aabbbe35fe6cabe811659087a55cc86e99336c74"
   dependencies:
     bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
     crypto-js "^3.1.4"
@@ -8771,6 +8755,16 @@ web3@^0.18.0, web3@^0.18.2:
     xhr2 "*"
     xmlhttprequest "*"
 
+web3@^0.20.0:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.2.tgz#c54dac5fc0e377399c04c1a6ecbb12e4513278d6"
+  dependencies:
+    bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
+    crypto-js "^3.1.4"
+    utf8 "^2.1.1"
+    xhr2 "*"
+    xmlhttprequest "*"
+
 webpack-dev-middleware@^1.10.0, webpack-dev-middleware@^1.11.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709"