From cf46d2c7049461e25441239e71f486bfbd2a986a Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 13 Sep 2018 13:51:09 +0200 Subject: 0xjs README/website docs update --- packages/0x.js/README.md | 11 ++++++-- packages/website/md/docs/0xjs/0.0.1/async.md | 26 ++++++++++++++++++ packages/website/md/docs/0xjs/0.0.1/errors.md | 1 + .../website/md/docs/0xjs/0.0.1/installation.md | 31 ++++++++++++++++++++++ .../website/md/docs/0xjs/0.0.1/introduction.md | 1 + packages/website/md/docs/0xjs/0.0.1/versioning.md | 1 + packages/website/md/docs/0xjs/1.0.0/async.md | 17 +++++++----- packages/website/md/docs/0xjs/1.0.0/errors.md | 1 - .../website/md/docs/0xjs/1.0.0/installation.md | 13 +++++++-- .../website/md/docs/0xjs/1.0.0/introduction.md | 4 ++- packages/website/md/docs/0xjs/1.0.0/versioning.md | 2 +- .../website/md/docs/0xjs/2.0.0/introduction.md | 3 --- packages/website/md/docs/0xjs/2.0.0/versioning.md | 1 - .../ts/containers/zero_ex_js_documentation.ts | 31 ++++++++++++---------- 14 files changed, 112 insertions(+), 31 deletions(-) create mode 100644 packages/website/md/docs/0xjs/0.0.1/async.md create mode 100644 packages/website/md/docs/0xjs/0.0.1/errors.md create mode 100644 packages/website/md/docs/0xjs/0.0.1/installation.md create mode 100644 packages/website/md/docs/0xjs/0.0.1/introduction.md create mode 100644 packages/website/md/docs/0xjs/0.0.1/versioning.md delete mode 100644 packages/website/md/docs/0xjs/1.0.0/errors.md delete mode 100644 packages/website/md/docs/0xjs/2.0.0/introduction.md delete mode 100644 packages/website/md/docs/0xjs/2.0.0/versioning.md diff --git a/packages/0x.js/README.md b/packages/0x.js/README.md index fd6217151..329037324 100644 --- a/packages/0x.js/README.md +++ b/packages/0x.js/README.md @@ -1,6 +1,6 @@ ## 0x.js -A TypeScript/Javascript library for interacting with the 0x protocol. +A TypeScript/Javascript library for interacting with the 0x protocol. It is a high level package which combines a number of underlying packages such as order-utils and order-watcher. ### Read the [Documentation](https://0xproject.com/docs/0x.js). @@ -19,7 +19,14 @@ npm install 0x.js --save **Import** ```javascript -import { ZeroEx } from '0x.js'; +import { + assetDataUtils, + BigNumber, + ContractWrappers, + generatePseudoRandomSalt, + orderHashUtils, + signatureUtils, +} from '0x.js'; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: diff --git a/packages/website/md/docs/0xjs/0.0.1/async.md b/packages/website/md/docs/0xjs/0.0.1/async.md new file mode 100644 index 000000000..8abaef331 --- /dev/null +++ b/packages/website/md/docs/0xjs/0.0.1/async.md @@ -0,0 +1,26 @@ +0x.js is a promise-based library. This means that whenever an asynchronous call is required, the library method will return a native Javascript promise. You can therefore choose between using `promise` or `async/await` syntax when calling our async methods. + +_Async/await syntax (recommended):_ + +```javascript +try { + var availableAddresses = await zeroEx.getAvailableAddressesAsync(); +} catch (error) { + console.log('Caught error: ', error); +} +``` + +_Promise syntax:_ + +```javascript +zeroEx + .getAvailableAddressesAsync() + .then(function(availableAddresses) { + console.log(availableAddresses); + }) + .catch(function(error) { + console.log('Caught error: ', error); + }); +``` + +As is the convention with promise-based libraries, if an error occurs, it is thrown. It is the callers responsibility to catch thrown errors and to handle them appropriately. diff --git a/packages/website/md/docs/0xjs/0.0.1/errors.md b/packages/website/md/docs/0xjs/0.0.1/errors.md new file mode 100644 index 000000000..e97973ccf --- /dev/null +++ b/packages/website/md/docs/0xjs/0.0.1/errors.md @@ -0,0 +1 @@ +All error messages thrown by the 0x.js library are part of a documented string enum. Each error message is in all-caps, snake-case format. This makes the error messages easily identifiable, unique and grep-able. The error enums listing all possible errors the library could throw can be found in the `Types` section. diff --git a/packages/website/md/docs/0xjs/0.0.1/installation.md b/packages/website/md/docs/0xjs/0.0.1/installation.md new file mode 100644 index 000000000..ac0a47699 --- /dev/null +++ b/packages/website/md/docs/0xjs/0.0.1/installation.md @@ -0,0 +1,31 @@ +0x.js ships as both a [UMD](https://github.com/umdjs/umd) module and a [CommonJS](https://en.wikipedia.org/wiki/CommonJS) package. + +#### CommonJS _(recommended)_: + +**Install** + +```bash +npm install 0x.js --save +``` + +**Import** + +```javascript +import { ZeroEx } from '0x.js'; +``` + +#### UMD: + +**Install** + +Download the UMD module from our [releases page](https://github.com/0xProject/0x-monorepo/releases) and add it to your project. + +**Import** + +```html + +``` + +### Wiki + +Check out our [wiki](https://0xproject.com/wiki) for articles on how to get 0x.js setup with TestRPC, Infura and more! diff --git a/packages/website/md/docs/0xjs/0.0.1/introduction.md b/packages/website/md/docs/0xjs/0.0.1/introduction.md new file mode 100644 index 000000000..008376d33 --- /dev/null +++ b/packages/website/md/docs/0xjs/0.0.1/introduction.md @@ -0,0 +1 @@ +Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any ERC20 token. Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20 token balance/allowance and much more. diff --git a/packages/website/md/docs/0xjs/0.0.1/versioning.md b/packages/website/md/docs/0xjs/0.0.1/versioning.md new file mode 100644 index 000000000..6bcaa5b4d --- /dev/null +++ b/packages/website/md/docs/0xjs/0.0.1/versioning.md @@ -0,0 +1 @@ +This project adheres to the [Semantic Versioning 2.0.0](http://semver.org/) specification. The library's public interface includes all the methods, properties and types included in the documentation. Since the library is still an alpha, it's public interface is not yet stable and we will introduce backward incompatible changes to the interface without incrementing the major version until the `1.0.0` release. Our convention until then will be to increment the minor version whenever we introduce backward incompatible changes to the public interface, and to increment the patch version otherwise. This way, it is safe for you to include 0x.js in your projects with the tilda (e.g `~0.22.0`) without fear that a patch update would break your app. diff --git a/packages/website/md/docs/0xjs/1.0.0/async.md b/packages/website/md/docs/0xjs/1.0.0/async.md index 8abaef331..2909e47e0 100644 --- a/packages/website/md/docs/0xjs/1.0.0/async.md +++ b/packages/website/md/docs/0xjs/1.0.0/async.md @@ -1,10 +1,15 @@ -0x.js is a promise-based library. This means that whenever an asynchronous call is required, the library method will return a native Javascript promise. You can therefore choose between using `promise` or `async/await` syntax when calling our async methods. +0x packages are promise-based libraries. This means that whenever an asynchronous call is required, the library method will return a native Javascript promise. You can therefore choose between using `promise` or `async/await` syntax when calling our async methods. _Async/await syntax (recommended):_ ```javascript try { - var availableAddresses = await zeroEx.getAvailableAddressesAsync(); + const signature = await signatureUtils.ecSignOrderHashAsync( + providerEngine, + orderHashHex, + maker, + SignerType.Default, + ); } catch (error) { console.log('Caught error: ', error); } @@ -13,10 +18,10 @@ try { _Promise syntax:_ ```javascript -zeroEx - .getAvailableAddressesAsync() - .then(function(availableAddresses) { - console.log(availableAddresses); +signature = signatureUtils + .ecSignOrderHashAsync(providerEngine, orderHashHex, maker, SignerType.Default) + .then(function(signature) { + console.log(signature); }) .catch(function(error) { console.log('Caught error: ', error); diff --git a/packages/website/md/docs/0xjs/1.0.0/errors.md b/packages/website/md/docs/0xjs/1.0.0/errors.md deleted file mode 100644 index e97973ccf..000000000 --- a/packages/website/md/docs/0xjs/1.0.0/errors.md +++ /dev/null @@ -1 +0,0 @@ -All error messages thrown by the 0x.js library are part of a documented string enum. Each error message is in all-caps, snake-case format. This makes the error messages easily identifiable, unique and grep-able. The error enums listing all possible errors the library could throw can be found in the `Types` section. diff --git a/packages/website/md/docs/0xjs/1.0.0/installation.md b/packages/website/md/docs/0xjs/1.0.0/installation.md index ac0a47699..74c902afd 100644 --- a/packages/website/md/docs/0xjs/1.0.0/installation.md +++ b/packages/website/md/docs/0xjs/1.0.0/installation.md @@ -11,7 +11,16 @@ npm install 0x.js --save **Import** ```javascript -import { ZeroEx } from '0x.js'; +import { + assetDataUtils, + BigNumber, + ContractWrappers, + generatePseudoRandomSalt, + Order, + orderHashUtils, + signatureUtils, + SignerType, +} from '0x.js'; ``` #### UMD: @@ -28,4 +37,4 @@ Download the UMD module from our [releases page](https://github.com/0xProject/0x ### Wiki -Check out our [wiki](https://0xproject.com/wiki) for articles on how to get 0x.js setup with TestRPC, Infura and more! +Check out our [wiki](https://0xproject.com/wiki) for articles on how to get 0x.js setup with Ganache, Infura and more! diff --git a/packages/website/md/docs/0xjs/1.0.0/introduction.md b/packages/website/md/docs/0xjs/1.0.0/introduction.md index 008376d33..d228c6855 100644 --- a/packages/website/md/docs/0xjs/1.0.0/introduction.md +++ b/packages/website/md/docs/0xjs/1.0.0/introduction.md @@ -1 +1,3 @@ -Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any ERC20 token. Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20 token balance/allowance and much more. +**NOTE:** Release candidate versions are meant to work with V2 of 0x protocol. To interact with V1, select a 0.X version. + +Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any token adhering to the token standards supported by the protocol (currently ERC20 & ERC721). Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20/ERC721 token balance/allowance and much more. diff --git a/packages/website/md/docs/0xjs/1.0.0/versioning.md b/packages/website/md/docs/0xjs/1.0.0/versioning.md index 6bcaa5b4d..6bae835d3 100644 --- a/packages/website/md/docs/0xjs/1.0.0/versioning.md +++ b/packages/website/md/docs/0xjs/1.0.0/versioning.md @@ -1 +1 @@ -This project adheres to the [Semantic Versioning 2.0.0](http://semver.org/) specification. The library's public interface includes all the methods, properties and types included in the documentation. Since the library is still an alpha, it's public interface is not yet stable and we will introduce backward incompatible changes to the interface without incrementing the major version until the `1.0.0` release. Our convention until then will be to increment the minor version whenever we introduce backward incompatible changes to the public interface, and to increment the patch version otherwise. This way, it is safe for you to include 0x.js in your projects with the tilda (e.g `~0.22.0`) without fear that a patch update would break your app. +Since v1.0.0, this package adheres to the [Semantic Versioning 2.0.0](http://semver.org/) specification. The library's public interface includes all the methods, properties and types included in the documentation. We will publish with a major version bump for any breaking change to the public interface, use a minor version bump when introducing new features in a backwards-compatible way, and patch versions when introducing backwards-compatible bug fixes. Because of this, we recommend you import `0x.js` with a caret `^1.0.0` to take advantage of non-breaking bug fixes. diff --git a/packages/website/md/docs/0xjs/2.0.0/introduction.md b/packages/website/md/docs/0xjs/2.0.0/introduction.md deleted file mode 100644 index d228c6855..000000000 --- a/packages/website/md/docs/0xjs/2.0.0/introduction.md +++ /dev/null @@ -1,3 +0,0 @@ -**NOTE:** Release candidate versions are meant to work with V2 of 0x protocol. To interact with V1, select a 0.X version. - -Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any token adhering to the token standards supported by the protocol (currently ERC20 & ERC721). Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20/ERC721 token balance/allowance and much more. diff --git a/packages/website/md/docs/0xjs/2.0.0/versioning.md b/packages/website/md/docs/0xjs/2.0.0/versioning.md deleted file mode 100644 index 7f2b6fee9..000000000 --- a/packages/website/md/docs/0xjs/2.0.0/versioning.md +++ /dev/null @@ -1 +0,0 @@ -Since v1.0.0, this package adheres to the [Semantic Versioning 2.0.0](http://semver.org/) specification. The library's public interface includes all the methods, properties and types included in the documentation. We will publish with a major version bump for any breaking change to the public interface, use a minor version bump when introducing new features in a backwards-compatible way, and patch versions when introducing backwards-compatible bug fixes. Because of this, we recommend you import `0x.js` with a caret `^2.0.0` to take advantage of non-breaking bug fixes. diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index 922dd3c10..51820d620 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -9,14 +9,15 @@ import { DocPackages } from 'ts/types'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdownV1 = require('md/docs/0xjs/1.0.0/introduction'); -const InstallationMarkdownV1 = require('md/docs/0xjs/1.0.0/installation'); -const AsyncMarkdownV1 = require('md/docs/0xjs/1.0.0/async'); -const ErrorsMarkdownV1 = require('md/docs/0xjs/1.0.0/errors'); -const versioningMarkdownV1 = require('md/docs/0xjs/1.0.0/versioning'); +const IntroMarkdownV1 = require('md/docs/0xjs/0.0.1/introduction'); +const InstallationMarkdownV1 = require('md/docs/0xjs/0.0.1/installation'); +const AsyncMarkdownV1 = require('md/docs/0xjs/0.0.1/async'); +const ErrorsMarkdownV1 = require('md/docs/0xjs/0.0.1/errors'); +const versioningMarkdownV1 = require('md/docs/0xjs/0.0.1/versioning'); + +const IntroMarkdownV2 = require('md/docs/0xjs/1.0.0/introduction'); +const versioningMarkdownV2 = require('md/docs/0xjs/1.0.0/versioning'); -const IntroMarkdownV2 = require('md/docs/0xjs/2.0.0/introduction'); -const versioningMarkdownV2 = require('md/docs/0xjs/2.0.0/versioning'); /* tslint:enable:no-var-requires */ const markdownSections = { @@ -28,6 +29,12 @@ const markdownSections = { versioning: 'versioning', }; +const sharedMarkdownSections = { + [markdownSections.installation]: InstallationMarkdownV1, + [markdownSections.async]: AsyncMarkdownV1, + [markdownSections.errors]: ErrorsMarkdownV1, +}; + const docsInfoConfig: DocsInfoConfig = { id: DocPackages.ZeroExJs, packageName: '0x.js', @@ -42,18 +49,14 @@ const docsInfoConfig: DocsInfoConfig = { sectionNameToMarkdownByVersion: { '0.0.1': { [markdownSections.introduction]: IntroMarkdownV1, - [markdownSections.installation]: InstallationMarkdownV1, - [markdownSections.async]: AsyncMarkdownV1, - [markdownSections.errors]: ErrorsMarkdownV1, [markdownSections.versioning]: versioningMarkdownV1, + ...sharedMarkdownSections, }, - '1.0.0-rc.1': { + '1.0.1': { [markdownSections.introduction]: IntroMarkdownV2, [markdownSections.versioning]: versioningMarkdownV2, // These are the same as for V1 - [markdownSections.installation]: InstallationMarkdownV1, - [markdownSections.async]: AsyncMarkdownV1, - [markdownSections.errors]: ErrorsMarkdownV1, + ...sharedMarkdownSections, }, }, markdownSections, -- cgit v1.2.3 From 3d1b7c10e8fe748f9105914e4a6ec82e45467034 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 13 Sep 2018 14:22:33 +0200 Subject: Remove note about RC versions --- packages/website/md/docs/0xjs/1.0.0/async.md | 2 +- packages/website/md/docs/0xjs/1.0.0/introduction.md | 2 -- .../ts/containers/zero_ex_js_documentation.ts | 20 ++++++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/website/md/docs/0xjs/1.0.0/async.md b/packages/website/md/docs/0xjs/1.0.0/async.md index 2909e47e0..bd5ae9d8a 100644 --- a/packages/website/md/docs/0xjs/1.0.0/async.md +++ b/packages/website/md/docs/0xjs/1.0.0/async.md @@ -18,7 +18,7 @@ try { _Promise syntax:_ ```javascript -signature = signatureUtils +signatureUtils .ecSignOrderHashAsync(providerEngine, orderHashHex, maker, SignerType.Default) .then(function(signature) { console.log(signature); diff --git a/packages/website/md/docs/0xjs/1.0.0/introduction.md b/packages/website/md/docs/0xjs/1.0.0/introduction.md index d228c6855..4d5d314d3 100644 --- a/packages/website/md/docs/0xjs/1.0.0/introduction.md +++ b/packages/website/md/docs/0xjs/1.0.0/introduction.md @@ -1,3 +1 @@ -**NOTE:** Release candidate versions are meant to work with V2 of 0x protocol. To interact with V1, select a 0.X version. - Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any token adhering to the token standards supported by the protocol (currently ERC20 & ERC721). Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20/ERC721 token balance/allowance and much more. diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index 51820d620..7d48e039c 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -16,6 +16,9 @@ const ErrorsMarkdownV1 = require('md/docs/0xjs/0.0.1/errors'); const versioningMarkdownV1 = require('md/docs/0xjs/0.0.1/versioning'); const IntroMarkdownV2 = require('md/docs/0xjs/1.0.0/introduction'); +const InstallationMarkdownV2 = require('md/docs/0xjs/1.0.0/installation'); +const AsyncMarkdownV2 = require('md/docs/0xjs/1.0.0/async'); +const ErrorsMarkdownV2 = ErrorsMarkdownV1; const versioningMarkdownV2 = require('md/docs/0xjs/1.0.0/versioning'); /* tslint:enable:no-var-requires */ @@ -29,12 +32,6 @@ const markdownSections = { versioning: 'versioning', }; -const sharedMarkdownSections = { - [markdownSections.installation]: InstallationMarkdownV1, - [markdownSections.async]: AsyncMarkdownV1, - [markdownSections.errors]: ErrorsMarkdownV1, -}; - const docsInfoConfig: DocsInfoConfig = { id: DocPackages.ZeroExJs, packageName: '0x.js', @@ -49,14 +46,17 @@ const docsInfoConfig: DocsInfoConfig = { sectionNameToMarkdownByVersion: { '0.0.1': { [markdownSections.introduction]: IntroMarkdownV1, + [markdownSections.installation]: InstallationMarkdownV1, [markdownSections.versioning]: versioningMarkdownV1, - ...sharedMarkdownSections, + [markdownSections.async]: AsyncMarkdownV1, + [markdownSections.errors]: ErrorsMarkdownV1, }, - '1.0.1': { + '1.0.0': { [markdownSections.introduction]: IntroMarkdownV2, + [markdownSections.installation]: InstallationMarkdownV2, [markdownSections.versioning]: versioningMarkdownV2, - // These are the same as for V1 - ...sharedMarkdownSections, + [markdownSections.async]: AsyncMarkdownV2, + [markdownSections.errors]: ErrorsMarkdownV2, }, }, markdownSections, -- cgit v1.2.3 From 45483557a53dc41871afdbc33dfec12f331c6acd Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 17 Sep 2018 12:45:27 +0100 Subject: Remove doc commands from forwarder-helper package for now --- packages/forwarder-helper/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/forwarder-helper/package.json b/packages/forwarder-helper/package.json index 410323f76..d328943f2 100644 --- a/packages/forwarder-helper/package.json +++ b/packages/forwarder-helper/package.json @@ -19,9 +19,6 @@ "clean": "shx rm -rf lib test_temp scripts", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "manual:postpublish": "yarn build; node ./scripts/postpublish.js", - "docs:stage": "node scripts/stage_docs.js", - "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES", - "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" }, "config": { "postpublish": { -- cgit v1.2.3 From e74f736eff9bc842faf69bda82a608974dbc599c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 17 Sep 2018 12:52:04 +0100 Subject: Update 0x.js README --- packages/0x.js/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/0x.js/README.md b/packages/0x.js/README.md index fd6217151..cfe35ff3e 100644 --- a/packages/0x.js/README.md +++ b/packages/0x.js/README.md @@ -19,7 +19,14 @@ npm install 0x.js --save **Import** ```javascript -import { ZeroEx } from '0x.js'; +import { + assetDataUtils, + BigNumber, + ContractWrappers, + generatePseudoRandomSalt, + orderHashUtils, + signatureUtils, +} from '0x.js'; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: -- cgit v1.2.3 From bfabf765e30d396c884220a786a6f748fd540e2f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 17 Sep 2018 12:52:12 +0100 Subject: Update decoration error --- packages/contract-wrappers/src/utils/decorators.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contract-wrappers/src/utils/decorators.ts b/packages/contract-wrappers/src/utils/decorators.ts index 6e77450e8..d6bf6ec1e 100644 --- a/packages/contract-wrappers/src/utils/decorators.ts +++ b/packages/contract-wrappers/src/utils/decorators.ts @@ -24,7 +24,7 @@ const contractCallErrorTransformer = (error: Error) => { const schemaErrorTransformer = (error: Error) => { if (_.includes(error.message, constants.INVALID_TAKER_FORMAT)) { const errMsg = - 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS'; + 'Order taker must be of type string. If you want anyone to be able to fill an order - pass NULL_ADDRESS'; return new Error(errMsg); } return error; -- cgit v1.2.3 From 6b9f0af82840f53abc1f9e46b6d005d13be0795a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 17 Sep 2018 12:52:25 +0100 Subject: Add 0x.js 2.0.0 async and installation sections --- packages/website/md/docs/0xjs/2.0.0/async.md | 26 +++++++++++++++ .../website/md/docs/0xjs/2.0.0/installation.md | 38 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 packages/website/md/docs/0xjs/2.0.0/async.md create mode 100644 packages/website/md/docs/0xjs/2.0.0/installation.md diff --git a/packages/website/md/docs/0xjs/2.0.0/async.md b/packages/website/md/docs/0xjs/2.0.0/async.md new file mode 100644 index 000000000..c84eebf94 --- /dev/null +++ b/packages/website/md/docs/0xjs/2.0.0/async.md @@ -0,0 +1,26 @@ +0x.js is a promise-based library. This means that whenever an asynchronous call is required, the library method will return a native Javascript promise. You can therefore choose between using `promise` or `async/await` syntax when calling our async methods. + +_Async/await syntax (recommended):_ + +```javascript +try { + var availableAddresses = await web3Wrapper.getAvailableAddressesAsync(); +} catch (error) { + console.log('Caught error: ', error); +} +``` + +_Promise syntax:_ + +```javascript +web3Wrapper + .getAvailableAddressesAsync() + .then(function(availableAddresses) { + console.log(availableAddresses); + }) + .catch(function(error) { + console.log('Caught error: ', error); + }); +``` + +As is the convention with promise-based libraries, if an error occurs, it is thrown. It is the callers responsibility to catch thrown errors and to handle them appropriately. diff --git a/packages/website/md/docs/0xjs/2.0.0/installation.md b/packages/website/md/docs/0xjs/2.0.0/installation.md new file mode 100644 index 000000000..aaac263d0 --- /dev/null +++ b/packages/website/md/docs/0xjs/2.0.0/installation.md @@ -0,0 +1,38 @@ +0x.js ships as both a [UMD](https://github.com/umdjs/umd) module and a [CommonJS](https://en.wikipedia.org/wiki/CommonJS) package. + +#### CommonJS _(recommended)_: + +**Install** + +```bash +npm install 0x.js --save +``` + +**Import** + +```javascript +import { + assetDataUtils, + BigNumber, + ContractWrappers, + generatePseudoRandomSalt, + orderHashUtils, + signatureUtils, +} from '0x.js'; +``` + +#### UMD: + +**Install** + +Download the UMD module from our [releases page](https://github.com/0xProject/0x-monorepo/releases) and add it to your project. + +**Import** + +```html + +``` + +### Wiki + +Check out our [wiki](https://0xproject.com/wiki) for articles on how to get 0x.js setup with TestRPC, Infura and more! -- cgit v1.2.3 From 074082ec945b89dba14315a5c9d715e77724566b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 17 Sep 2018 12:53:05 +0100 Subject: Fix forwarder package.json --- packages/forwarder-helper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/forwarder-helper/package.json b/packages/forwarder-helper/package.json index d328943f2..99f82d32e 100644 --- a/packages/forwarder-helper/package.json +++ b/packages/forwarder-helper/package.json @@ -18,7 +18,7 @@ "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit", "clean": "shx rm -rf lib test_temp scripts", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", - "manual:postpublish": "yarn build; node ./scripts/postpublish.js", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "config": { "postpublish": { -- cgit v1.2.3 From 65aecc0024fdaaa82abd2db440c5a1f24e18400d Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 17 Sep 2018 23:23:27 +0200 Subject: Rename to v1->v0 v2->v1 --- .../ts/containers/zero_ex_js_documentation.ts | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index 7d48e039c..c6aee571d 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -9,17 +9,17 @@ import { DocPackages } from 'ts/types'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdownV1 = require('md/docs/0xjs/0.0.1/introduction'); -const InstallationMarkdownV1 = require('md/docs/0xjs/0.0.1/installation'); -const AsyncMarkdownV1 = require('md/docs/0xjs/0.0.1/async'); -const ErrorsMarkdownV1 = require('md/docs/0xjs/0.0.1/errors'); -const versioningMarkdownV1 = require('md/docs/0xjs/0.0.1/versioning'); +const IntroMarkdownV0 = require('md/docs/0xjs/0.0.1/introduction'); +const InstallationMarkdownV0 = require('md/docs/0xjs/0.0.1/installation'); +const AsyncMarkdownV0 = require('md/docs/0xjs/0.0.1/async'); +const ErrorsMarkdownV0 = require('md/docs/0xjs/0.0.1/errors'); +const versioningMarkdownV0 = require('md/docs/0xjs/0.0.1/versioning'); -const IntroMarkdownV2 = require('md/docs/0xjs/1.0.0/introduction'); -const InstallationMarkdownV2 = require('md/docs/0xjs/1.0.0/installation'); -const AsyncMarkdownV2 = require('md/docs/0xjs/1.0.0/async'); -const ErrorsMarkdownV2 = ErrorsMarkdownV1; -const versioningMarkdownV2 = require('md/docs/0xjs/1.0.0/versioning'); +const IntroMarkdownV1 = require('md/docs/0xjs/1.0.0/introduction'); +const InstallationMarkdownV1 = require('md/docs/0xjs/1.0.0/installation'); +const AsyncMarkdownV1 = require('md/docs/0xjs/1.0.0/async'); +const ErrorsMarkdownV1 = ErrorsMarkdownV0; +const versioningMarkdownV1 = require('md/docs/0xjs/1.0.0/versioning'); /* tslint:enable:no-var-requires */ @@ -45,19 +45,19 @@ const docsInfoConfig: DocsInfoConfig = { }, sectionNameToMarkdownByVersion: { '0.0.1': { + [markdownSections.introduction]: IntroMarkdownV0, + [markdownSections.installation]: InstallationMarkdownV0, + [markdownSections.versioning]: versioningMarkdownV0, + [markdownSections.async]: AsyncMarkdownV0, + [markdownSections.errors]: ErrorsMarkdownV0, + }, + '1.0.0': { [markdownSections.introduction]: IntroMarkdownV1, [markdownSections.installation]: InstallationMarkdownV1, [markdownSections.versioning]: versioningMarkdownV1, [markdownSections.async]: AsyncMarkdownV1, [markdownSections.errors]: ErrorsMarkdownV1, }, - '1.0.0': { - [markdownSections.introduction]: IntroMarkdownV2, - [markdownSections.installation]: InstallationMarkdownV2, - [markdownSections.versioning]: versioningMarkdownV2, - [markdownSections.async]: AsyncMarkdownV2, - [markdownSections.errors]: ErrorsMarkdownV2, - }, }, markdownSections, }; -- cgit v1.2.3 From 2df569b72727bf4face8ad5f223535657f99db39 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 17 Sep 2018 21:33:50 +0000 Subject: Folder 1.0.0 -> 1.0.1 --- packages/website/md/docs/0xjs/1.0.0/async.md | 31 ----------------- .../website/md/docs/0xjs/1.0.0/installation.md | 40 ---------------------- .../website/md/docs/0xjs/1.0.0/introduction.md | 1 - packages/website/md/docs/0xjs/1.0.0/versioning.md | 1 - packages/website/md/docs/0xjs/1.0.1/async.md | 31 +++++++++++++++++ .../website/md/docs/0xjs/1.0.1/installation.md | 40 ++++++++++++++++++++++ .../website/md/docs/0xjs/1.0.1/introduction.md | 1 + packages/website/md/docs/0xjs/1.0.1/versioning.md | 1 + .../ts/containers/zero_ex_js_documentation.ts | 10 +++--- 9 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 packages/website/md/docs/0xjs/1.0.0/async.md delete mode 100644 packages/website/md/docs/0xjs/1.0.0/installation.md delete mode 100644 packages/website/md/docs/0xjs/1.0.0/introduction.md delete mode 100644 packages/website/md/docs/0xjs/1.0.0/versioning.md create mode 100644 packages/website/md/docs/0xjs/1.0.1/async.md create mode 100644 packages/website/md/docs/0xjs/1.0.1/installation.md create mode 100644 packages/website/md/docs/0xjs/1.0.1/introduction.md create mode 100644 packages/website/md/docs/0xjs/1.0.1/versioning.md diff --git a/packages/website/md/docs/0xjs/1.0.0/async.md b/packages/website/md/docs/0xjs/1.0.0/async.md deleted file mode 100644 index bd5ae9d8a..000000000 --- a/packages/website/md/docs/0xjs/1.0.0/async.md +++ /dev/null @@ -1,31 +0,0 @@ -0x packages are promise-based libraries. This means that whenever an asynchronous call is required, the library method will return a native Javascript promise. You can therefore choose between using `promise` or `async/await` syntax when calling our async methods. - -_Async/await syntax (recommended):_ - -```javascript -try { - const signature = await signatureUtils.ecSignOrderHashAsync( - providerEngine, - orderHashHex, - maker, - SignerType.Default, - ); -} catch (error) { - console.log('Caught error: ', error); -} -``` - -_Promise syntax:_ - -```javascript -signatureUtils - .ecSignOrderHashAsync(providerEngine, orderHashHex, maker, SignerType.Default) - .then(function(signature) { - console.log(signature); - }) - .catch(function(error) { - console.log('Caught error: ', error); - }); -``` - -As is the convention with promise-based libraries, if an error occurs, it is thrown. It is the callers responsibility to catch thrown errors and to handle them appropriately. diff --git a/packages/website/md/docs/0xjs/1.0.0/installation.md b/packages/website/md/docs/0xjs/1.0.0/installation.md deleted file mode 100644 index 74c902afd..000000000 --- a/packages/website/md/docs/0xjs/1.0.0/installation.md +++ /dev/null @@ -1,40 +0,0 @@ -0x.js ships as both a [UMD](https://github.com/umdjs/umd) module and a [CommonJS](https://en.wikipedia.org/wiki/CommonJS) package. - -#### CommonJS _(recommended)_: - -**Install** - -```bash -npm install 0x.js --save -``` - -**Import** - -```javascript -import { - assetDataUtils, - BigNumber, - ContractWrappers, - generatePseudoRandomSalt, - Order, - orderHashUtils, - signatureUtils, - SignerType, -} from '0x.js'; -``` - -#### UMD: - -**Install** - -Download the UMD module from our [releases page](https://github.com/0xProject/0x-monorepo/releases) and add it to your project. - -**Import** - -```html - -``` - -### Wiki - -Check out our [wiki](https://0xproject.com/wiki) for articles on how to get 0x.js setup with Ganache, Infura and more! diff --git a/packages/website/md/docs/0xjs/1.0.0/introduction.md b/packages/website/md/docs/0xjs/1.0.0/introduction.md deleted file mode 100644 index 4d5d314d3..000000000 --- a/packages/website/md/docs/0xjs/1.0.0/introduction.md +++ /dev/null @@ -1 +0,0 @@ -Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any token adhering to the token standards supported by the protocol (currently ERC20 & ERC721). Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20/ERC721 token balance/allowance and much more. diff --git a/packages/website/md/docs/0xjs/1.0.0/versioning.md b/packages/website/md/docs/0xjs/1.0.0/versioning.md deleted file mode 100644 index 6bae835d3..000000000 --- a/packages/website/md/docs/0xjs/1.0.0/versioning.md +++ /dev/null @@ -1 +0,0 @@ -Since v1.0.0, this package adheres to the [Semantic Versioning 2.0.0](http://semver.org/) specification. The library's public interface includes all the methods, properties and types included in the documentation. We will publish with a major version bump for any breaking change to the public interface, use a minor version bump when introducing new features in a backwards-compatible way, and patch versions when introducing backwards-compatible bug fixes. Because of this, we recommend you import `0x.js` with a caret `^1.0.0` to take advantage of non-breaking bug fixes. diff --git a/packages/website/md/docs/0xjs/1.0.1/async.md b/packages/website/md/docs/0xjs/1.0.1/async.md new file mode 100644 index 000000000..bd5ae9d8a --- /dev/null +++ b/packages/website/md/docs/0xjs/1.0.1/async.md @@ -0,0 +1,31 @@ +0x packages are promise-based libraries. This means that whenever an asynchronous call is required, the library method will return a native Javascript promise. You can therefore choose between using `promise` or `async/await` syntax when calling our async methods. + +_Async/await syntax (recommended):_ + +```javascript +try { + const signature = await signatureUtils.ecSignOrderHashAsync( + providerEngine, + orderHashHex, + maker, + SignerType.Default, + ); +} catch (error) { + console.log('Caught error: ', error); +} +``` + +_Promise syntax:_ + +```javascript +signatureUtils + .ecSignOrderHashAsync(providerEngine, orderHashHex, maker, SignerType.Default) + .then(function(signature) { + console.log(signature); + }) + .catch(function(error) { + console.log('Caught error: ', error); + }); +``` + +As is the convention with promise-based libraries, if an error occurs, it is thrown. It is the callers responsibility to catch thrown errors and to handle them appropriately. diff --git a/packages/website/md/docs/0xjs/1.0.1/installation.md b/packages/website/md/docs/0xjs/1.0.1/installation.md new file mode 100644 index 000000000..74c902afd --- /dev/null +++ b/packages/website/md/docs/0xjs/1.0.1/installation.md @@ -0,0 +1,40 @@ +0x.js ships as both a [UMD](https://github.com/umdjs/umd) module and a [CommonJS](https://en.wikipedia.org/wiki/CommonJS) package. + +#### CommonJS _(recommended)_: + +**Install** + +```bash +npm install 0x.js --save +``` + +**Import** + +```javascript +import { + assetDataUtils, + BigNumber, + ContractWrappers, + generatePseudoRandomSalt, + Order, + orderHashUtils, + signatureUtils, + SignerType, +} from '0x.js'; +``` + +#### UMD: + +**Install** + +Download the UMD module from our [releases page](https://github.com/0xProject/0x-monorepo/releases) and add it to your project. + +**Import** + +```html + +``` + +### Wiki + +Check out our [wiki](https://0xproject.com/wiki) for articles on how to get 0x.js setup with Ganache, Infura and more! diff --git a/packages/website/md/docs/0xjs/1.0.1/introduction.md b/packages/website/md/docs/0xjs/1.0.1/introduction.md new file mode 100644 index 000000000..4d5d314d3 --- /dev/null +++ b/packages/website/md/docs/0xjs/1.0.1/introduction.md @@ -0,0 +1 @@ +Welcome to the [0x.js](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js) documentation! 0x.js is a Javascript library for interacting with the 0x protocol. With it, you can easily make calls to the 0x smart contracts as well as any token adhering to the token standards supported by the protocol (currently ERC20 & ERC721). Functionality includes generating, signing, filling and cancelling orders, verifying an orders signature, setting or checking a users ERC20/ERC721 token balance/allowance and much more. diff --git a/packages/website/md/docs/0xjs/1.0.1/versioning.md b/packages/website/md/docs/0xjs/1.0.1/versioning.md new file mode 100644 index 000000000..6bae835d3 --- /dev/null +++ b/packages/website/md/docs/0xjs/1.0.1/versioning.md @@ -0,0 +1 @@ +Since v1.0.0, this package adheres to the [Semantic Versioning 2.0.0](http://semver.org/) specification. The library's public interface includes all the methods, properties and types included in the documentation. We will publish with a major version bump for any breaking change to the public interface, use a minor version bump when introducing new features in a backwards-compatible way, and patch versions when introducing backwards-compatible bug fixes. Because of this, we recommend you import `0x.js` with a caret `^1.0.0` to take advantage of non-breaking bug fixes. diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index c6aee571d..2a3afd86c 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -15,11 +15,11 @@ const AsyncMarkdownV0 = require('md/docs/0xjs/0.0.1/async'); const ErrorsMarkdownV0 = require('md/docs/0xjs/0.0.1/errors'); const versioningMarkdownV0 = require('md/docs/0xjs/0.0.1/versioning'); -const IntroMarkdownV1 = require('md/docs/0xjs/1.0.0/introduction'); -const InstallationMarkdownV1 = require('md/docs/0xjs/1.0.0/installation'); -const AsyncMarkdownV1 = require('md/docs/0xjs/1.0.0/async'); +const IntroMarkdownV1 = require('md/docs/0xjs/1.0.1/introduction'); +const InstallationMarkdownV1 = require('md/docs/0xjs/1.0.1/installation'); +const AsyncMarkdownV1 = require('md/docs/0xjs/1.0.1/async'); const ErrorsMarkdownV1 = ErrorsMarkdownV0; -const versioningMarkdownV1 = require('md/docs/0xjs/1.0.0/versioning'); +const versioningMarkdownV1 = require('md/docs/0xjs/1.0.1/versioning'); /* tslint:enable:no-var-requires */ @@ -51,7 +51,7 @@ const docsInfoConfig: DocsInfoConfig = { [markdownSections.async]: AsyncMarkdownV0, [markdownSections.errors]: ErrorsMarkdownV0, }, - '1.0.0': { + '1.0.1': { [markdownSections.introduction]: IntroMarkdownV1, [markdownSections.installation]: InstallationMarkdownV1, [markdownSections.versioning]: versioningMarkdownV1, -- cgit v1.2.3 From 2457ecb7e78b3ec1c0d71fa1447293e336428ff0 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 18 Sep 2018 10:29:27 +0100 Subject: Add missing mainnet addresses to ZRXToken & WETH artifacts --- packages/migrations/artifacts/2.0.0/WETH9.json | 5 +++++ packages/migrations/artifacts/2.0.0/ZRXToken.json | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packages/migrations/artifacts/2.0.0/WETH9.json b/packages/migrations/artifacts/2.0.0/WETH9.json index 8cca84e41..a4f90ae2f 100644 --- a/packages/migrations/artifacts/2.0.0/WETH9.json +++ b/packages/migrations/artifacts/2.0.0/WETH9.json @@ -327,6 +327,11 @@ } }, "networks": { + "1": { + "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", + "links": {}, + "constructorArgs": "[]" + }, "3": { "address": "0xc778417e063141139fce010982780140aa0cd5ab", "links": {}, diff --git a/packages/migrations/artifacts/2.0.0/ZRXToken.json b/packages/migrations/artifacts/2.0.0/ZRXToken.json index 76ee77b34..b984aa171 100644 --- a/packages/migrations/artifacts/2.0.0/ZRXToken.json +++ b/packages/migrations/artifacts/2.0.0/ZRXToken.json @@ -10022,6 +10022,11 @@ } }, "networks": { + "1": { + "address": "0xe41d2489571d322189246dafa5ebde1f4699f498", + "links": {}, + "constructorArgs": "[]" + }, "3": { "address": "0xff67881f8d12f372d91baae9752eb3631ff0ed00", "links": {}, -- cgit v1.2.3 From 6f36048a8ed4a1108f8d266ec9b69858e0152012 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 18 Sep 2018 10:43:18 +0100 Subject: Add CHANGELOG entries about bug fix --- packages/0x.js/CHANGELOG.json | 8 ++++++++ packages/contract-wrappers/CHANGELOG.json | 8 ++++++++ packages/order-watcher/CHANGELOG.json | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 9ff4963c0..7d77e74eb 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.2", + "changes": [ + { + "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts" + } + ] + }, { "timestamp": 1536142250, "version": "1.0.1", diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 477537bb3..b97b11551 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.2", + "changes": [ + { + "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts" + } + ] + }, { "version": "1.0.1", "changes": [ diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index d6cfe9c3c..5ec67d5d0 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.2", + "changes": [ + { + "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts" + } + ] + }, { "timestamp": 1536142250, "version": "1.0.1", -- cgit v1.2.3 From ccc18620bfe4287db90155b37c9a8a090361f6aa Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 18 Sep 2018 11:18:19 +0100 Subject: Updated CHANGELOGS --- packages/0x.js/CHANGELOG.json | 3 ++- packages/0x.js/CHANGELOG.md | 4 ++++ packages/contract-wrappers/CHANGELOG.json | 3 ++- packages/contract-wrappers/CHANGELOG.md | 4 ++++ packages/forwarder-helper/CHANGELOG.json | 9 +++++++++ packages/forwarder-helper/CHANGELOG.md | 4 ++++ packages/migrations/CHANGELOG.json | 9 +++++++++ packages/migrations/CHANGELOG.md | 4 ++++ packages/order-watcher/CHANGELOG.json | 3 ++- packages/order-watcher/CHANGELOG.md | 4 ++++ 10 files changed, 44 insertions(+), 3 deletions(-) diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 7d77e74eb..f4aa99b82 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts" } - ] + ], + "timestamp": 1537265493 }, { "timestamp": 1536142250, diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 2fd357eb6..9e92e877f 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _September 18, 2018_ + + * Add ZRX & WETH mainnet contract addresses into the included artifacts + ## v1.0.1 - _September 5, 2018_ * Dependencies updated diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index b97b11551..a05a43114 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts" } - ] + ], + "timestamp": 1537265493 }, { "version": "1.0.1", diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md index b5be34d36..5056d0f87 100644 --- a/packages/contract-wrappers/CHANGELOG.md +++ b/packages/contract-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _September 18, 2018_ + + * Add ZRX & WETH mainnet contract addresses into the included artifacts + ## v1.0.1 - _September 5, 2018_ * Add `OrderValidatorWrapper` diff --git a/packages/forwarder-helper/CHANGELOG.json b/packages/forwarder-helper/CHANGELOG.json index f0e646700..b505cb7d1 100644 --- a/packages/forwarder-helper/CHANGELOG.json +++ b/packages/forwarder-helper/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1537265493, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1536142250, "version": "1.0.1", diff --git a/packages/forwarder-helper/CHANGELOG.md b/packages/forwarder-helper/CHANGELOG.md index d6b67aa1b..23cba8f46 100644 --- a/packages/forwarder-helper/CHANGELOG.md +++ b/packages/forwarder-helper/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _September 18, 2018_ + + * Dependencies updated + ## v1.0.1 - _September 5, 2018_ * Dependencies updated diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 3d9280938..e4636ade0 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1537265493, + "version": "1.0.8", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1536142250, "version": "1.0.7", diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md index ed328a60c..5021e7a02 100644 --- a/packages/migrations/CHANGELOG.md +++ b/packages/migrations/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.8 - _September 18, 2018_ + + * Dependencies updated + ## v1.0.7 - _September 5, 2018_ * Dependencies updated diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 5ec67d5d0..351d8853f 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts" } - ] + ], + "timestamp": 1537265493 }, { "timestamp": 1536142250, diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md index 31ed75927..ec31791a0 100644 --- a/packages/order-watcher/CHANGELOG.md +++ b/packages/order-watcher/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _September 18, 2018_ + + * Add ZRX & WETH mainnet contract addresses into the included artifacts + ## v1.0.1 - _September 5, 2018_ * Dependencies updated -- cgit v1.2.3 From e2559798df37cd246fe26d40d5bd030431a683e9 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 18 Sep 2018 11:18:28 +0100 Subject: Publish - 0x.js@1.0.2 - @0xproject/contract-wrappers@1.0.2 - @0xproject/forwarder-helper@1.0.2 - @0xproject/migrations@1.0.8 - @0xproject/order-watcher@1.0.2 - @0xproject/testnet-faucets@1.0.45 - @0xproject/website@0.0.48 --- packages/0x.js/package.json | 8 ++++---- packages/contract-wrappers/package.json | 4 ++-- packages/forwarder-helper/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-watcher/package.json | 6 +++--- packages/testnet-faucets/package.json | 4 ++-- packages/website/package.json | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index c2286ebf2..d52914d3e 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -43,7 +43,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.8", "@0xproject/dev-utils": "^1.0.7", - "@0xproject/migrations": "^1.0.7", + "@0xproject/migrations": "^1.0.8", "@0xproject/monorepo-scripts": "^1.0.8", "@0xproject/tslint-config": "^1.0.7", "@types/lodash": "4.14.104", @@ -75,9 +75,9 @@ "dependencies": { "@0xproject/assert": "^1.0.8", "@0xproject/base-contract": "^2.0.2", - "@0xproject/contract-wrappers": "^1.0.1", + "@0xproject/contract-wrappers": "^1.0.2", "@0xproject/order-utils": "^1.0.1", - "@0xproject/order-watcher": "^1.0.1", + "@0xproject/order-watcher": "^1.0.2", "@0xproject/subproviders": "^2.0.2", "@0xproject/types": "^1.0.1", "@0xproject/typescript-typings": "^2.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 5cfe8f6b5..d785dc20d 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/contract-wrappers", - "version": "1.0.1", + "version": "1.0.2", "description": "Smart TS wrappers for 0x smart contracts", "keywords": [ "0xproject", @@ -43,7 +43,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.8", "@0xproject/dev-utils": "^1.0.7", - "@0xproject/migrations": "^1.0.7", + "@0xproject/migrations": "^1.0.8", "@0xproject/subproviders": "^2.0.2", "@0xproject/tslint-config": "^1.0.7", "@types/lodash": "4.14.104", diff --git a/packages/forwarder-helper/package.json b/packages/forwarder-helper/package.json index 99f82d32e..64613561d 100644 --- a/packages/forwarder-helper/package.json +++ b/packages/forwarder-helper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/forwarder-helper", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 2447de51a..230c0c3ab 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/migrations", - "version": "1.0.7", + "version": "1.0.8", "engines": { "node": ">=6.12" }, diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index a6195793b..d36112a91 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/order-watcher", - "version": "1.0.1", + "version": "1.0.2", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", @@ -44,7 +44,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.8", "@0xproject/dev-utils": "^1.0.7", - "@0xproject/migrations": "^1.0.7", + "@0xproject/migrations": "^1.0.8", "@0xproject/tslint-config": "^1.0.7", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", @@ -72,7 +72,7 @@ "dependencies": { "@0xproject/assert": "^1.0.8", "@0xproject/base-contract": "^2.0.2", - "@0xproject/contract-wrappers": "^1.0.1", + "@0xproject/contract-wrappers": "^1.0.2", "@0xproject/fill-scenarios": "^1.0.1", "@0xproject/json-schemas": "^1.0.1", "@0xproject/order-utils": "^1.0.1", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index a2d107f58..5774d323a 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.44", + "version": "1.0.45", "engines": { "node": ">=6.12" }, @@ -17,7 +17,7 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "1.0.1", + "0x.js": "^1.0.2", "@0xproject/subproviders": "^2.0.2", "@0xproject/typescript-typings": "^2.0.0", "@0xproject/utils": "^1.0.8", diff --git a/packages/website/package.json b/packages/website/package.json index b602a3116..025711cef 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.47", + "version": "0.0.48", "engines": { "node": ">=6.12" }, @@ -19,7 +19,7 @@ "license": "Apache-2.0", "dependencies": { "0x.js": "^0.38.6", - "@0xproject/contract-wrappers": "^1.0.1", + "@0xproject/contract-wrappers": "^1.0.2", "@0xproject/order-utils": "^1.0.1", "@0xproject/react-docs": "^1.0.8", "@0xproject/react-shared": "^1.0.9", -- cgit v1.2.3