aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-08 03:13:30 +0800
committerFabio Berger <me@fabioberger.com>2018-06-08 03:13:30 +0800
commit5aaf87d61260ec4723e7eb0a887629b057454957 (patch)
tree0637dfabfec4e71f5cc7d3b2f46712572bb58ce0 /packages/website/ts
parent10478a6b2fd1f2a01597a88afde9cf582640a849 (diff)
parent96b31f39749fb32bd89978245c79aa637791336c (diff)
downloaddexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar
dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.gz
dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.bz2
dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.lz
dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.xz
dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.zst
dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.zip
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
* v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/containers/zero_ex_js_documentation.ts3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index 94efd1cf7..9c3f447fb 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -101,6 +101,9 @@ const docsInfoConfig: DocsInfoConfig = {
'"0x.js/src/contract_wrappers/generated/ether_token"',
'"0x.js/src/contract_wrappers/generated/token"',
'"0x.js/src/contract_wrappers/generated/exchange"',
+ '"0x.js/src/generated_contract_wrappers/ether_token"',
+ '"0x.js/src/generated_contract_wrappers/token"',
+ '"0x.js/src/generated_contract_wrappers/exchange"',
],
},
menuSubsectionToVersionWhenIntroduced: {