aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-10-09 17:42:35 +0800
committerFabio Berger <me@fabioberger.com>2018-10-09 17:42:35 +0800
commit6c9f7839c3948e60f2987f474bb2ad6457588fa3 (patch)
tree5736c15290289124e24392bc81eb4f8426c468f1
parent9654397b292ee03c503313e3fbb127ebb4b7d76b (diff)
parent3ac9dac4f0a6b3875b7ae0ea6dd1855743768ef2 (diff)
downloaddexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.tar
dexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.tar.gz
dexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.tar.bz2
dexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.tar.lz
dexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.tar.xz
dexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.tar.zst
dexon-sol-tools-6c9f7839c3948e60f2987f474bb2ad6457588fa3.zip
Merge branch 'development' into dev-section-redesign
* development: Clarifies use of schemas outside of Javascript/TypeScript. Fix typo Add asset-buyer to published packages section in README Publish Updated CHANGELOGS Update BuyQuote interface Add missing default options Remove unused constants Add fee order with a takerFee Add additional order factory methods and refactor test to use them Add comments about buy quote calculation Update CHANGELOG Fix linter Add additional test for slippage Add buy_quote_calculator_test
-rw-r--r--README.md1
-rw-r--r--packages/0x.js/CHANGELOG.json4
-rw-r--r--packages/0x.js/CHANGELOG.md10
-rw-r--r--packages/0x.js/package.json34
-rw-r--r--packages/abi-gen/CHANGELOG.json4
-rw-r--r--packages/abi-gen/CHANGELOG.md10
-rw-r--r--packages/abi-gen/package.json10
-rw-r--r--packages/assert/CHANGELOG.json4
-rw-r--r--packages/assert/CHANGELOG.md10
-rw-r--r--packages/assert/package.json10
-rw-r--r--packages/asset-buyer/CHANGELOG.json7
-rw-r--r--packages/asset-buyer/CHANGELOG.md5
-rw-r--r--packages/asset-buyer/package.json26
-rw-r--r--packages/asset-buyer/src/asset_buyer.ts24
-rw-r--r--packages/asset-buyer/src/types.ts27
-rw-r--r--packages/asset-buyer/src/utils/assert.ts11
-rw-r--r--packages/asset-buyer/src/utils/buy_quote_calculator.ts159
-rw-r--r--packages/asset-buyer/test/buy_quote_calculator_test.ts160
-rw-r--r--packages/base-contract/CHANGELOG.json4
-rw-r--r--packages/base-contract/CHANGELOG.md10
-rw-r--r--packages/base-contract/package.json12
-rw-r--r--packages/connect/CHANGELOG.json4
-rw-r--r--packages/connect/CHANGELOG.md8
-rw-r--r--packages/connect/package.json16
-rw-r--r--packages/contract-wrappers/CHANGELOG.json4
-rw-r--r--packages/contract-wrappers/CHANGELOG.md6
-rw-r--r--packages/contract-wrappers/package.json32
-rw-r--r--packages/contracts/package.json28
-rw-r--r--packages/dev-utils/CHANGELOG.json4
-rw-r--r--packages/dev-utils/CHANGELOG.md8
-rw-r--r--packages/dev-utils/package.json16
-rw-r--r--packages/ethereum-types/CHANGELOG.json9
-rw-r--r--packages/ethereum-types/CHANGELOG.md10
-rw-r--r--packages/ethereum-types/package.json4
-rw-r--r--packages/fill-scenarios/CHANGELOG.json4
-rw-r--r--packages/fill-scenarios/CHANGELOG.md6
-rw-r--r--packages/fill-scenarios/package.json20
-rw-r--r--packages/instant/package.json10
-rw-r--r--packages/json-schemas/CHANGELOG.json9
-rw-r--r--packages/json-schemas/CHANGELOG.md10
-rw-r--r--packages/json-schemas/package.json8
-rw-r--r--packages/metacoin/package.json26
-rw-r--r--packages/migrations/CHANGELOG.json4
-rw-r--r--packages/migrations/CHANGELOG.md8
-rw-r--r--packages/migrations/package.json26
-rw-r--r--packages/monorepo-scripts/package.json2
-rw-r--r--packages/order-utils/CHANGELOG.json4
-rw-r--r--packages/order-utils/CHANGELOG.md8
-rw-r--r--packages/order-utils/package.json22
-rw-r--r--packages/order-utils/src/order_factory.ts39
-rw-r--r--packages/order-watcher/CHANGELOG.json4
-rw-r--r--packages/order-watcher/CHANGELOG.md6
-rw-r--r--packages/order-watcher/package.json32
-rw-r--r--packages/react-docs/CHANGELOG.json4
-rw-r--r--packages/react-docs/CHANGELOG.md10
-rw-r--r--packages/react-docs/package.json12
-rw-r--r--packages/react-shared/CHANGELOG.json9
-rw-r--r--packages/react-shared/CHANGELOG.md12
-rw-r--r--packages/react-shared/package.json6
-rw-r--r--packages/sol-compiler/CHANGELOG.json4
-rw-r--r--packages/sol-compiler/CHANGELOG.md8
-rw-r--r--packages/sol-compiler/package.json22
-rw-r--r--packages/sol-cov/CHANGELOG.json4
-rw-r--r--packages/sol-cov/CHANGELOG.md10
-rw-r--r--packages/sol-cov/package.json18
-rw-r--r--packages/sol-doc/CHANGELOG.json4
-rw-r--r--packages/sol-doc/CHANGELOG.md2
-rw-r--r--packages/sol-doc/package.json12
-rw-r--r--packages/sol-resolver/CHANGELOG.json9
-rw-r--r--packages/sol-resolver/CHANGELOG.md12
-rw-r--r--packages/sol-resolver/package.json8
-rw-r--r--packages/sra-report/CHANGELOG.json4
-rw-r--r--packages/sra-report/CHANGELOG.md8
-rw-r--r--packages/sra-report/package.json10
-rw-r--r--packages/sra-spec/CHANGELOG.json4
-rw-r--r--packages/sra-spec/CHANGELOG.md4
-rw-r--r--packages/sra-spec/package.json6
-rw-r--r--packages/subproviders/CHANGELOG.json4
-rw-r--r--packages/subproviders/CHANGELOG.md8
-rw-r--r--packages/subproviders/package.json16
-rw-r--r--packages/testnet-faucets/package.json16
-rw-r--r--packages/tslint-config/CHANGELOG.json9
-rw-r--r--packages/tslint-config/CHANGELOG.md10
-rw-r--r--packages/tslint-config/package.json2
-rw-r--r--packages/types/CHANGELOG.json9
-rw-r--r--packages/types/CHANGELOG.md10
-rw-r--r--packages/types/package.json6
-rw-r--r--packages/typescript-typings/CHANGELOG.json9
-rw-r--r--packages/typescript-typings/CHANGELOG.md10
-rw-r--r--packages/typescript-typings/package.json4
-rw-r--r--packages/utils/CHANGELOG.json9
-rw-r--r--packages/utils/CHANGELOG.md12
-rw-r--r--packages/utils/package.json10
-rw-r--r--packages/web3-wrapper/CHANGELOG.json4
-rw-r--r--packages/web3-wrapper/CHANGELOG.md10
-rw-r--r--packages/web3-wrapper/package.json14
-rw-r--r--packages/website/md/docs/json_schemas/1.0.0/introduction.md2
-rw-r--r--packages/website/package.json24
98 files changed, 879 insertions, 460 deletions
diff --git a/README.md b/README.md
index 6e697ee78..d850d5703 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ If you're developing on 0x now or are interested in using 0x infrastructure in t
| [`0x.js`](/packages/0x.js) | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages |
+| [`@0xproject/asset-buyer`](/packages/asset-buyer) | [![npm](https://img.shields.io/npm/v/@0xproject/asset-buyer.svg)](https://www.npmjs.com/package/@0xproject/asset-buyer) | Convenience package for discovering and buying assets with Ether. |
| [`@0xproject/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0xproject/base-contract.svg)](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts |
| [`@0xproject/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the Standard Relayer API |
| [`@0xproject/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0xproject/dev-utils.svg)](https://www.npmjs.com/package/@0xproject/dev-utils) | Dev utils to be shared across 0x projects and packages |
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 81a128c4c..1d6f08760 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.8",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index eb5813c59..27702413d 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.8 - _October 2, 2018_
+## v1.0.8 - _October 4, 2018_
* Dependencies updated
@@ -49,7 +49,7 @@ CHANGELOG
* Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher` (#963)
-## v1.0.1-rc.3 - _August 14, 2018_
+## v1.0.1-rc.3 - _August 13, 2018_
* Dependencies updated
* Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914)
@@ -66,11 +66,11 @@ CHANGELOG
* Dependencies updated
-## v1.0.0-rc.2 - _July 20, 2018_
+## v1.0.0-rc.2 - _July 19, 2018_
* Remove `zeroEx.assetData` and instead re-export it's static functions directly off `ZeroEx`
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Remove tokenRegistry wrapper (#863)
* Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
@@ -110,7 +110,7 @@ CHANGELOG
* 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 5, 2018_
+## v0.37.2 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 268972a4f..6a3074d26 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "1.0.7",
+ "version": "1.0.8",
"engines": {
"node": ">=6.12"
},
@@ -42,11 +42,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/migrations": "^1.0.13",
- "@0xproject/monorepo-scripts": "^1.0.10",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/migrations": "^1.0.14",
+ "@0xproject/monorepo-scripts": "^1.0.11",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",
@@ -73,17 +73,17 @@
"webpack": "^4.20.2"
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/contract-wrappers": "^2.0.1",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/order-watcher": "^2.1.0",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/contract-wrappers": "^2.0.2",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/order-watcher": "^2.1.1",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5",
"web3-provider-engine": "14.0.6"
diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json
index ab2423e88..d5e0f9469 100644
--- a/packages/abi-gen/CHANGELOG.json
+++ b/packages/abi-gen/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.13",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md
index 5f72e257d..ed955a051 100644
--- a/packages/abi-gen/CHANGELOG.md
+++ b/packages/abi-gen/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.13 - _October 2, 2018_
+## v1.0.13 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -57,7 +57,7 @@ CHANGELOG
* Fix the abi-gen entry point in package.json (#901)
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Convert e_r_c to erc in generated file names (#822)
* Remove the output directory before writing to it (#822)
@@ -75,7 +75,7 @@ CHANGELOG
* Dependencies updated
-## v0.3.1 - _June 1, 2018_
+## v0.3.1 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -83,7 +83,7 @@ CHANGELOG
* Properly export the executable binary (#588)
-## v0.2.13 - _May 5, 2018_
+## v0.2.13 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index fd239ca21..d6cd80978 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/abi-gen",
- "version": "1.0.12",
+ "version": "1.0.13",
"engines": {
"node": ">=6.12"
},
@@ -31,10 +31,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
"chalk": "^2.3.0",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
"lodash": "^4.17.5",
@@ -45,7 +45,7 @@
"yargs": "^10.0.3"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/glob": "5.0.35",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",
diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json
index 0efcc3ac3..ec84f099e 100644
--- a/packages/assert/CHANGELOG.json
+++ b/packages/assert/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.13",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md
index 910904730..b9f097c4e 100644
--- a/packages/assert/CHANGELOG.md
+++ b/packages/assert/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.13 - _October 2, 2018_
+## v1.0.13 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -57,7 +57,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values (#821)
@@ -73,7 +73,7 @@ CHANGELOG
* Dependencies updated
-## v0.2.11 - _June 1, 2018_
+## v0.2.11 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -81,7 +81,7 @@ CHANGELOG
* Dependencies updated
-## v0.2.9 - _May 5, 2018_
+## v0.2.9 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/assert/package.json b/packages/assert/package.json
index b536d31f4..795010cd0 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/assert",
- "version": "1.0.12",
+ "version": "1.0.13",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
@@ -45,9 +45,9 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
"lodash": "^4.17.5",
"valid-url": "^1.0.9"
},
diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json
index 8c2c7a8d2..d50a564dc 100644
--- a/packages/asset-buyer/CHANGELOG.json
+++ b/packages/asset-buyer/CHANGELOG.json
@@ -5,8 +5,13 @@
{
"note": "Expand AssetBuyer to work with multiple assets at once",
"pr": 1086
+ },
+ {
+ "note": "Fix minRate and maxRate calculation",
+ "pr": 1113
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538475601,
diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md
index 6f125fa1a..65d190a2d 100644
--- a/packages/asset-buyer/CHANGELOG.md
+++ b/packages/asset-buyer/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v2.0.0 - _October 4, 2018_
+
+ * Expand AssetBuyer to work with multiple assets at once (#1086)
+ * Fix minRate and maxRate calculation (#1113)
+
## v1.0.3 - _October 2, 2018_
* Dependencies updated
diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json
index dacfbf730..291342169 100644
--- a/packages/asset-buyer/package.json
+++ b/packages/asset-buyer/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/asset-buyer",
- "version": "1.0.2",
+ "version": "2.0.0",
"engines": {
"node": ">=6.12"
},
@@ -37,21 +37,21 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/connect": "^3.0.0",
- "@0xproject/contract-wrappers": "^2.0.1",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/connect": "^3.0.1",
+ "@0xproject/contract-wrappers": "^2.0.2",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"lodash": "^4.17.10"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "^4.14.116",
"@types/mocha": "^2.2.42",
"@types/node": "*",
diff --git a/packages/asset-buyer/src/asset_buyer.ts b/packages/asset-buyer/src/asset_buyer.ts
index 0bb757f52..7ec39e012 100644
--- a/packages/asset-buyer/src/asset_buyer.ts
+++ b/packages/asset-buyer/src/asset_buyer.ts
@@ -123,7 +123,7 @@ export class AssetBuyer {
public async getBuyQuoteAsync(
assetData: string,
assetBuyAmount: BigNumber,
- options: Partial<BuyQuoteRequestOpts>,
+ options: Partial<BuyQuoteRequestOpts> = {},
): Promise<BuyQuote> {
const { feePercentage, shouldForceOrderRefresh, slippagePercentage } = {
...constants.DEFAULT_BUY_QUOTE_REQUEST_OPTS,
@@ -164,7 +164,7 @@ export class AssetBuyer {
public async getBuyQuoteForERC20TokenAddressAsync(
tokenAddress: string,
assetBuyAmount: BigNumber,
- options: Partial<BuyQuoteRequestOpts>,
+ options: Partial<BuyQuoteRequestOpts> = {},
): Promise<BuyQuote> {
assert.isETHAddressHex('tokenAddress', tokenAddress);
assert.isBigNumber('assetBuyAmount', assetBuyAmount);
@@ -179,20 +179,23 @@ export class AssetBuyer {
*
* @return A promise of the txHash.
*/
- public async executeBuyQuoteAsync(buyQuote: BuyQuote, options: Partial<BuyQuoteExecutionOpts>): Promise<string> {
- const { rate, takerAddress, feeRecipient } = {
+ public async executeBuyQuoteAsync(
+ buyQuote: BuyQuote,
+ options: Partial<BuyQuoteExecutionOpts> = {},
+ ): Promise<string> {
+ const { ethAmount, takerAddress, feeRecipient } = {
...constants.DEFAULT_BUY_QUOTE_EXECUTION_OPTS,
...options,
};
assert.isValidBuyQuote('buyQuote', buyQuote);
- if (!_.isUndefined(rate)) {
- assert.isBigNumber('rate', rate);
+ if (!_.isUndefined(ethAmount)) {
+ assert.isBigNumber('ethAmount', ethAmount);
}
if (!_.isUndefined(takerAddress)) {
assert.isETHAddressHex('takerAddress', takerAddress);
}
assert.isETHAddressHex('feeRecipient', feeRecipient);
- const { orders, feeOrders, feePercentage, assetBuyAmount, maxRate } = buyQuote;
+ const { orders, feeOrders, feePercentage, assetBuyAmount, worstCaseQuoteInfo } = buyQuote;
// if no takerAddress is provided, try to get one from the provider
let finalTakerAddress;
if (!_.isUndefined(takerAddress)) {
@@ -207,15 +210,12 @@ export class AssetBuyer {
throw new Error(AssetBuyerError.NoAddressAvailable);
}
}
- // if no rate is provided, default to the maxRate from buyQuote
- const desiredRate = rate || maxRate;
- // calculate how much eth is required to buy assetBuyAmount at the desired rate
- const ethAmount = assetBuyAmount.dividedToIntegerBy(desiredRate);
+ // if no ethAmount is provided, default to the worst ethAmount from buyQuote
const txHash = await this._contractWrappers.forwarder.marketBuyOrdersWithEthAsync(
orders,
assetBuyAmount,
finalTakerAddress,
- ethAmount,
+ ethAmount || worstCaseQuoteInfo.totalEthAmount,
feeOrders,
feePercentage,
feeRecipient,
diff --git a/packages/asset-buyer/src/types.ts b/packages/asset-buyer/src/types.ts
index 8d3dcbfe6..b96795bb6 100644
--- a/packages/asset-buyer/src/types.ts
+++ b/packages/asset-buyer/src/types.ts
@@ -35,21 +35,32 @@ export interface OrderProvider {
/**
* assetData: String that represents a specific asset (for more info: https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+ * assetBuyAmount: The amount of asset to buy.
* orders: An array of objects conforming to SignedOrder. These orders can be used to cover the requested assetBuyAmount plus slippage.
* feeOrders: An array of objects conforming to SignedOrder. These orders can be used to cover the fees for the orders param above.
- * minRate: Min rate that needs to be paid in order to execute the buy.
- * maxRate: Max rate that can be paid in order to execute the buy.
- * assetBuyAmount: The amount of asset to buy.
* feePercentage: Optional affiliate fee percentage used to calculate the eth amounts above.
+ * bestCaseQuoteInfo: Info about the best case price for the asset.
+ * worstCaseQuoteInfo: Info about the worst case price for the asset.
*/
export interface BuyQuote {
assetData: string;
+ assetBuyAmount: BigNumber;
orders: SignedOrder[];
feeOrders: SignedOrder[];
- minRate: BigNumber;
- maxRate: BigNumber;
- assetBuyAmount: BigNumber;
feePercentage?: number;
+ bestCaseQuoteInfo: BuyQuoteInfo;
+ worstCaseQuoteInfo: BuyQuoteInfo;
+}
+
+/**
+ * ethPerAssetPrice: The price of one unit of the desired asset in ETH
+ * feeEthAmount: The amount of eth required to pay the affiliate fee.
+ * totalEthAmount: the total amount of eth required to complete the buy. (Filling orders, feeOrders, and paying affiliate fee)
+ */
+export interface BuyQuoteInfo {
+ ethPerAssetPrice: BigNumber;
+ feeEthAmount: BigNumber;
+ totalEthAmount: BigNumber;
}
/**
@@ -64,12 +75,12 @@ export interface BuyQuoteRequestOpts {
}
/**
- * rate: The desired rate to execute the buy at. Affects the amount of ETH sent with the transaction, defaults to buyQuote.maxRate.
+ * ethAmount: The desired amount of eth to spend. Defaults to buyQuote.worstCaseQuoteInfo.totalEthAmount.
* takerAddress: The address to perform the buy. Defaults to the first available address from the provider.
* feeRecipient: The address where affiliate fees are sent. Defaults to null address (0x000...000).
*/
export interface BuyQuoteExecutionOpts {
- rate?: BigNumber;
+ ethAmount?: BigNumber;
takerAddress?: string;
feeRecipient: string;
}
diff --git a/packages/asset-buyer/src/utils/assert.ts b/packages/asset-buyer/src/utils/assert.ts
index 04f425237..d43b71fee 100644
--- a/packages/asset-buyer/src/utils/assert.ts
+++ b/packages/asset-buyer/src/utils/assert.ts
@@ -3,7 +3,7 @@ import { schemas } from '@0xproject/json-schemas';
import { SignedOrder } from '@0xproject/types';
import * as _ from 'lodash';
-import { BuyQuote, OrderProvider, OrderProviderRequest } from '../types';
+import { BuyQuote, BuyQuoteInfo, OrderProvider, OrderProviderRequest } from '../types';
export const assert = {
...sharedAssert,
@@ -11,13 +11,18 @@ export const assert = {
sharedAssert.isHexString(`${variableName}.assetData`, buyQuote.assetData);
sharedAssert.doesConformToSchema(`${variableName}.orders`, buyQuote.orders, schemas.signedOrdersSchema);
sharedAssert.doesConformToSchema(`${variableName}.feeOrders`, buyQuote.feeOrders, schemas.signedOrdersSchema);
- sharedAssert.isBigNumber(`${variableName}.minRate`, buyQuote.minRate);
- sharedAssert.isBigNumber(`${variableName}.maxRate`, buyQuote.maxRate);
+ assert.isValidBuyQuoteInfo(`${variableName}.bestCaseQuoteInfo`, buyQuote.bestCaseQuoteInfo);
+ assert.isValidBuyQuoteInfo(`${variableName}.worstCaseQuoteInfo`, buyQuote.worstCaseQuoteInfo);
sharedAssert.isBigNumber(`${variableName}.assetBuyAmount`, buyQuote.assetBuyAmount);
if (!_.isUndefined(buyQuote.feePercentage)) {
sharedAssert.isNumber(`${variableName}.feePercentage`, buyQuote.feePercentage);
}
},
+ isValidBuyQuoteInfo(variableName: string, buyQuoteInfo: BuyQuoteInfo): void {
+ sharedAssert.isBigNumber(`${variableName}.ethPerAssetPrice`, buyQuoteInfo.ethPerAssetPrice);
+ sharedAssert.isBigNumber(`${variableName}.feeEthAmount`, buyQuoteInfo.feeEthAmount);
+ sharedAssert.isBigNumber(`${variableName}.totalEthAmount`, buyQuoteInfo.totalEthAmount);
+ },
isValidOrderProvider(variableName: string, orderFetcher: OrderProvider): void {
sharedAssert.isFunction(`${variableName}.getOrdersAsync`, orderFetcher.getOrdersAsync);
},
diff --git a/packages/asset-buyer/src/utils/buy_quote_calculator.ts b/packages/asset-buyer/src/utils/buy_quote_calculator.ts
index b706ea143..cb0fd128c 100644
--- a/packages/asset-buyer/src/utils/buy_quote_calculator.ts
+++ b/packages/asset-buyer/src/utils/buy_quote_calculator.ts
@@ -1,11 +1,9 @@
-import { marketUtils } from '@0xproject/order-utils';
+import { marketUtils, rateUtils } from '@0xproject/order-utils';
import { BigNumber } from '@0xproject/utils';
import * as _ from 'lodash';
import { constants } from '../constants';
-import { AssetBuyerError, BuyQuote, OrdersAndFillableAmounts } from '../types';
-
-import { orderUtils } from './order_utils';
+import { AssetBuyerError, BuyQuote, BuyQuoteInfo, OrdersAndFillableAmounts } from '../types';
// Calculates a buy quote for orders that have WETH as the takerAsset
export const buyQuoteCalculator = {
@@ -21,6 +19,7 @@ export const buyQuoteCalculator = {
const feeOrders = feeOrdersAndFillableAmounts.orders;
const remainingFillableFeeAmounts = feeOrdersAndFillableAmounts.remainingFillableMakerAssetAmounts;
const slippageBufferAmount = assetBuyAmount.mul(slippagePercentage).round();
+ // find the orders that cover the desired assetBuyAmount (with slippage)
const {
resultOrders,
remainingFillAmount,
@@ -29,9 +28,11 @@ export const buyQuoteCalculator = {
remainingFillableMakerAssetAmounts,
slippageBufferAmount,
});
+ // if we do not have enough orders to cover the desired assetBuyAmount, throw
if (remainingFillAmount.gt(constants.ZERO_AMOUNT)) {
throw new Error(AssetBuyerError.InsufficientAssetLiquidity);
}
+ // given the orders calculated above, find the fee-orders that cover the desired assetBuyAmount (with slippage)
// TODO(bmillman): optimization
// update this logic to find the minimum amount of feeOrders to cover the worst case as opposed to
// finding order that cover all fees, this will help with estimating ETH and minimizing gas usage
@@ -40,49 +41,139 @@ export const buyQuoteCalculator = {
remainingFeeAmount,
feeOrdersRemainingFillableMakerAssetAmounts,
} = marketUtils.findFeeOrdersThatCoverFeesForTargetOrders(resultOrders, feeOrders, {
- remainingFillableMakerAssetAmounts,
+ remainingFillableMakerAssetAmounts: ordersRemainingFillableMakerAssetAmounts,
remainingFillableFeeAmounts,
});
+ // if we do not have enough feeOrders to cover the fees, throw
if (remainingFeeAmount.gt(constants.ZERO_AMOUNT)) {
throw new Error(AssetBuyerError.InsufficientZrxLiquidity);
}
+ // assetData information for the result
const assetData = orders[0].makerAssetData;
-
- // calculate minRate and maxRate by calculating min and max eth usage and then dividing into
- // assetBuyAmount to get assetData / WETH, needs to take into account feePercentage as well
- // minEthAmount = (sum(takerAssetAmount[i]) until sum(makerAssetAmount[i]) >= assetBuyAmount ) * (1 + feePercentage)
- // maxEthAmount = (sum(takerAssetAmount[i]) until i == orders.length) * (1 + feePercentage)
- const allOrders = _.concat(resultOrders, resultFeeOrders);
- const allRemainingAmounts = _.concat(
- ordersRemainingFillableMakerAssetAmounts,
- feeOrdersRemainingFillableMakerAssetAmounts,
+ // compile the resulting trimmed set of orders for makerAsset and feeOrders that are needed for assetBuyAmount
+ const trimmedOrdersAndFillableAmounts: OrdersAndFillableAmounts = {
+ orders: resultOrders,
+ remainingFillableMakerAssetAmounts: ordersRemainingFillableMakerAssetAmounts,
+ };
+ const trimmedFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts = {
+ orders: resultFeeOrders,
+ remainingFillableMakerAssetAmounts: feeOrdersRemainingFillableMakerAssetAmounts,
+ };
+ const bestCaseQuoteInfo = calculateQuoteInfo(
+ trimmedOrdersAndFillableAmounts,
+ trimmedFeeOrdersAndFillableAmounts,
+ assetBuyAmount,
+ feePercentage,
);
- let minEthAmount = constants.ZERO_AMOUNT;
- let maxEthAmount = constants.ZERO_AMOUNT;
- let cumulativeMakerAmount = constants.ZERO_AMOUNT;
- _.forEach(allOrders, (order, index) => {
- const remainingFillableMakerAssetAmount = allRemainingAmounts[index];
- const claimableTakerAssetAmount = orderUtils.calculateRemainingTakerAssetAmount(
- order,
- remainingFillableMakerAssetAmount,
- );
- // taker asset is always assumed to be WETH
- maxEthAmount = maxEthAmount.plus(claimableTakerAssetAmount);
- if (cumulativeMakerAmount.lessThan(assetBuyAmount)) {
- minEthAmount = minEthAmount.plus(claimableTakerAssetAmount);
- }
- cumulativeMakerAmount = cumulativeMakerAmount.plus(remainingFillableMakerAssetAmount);
- });
- const feeAdjustedMinRate = minEthAmount.mul(feePercentage + 1).div(assetBuyAmount);
- const feeAdjustedMaxRate = minEthAmount.mul(feePercentage + 1).div(assetBuyAmount);
+ // in order to calculate the maxRate, reverse the ordersAndFillableAmounts such that they are sorted from worst rate to best rate
+ const worstCaseQuoteInfo = calculateQuoteInfo(
+ reverseOrdersAndFillableAmounts(trimmedOrdersAndFillableAmounts),
+ reverseOrdersAndFillableAmounts(trimmedFeeOrdersAndFillableAmounts),
+ assetBuyAmount,
+ feePercentage,
+ );
+
return {
assetData,
orders: resultOrders,
feeOrders: resultFeeOrders,
- minRate: feeAdjustedMinRate,
- maxRate: feeAdjustedMaxRate,
+ bestCaseQuoteInfo,
+ worstCaseQuoteInfo,
assetBuyAmount,
feePercentage,
};
},
};
+
+function calculateQuoteInfo(
+ ordersAndFillableAmounts: OrdersAndFillableAmounts,
+ feeOrdersAndFillableAmounts: OrdersAndFillableAmounts,
+ assetBuyAmount: BigNumber,
+ feePercentage: number,
+): BuyQuoteInfo {
+ // find the total eth and zrx needed to buy assetAmount from the resultOrders from left to right
+ const [ethAmountToBuyAsset, zrxAmountToBuyAsset] = findEthAndZrxAmountNeededToBuyAsset(
+ ordersAndFillableAmounts,
+ assetBuyAmount,
+ );
+ // find the total eth needed to buy fees
+ const ethAmountToBuyFees = findEthAmountNeededToBuyFees(feeOrdersAndFillableAmounts, zrxAmountToBuyAsset);
+ const ethAmountBeforeAffiliateFee = ethAmountToBuyAsset.plus(ethAmountToBuyFees);
+ const totalEthAmount = ethAmountBeforeAffiliateFee.mul(feePercentage + 1);
+ // divide into the assetBuyAmount in order to find rate of makerAsset / WETH
+ const ethPerAssetPrice = ethAmountBeforeAffiliateFee.div(assetBuyAmount);
+ return {
+ totalEthAmount,
+ feeEthAmount: totalEthAmount.minus(ethAmountBeforeAffiliateFee),
+ ethPerAssetPrice,
+ };
+}
+
+// given an OrdersAndFillableAmounts, reverse the orders and remainingFillableMakerAssetAmounts properties
+function reverseOrdersAndFillableAmounts(ordersAndFillableAmounts: OrdersAndFillableAmounts): OrdersAndFillableAmounts {
+ const ordersCopy = _.clone(ordersAndFillableAmounts.orders);
+ const remainingFillableMakerAssetAmountsCopy = _.clone(ordersAndFillableAmounts.remainingFillableMakerAssetAmounts);
+ return {
+ orders: ordersCopy.reverse(),
+ remainingFillableMakerAssetAmounts: remainingFillableMakerAssetAmountsCopy.reverse(),
+ };
+}
+
+function findEthAmountNeededToBuyFees(
+ feeOrdersAndFillableAmounts: OrdersAndFillableAmounts,
+ feeAmount: BigNumber,
+): BigNumber {
+ const { orders, remainingFillableMakerAssetAmounts } = feeOrdersAndFillableAmounts;
+ const result = _.reduce(
+ orders,
+ (acc, order, index) => {
+ const remainingFillableMakerAssetAmount = remainingFillableMakerAssetAmounts[index];
+ const amountToFill = BigNumber.min(acc.remainingFeeAmount, remainingFillableMakerAssetAmount);
+ const feeAdjustedRate = rateUtils.getFeeAdjustedRateOfFeeOrder(order);
+ const ethAmountForThisOrder = feeAdjustedRate.mul(amountToFill);
+ return {
+ ethAmount: acc.ethAmount.plus(ethAmountForThisOrder),
+ remainingFeeAmount: BigNumber.max(constants.ZERO_AMOUNT, acc.remainingFeeAmount.minus(amountToFill)),
+ };
+ },
+ {
+ ethAmount: constants.ZERO_AMOUNT,
+ remainingFeeAmount: feeAmount,
+ },
+ );
+ return result.ethAmount;
+}
+
+function findEthAndZrxAmountNeededToBuyAsset(
+ ordersAndFillableAmounts: OrdersAndFillableAmounts,
+ assetBuyAmount: BigNumber,
+): [BigNumber, BigNumber] {
+ const { orders, remainingFillableMakerAssetAmounts } = ordersAndFillableAmounts;
+ const result = _.reduce(
+ orders,
+ (acc, order, index) => {
+ const remainingFillableMakerAssetAmount = remainingFillableMakerAssetAmounts[index];
+ const amountToFill = BigNumber.min(acc.remainingAssetBuyAmount, remainingFillableMakerAssetAmount);
+ // find the amount of eth required to fill amountToFill (amountToFill / makerAssetAmount) * takerAssetAmount
+ const ethAmountForThisOrder = amountToFill
+ .mul(order.takerAssetAmount)
+ .dividedToIntegerBy(order.makerAssetAmount);
+ // find the amount of zrx required to fill fees for amountToFill (amountToFill / makerAssetAmount) * takerFee
+ const zrxAmountForThisOrder = amountToFill.mul(order.takerFee).dividedToIntegerBy(order.makerAssetAmount);
+ return {
+ ethAmount: acc.ethAmount.plus(ethAmountForThisOrder),
+ zrxAmount: acc.zrxAmount.plus(zrxAmountForThisOrder),
+ remainingAssetBuyAmount: BigNumber.max(
+ constants.ZERO_AMOUNT,
+ acc.remainingAssetBuyAmount.minus(amountToFill),
+ ),
+ };
+ },
+ {
+ ethAmount: constants.ZERO_AMOUNT,
+ zrxAmount: constants.ZERO_AMOUNT,
+ remainingAssetBuyAmount: assetBuyAmount,
+ },
+ );
+ return [result.ethAmount, result.zrxAmount];
+}
diff --git a/packages/asset-buyer/test/buy_quote_calculator_test.ts b/packages/asset-buyer/test/buy_quote_calculator_test.ts
new file mode 100644
index 000000000..b987b45a8
--- /dev/null
+++ b/packages/asset-buyer/test/buy_quote_calculator_test.ts
@@ -0,0 +1,160 @@
+import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory';
+import { BigNumber } from '@0xproject/utils';
+import * as chai from 'chai';
+import * as _ from 'lodash';
+import 'mocha';
+
+import { AssetBuyerError, OrdersAndFillableAmounts } from '../src/types';
+import { buyQuoteCalculator } from '../src/utils/buy_quote_calculator';
+
+import { chaiSetup } from './utils/chai_setup';
+
+chaiSetup.configure();
+const expect = chai.expect;
+
+// tslint:disable:custom-no-magic-numbers
+describe('buyQuoteCalculator', () => {
+ describe('#calculate', () => {
+ let ordersAndFillableAmounts: OrdersAndFillableAmounts;
+ let smallFeeOrderAndFillableAmount: OrdersAndFillableAmounts;
+ let allFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts;
+ beforeEach(() => {
+ // generate two orders for our desired maker asset
+ // the first order has a rate of 4 makerAsset / WETH with a takerFee of 200 ZRX and has only 200 / 400 makerAsset units left to fill (half fillable)
+ // the second order has a rate of 2 makerAsset / WETH with a takerFee of 100 ZRX and has 200 / 200 makerAsset units left to fill (completely fillable)
+ // generate one order for fees
+ // the fee order has a rate of 1 ZRX / WETH with no taker fee and has 100 ZRX left to fill (completely fillable)
+ const firstOrder = orderFactory.createSignedOrderFromPartial({
+ makerAssetAmount: new BigNumber(400),
+ takerAssetAmount: new BigNumber(100),
+ takerFee: new BigNumber(200),
+ });
+ const firstRemainingFillAmount = new BigNumber(200);
+ const secondOrder = orderFactory.createSignedOrderFromPartial({
+ makerAssetAmount: new BigNumber(200),
+ takerAssetAmount: new BigNumber(100),
+ takerFee: new BigNumber(100),
+ });
+ const secondRemainingFillAmount = secondOrder.makerAssetAmount;
+ ordersAndFillableAmounts = {
+ orders: [firstOrder, secondOrder],
+ remainingFillableMakerAssetAmounts: [firstRemainingFillAmount, secondRemainingFillAmount],
+ };
+ const smallFeeOrder = orderFactory.createSignedOrderFromPartial({
+ makerAssetAmount: new BigNumber(100),
+ takerAssetAmount: new BigNumber(100),
+ });
+ smallFeeOrderAndFillableAmount = {
+ orders: [smallFeeOrder],
+ remainingFillableMakerAssetAmounts: [smallFeeOrder.makerAssetAmount],
+ };
+ const largeFeeOrder = orderFactory.createSignedOrderFromPartial({
+ makerAssetAmount: new BigNumber(110),
+ takerAssetAmount: new BigNumber(200),
+ takerFee: new BigNumber(10),
+ });
+ allFeeOrdersAndFillableAmounts = {
+ orders: [smallFeeOrder, largeFeeOrder],
+ remainingFillableMakerAssetAmounts: [
+ smallFeeOrder.makerAssetAmount,
+ largeFeeOrder.makerAssetAmount.minus(largeFeeOrder.takerFee),
+ ],
+ };
+ });
+ it('should throw if not enough maker asset liquidity', () => {
+ // we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
+ expect(() =>
+ buyQuoteCalculator.calculate(
+ ordersAndFillableAmounts,
+ smallFeeOrderAndFillableAmount,
+ new BigNumber(500),
+ 0,
+ 0,
+ ),
+ ).to.throw(AssetBuyerError.InsufficientAssetLiquidity);
+ });
+ it('should throw if not enough ZRX liquidity', () => {
+ // we request 300 makerAsset units but the ZRX order is only enough to fill the first order, which only has 200 makerAssetUnits available
+ expect(() =>
+ buyQuoteCalculator.calculate(
+ ordersAndFillableAmounts,
+ smallFeeOrderAndFillableAmount,
+ new BigNumber(300),
+ 0,
+ 0,
+ ),
+ ).to.throw(AssetBuyerError.InsufficientZrxLiquidity);
+ });
+ it('calculates a correct buyQuote with no slippage', () => {
+ // we request 200 makerAsset units which can be filled using the first order
+ // the first order requires a fee of 100 ZRX from the taker which can be filled by the feeOrder
+ const assetBuyAmount = new BigNumber(200);
+ const feePercentage = 0.02;
+ const slippagePercentage = 0;
+ const buyQuote = buyQuoteCalculator.calculate(
+ ordersAndFillableAmounts,
+ smallFeeOrderAndFillableAmount,
+ assetBuyAmount,
+ feePercentage,
+ slippagePercentage,
+ );
+ // test if orders are correct
+ expect(buyQuote.orders).to.deep.equal([ordersAndFillableAmounts.orders[0]]);
+ expect(buyQuote.feeOrders).to.deep.equal([smallFeeOrderAndFillableAmount.orders[0]]);
+ // test if rates are correct
+ // 50 eth to fill the first order + 100 eth for fees
+ const expectedFillEthAmount = new BigNumber(150);
+ const expectedTotalEthAmount = expectedFillEthAmount.mul(feePercentage + 1);
+ const expectedFeeEthAmount = expectedTotalEthAmount.minus(expectedFillEthAmount);
+ const expectedEthPerAssetPrice = expectedFillEthAmount.div(assetBuyAmount);
+ expect(buyQuote.bestCaseQuoteInfo.feeEthAmount).to.bignumber.equal(expectedFeeEthAmount);
+ expect(buyQuote.bestCaseQuoteInfo.totalEthAmount).to.bignumber.equal(expectedTotalEthAmount);
+ expect(buyQuote.bestCaseQuoteInfo.ethPerAssetPrice).to.bignumber.equal(expectedEthPerAssetPrice);
+ // because we have no slippage protection, minRate is equal to maxRate
+ expect(buyQuote.worstCaseQuoteInfo.feeEthAmount).to.bignumber.equal(expectedFeeEthAmount);
+ expect(buyQuote.worstCaseQuoteInfo.totalEthAmount).to.bignumber.equal(expectedTotalEthAmount);
+ expect(buyQuote.worstCaseQuoteInfo.ethPerAssetPrice).to.bignumber.equal(expectedEthPerAssetPrice);
+ // test if feePercentage gets passed through
+ expect(buyQuote.feePercentage).to.equal(feePercentage);
+ });
+ it('calculates a correct buyQuote with with slippage', () => {
+ // we request 200 makerAsset units which can be filled using the first order
+ // however with 50% slippage we are protecting the buy with 100 extra makerAssetUnits
+ // so we need enough orders to fill 300 makerAssetUnits
+ // 300 makerAssetUnits can only be filled using both orders
+ // the first order requires a fee of 100 ZRX from the taker which can be filled by the feeOrder
+ const assetBuyAmount = new BigNumber(200);
+ const feePercentage = 0.02;
+ const slippagePercentage = 0.5;
+ const buyQuote = buyQuoteCalculator.calculate(
+ ordersAndFillableAmounts,
+ allFeeOrdersAndFillableAmounts,
+ assetBuyAmount,
+ feePercentage,
+ slippagePercentage,
+ );
+ // test if orders are correct
+ expect(buyQuote.orders).to.deep.equal(ordersAndFillableAmounts.orders);
+ expect(buyQuote.feeOrders).to.deep.equal(allFeeOrdersAndFillableAmounts.orders);
+ // test if rates are correct
+ // 50 eth to fill the first order + 100 eth for fees
+ const expectedFillEthAmount = new BigNumber(150);
+ const expectedTotalEthAmount = expectedFillEthAmount.mul(feePercentage + 1);
+ const expectedFeeEthAmount = expectedTotalEthAmount.minus(expectedFillEthAmount);
+ const expectedEthPerAssetPrice = expectedFillEthAmount.div(assetBuyAmount);
+ expect(buyQuote.bestCaseQuoteInfo.feeEthAmount).to.bignumber.equal(expectedFeeEthAmount);
+ expect(buyQuote.bestCaseQuoteInfo.totalEthAmount).to.bignumber.equal(expectedTotalEthAmount);
+ expect(buyQuote.bestCaseQuoteInfo.ethPerAssetPrice).to.bignumber.equal(expectedEthPerAssetPrice);
+ // 100 eth to fill the first order + 200 eth for fees
+ const expectedWorstFillEthAmount = new BigNumber(300);
+ const expectedWorstTotalEthAmount = expectedWorstFillEthAmount.mul(feePercentage + 1);
+ const expectedWorstFeeEthAmount = expectedWorstTotalEthAmount.minus(expectedWorstFillEthAmount);
+ const expectedWorstEthPerAssetPrice = expectedWorstFillEthAmount.div(assetBuyAmount);
+ expect(buyQuote.worstCaseQuoteInfo.feeEthAmount).to.bignumber.equal(expectedWorstFeeEthAmount);
+ expect(buyQuote.worstCaseQuoteInfo.totalEthAmount).to.bignumber.equal(expectedWorstTotalEthAmount);
+ expect(buyQuote.worstCaseQuoteInfo.ethPerAssetPrice).to.bignumber.equal(expectedWorstEthPerAssetPrice);
+ // test if feePercentage gets passed through
+ expect(buyQuote.feePercentage).to.equal(feePercentage);
+ });
+ });
+});
diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json
index 92680729f..eca1717d5 100644
--- a/packages/base-contract/CHANGELOG.json
+++ b/packages/base-contract/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "3.0.1",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"version": "3.0.0",
diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md
index 90d7f3bc2..114cac90f 100644
--- a/packages/base-contract/CHANGELOG.md
+++ b/packages/base-contract/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v3.0.1 - _October 2, 2018_
+## v3.0.1 - _October 4, 2018_
* Dependencies updated
@@ -38,7 +38,7 @@ CHANGELOG
* Dependencies updated
-## v2.0.0-rc.1 - _August 14, 2018_
+## v2.0.0-rc.1 - _August 13, 2018_
* Added strict encoding/decoding checks for sendTransaction and call (#915)
@@ -58,7 +58,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Dependencies updated
@@ -74,7 +74,7 @@ CHANGELOG
* Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201
-## v0.3.3 - _June 1, 2018_
+## v0.3.3 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -82,7 +82,7 @@ CHANGELOG
* Dependencies updated
-## v0.3.1 - _May 5, 2018_
+## v0.3.1 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index e95a753e6..7aac46ab9 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/base-contract",
- "version": "3.0.0",
+ "version": "3.0.1",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"copyfiles": "^2.0.0",
@@ -41,10 +41,10 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5"
},
diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json
index 2b42f1654..04488504d 100644
--- a/packages/connect/CHANGELOG.json
+++ b/packages/connect/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "3.0.1",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"version": "3.0.0",
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index 564a91685..16e35a0d5 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v3.0.1 - _October 2, 2018_
+## v3.0.1 - _October 4, 2018_
* Dependencies updated
@@ -42,7 +42,7 @@ CHANGELOG
* Updated for SRA v2 (#974)
* Stopped exporting `Order` type (#924)
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -62,7 +62,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`
@@ -86,7 +86,7 @@ CHANGELOG
* Dependencies updated
-## v0.6.12 - _May 5, 2018_
+## v0.6.12 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/connect/package.json b/packages/connect/package.json
index c8f53d526..e47ca3b79 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
- "version": "3.0.0",
+ "version": "3.0.1",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
"lodash": "^4.17.5",
"query-string": "^5.0.1",
"sinon": "^4.0.0",
@@ -57,7 +57,7 @@
"websocket": "^1.0.25"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/fetch-mock": "^6.0.3",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json
index ffb15c43a..a96cb3a59 100644
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "2.0.2",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md
index 217347d1f..60675ddbe 100644
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v2.0.2 - _October 2, 2018_
+## v2.0.2 - _October 4, 2018_
* Dependencies updated
@@ -51,7 +51,7 @@ CHANGELOG
* Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`, `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs` (#924)
* Added Transaction Encoder for use with 0x Exchange executeTransaction (#975)
-## v1.0.1-rc.3 - _August 14, 2018_
+## v1.0.1-rc.3 - _August 13, 2018_
* Added strict encoding/decoding checks for sendTransaction and call (#915)
* Add ForwarderWrapper (#934)
@@ -69,7 +69,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Update blockstream to v5.0 and propogate up caught errors to active subscriptions (#815)
* Update to v2 of 0x rpotocol (#822)
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index c345d0a6a..e83caad97 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/contract-wrappers",
- "version": "2.0.1",
+ "version": "2.0.2",
"description": "Smart TS wrappers for 0x smart contracts",
"keywords": [
"0xproject",
@@ -42,11 +42,11 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/migrations": "^1.0.13",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/migrations": "^1.0.14",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",
@@ -72,16 +72,16 @@
"web3-provider-engine": "14.0.6"
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/fill-scenarios": "^1.0.6",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/fill-scenarios": "^1.0.7",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"ethereumjs-blockstream": "6.0.0",
"ethereumjs-util": "^5.1.1",
"ethers": "4.0.0-beta.14",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 6d4534eac..081e5f8ee 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "contracts",
- "version": "2.1.48",
+ "version": "2.1.49",
"engines": {
"node": ">=6.12"
},
@@ -46,12 +46,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/sol-compiler": "^1.1.6",
- "@0xproject/sol-cov": "^2.1.6",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/sol-compiler": "^1.1.7",
+ "@0xproject/sol-cov": "^2.1.7",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/bn.js": "^4.11.0",
"@types/ethereumjs-abi": "^0.6.0",
"@types/lodash": "4.14.104",
@@ -73,15 +73,15 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "4.0.0-beta.14",
diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json
index e825c012a..d412d0afe 100644
--- a/packages/dev-utils/CHANGELOG.json
+++ b/packages/dev-utils/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.12",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 4598c8e5b..00301d9c9 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.12 - _October 2, 2018_
+## v1.0.12 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.4 - _August 14, 2018_
+## v1.0.4 - _August 13, 2018_
* Dependencies updated
@@ -53,7 +53,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Dependencies updated
@@ -79,7 +79,7 @@ CHANGELOG
* Pass SolCompilerArtifactAdapter to CoverageSubprovider (#589)
* Move callbackErrorReporter over from 0x.js (#579)
-## v0.4.1 - _May 5, 2018_
+## v0.4.1 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index c0f6107b3..c4298c2d2 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/dev-utils",
- "version": "1.0.11",
+ "version": "1.0.12",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
@@ -43,12 +43,12 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json
index 0552bb184..e955f4d04 100644
--- a/packages/ethereum-types/CHANGELOG.json
+++ b/packages/ethereum-types/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "1.0.11",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "1.0.10",
"changes": [
diff --git a/packages/ethereum-types/CHANGELOG.md b/packages/ethereum-types/CHANGELOG.md
index 0ce074916..6e1965964 100644
--- a/packages/ethereum-types/CHANGELOG.md
+++ b/packages/ethereum-types/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.11 - _October 4, 2018_
+
+ * Dependencies updated
+
## v1.0.10 - _October 2, 2018_
* Dependencies updated
@@ -29,7 +33,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.4 - _August 14, 2018_
+## v1.0.4 - _August 13, 2018_
* Dependencies updated
@@ -45,12 +49,12 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Add `TraceParams` interface for `debug_traceTransaction` parameters (#675)
* Add `TransactionReceiptStatus` type (#812)
* Add Artifact types: `CompilerSettings`, `CompilerOptions`, `OutputField` (#924)
-## v0.0.2 - _June 1, 2018_
+## v0.0.2 - _May 31, 2018_
* Initial publish (#642)
diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json
index d52f39a2d..26dd147ed 100644
--- a/packages/ethereum-types/package.json
+++ b/packages/ethereum-types/package.json
@@ -1,6 +1,6 @@
{
"name": "ethereum-types",
- "version": "1.0.10",
+ "version": "1.0.11",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json
index dca21f447..78a51d265 100644
--- a/packages/fill-scenarios/CHANGELOG.json
+++ b/packages/fill-scenarios/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.7",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md
index 585a31027..bf6fcf13e 100644
--- a/packages/fill-scenarios/CHANGELOG.md
+++ b/packages/fill-scenarios/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.7 - _October 2, 2018_
+## v1.0.7 - _October 4, 2018_
* Dependencies updated
@@ -41,7 +41,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.1-rc.3 - _August 14, 2018_
+## v1.0.1-rc.3 - _August 13, 2018_
* Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface (#936)
* Dependencies updated
@@ -58,7 +58,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Make fill-scenarios compatible with V2 of 0x protocol (#656)
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 54c2f90da..0616454d6 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/fill-scenarios",
- "version": "1.0.6",
+ "version": "1.0.7",
"description": "0x order fill scenario generator",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -27,8 +27,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
@@ -38,13 +38,13 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5"
},
diff --git a/packages/instant/package.json b/packages/instant/package.json
index 365312a70..26c370e4c 100644
--- a/packages/instant/package.json
+++ b/packages/instant/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/instant",
- "version": "0.0.1",
+ "version": "0.0.2",
"engines": {
"node": ">=6.12"
},
@@ -44,17 +44,17 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
"dependencies": {
"@0xproject/connect": "^2.0.4",
- "@0xproject/types": "^1.1.1",
+ "@0xproject/types": "^1.1.4",
"@0xproject/typescript-typings": "^2.0.2",
"@0xproject/utils": "^1.0.11",
- "@0xproject/web3-wrapper": "^3.0.1",
- "ethereum-types": "^1.0.8",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"lodash": "^4.17.10",
"react": "^16.5.2",
"react-dom": "^16.5.2"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/enzyme": "^3.1.14",
"@types/enzyme-adapter-react-16": "^1.0.3",
"@types/lodash": "^4.14.116",
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json
index b9f6b08dd..53d929901 100644
--- a/packages/json-schemas/CHANGELOG.json
+++ b/packages/json-schemas/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "1.0.7",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "1.0.6",
"changes": [
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index 7bfd02c9b..d9813053f 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.7 - _October 4, 2018_
+
+ * Dependencies updated
+
## v1.0.6 - _October 2, 2018_
* Dependencies updated
@@ -37,7 +41,7 @@ CHANGELOG
* Update incorrect relayer api fee recipients response schema (#974)
-## v1.0.1-rc.4 - _August 14, 2018_
+## v1.0.1-rc.4 - _August 13, 2018_
* Allow for additional properties in txData schema (#938)
* Change hexSchema to match `0x` (#937)
@@ -59,7 +63,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Update schemas for V2 or 0x Protocol (#615)
* Added CallData schema (#821)
@@ -85,7 +89,7 @@ CHANGELOG
* Dependencies updated
-## v0.7.23 - _May 5, 2018_
+## v0.7.23 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index dc3e97a86..5f719d7f9 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/json-schemas",
- "version": "1.0.6",
+ "version": "1.0.7",
"engines": {
"node": ">=6.12"
},
@@ -39,14 +39,14 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
"dependencies": {
- "@0xproject/typescript-typings": "^3.0.0",
+ "@0xproject/typescript-typings": "^3.0.2",
"@types/node": "*",
"jsonschema": "^1.2.0",
"lodash.values": "^4.3.0"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
- "@0xproject/utils": "^2.0.0",
+ "@0xproject/tslint-config": "^1.0.8",
+ "@0xproject/utils": "^2.0.2",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index d7c5aadec..83082d964 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/metacoin",
- "version": "0.0.22",
+ "version": "0.0.23",
"engines": {
"node": ">=6.12"
},
@@ -29,25 +29,25 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/sol-cov": "^2.1.6",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/tslint-config": "^1.0.7",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/sol-cov": "^2.1.7",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"@types/mocha": "^5.2.2",
"copyfiles": "^2.0.0",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5",
"run-s": "^0.0.0"
},
"devDependencies": {
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/sol-compiler": "^1.1.6",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/sol-compiler": "^1.1.7",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json
index 772fc6cac..068fdc56f 100644
--- a/packages/migrations/CHANGELOG.json
+++ b/packages/migrations/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.14",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md
index 78b6ae149..81f9fabe3 100644
--- a/packages/migrations/CHANGELOG.md
+++ b/packages/migrations/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.14 - _October 2, 2018_
+## v1.0.14 - _October 4, 2018_
* Dependencies updated
@@ -45,7 +45,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.4 - _August 14, 2018_
+## v1.0.4 - _August 13, 2018_
* Dependencies updated
@@ -61,7 +61,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Added migrations for 0x Protocol v2
@@ -85,7 +85,7 @@ CHANGELOG
* Dependencies updated
-## v0.0.5 - _May 5, 2018_
+## v0.0.5 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 896570cd4..dcae2c562 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/migrations",
- "version": "1.0.13",
+ "version": "1.0.14",
"engines": {
"node": ">=6.12"
},
@@ -31,10 +31,10 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/tslint-config": "^1.0.7",
- "@0xproject/types": "^1.1.2",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/tslint-config": "^1.0.8",
+ "@0xproject/types": "^1.1.4",
"@types/yargs": "^10.0.0",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
@@ -45,15 +45,15 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/sol-compiler": "^1.1.6",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/sol-compiler": "^1.1.7",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"@ledgerhq/hw-app-eth": "^4.3.0",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5"
},
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index ba4c4fead..83091ae84 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/monorepo-scripts",
- "version": "1.0.10",
+ "version": "1.0.11",
"engines": {
"node": ">=6.12"
},
diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index b6c284908..3e841c43c 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.7",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"version": "1.0.6",
diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md
index 747c988a2..24598883a 100644
--- a/packages/order-utils/CHANGELOG.md
+++ b/packages/order-utils/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.7 - _October 2, 2018_
+## v1.0.7 - _October 4, 2018_
* Dependencies updated
@@ -52,7 +52,7 @@ CHANGELOG
* Make `sortFeeOrdersByFeeAdjustedRate` in `sortingUtils` generic (#997)
* Update `findFeeOrdersThatCoverFeesForTargetOrders` to round the the nearest integer when calculating required fees (#997)
-## v1.0.1-rc.3 - _August 14, 2018_
+## v1.0.1-rc.3 - _August 13, 2018_
* Update ecSignOrderHashAsync to return signature string with signature type byte. Removes messagePrefixOpts. (#914)
* Added a synchronous `createOrder` method in `orderFactory`, updated public interfaces to support some optional parameters (#936)
@@ -75,7 +75,7 @@ CHANGELOG
* Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Refactor to work with V2 of 0x protocol (#636)
* Export parseECSignature method (#684)
@@ -101,7 +101,7 @@ CHANGELOG
* Add orderStateUtils, a module for computing order state needed to decide if an order is still valid
-## v0.0.4 - _May 5, 2018_
+## v0.0.4 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 9fefdba5e..23ed9ca12 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-utils",
- "version": "1.0.6",
+ "version": "1.0.7",
"engines": {
"node": ">=6.12"
},
@@ -39,8 +39,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
@@ -58,16 +58,16 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"@types/node": "*",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "4.0.0-beta.14",
diff --git a/packages/order-utils/src/order_factory.ts b/packages/order-utils/src/order_factory.ts
index 46a69ae4d..b1292903a 100644
--- a/packages/order-utils/src/order_factory.ts
+++ b/packages/order-utils/src/order_factory.ts
@@ -8,8 +8,21 @@ import { orderHashUtils } from './order_hash';
import { generatePseudoRandomSalt } from './salt';
import { signatureUtils } from './signature_utils';
import { CreateOrderOpts } from './types';
-
export const orderFactory = {
+ createOrderFromPartial(partialOrder: Partial<Order>): Order {
+ const defaultOrder = generateEmptyOrder();
+ return {
+ ...defaultOrder,
+ ...partialOrder,
+ };
+ },
+ createSignedOrderFromPartial(partialSignedOrder: Partial<SignedOrder>): SignedOrder {
+ const defaultOrder = generateEmptySignedOrder();
+ return {
+ ...defaultOrder,
+ ...partialSignedOrder,
+ };
+ },
createOrder(
makerAddress: string,
makerAssetAmount: BigNumber,
@@ -69,6 +82,30 @@ export const orderFactory = {
},
};
+function generateEmptySignedOrder(): SignedOrder {
+ return {
+ ...generateEmptyOrder(),
+ signature: constants.NULL_BYTES,
+ };
+}
+function generateEmptyOrder(): Order {
+ return {
+ senderAddress: constants.NULL_ADDRESS,
+ makerAddress: constants.NULL_ADDRESS,
+ takerAddress: constants.NULL_ADDRESS,
+ makerFee: constants.ZERO_AMOUNT,
+ takerFee: constants.ZERO_AMOUNT,
+ makerAssetAmount: constants.ZERO_AMOUNT,
+ takerAssetAmount: constants.ZERO_AMOUNT,
+ makerAssetData: constants.NULL_BYTES,
+ takerAssetData: constants.NULL_BYTES,
+ salt: generatePseudoRandomSalt(),
+ exchangeAddress: constants.NULL_ADDRESS,
+ feeRecipientAddress: constants.NULL_ADDRESS,
+ expirationTimeSeconds: constants.INFINITE_TIMESTAMP_SEC,
+ };
+}
+
function generateDefaultCreateOrderOpts(): {
takerAddress: string;
senderAddress: string;
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index f26bf4ca4..ce56e492c 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"version": "2.1.0",
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 7bc74cf2a..5fdf5c944 100644
--- a/packages/order-watcher/CHANGELOG.md
+++ b/packages/order-watcher/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v2.1.1 - _October 2, 2018_
+## v2.1.1 - _October 4, 2018_
* Dependencies updated
@@ -48,7 +48,7 @@ CHANGELOG
* Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload` (#924)
* Remove exporting types: `BlockParamLiteral`, `BlockParam`, `Order` (#924)
-## v1.0.1-rc.3 - _August 14, 2018_
+## v1.0.1-rc.3 - _August 13, 2018_
* Dependencies updated
@@ -64,7 +64,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Add support for ERC721 event watching and Exchange V2 events (#887)
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index de5f7ba09..1b075b8ea 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-watcher",
- "version": "2.1.0",
+ "version": "2.1.1",
"description": "An order watcher daemon that watches for order validity",
"keywords": [
"0x",
@@ -43,10 +43,10 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.12",
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/migrations": "^1.0.13",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/migrations": "^1.0.14",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -69,18 +69,18 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/base-contract": "^3.0.0",
- "@0xproject/contract-wrappers": "^2.0.1",
- "@0xproject/fill-scenarios": "^1.0.6",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/base-contract": "^3.0.1",
+ "@0xproject/contract-wrappers": "^2.0.2",
+ "@0xproject/fill-scenarios": "^1.0.7",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"bintrees": "^1.0.2",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-blockstream": "6.0.0",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5"
diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 3fa89b0bc..ac3f22716 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.13",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 48cd4d654..485bf61a6 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.13 - _October 2, 2018_
+## v1.0.13 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -57,7 +57,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Dependencies updated
@@ -77,7 +77,7 @@ CHANGELOG
* Dependencies updated
-## v0.0.13 - _June 1, 2018_
+## v0.0.13 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -85,7 +85,7 @@ CHANGELOG
* Dependencies updated
-## v0.0.11 - _May 5, 2018_
+## v0.0.11 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 0379e9e2f..1f8b77e2c 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-docs",
- "version": "1.0.12",
+ "version": "1.0.13",
"engines": {
"node": ">=6.12"
},
@@ -24,8 +24,8 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/compare-versions": "^3.0.0",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
@@ -34,9 +34,9 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/react-shared": "^1.0.13",
- "@0xproject/types": "^1.1.2",
- "@0xproject/utils": "^2.0.0",
+ "@0xproject/react-shared": "^1.0.15",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/utils": "^2.0.2",
"@types/lodash": "4.14.104",
"@types/material-ui": "^0.20.0",
"@types/node": "*",
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index 1a01527e3..d1907e785 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "1.0.15",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "1.0.14",
"changes": [
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index e26a2916e..20d3e0bf7 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.15 - _October 4, 2018_
+
+ * Dependencies updated
+
## v1.0.14 - _October 2, 2018_
* Dependencies updated
@@ -37,7 +41,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.6 - _August 14, 2018_
+## v1.0.6 - _August 13, 2018_
* Dependencies updated
@@ -61,7 +65,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Dependencies updated
@@ -77,11 +81,11 @@ CHANGELOG
* Dependencies updated
-## v0.2.0 - _May 5, 2018_
+## v0.2.0 - _May 4, 2018_
* Removed portal specific colors
-## v0.1.6 - _May 5, 2018_
+## v0.1.6 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 490933fb3..005108e92 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-shared",
- "version": "1.0.14",
+ "version": "1.0.15",
"engines": {
"node": ">=6.12"
},
@@ -25,8 +25,8 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/tslint-config": "^1.0.8",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index 836c34e5f..3b19a253a 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.1.7",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md
index 21cfaa879..d436462c9 100644
--- a/packages/sol-compiler/CHANGELOG.md
+++ b/packages/sol-compiler/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.1.7 - _October 2, 2018_
+## v1.1.7 - _October 4, 2018_
* Dependencies updated
@@ -39,7 +39,7 @@ CHANGELOG
* Stop exporting types: `ContractArtifact`, `ContractNetworks` (#924)
* Export types: `CompilerSettings`, `OutputField` (#924)
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -59,7 +59,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Dependencies updated
@@ -85,7 +85,7 @@ CHANGELOG
* Properly export the executable binary (#588)
* Add the ability to define a specific solidity version (#589)
-## v0.4.3 - _May 5, 2018_
+## v0.4.3 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index d7e9653e0..9ee88a5ef 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-compiler",
- "version": "1.1.6",
+ "version": "1.1.7",
"engines": {
"node": ">=6.12"
},
@@ -42,8 +42,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
"devDependencies": {
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/mkdirp": "^0.5.2",
"@types/require-from-string": "^1.2.0",
"@types/semver": "^5.5.0",
@@ -65,16 +65,16 @@
"zeppelin-solidity": "1.8.0"
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/sol-resolver": "^1.0.12",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/sol-resolver": "^1.0.14",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"@types/yargs": "^11.0.0",
"chalk": "^2.3.0",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5",
"mkdirp": "^0.5.1",
diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json
index 334492760..3ced03e80 100644
--- a/packages/sol-cov/CHANGELOG.json
+++ b/packages/sol-cov/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "2.1.7",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/sol-cov/CHANGELOG.md b/packages/sol-cov/CHANGELOG.md
index 5c1e61c1f..c019c9e79 100644
--- a/packages/sol-cov/CHANGELOG.md
+++ b/packages/sol-cov/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v2.1.7 - _October 2, 2018_
+## v2.1.7 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Export types: `JSONRPCRequestPayload`, `Provider`, `JSONRPCErrorCallback`, `JSONRPCResponsePayload`, `JSONRPCRequestPayloadWithMethod`, `NextCallback`, `ErrorCallback`, `OnNextCompleted` and `Callback` (#924)
-## v2.0.0 - _August 14, 2018_
+## v2.0.0 - _August 13, 2018_
* Fix a bug when eth_call coverage was not computed because of silent schema validation failures (#938)
* Make `TruffleArtifactAdapter` read the `truffle.js` config for `solc` settings (#938)
@@ -56,7 +56,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Add artifact adapter as a parameter for `CoverageSubprovider`. Export `AbstractArtifactAdapter` (#589)
* Implement `SolCompilerArtifactAdapter` and `TruffleArtifactAdapter` (#589)
@@ -89,7 +89,7 @@ CHANGELOG
* Dependencies updated
-## v0.1.0 - _June 1, 2018_
+## v0.1.0 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -97,7 +97,7 @@ CHANGELOG
* Dependencies updated
-## v0.0.10 - _May 5, 2018_
+## v0.0.10 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 4711c9770..3c8d2cf73 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-cov",
- "version": "2.1.6",
+ "version": "2.1.7",
"engines": {
"node": ">=6.12"
},
@@ -42,13 +42,13 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
"dependencies": {
- "@0xproject/dev-utils": "^1.0.11",
- "@0xproject/sol-compiler": "^1.1.6",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
- "ethereum-types": "^1.0.9",
+ "@0xproject/dev-utils": "^1.0.12",
+ "@0xproject/sol-compiler": "^1.1.7",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
+ "ethereum-types": "^1.0.11",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
"istanbul": "^0.4.5",
@@ -60,7 +60,7 @@
"solidity-parser-antlr": "^0.2.12"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/istanbul": "^0.4.30",
"@types/loglevel": "^1.5.3",
"@types/mkdirp": "^0.5.1",
diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json
index 9d3f4bcde..c0b094ba0 100644
--- a/packages/sol-doc/CHANGELOG.json
+++ b/packages/sol-doc/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.2",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/sol-doc/CHANGELOG.md b/packages/sol-doc/CHANGELOG.md
index 9f16fb108..437c2e7be 100644
--- a/packages/sol-doc/CHANGELOG.md
+++ b/packages/sol-doc/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.2 - _October 2, 2018_
+## v1.0.2 - _October 4, 2018_
* Dependencies updated
diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json
index 0b0c7c963..b9fe9f56d 100644
--- a/packages/sol-doc/package.json
+++ b/packages/sol-doc/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-doc",
- "version": "1.0.1",
+ "version": "1.0.2",
"description": "Solidity documentation generator",
"main": "lib/src/index.js",
"types": "lib/src/index.d.js",
@@ -25,16 +25,16 @@
"author": "F. Eugene Aumson",
"license": "Apache-2.0",
"dependencies": {
- "@0xproject/sol-compiler": "^1.1.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/utils": "^2.0.0",
- "ethereum-types": "^1.0.9",
+ "@0xproject/sol-compiler": "^1.1.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/utils": "^2.0.2",
+ "ethereum-types": "^1.0.11",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.10",
"yargs": "^12.0.2"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"chai": "^4.1.2",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.2",
diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json
index 6b0df115b..f09870cac 100644
--- a/packages/sol-resolver/CHANGELOG.json
+++ b/packages/sol-resolver/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "1.0.14",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "1.0.13",
"changes": [
diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md
index 22c378c92..ef9033dde 100644
--- a/packages/sol-resolver/CHANGELOG.md
+++ b/packages/sol-resolver/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.14 - _October 4, 2018_
+
+ * Dependencies updated
+
## v1.0.13 - _October 2, 2018_
* Dependencies updated
@@ -37,7 +41,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Fix a bug where RelativeFSResolver would crash when trying to read a directory (#909)
* Fix a bug where NpmResolver would crash when trying to read a directory (#961)
@@ -58,7 +62,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Fix a bug in FsResolver where it tries to read directories as files (#589)
* Fix a bug in NameResolver where it is not ignoring .sol files (#589)
@@ -71,7 +75,7 @@ CHANGELOG
* Dependencies updated
-## v0.0.6 - _June 1, 2018_
+## v0.0.6 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -79,7 +83,7 @@ CHANGELOG
* Dependencies updated
-## v0.0.4 - _May 5, 2018_
+## v0.0.4 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json
index a91abaf42..e708fa1aa 100644
--- a/packages/sol-resolver/package.json
+++ b/packages/sol-resolver/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/sol-resolver",
- "version": "1.0.13",
+ "version": "1.0.14",
"engines": {
"node": ">=6.12"
},
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -31,8 +31,8 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/sra-report/CHANGELOG.json b/packages/sra-report/CHANGELOG.json
index 7b23b1889..c88854b08 100644
--- a/packages/sra-report/CHANGELOG.json
+++ b/packages/sra-report/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.13",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/sra-report/CHANGELOG.md b/packages/sra-report/CHANGELOG.md
index ca2b884bd..803baae5b 100644
--- a/packages/sra-report/CHANGELOG.md
+++ b/packages/sra-report/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.13 - _October 2, 2018_
+## v1.0.13 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -57,7 +57,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Dependencies updated
@@ -89,7 +89,7 @@ CHANGELOG
* Properly export the executable binary (#588)
-## v0.0.14 - _May 5, 2018_
+## v0.0.14 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index 0b6f9896b..a822aa61d 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/sra-report",
- "version": "1.0.12",
+ "version": "1.0.13",
"engines": {
"node": ">=6.12"
},
@@ -34,20 +34,20 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
"dependencies": {
- "@0xproject/assert": "^1.0.12",
+ "@0xproject/assert": "^1.0.13",
"@0xproject/connect": "1.0.4",
"@0xproject/json-schemas": "^0.8.3",
"@0xproject/order-utils": "^0.0.9",
"@0xproject/types": "^0.8.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
"chalk": "^2.3.0",
"lodash": "^4.17.5",
"newman": "^3.9.3",
"yargs": "^10.0.3"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.48",
"@types/newman": "^3.9.0",
diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json
index 0af03193a..7657dd9ee 100644
--- a/packages/sra-spec/CHANGELOG.json
+++ b/packages/sra-spec/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "1.0.6",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/sra-spec/CHANGELOG.md b/packages/sra-spec/CHANGELOG.md
index 67790563e..4d27f20df 100644
--- a/packages/sra-spec/CHANGELOG.md
+++ b/packages/sra-spec/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v1.0.6 - _October 2, 2018_
+## v1.0.6 - _October 4, 2018_
* Dependencies updated
@@ -38,6 +38,6 @@ CHANGELOG
* Add takerAddress to /orders parameters (#974)
-## v1.0.1-rc.4 - _August 14, 2018_
+## v1.0.1-rc.4 - _August 13, 2018_
* Add inital spec for SRA v2 (#916)
diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json
index 5b4bc821e..6b4157699 100644
--- a/packages/sra-spec/package.json
+++ b/packages/sra-spec/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/sra-spec",
- "version": "1.0.5",
+ "version": "1.0.6",
"engines": {
"node": ">=6.12"
},
@@ -35,10 +35,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md",
"dependencies": {
- "@0xproject/json-schemas": "^1.0.5"
+ "@0xproject/json-schemas": "^1.0.7"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@loopback/openapi-v3-types": "^0.8.2",
"@types/mocha": "^2.2.42",
"@types/node": "^10.5.3",
diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index 8ded2d2d4..97f886f64 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "2.0.7",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index ca8f767c7..872948ad7 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v2.0.7 - _October 2, 2018_
+## v2.0.7 - _October 4, 2018_
* Dependencies updated
@@ -37,7 +37,7 @@ CHANGELOG
* Export types: `PartialTxParams`, `JSONRPCRequestPayloadWithMethod`, `ECSignatureString`, `AccountFetchingConfigs`, `LedgerEthereumClientFactoryAsync`, `OnNextCompleted`, `MnemonicWalletSubproviderConfigs`, LedgerGetAddressResult, `JSONRPCRequestPayload`, `Provider`, `JSONRPCResponsePayload` and `JSONRPCErrorCallback` (#924)
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -57,7 +57,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Add `RpcSubprovider` with timeout (#874)
* Add `EthLightwalletSubprovider` (#775)
@@ -78,7 +78,7 @@ CHANGELOG
* Dependencies updated
-## v0.10.1 - _May 5, 2018_
+## v0.10.1 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 491f079d2..fad478349 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/subproviders",
- "version": "2.0.6",
+ "version": "2.0.7",
"engines": {
"node": ">=6.12"
},
@@ -29,11 +29,11 @@
}
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
"@types/eth-lightwallet": "^3.0.0",
@@ -42,7 +42,7 @@
"bip39": "^2.5.0",
"bn.js": "^4.11.8",
"eth-lightwallet": "^3.0.1",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-tx": "^1.3.5",
"ethereumjs-util": "^5.1.1",
"ganache-core": "0xProject/ganache-core#monorepo-dep",
@@ -53,7 +53,7 @@
"web3-provider-engine": "14.0.6"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/bip39": "^2.4.0",
"@types/bn.js": "^4.11.0",
"@types/ethereumjs-tx": "^1.0.0",
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 8213f896f..a113889cc 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/testnet-faucets",
- "version": "1.0.50",
+ "version": "1.0.51",
"engines": {
"node": ">=6.12"
},
@@ -18,13 +18,13 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^1.0.7",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "0x.js": "^1.0.8",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"body-parser": "^1.17.1",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-tx": "^1.3.5",
"ethereumjs-util": "^5.1.1",
"express": "^4.15.2",
@@ -32,7 +32,7 @@
"rollbar": "^0.6.5"
},
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "4.14.104",
diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 69b9c603c..2a9b22922 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "1.0.8",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1536142250,
"version": "1.0.7",
"changes": [
diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md
index 78e05d3cb..0486cb523 100644
--- a/packages/tslint-config/CHANGELOG.md
+++ b/packages/tslint-config/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.8 - _October 4, 2018_
+
+ * Dependencies updated
+
## v1.0.7 - _September 5, 2018_
* Dependencies updated
@@ -13,7 +17,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Dependencies updated
@@ -33,7 +37,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Added a bunch of rules (#883)
@@ -45,7 +49,7 @@ CHANGELOG
* Dependencies updated
-## v0.4.19 - _June 1, 2018_
+## v0.4.19 - _May 31, 2018_
* Incorrect publish that was unpublished
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 91596d32a..0c85c98ab 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/tslint-config",
- "version": "1.0.7",
+ "version": "1.0.8",
"engines": {
"node": ">=6.12"
},
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json
index abf62c19d..6bb6ced70 100644
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "1.1.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "1.1.3",
"changes": [
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index a207a2c0c..aeb056903 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.1.4 - _October 4, 2018_
+
+ * Dependencies updated
+
## v1.1.3 - _October 2, 2018_
* Dependencies updated
@@ -40,7 +44,7 @@ CHANGELOG
* Add revert reasons for ERC721Token (#933)
-## v1.0.1-rc.4 - _August 14, 2018_
+## v1.0.1-rc.4 - _August 13, 2018_
* Added SignerType to handle different signing prefix scenarios (#914)
@@ -60,7 +64,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
* Updated types for V2 of 0x protocol
* Add `ECSignatureBuffer`
@@ -83,7 +87,7 @@ CHANGELOG
* Make OpCode type an enum (#589)
* Moved ExchangeContractErrs, DoneCallback, Token, OrderRelevantState, OrderStateValid, OrderStateInvalid, OrderState, OrderAddresses and OrderValues types from 0x.js (#579)
-## v0.6.3 - _May 5, 2018_
+## v0.6.3 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/types/package.json b/packages/types/package.json
index 2901b067c..9710ff8eb 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/types",
- "version": "1.1.3",
+ "version": "1.1.4",
"engines": {
"node": ">=6.12"
},
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -33,7 +33,7 @@
"dependencies": {
"@types/node": "*",
"bignumber.js": "~4.1.0",
- "ethereum-types": "^1.0.9"
+ "ethereum-types": "^1.0.11"
},
"publishConfig": {
"access": "public"
diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json
index c3ee81bde..4a85fd592 100644
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "3.0.2",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "3.0.1",
"changes": [
diff --git a/packages/typescript-typings/CHANGELOG.md b/packages/typescript-typings/CHANGELOG.md
index ea9e4d441..71ab1113b 100644
--- a/packages/typescript-typings/CHANGELOG.md
+++ b/packages/typescript-typings/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v3.0.2 - _October 4, 2018_
+
+ * Dependencies updated
+
## v3.0.1 - _October 2, 2018_
* Dependencies updated
@@ -29,7 +33,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.4 - _August 14, 2018_
+## v1.0.4 - _August 13, 2018_
* Dependencies updated
@@ -45,7 +49,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Add types for `eth-lightwallet` (#775)
* Improve 'web3-provider-engine' typings (#768)
@@ -70,7 +74,7 @@ CHANGELOG
* Dependencies updated
-## v0.3.1 - _May 5, 2018_
+## v0.3.1 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json
index 07ac730ff..2491362ef 100644
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/typescript-typings",
- "version": "3.0.1",
+ "version": "3.0.2",
"engines": {
"node": ">=6.12"
},
@@ -27,7 +27,7 @@
"@types/bn.js": "^4.11.0",
"@types/react": "*",
"bignumber.js": "~4.1.0",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"popper.js": "1.14.3"
},
"devDependencies": {
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json
index b666ee829..237ebeecc 100644
--- a/packages/utils/CHANGELOG.json
+++ b/packages/utils/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1538693146,
+ "version": "2.0.2",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1538475601,
"version": "2.0.1",
"changes": [
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index c62e414f8..fa731ecf0 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v2.0.2 - _October 4, 2018_
+
+ * Dependencies updated
+
## v2.0.1 - _October 2, 2018_
* Dependencies updated
@@ -37,7 +41,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.5 - _August 14, 2018_
+## v1.0.5 - _August 13, 2018_
* Increased BigNumber decimal precision from 20 to 78 (#807)
* Store different ABIs for events with same function signature and different amount of indexed arguments (#933)
@@ -58,7 +62,7 @@ CHANGELOG
* Add `AbortController` polyfill to `fetchAsync` (#903)
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Add `fetchAsync` which adds a default timeout to all requests (#874)
@@ -76,7 +80,7 @@ CHANGELOG
* Dependencies updated
-## v0.7.0 - _June 1, 2018_
+## v0.7.0 - _May 31, 2018_
* Incorrect publish that was unpublished
@@ -84,7 +88,7 @@ CHANGELOG
* Dependencies updated
-## v0.6.1 - _May 5, 2018_
+## v0.6.1 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/utils/package.json b/packages/utils/package.json
index d2ed67554..f1017f84d 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/utils",
- "version": "2.0.1",
+ "version": "2.0.2",
"engines": {
"node": ">=6.12"
},
@@ -28,7 +28,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/detect-node": "2.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -42,13 +42,13 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
"@types/node": "*",
"abortcontroller-polyfill": "^1.1.9",
"bignumber.js": "~4.1.0",
"detect-node": "2.0.3",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-util": "^5.1.1",
"ethers": "4.0.0-beta.14",
"isomorphic-fetch": "^2.2.1",
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index 7261dd474..47f054300 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,12 +1,12 @@
[
{
- "timestamp": 1538475601,
"version": "3.0.3",
"changes": [
{
"note": "Dependencies updated"
}
- ]
+ ],
+ "timestamp": 1538693146
},
{
"timestamp": 1538157789,
diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md
index 05e6a998b..8f1dc0f3f 100644
--- a/packages/web3-wrapper/CHANGELOG.md
+++ b/packages/web3-wrapper/CHANGELOG.md
@@ -5,7 +5,7 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
-## v3.0.3 - _October 2, 2018_
+## v3.0.3 - _October 4, 2018_
* Dependencies updated
@@ -40,7 +40,7 @@ CHANGELOG
* Stop exporting types: `CallTxDataBaseRPC` and `AbstractBlockRPC` (#924)
* Export `AbiDecoder` class (#924)
-## v1.2.0 - _August 14, 2018_
+## v1.2.0 - _August 13, 2018_
* Export marshaller to convert between RPC and user-space data formats (#938)
* Export RPC types (#938)
@@ -61,7 +61,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
* Stop exporting `marshaller` utility file. (#902)
* Export `marshaller` utility file. (#829)
@@ -80,7 +80,7 @@ CHANGELOG
* Dependencies updated
-## v0.7.0 - _June 4, 2018_
+## v0.7.0 - _June 3, 2018_
* Add `web3Wrapper.getContractCodeAsync` (#675)
* Add `web3Wrapper.getTransactionTraceAsync` (#675)
@@ -95,7 +95,7 @@ CHANGELOG
* Dependencies updated
-## v0.6.3 - _May 5, 2018_
+## v0.6.3 - _May 4, 2018_
* Dependencies updated
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 5b5c0ec5b..ef31a68dc 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/web3-wrapper",
- "version": "3.0.2",
+ "version": "3.0.3",
"engines": {
"node": ">=6.12"
},
@@ -35,7 +35,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^1.0.7",
+ "@0xproject/tslint-config": "^1.0.8",
"@types/ganache-core": "^2.1.0",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
@@ -54,11 +54,11 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/assert": "^1.0.12",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "ethereum-types": "^1.0.9",
+ "@0xproject/assert": "^1.0.13",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "ethereum-types": "^1.0.11",
"ethereumjs-util": "^5.1.1",
"ethers": "4.0.0-beta.14",
"lodash": "^4.17.5"
diff --git a/packages/website/md/docs/json_schemas/1.0.0/introduction.md b/packages/website/md/docs/json_schemas/1.0.0/introduction.md
index a27f4b521..5b2e90387 100644
--- a/packages/website/md/docs/json_schemas/1.0.0/introduction.md
+++ b/packages/website/md/docs/json_schemas/1.0.0/introduction.md
@@ -1,3 +1,3 @@
Welcome to the [@0xproject/json-schemas](https://github.com/0xProject/0x-monorepo/tree/development/packages/json-schemas) documentation! This package provides JSON schemas for validating 0x Protocol & Standard Relayer API data structures. It provides both the raw JSON schemas and a schema validator class to interact with them from a JS project.
-If you are not using a Javascript-based language for your project, you can copy-paste the JSON schemas within this package and use them together with a [JSON Schema](http://json-schema.org/) implementation in your [language of choice](http://json-schema.org/implementations.html) (e.g Python, Haskell, Go, C, C++, Rust, Ruby, Scala, etc...).
+If you are not using a Javascript-based language for your project, you can use a Javascript environment to render the JSON schemas within this package and use them together with a [JSON Schema](http://json-schema.org/) implementation in your [language of choice](http://json-schema.org/implementations.html) (e.g Python, Haskell, Go, C, C++, Rust, Ruby, Scala, etc...). All the schema files are currently TypeScript that require evaluation in order to be recognized as valid JSON.
diff --git a/packages/website/package.json b/packages/website/package.json
index 3073eca72..aabb6b28e 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.53",
+ "version": "0.0.54",
"engines": {
"node": ">=6.12"
},
@@ -20,22 +20,22 @@
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.38.6",
- "@0xproject/contract-wrappers": "^2.0.1",
- "@0xproject/json-schemas": "^1.0.5",
- "@0xproject/order-utils": "^1.0.6",
- "@0xproject/react-docs": "^1.0.12",
- "@0xproject/react-shared": "^1.0.13",
- "@0xproject/subproviders": "^2.0.6",
- "@0xproject/types": "^1.1.2",
- "@0xproject/typescript-typings": "^3.0.0",
- "@0xproject/utils": "^2.0.0",
- "@0xproject/web3-wrapper": "^3.0.2",
+ "@0xproject/contract-wrappers": "^2.0.2",
+ "@0xproject/json-schemas": "^1.0.7",
+ "@0xproject/order-utils": "^1.0.7",
+ "@0xproject/react-docs": "^1.0.13",
+ "@0xproject/react-shared": "^1.0.15",
+ "@0xproject/subproviders": "^2.0.7",
+ "@0xproject/types": "^1.1.4",
+ "@0xproject/typescript-typings": "^3.0.2",
+ "@0xproject/utils": "^2.0.2",
+ "@0xproject/web3-wrapper": "^3.0.3",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
"bowser": "^1.9.3",
"deep-equal": "^1.0.1",
- "ethereum-types": "^1.0.9",
+ "ethereum-types": "^1.0.11",
"ethereumjs-util": "^5.1.1",
"find-versions": "^2.0.0",
"jsonschema": "^1.2.0",