diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-02-24 04:20:59 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-02-28 04:05:23 +0800 |
| commit | fe8f2d8d898e9909636366c9ceee37a5e9481573 (patch) | |
| tree | 16be81a7d12e527c65084b972b39a4fe27c3267f /packages/0x.js | |
| parent | 2d561bc8a05e8d1fca91cde93bae2080d87be926 (diff) | |
| download | dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.tar dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.tar.gz dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.tar.bz2 dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.tar.lz dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.tar.xz dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.tar.zst dexon-sol-tools-fe8f2d8d898e9909636366c9ceee37a5e9481573.zip | |
Add support for ABIv2 to abi-gen
Diffstat (limited to 'packages/0x.js')
4 files changed, 5 insertions, 5 deletions
diff --git a/packages/0x.js/contract_templates/partials/event.handlebars b/packages/0x.js/contract_templates/partials/event.handlebars index 6d68d4c0f..3c6100e4f 100644 --- a/packages/0x.js/contract_templates/partials/event.handlebars +++ b/packages/0x.js/contract_templates/partials/event.handlebars @@ -1,5 +1,5 @@ export interface {{name}}ContractEventArgs { {{#each inputs}} - {{name}}: {{#returnType type}}{{/returnType}}; + {{name}}: {{#returnType type components}}{{/returnType}}; {{/each}} } diff --git a/packages/0x.js/contract_templates/partials/return_type.handlebars b/packages/0x.js/contract_templates/partials/return_type.handlebars index 383961a40..268ad15f7 100644 --- a/packages/0x.js/contract_templates/partials/return_type.handlebars +++ b/packages/0x.js/contract_templates/partials/return_type.handlebars @@ -1,6 +1,6 @@ {{#singleReturnValue}} -{{#returnType outputs.0.type}}{{/returnType}} +{{#returnType outputs.0.type outputs.0.components}}{{/returnType}} {{/singleReturnValue}} {{^singleReturnValue}} -[{{#each outputs}}{{#returnType type}}{{/returnType}}{{#unless @last}}, {{/unless}}{{/each}}] +[{{#each outputs}}{{#returnType type components}}{{/returnType}}{{#unless @last}}, {{/unless}}{{/each}}] {{/singleReturnValue}} diff --git a/packages/0x.js/contract_templates/partials/typed_params.handlebars b/packages/0x.js/contract_templates/partials/typed_params.handlebars index 3ea4b2e95..c100e58f7 100644 --- a/packages/0x.js/contract_templates/partials/typed_params.handlebars +++ b/packages/0x.js/contract_templates/partials/typed_params.handlebars @@ -1,3 +1,3 @@ {{#each inputs}} - {{name}}: {{#parameterType type}}{{/parameterType}}, + {{name}}: {{#parameterType type components}}{{/parameterType}}, {{/each}} diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 6a0a84cfc..78cba529a 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -17,7 +17,7 @@ "build": "run-p build:umd:prod build:commonjs; exit 0;", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR", "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 --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 && prettier --write 'src/contract_wrappers/generated/**.ts'", + "generate_contract_wrappers": "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 --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test:circleci": "run-s test:coverage report_test_coverage", "test": "run-s clean test:commonjs", |