diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-02-01 04:38:12 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-02-01 04:38:12 +0800 |
| commit | 89547332eef489a8f258300224cf632dad12fe61 (patch) | |
| tree | 5d4bf5d804b8ae2843b0a6c709ff5290d00d6e0f /packages/0x.js | |
| parent | ca55cc99edee3697646e2b4f28622f345c290fd7 (diff) | |
| parent | 75539bf67537f202bc1075b096fd70f64705867e (diff) | |
| download | dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.tar dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.tar.gz dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.tar.bz2 dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.tar.lz dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.tar.xz dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.tar.zst dexon-sol-tools-89547332eef489a8f258300224cf632dad12fe61.zip | |
Merge branch 'development' into feature/tslint-config/underscore-protected-members
* development:
Updated contract generation in 0x to new abi-gen CLI
Removed deprecated CLI options
Added PR # to the changelog of abi-gen
Added CLI options for explicit specifying location of partials and main template
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/contract_templates/contract.handlebars (renamed from packages/0x.js/contract_templates/contract.mustache) | 0 | ||||
| -rw-r--r-- | packages/0x.js/contract_templates/partials/call.handlebars (renamed from packages/0x.js/contract_templates/partials/call.mustache) | 0 | ||||
| -rw-r--r-- | packages/0x.js/contract_templates/partials/params.handlebars (renamed from packages/0x.js/contract_templates/partials/params.mustache) | 0 | ||||
| -rw-r--r-- | packages/0x.js/contract_templates/partials/return_type.handlebars (renamed from packages/0x.js/contract_templates/partials/return_type.mustache) | 0 | ||||
| -rw-r--r-- | packages/0x.js/contract_templates/partials/tx.handlebars (renamed from packages/0x.js/contract_templates/partials/tx.mustache) | 0 | ||||
| -rw-r--r-- | packages/0x.js/contract_templates/partials/typed_params.handlebars (renamed from packages/0x.js/contract_templates/partials/typed_params.mustache) | 0 | ||||
| -rw-r--r-- | packages/0x.js/package.json | 2 |
7 files changed, 1 insertions, 1 deletions
diff --git a/packages/0x.js/contract_templates/contract.mustache b/packages/0x.js/contract_templates/contract.handlebars index d3fe1b8cc..d3fe1b8cc 100644 --- a/packages/0x.js/contract_templates/contract.mustache +++ b/packages/0x.js/contract_templates/contract.handlebars diff --git a/packages/0x.js/contract_templates/partials/call.mustache b/packages/0x.js/contract_templates/partials/call.handlebars index 0475136f0..0475136f0 100644 --- a/packages/0x.js/contract_templates/partials/call.mustache +++ b/packages/0x.js/contract_templates/partials/call.handlebars diff --git a/packages/0x.js/contract_templates/partials/params.mustache b/packages/0x.js/contract_templates/partials/params.handlebars index ac5d4ae85..ac5d4ae85 100644 --- a/packages/0x.js/contract_templates/partials/params.mustache +++ b/packages/0x.js/contract_templates/partials/params.handlebars diff --git a/packages/0x.js/contract_templates/partials/return_type.mustache b/packages/0x.js/contract_templates/partials/return_type.handlebars index 383961a40..383961a40 100644 --- a/packages/0x.js/contract_templates/partials/return_type.mustache +++ b/packages/0x.js/contract_templates/partials/return_type.handlebars diff --git a/packages/0x.js/contract_templates/partials/tx.mustache b/packages/0x.js/contract_templates/partials/tx.handlebars index 9df83266a..9df83266a 100644 --- a/packages/0x.js/contract_templates/partials/tx.mustache +++ b/packages/0x.js/contract_templates/partials/tx.handlebars diff --git a/packages/0x.js/contract_templates/partials/typed_params.mustache b/packages/0x.js/contract_templates/partials/typed_params.handlebars index 3ea4b2e95..3ea4b2e95 100644 --- a/packages/0x.js/contract_templates/partials/typed_params.mustache +++ b/packages/0x.js/contract_templates/partials/typed_params.handlebars diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 9cce372a5..32063aab2 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -12,7 +12,7 @@ "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json", "generate_contract_wrappers": - "node ../abi-gen/lib/index.js --abiGlob 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --templates contract_templates --output src/contract_wrappers/generated", + "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template contract_templates/contract.handlebars --partials 'contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test:circleci": "run-s test:coverage report_test_coverage", "test": "run-s clean test:commonjs", |