aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-23 07:56:09 +0800
committerFabio Berger <me@fabioberger.com>2018-05-23 07:56:09 +0800
commit577528bb9ca72f3364336fa78be33b7881eba8d8 (patch)
tree6f04c2bf7fcca4f24510344d1e2ac575d008c7f9 /packages/0x.js
parent1b8204dabe1d6f69b782233b46e5f283beec1437 (diff)
parent706bfafe74f289feb98021c1303ca27c342c2f14 (diff)
downloaddexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.tar
dexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.tar.gz
dexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.tar.bz2
dexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.tar.lz
dexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.tar.xz
dexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.tar.zst
dexon-sol-tools-577528bb9ca72f3364336fa78be33b7881eba8d8.zip
merge v2-prototype
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json3
-rw-r--r--packages/0x.js/CHANGELOG.md7
-rw-r--r--packages/0x.js/package.json34
3 files changed, 25 insertions, 19 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 5e4a726b1..2a219180d 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -11,7 +11,8 @@
"Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage",
"pr": 579
}
- ]
+ ],
+ "timestamp": 1527008270
},
{
"timestamp": 1525477860,
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 353e0de29..f7ceaa552 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,7 +5,12 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v0.37.2 - _May 5, 2018_
+## v0.38.0 - _May 22, 2018_
+
+ * Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
+ * Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
+
+## v0.37.2 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 2fff1c058..6eff2fd9b 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "0.37.2",
+ "version": "0.38.0",
"engines": {
"node": ">=6.12"
},
@@ -68,12 +68,12 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0xproject/abi-gen": "^0.2.13",
- "@0xproject/dev-utils": "^0.4.1",
- "@0xproject/migrations": "^0.0.5",
- "@0xproject/monorepo-scripts": "^0.1.19",
- "@0xproject/sol-compiler": "^0.4.3",
- "@0xproject/tslint-config": "^0.4.17",
+ "@0xproject/abi-gen": "^0.3.0",
+ "@0xproject/dev-utils": "^0.4.2",
+ "@0xproject/migrations": "^0.0.6",
+ "@0xproject/monorepo-scripts": "^0.1.20",
+ "@0xproject/sol-compiler": "^0.5.0",
+ "@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
@@ -100,16 +100,16 @@
"webpack": "^3.1.0"
},
"dependencies": {
- "@0xproject/assert": "^0.2.9",
- "@0xproject/base-contract": "^0.3.1",
- "@0xproject/contract-wrappers": "^0.0.1",
- "@0xproject/order-utils": "^0.0.4",
- "@0xproject/order-watcher": "^0.0.1",
- "@0xproject/sol-compiler": "^0.4.3",
- "@0xproject/types": "^0.6.3",
- "@0xproject/typescript-typings": "^0.3.1",
- "@0xproject/utils": "^0.6.1",
- "@0xproject/web3-wrapper": "^0.6.3",
+ "@0xproject/assert": "^0.2.10",
+ "@0xproject/base-contract": "^0.3.2",
+ "@0xproject/contract-wrappers": "^0.0.2",
+ "@0xproject/order-utils": "^0.0.5",
+ "@0xproject/order-watcher": "^0.0.2",
+ "@0xproject/sol-compiler": "^0.5.0",
+ "@0xproject/types": "^0.7.0",
+ "@0xproject/typescript-typings": "^0.3.2",
+ "@0xproject/utils": "^0.6.2",
+ "@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"lodash": "^4.17.4"
},