aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorF. Eugene Aumson <feuGeneA@users.noreply.github.com>2018-09-12 07:00:11 +0800
committerGitHub <noreply@github.com>2018-09-12 07:00:11 +0800
commitcbb5a425dfb45d1dfda3579548d6b3f70dfca166 (patch)
tree8751979ad70ed0eb61dfda5a954bb9e1bc3d5c3b /packages/0x.js
parent800dd5fb4f0ab21388440a46aef21cd0cf0801c3 (diff)
parent45b68832aa3eb5c09db33140468ab737114be9e3 (diff)
downloaddexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar
dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.gz
dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.bz2
dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.lz
dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.xz
dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.zst
dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.zip
Merge branch 'development' into sol-doc
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json9
-rw-r--r--packages/0x.js/CHANGELOG.md4
-rw-r--r--packages/0x.js/package.json35
-rw-r--r--packages/0x.js/src/index.ts1
4 files changed, 32 insertions, 17 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 0a43abe89..9ff4963c0 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1536142250,
+ "version": "1.0.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "1.0.1-rc.6",
"changes": [
{
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 65cbbb8fe..2fd357eb6 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.1 - _September 5, 2018_
+
+ * Dependencies updated
+
## v1.0.1-rc.6 - _August 27, 2018_
* Fix missing `BlockParamLiteral` type import issue
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index db6e2363e..c2286ebf2 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "1.0.1-rc.6",
+ "version": "1.0.1",
"engines": {
"node": ">=6.12"
},
@@ -41,15 +41,16 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.7",
- "@0xproject/dev-utils": "^1.0.6",
- "@0xproject/migrations": "^1.0.6",
- "@0xproject/monorepo-scripts": "^1.0.7",
- "@0xproject/tslint-config": "^1.0.6",
+ "@0xproject/abi-gen": "^1.0.8",
+ "@0xproject/dev-utils": "^1.0.7",
+ "@0xproject/migrations": "^1.0.7",
+ "@0xproject/monorepo-scripts": "^1.0.8",
+ "@0xproject/tslint-config": "^1.0.7",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
+ "@types/web3-provider-engine": "^14.0.0",
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
@@ -72,17 +73,17 @@
"webpack": "^3.1.0"
},
"dependencies": {
- "@0xproject/assert": "^1.0.7",
- "@0xproject/base-contract": "^2.0.1",
- "@0xproject/contract-wrappers": "^1.0.1-rc.5",
- "@0xproject/order-utils": "^1.0.1-rc.6",
- "@0xproject/order-watcher": "^1.0.1-rc.5",
- "@0xproject/subproviders": "^2.0.1",
- "@0xproject/types": "^1.0.1-rc.6",
- "@0xproject/typescript-typings": "^1.0.5",
- "@0xproject/utils": "^1.0.7",
- "@0xproject/web3-wrapper": "^2.0.1",
- "ethereum-types": "^1.0.5",
+ "@0xproject/assert": "^1.0.8",
+ "@0xproject/base-contract": "^2.0.2",
+ "@0xproject/contract-wrappers": "^1.0.1",
+ "@0xproject/order-utils": "^1.0.1",
+ "@0xproject/order-watcher": "^1.0.1",
+ "@0xproject/subproviders": "^2.0.2",
+ "@0xproject/types": "^1.0.1",
+ "@0xproject/typescript-typings": "^2.0.0",
+ "@0xproject/utils": "^1.0.8",
+ "@0xproject/web3-wrapper": "^2.0.2",
+ "ethereum-types": "^1.0.6",
"ethers": "3.0.22",
"lodash": "^4.17.5",
"web3-provider-engine": "14.0.6"
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';