aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-11-26 21:12:13 +0800
committerGitHub <noreply@github.com>2018-11-26 21:12:13 +0800
commit7b152176948c02e7bf1c27e377530fc3c6d9245a (patch)
tree065bfc9d0b9d193f20035a1849912cc25f8cff1a
parent8caded1d1d94d03aa49a2490b46eaebd8bf5ed74 (diff)
parent9ddd45e2c687280041cc0bb4cd7cb3c1a2c22767 (diff)
downloaddexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.tar
dexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.tar.gz
dexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.tar.bz2
dexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.tar.lz
dexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.tar.xz
dexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.tar.zst
dexon-sol-tools-7b152176948c02e7bf1c27e377530fc3c6d9245a.zip
Merge pull request #1305 from 0xProject/feature/contract-templates
[@0x/contract-templates] Make contract-templates an npm package
-rw-r--r--package.json6
-rw-r--r--packages/0x.js/package.json1
-rw-r--r--packages/abi-gen-templates/CHANGELOG.json11
-rw-r--r--packages/abi-gen-templates/README.md (renamed from packages/contract_templates/README.md)0
-rw-r--r--packages/abi-gen-templates/contract.handlebars (renamed from packages/contract_templates/contract.handlebars)0
-rw-r--r--packages/abi-gen-templates/package.json20
-rw-r--r--packages/abi-gen-templates/partials/call.handlebars (renamed from packages/contract_templates/partials/call.handlebars)0
-rw-r--r--packages/abi-gen-templates/partials/callAsync.handlebars (renamed from packages/contract_templates/partials/callAsync.handlebars)0
-rw-r--r--packages/abi-gen-templates/partials/event.handlebars (renamed from packages/contract_templates/partials/event.handlebars)0
-rw-r--r--packages/abi-gen-templates/partials/params.handlebars (renamed from packages/contract_templates/partials/params.handlebars)0
-rw-r--r--packages/abi-gen-templates/partials/return_type.handlebars (renamed from packages/contract_templates/partials/return_type.handlebars)0
-rw-r--r--packages/abi-gen-templates/partials/tx.handlebars (renamed from packages/contract_templates/partials/tx.handlebars)0
-rw-r--r--packages/abi-gen-templates/partials/typed_params.handlebars (renamed from packages/contract_templates/partials/typed_params.handlebars)0
-rw-r--r--packages/abi-gen-wrappers/package.json3
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/metacoin/package.json3
16 files changed, 39 insertions, 7 deletions
diff --git a/package.json b/package.json
index 8b74aad67..bc9fd06ed 100644
--- a/package.json
+++ b/package.json
@@ -22,9 +22,9 @@
"install:all": "yarn install",
"wsrun": "wsrun",
"lerna": "lerna",
- "build": "wsrun build $PKG --fast-exit -r --stages",
- "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0x/website",
- "build:ci:no_website": "wsrun build:ci $PKG --fast-exit -r --stages --exclude @0x/website",
+ "build": "wsrun build $PKG --fast-exit -r --stages --exclude-missing",
+ "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0x/website --exclude-missing",
+ "build:ci:no_website": "wsrun build:ci $PKG --fast-exit -r --stages --exclude @0x/website --exclude-missing",
"build:monorepo_scripts": "PKG=@0x/monorepo-scripts yarn build",
"build:ts": "tsc -b",
"watch:ts": "tsc -b -w",
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index bc7ee2c87..3850e9038 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -42,7 +42,6 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0x/abi-gen": "^1.0.17",
"@0x/abi-gen-wrappers": "^1.1.0",
"@0x/contract-addresses": "^1.2.0",
"@0x/dev-utils": "^1.0.18",
diff --git a/packages/abi-gen-templates/CHANGELOG.json b/packages/abi-gen-templates/CHANGELOG.json
new file mode 100644
index 000000000..adf615b3b
--- /dev/null
+++ b/packages/abi-gen-templates/CHANGELOG.json
@@ -0,0 +1,11 @@
+[
+ {
+ "version": "1.0.0",
+ "changes": [
+ {
+ "note": "Initial publish",
+ "pr": 1305
+ }
+ ]
+ }
+]
diff --git a/packages/contract_templates/README.md b/packages/abi-gen-templates/README.md
index c6cc3b1b3..c6cc3b1b3 100644
--- a/packages/contract_templates/README.md
+++ b/packages/abi-gen-templates/README.md
diff --git a/packages/contract_templates/contract.handlebars b/packages/abi-gen-templates/contract.handlebars
index 9b2a2b336..9b2a2b336 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/abi-gen-templates/contract.handlebars
diff --git a/packages/abi-gen-templates/package.json b/packages/abi-gen-templates/package.json
new file mode 100644
index 000000000..e06be6127
--- /dev/null
+++ b/packages/abi-gen-templates/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "@0x/abi-gen-templates",
+ "version": "1.0.0",
+ "engines": {
+ "node": ">=6.12"
+ },
+ "description": "Handlebars templates used by abi-gen to generate contract-wrappers",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/0xProject/0x-monorepo.git"
+ },
+ "license": "Apache-2.0",
+ "bugs": {
+ "url": "https://github.com/0xProject/0x-monorepo/issues"
+ },
+ "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-templates/README.md",
+ "publishConfig": {
+ "access": "public"
+ }
+}
diff --git a/packages/contract_templates/partials/call.handlebars b/packages/abi-gen-templates/partials/call.handlebars
index 7c9c934c3..7c9c934c3 100644
--- a/packages/contract_templates/partials/call.handlebars
+++ b/packages/abi-gen-templates/partials/call.handlebars
diff --git a/packages/contract_templates/partials/callAsync.handlebars b/packages/abi-gen-templates/partials/callAsync.handlebars
index ddbbe7508..ddbbe7508 100644
--- a/packages/contract_templates/partials/callAsync.handlebars
+++ b/packages/abi-gen-templates/partials/callAsync.handlebars
diff --git a/packages/contract_templates/partials/event.handlebars b/packages/abi-gen-templates/partials/event.handlebars
index 61d523ca2..61d523ca2 100644
--- a/packages/contract_templates/partials/event.handlebars
+++ b/packages/abi-gen-templates/partials/event.handlebars
diff --git a/packages/contract_templates/partials/params.handlebars b/packages/abi-gen-templates/partials/params.handlebars
index 2d9bb8ed9..2d9bb8ed9 100644
--- a/packages/contract_templates/partials/params.handlebars
+++ b/packages/abi-gen-templates/partials/params.handlebars
diff --git a/packages/contract_templates/partials/return_type.handlebars b/packages/abi-gen-templates/partials/return_type.handlebars
index 77d96e8c4..77d96e8c4 100644
--- a/packages/contract_templates/partials/return_type.handlebars
+++ b/packages/abi-gen-templates/partials/return_type.handlebars
diff --git a/packages/contract_templates/partials/tx.handlebars b/packages/abi-gen-templates/partials/tx.handlebars
index b39156583..b39156583 100644
--- a/packages/contract_templates/partials/tx.handlebars
+++ b/packages/abi-gen-templates/partials/tx.handlebars
diff --git a/packages/contract_templates/partials/typed_params.handlebars b/packages/abi-gen-templates/partials/typed_params.handlebars
index c100e58f7..c100e58f7 100644
--- a/packages/contract_templates/partials/typed_params.handlebars
+++ b/packages/abi-gen-templates/partials/typed_params.handlebars
diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json
index 0977ca03a..1b7015d55 100644
--- a/packages/abi-gen-wrappers/package.json
+++ b/packages/abi-gen-wrappers/package.json
@@ -15,7 +15,7 @@
"lint": "tslint --format stylish --project .",
"pre_build": "yarn generate_contract_wrappers",
"clean": "shx rm -rf lib wrappers",
- "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers"
+ "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers"
},
"config": {
"abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IValidator|IWallet|OrderValidator|WETH9|ZRXToken).json"
@@ -31,6 +31,7 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
"devDependencies": {
"@0x/abi-gen": "^1.0.17",
+ "@0x/abi-gen-templates": "^1.0.0",
"@0x/tslint-config": "^1.0.10",
"@0x/types": "^1.3.0",
"@0x/utils": "^2.0.6",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index e10678d83..25445c4f8 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -22,7 +22,7 @@
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
"compile": "sol-compiler --contracts-dir contracts",
"clean": "shx rm -rf lib generated-artifacts generated-wrappers",
- "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+ "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
"lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index c5679a1d6..332fbb466 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -18,7 +18,7 @@
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
"test:profile": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit --timeout 10000",
- "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",
+ "generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@@ -30,6 +30,7 @@
"license": "Apache-2.0",
"dependencies": {
"@0x/abi-gen": "^1.0.17",
+ "@0x/abi-gen-templates": "^1.0.0",
"@0x/base-contract": "^3.0.7",
"@0x/sol-cov": "^2.1.13",
"@0x/subproviders": "^2.1.5",