diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-08-15 04:48:21 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-08-15 04:48:21 +0800 |
| commit | 9c3d10d5be40abe86cb24ec437946707167c19ff (patch) | |
| tree | ecdc085c2439090728e8816687357cf489320dd3 /packages/sol-resolver/package.json | |
| parent | 6a2634d362e50e5a611f388c0785df3209cee308 (diff) | |
| parent | 3afe405bbe92f9c549a59f26b9c82654f0e304c4 (diff) | |
| download | dexon-0x-contracts-9c3d10d5be40abe86cb24ec437946707167c19ff.tar.gz dexon-0x-contracts-9c3d10d5be40abe86cb24ec437946707167c19ff.tar.zst dexon-0x-contracts-9c3d10d5be40abe86cb24ec437946707167c19ff.zip | |
Merge branch 'development' into refactor/order-utils/market-utils-api
* development:
feat: Upgrade TypeScript to 3.0.1
Add defaults for networkId and pagination
Update sortingUtils to support Order and SignedOrder
Change rateUtils to use Order
Updated CHANGELOG
Fix lint errors
Update tests for optional feeRate
Make feeRate optional with a default of 0
Add tests for sortingUtils
Implement sorting utils
Add tests for rateUtils
Implement rate utils
Diffstat (limited to 'packages/sol-resolver/package.json')
| -rw-r--r-- | packages/sol-resolver/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 7a3c7509a..46ad8f784 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -30,7 +30,7 @@ "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "5.11.0", - "typescript": "2.9.2" + "typescript": "3.0.1" }, "dependencies": { "@0xproject/types": "^1.0.1-rc.4", |