diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-09-25 20:06:07 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-09-25 20:06:07 +0800 |
commit | ebe731ea86944725d928669c5ce329f1e7a8ef96 (patch) | |
tree | 4621b9c2a92936d317c7ffd727aecb582dfce285 /packages/asset-buyer | |
parent | b853f04972d797431a5e3f40155fc77c17f913c6 (diff) | |
parent | 78ef98c27ce954f7e46b261b0809ff9d8d70519b (diff) | |
download | dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.tar dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.tar.gz dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.tar.bz2 dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.tar.lz dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.tar.xz dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.tar.zst dexon-0x-contracts-ebe731ea86944725d928669c5ce329f1e7a8ef96.zip |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/asset-buyer/improve-asset-buyer-manager
Diffstat (limited to 'packages/asset-buyer')
-rw-r--r-- | packages/asset-buyer/CHANGELOG.json | 9 | ||||
-rw-r--r-- | packages/asset-buyer/CHANGELOG.md | 13 | ||||
-rw-r--r-- | packages/asset-buyer/package.json | 20 | ||||
-rw-r--r-- | packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts | 3 |
4 files changed, 34 insertions, 11 deletions
diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index 2e4db1f6e..50b965f2d 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "timestamp": 1537875740, + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md index 8b1378917..b27795d18 100644 --- a/packages/asset-buyer/CHANGELOG.md +++ b/packages/asset-buyer/CHANGELOG.md @@ -1 +1,14 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> +CHANGELOG + +## v1.0.0 - _September 25, 2018_ + + * Dependencies updated + +## v1.0.0-rc.1 - _Invalid date_ + + * Init diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index b75f09cd3..20f095f61 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/asset-buyer", - "version": "1.0.0-rc.1", + "version": "1.0.0", "engines": { "node": ">=6.12" }, @@ -36,16 +36,16 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md", "dependencies": { - "@0xproject/assert": "^1.0.9", - "@0xproject/connect": "^2.0.2", - "@0xproject/contract-wrappers": "^1.0.4", - "@0xproject/json-schemas": "^1.0.2", - "@0xproject/order-utils": "^1.0.1", - "@0xproject/subproviders": "^2.0.2", - "@0xproject/types": "^1.0.2", + "@0xproject/assert": "^1.0.10", + "@0xproject/connect": "^2.0.3", + "@0xproject/contract-wrappers": "^1.0.5", + "@0xproject/json-schemas": "^1.0.3", + "@0xproject/order-utils": "^1.0.4", + "@0xproject/subproviders": "^2.0.4", + "@0xproject/types": "^1.1.0", "@0xproject/typescript-typings": "^2.0.1", - "@0xproject/utils": "^1.0.9", - "@0xproject/web3-wrapper": "^2.0.3", + "@0xproject/utils": "^1.0.10", + "@0xproject/web3-wrapper": "^3.0.0", "ethereum-types": "^1.0.6", "lodash": "^4.17.10" }, diff --git a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts b/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts index be3e9da50..31942c25b 100644 --- a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts +++ b/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts @@ -1,4 +1,5 @@ -import { APIOrder, HttpClient, OrderbookResponse } from '@0xproject/connect'; +import { HttpClient } from '@0xproject/connect'; +import { APIOrder, OrderbookResponse } from '@0xproject/types'; import * as _ from 'lodash'; import { |