diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-13 10:12:37 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-13 10:12:37 +0800 |
| commit | e33027c6244b99a1fb181404668bd2a259d923e2 (patch) | |
| tree | 24438eda01318a80b5cbc7f1939d1640764a9859 /package.json | |
| parent | 5d2b6585c66fc17a36bb9841a3b3fb009e23024c (diff) | |
| parent | b0be323e899ea7be42b6c695b4fd6d526070b213 (diff) | |
| download | dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.tar dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.tar.gz dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.tar.bz2 dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.tar.lz dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.tar.xz dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.tar.zst dexon-sol-tools-e33027c6244b99a1fb181404668bd2a259d923e2.zip | |
Merge branch 'development' into feature/receipt-status
* development: (164 commits)
Remove old tests
Remove unused code
Fix tests
Remove redundant spaces
Don't store empty objects
Fix a typo
Remove duplicate operations
Remove redundant instance variables
Fix tests
Remove blockStore and default to numConfirmations === 0
Add a comment
Store number of confirmations in a blockStore
Remove tautology check
Pass blockStore to eventWatcher
Fix last merge conflicts
Clear cache on unsubscribe
Clear store cache on events
Add more configs for order watcher
Make subscribe function async and make blockStore operational
Adjust tests to new interface
...
# Conflicts:
# package.json
# src/types.ts
# yarn.lock
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 67bdb2043..1d3b0c7d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.22.6", + "version": "0.23.0", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -62,7 +62,7 @@ "chai-as-promised": "^7.1.0", "chai-as-promised-typescript-typings": "0.0.3", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.0", + "chai-typescript-typings": "^0.0.1", "copyfiles": "^1.2.0", "coveralls": "^3.0.0", "dirty-chai": "^2.0.1", @@ -85,7 +85,7 @@ "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "^2.4.1", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.6.4", + "web3-typescript-typings": "^0.7.1", "webpack": "^3.1.0" }, "dependencies": { |