Fix abi-gen binary so it can be called directly from packages

10 files changed, 17 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 2c819cacf..18c3a0fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,8 +70,6 @@ TODO.md
 packages/website/public/bundle*
 packages/react-docs/example/public/bundle*
 
-# generated binaries
-bin/
 
 # generated contract artifacts/
 packages/sol-cov/test/fixtures/artifacts/
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 028fdceaf..167edbf67 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -15,7 +15,7 @@
         "watch": "tsc -w",
         "prebuild": "run-s clean generate_contract_wrappers",
         "build": "run-p build:umd:prod build:commonjs; exit 0;",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
+        "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "lint": "tslint --project .",
         "test:circleci": "run-s test:coverage",
         "test": "run-s clean test:commonjs",
@@ -66,6 +66,7 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
+        "@0xproject/abi-gen": "^0.2.13",
         "@0xproject/sol-compiler": "^0.4.3",
         "@0xproject/dev-utils": "^0.4.1",
         "@0xproject/migrations": "^0.0.5",
diff --git a/packages/abi-gen/bin/abi-gen.js b/packages/abi-gen/bin/abi-gen.js
new file mode 100755
index 000000000..c46eb9b66
--- /dev/null
+++ b/packages/abi-gen/bin/abi-gen.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../lib/index.js')
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index a151ff2e2..0fa621735 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -12,7 +12,7 @@
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "bin": {
-        "abi-gen": "lib/index.js"
+        "abi-gen": "bin/abi-gen.js"
     },
     "repository": {
         "type": "git",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 1ebdf7252..5042a14e7 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -13,7 +13,7 @@
     "scripts": {
         "watch": "tsc -w",
         "prebuild": "run-s clean generate_contract_wrappers",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
+        "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "lint": "tslint --project .",
         "test:circleci": "run-s test:coverage",
         "test": "run-s clean build run_mocha",
@@ -44,6 +44,7 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
+        "@0xproject/abi-gen": "^0.2.13",
         "@0xproject/sol-compiler": "^0.4.3",
         "@0xproject/dev-utils": "^0.4.1",
         "@0xproject/migrations": "^0.0.5",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 14f6e53f0..ec41f951b 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -18,7 +18,7 @@
         "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
         "compile": "node ../sol-compiler/lib/src/cli.js",
         "clean": "shx rm -rf lib src/contract_wrappers/generated",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "lint": "tslint --project .",
         "coverage:report:text": "istanbul report text",
         "coverage:report:html": "istanbul report html && open coverage/index.html",
@@ -39,6 +39,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
     "devDependencies": {
+        "@0xproject/abi-gen": "^0.2.13",
         "@0xproject/dev-utils": "^0.4.1",
         "@0xproject/tslint-config": "^0.4.17",
         "@types/lodash": "4.14.104",
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 0a3742e8c..2f1a46c97 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -7,7 +7,7 @@
     "scripts": {
         "watch": "tsc -w",
         "prebuild": "run-s clean generate_contract_wrappers",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
+        "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
         "build": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts src/generated_contract_wrappers",
         "lint": "tslint --project .",
@@ -23,6 +23,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
     "devDependencies": {
+        "@0xproject/abi-gen": "^0.2.13",
         "@0xproject/monorepo-scripts": "^0.1.19",
         "@0xproject/sol-compiler": "^0.4.3",
         "@0xproject/tslint-config": "^0.4.17",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 204d940ad..e000b8a56 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -13,7 +13,7 @@
         "test": "run-s build run_mocha",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'",
+        "generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'",
         "coverage:report:text": "istanbul report text",
         "coverage:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 5eaa9530c..ca044e0ca 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -14,14 +14,15 @@
         "migrate": "run-s build compile script:migrate",
         "script:migrate": "node ./lib/migrate.js",
         "copy_artifacts": "copyfiles 'artifacts/1.0.0/**/*' ./lib",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'",
-        "compile": "node ../sol-compiler/lib/src/cli.js compile"
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'",
+        "compile": "sol-compiler"
     },
     "config": {
         "abis": "artifacts/1.0.0/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels|WETH9|MaliciousToken).json"
     },
     "license": "Apache-2.0",
     "devDependencies": {
+        "@0xproject/abi-gen": "^0.2.13",
         "@0xproject/dev-utils": "^0.4.1",
         "@0xproject/types": "^0.6.3",
         "@0xproject/tslint-config": "^0.4.17",
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 0ac9f8592..50aaffd7f 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -14,7 +14,7 @@
     "scripts": {
         "watch": "tsc -w",
         "prebuild": "run-s clean generate_contract_wrappers",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
+        "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
         "lint": "tslint --project .",
         "test:circleci": "run-s test:coverage",
         "test": "run-s clean build run_mocha",
@@ -45,6 +45,7 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
+        "@0xproject/abi-gen": "^0.2.13",
         "@0xproject/sol-compiler": "^0.4.3",
         "@0xproject/dev-utils": "^0.4.1",
         "@0xproject/migrations": "^0.0.5",