aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-09-05 01:53:18 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-09-05 01:53:18 +0800
commite61dbbb6cf395d3bf807340cac8f99f224ec616e (patch)
tree04cbe061658c4062423aa6ac40c0968c5b250c90 /packages/0x.js
parent11df29fa8e4f355ec438966fa9e40cb09fe97380 (diff)
parent6a619a4084188d1c48d8030d0fe2a1ba777c55e3 (diff)
downloaddexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar
dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.gz
dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.bz2
dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.lz
dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.xz
dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.zst
dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.zip
Merge https://github.com/0xProject/0x-monorepo into feature/website/update-portal-v2
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/package.json1
-rw-r--r--packages/0x.js/src/index.ts1
2 files changed, 2 insertions, 0 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index db6e2363e..ce8ed859a 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -47,6 +47,7 @@
"@0xproject/monorepo-scripts": "^1.0.7",
"@0xproject/tslint-config": "^1.0.6",
"@types/lodash": "4.14.104",
+ "@types/web3-provider-engine": "^14.0.0",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 17511f468..d07bfcfc8 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -46,6 +46,7 @@ export {
BalanceAndAllowance,
OrderAndTraderInfo,
TraderInfo,
+ ValidateOrderFillableOpts,
} from '@0xproject/contract-wrappers';
export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';