Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Commit

Permalink
merge development
Browse files Browse the repository at this point in the history
  • Loading branch information
fabioberger committed Sep 25, 2018
2 parents fc3acec + 78ef98c commit 977d55c
Show file tree
Hide file tree
Showing 134 changed files with 2,004 additions and 903 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
test-contracts-geth:
docker:
- image: circleci/node:9
- image: albrow/0x-devnet
- image: 0xorg/devnet
working_directory: ~/repo
steps:
- restore_cache:
Expand All @@ -64,7 +64,7 @@ jobs:
resource_class: medium+
docker:
- image: circleci/node:9
- image: verdaccio/verdaccio
- image: 0xorg/verdaccio
working_directory: ~/repo
steps:
- restore_cache:
Expand Down
9 changes: 9 additions & 0 deletions packages/0x.js/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"timestamp": 1537875740,
"version": "1.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1537541580,
"version": "1.0.4",
Expand Down
4 changes: 4 additions & 0 deletions packages/0x.js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

CHANGELOG

## v1.0.5 - _September 25, 2018_

* Dependencies updated

## v1.0.4 - _September 21, 2018_

* Dependencies updated
Expand Down
26 changes: 13 additions & 13 deletions packages/0x.js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "1.0.4",
"version": "1.0.5",
"engines": {
"node": ">=6.12"
},
Expand Down Expand Up @@ -41,9 +41,9 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0xproject/abi-gen": "^1.0.9",
"@0xproject/dev-utils": "^1.0.8",
"@0xproject/migrations": "^1.0.10",
"@0xproject/abi-gen": "^1.0.10",
"@0xproject/dev-utils": "^1.0.9",
"@0xproject/migrations": "^1.0.11",
"@0xproject/monorepo-scripts": "^1.0.9",
"@0xproject/tslint-config": "^1.0.7",
"@types/lodash": "4.14.104",
Expand Down Expand Up @@ -73,16 +73,16 @@
"webpack": "^3.1.0"
},
"dependencies": {
"@0xproject/assert": "^1.0.9",
"@0xproject/base-contract": "^2.0.3",
"@0xproject/contract-wrappers": "^1.0.4",
"@0xproject/order-utils": "^1.0.3",
"@0xproject/order-watcher": "^1.0.4",
"@0xproject/subproviders": "^2.0.3",
"@0xproject/types": "^1.0.2",
"@0xproject/assert": "^1.0.10",
"@0xproject/base-contract": "^2.0.4",
"@0xproject/contract-wrappers": "^1.0.5",
"@0xproject/order-utils": "^1.0.4",
"@0xproject/order-watcher": "^1.0.5",
"@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.7",
"ethers": "3.0.22",
"lodash": "^4.17.5",
Expand Down
9 changes: 9 additions & 0 deletions packages/abi-gen/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"timestamp": 1537875740,
"version": "1.0.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1537541580,
"version": "1.0.9",
Expand Down
4 changes: 4 additions & 0 deletions packages/abi-gen/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

CHANGELOG

## v1.0.10 - _September 25, 2018_

* Dependencies updated

## v1.0.9 - _September 21, 2018_

* Dependencies updated
Expand Down
4 changes: 2 additions & 2 deletions packages/abi-gen/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xproject/abi-gen",
"version": "1.0.9",
"version": "1.0.10",
"engines": {
"node": ">=6.12"
},
Expand Down Expand Up @@ -31,7 +31,7 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
"@0xproject/typescript-typings": "^2.0.1",
"@0xproject/utils": "^1.0.9",
"@0xproject/utils": "^1.0.10",
"chalk": "^2.3.0",
"ethereum-types": "^1.0.7",
"glob": "^7.1.2",
Expand Down
9 changes: 9 additions & 0 deletions packages/assert/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"timestamp": 1537875740,
"version": "1.0.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1537541580,
"version": "1.0.9",
Expand Down
4 changes: 4 additions & 0 deletions packages/assert/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

CHANGELOG

## v1.0.10 - _September 25, 2018_

* Dependencies updated

## v1.0.9 - _September 21, 2018_

* Dependencies updated
Expand Down
6 changes: 3 additions & 3 deletions packages/assert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xproject/assert",
"version": "1.0.9",
"version": "1.0.10",
"engines": {
"node": ">=6.12"
},
Expand Down Expand Up @@ -44,9 +44,9 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0xproject/json-schemas": "^1.0.2",
"@0xproject/json-schemas": "^1.0.3",
"@0xproject/typescript-typings": "^2.0.1",
"@0xproject/utils": "^1.0.9",
"@0xproject/utils": "^1.0.10",
"lodash": "^4.17.5",
"valid-url": "^1.0.9"
},
Expand Down
File renamed without changes.
19 changes: 19 additions & 0 deletions packages/asset-buyer/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"timestamp": 1537875740,
"version": "1.0.0",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "1.0.0-rc.1",
"changes": [
{
"note": "Init"
}
]
}
]
14 changes: 14 additions & 0 deletions packages/asset-buyer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +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
83 changes: 83 additions & 0 deletions packages/asset-buyer/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
## @0xproject/asset-buyer

Convenience package for buying assets represented on the Ethereum blockchain using 0x. In its simplest form, the package helps in the usage of the [0x forwarder contract](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md), which allows users to execute [Wrapped Ether](https://weth.io/) based 0x orders without having to set allowances, wrap Ether or buy ZRX, meaning they can buy tokens with Ether alone. Given some liquidity (0x signed orders), it helps estimate the Ether cost of buying a certain asset (giving a range) and then buying that asset.

In its more advanced and useful form, it integrates with the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api) and takes care of sourcing liquidity for you given an SRA compliant endpoint. The final result is a library that tells you what assets are available, provides an Ether based quote for any asset desired, and allows you to buy that asset using Ether alone.

## Installation

```bash
yarn add @0xproject/asset-buyer
```

**Import**

```typescript
import { AssetBuyer } from '@0xproject/asset-buyer';
```

or

```javascript
var AssetBuyer = require('@0xproject/asset-buyer').AssetBuyer;
```

If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:

```json
"compilerOptions": {
"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
}
```

## Contributing

We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.

Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.

### Install dependencies

If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:

```bash
yarn config set workspaces-experimental true
```

Then install dependencies

```bash
yarn install
```

### Build

To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:

```bash
PKG=@0xproject/asset-buyer yarn build
```

Or continuously rebuild on change:

```bash
PKG=@0xproject/asset-buyer yarn watch
```

### Clean

```bash
yarn clean
```

### Lint

```bash
yarn lint
```

### Run Tests

```bash
yarn test
```
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@0xproject/forwarder-helper",
"version": "1.0.4",
"name": "@0xproject/asset-buyer",
"version": "1.0.0",
"engines": {
"node": ">=6.12"
},
"description": "Convenience object for working with the forwarder contract",
"description": "Convenience package for buying assets",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
Expand Down Expand Up @@ -34,21 +34,26 @@
"bugs": {
"url": "https://github.com/0xProject/0x-monorepo/issues"
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/forwarder-helper/README.md",
"homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
"dependencies": {
"@0xproject/assert": "^1.0.9",
"@0xproject/json-schemas": "^1.0.2",
"@0xproject/order-utils": "^1.0.3",
"@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",
"@types/node": "*",
"@0xproject/utils": "^1.0.10",
"@0xproject/web3-wrapper": "^3.0.0",
"ethereum-types": "^1.0.6",
"lodash": "^4.17.10"
},
"devDependencies": {
"@0xproject/tslint-config": "^1.0.7",
"@types/lodash": "^4.14.116",
"@types/mocha": "^2.2.42",
"@types/node": "*",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
Expand Down
Loading

0 comments on commit 977d55c

Please sign in to comment.