From 324b1079e7eb29829bf06ff65299acdc58abf308 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 9 Jul 2018 19:05:38 +0200 Subject: Add ability to nest doc ref markdown under specific versions --- packages/react-docs-example/ts/docs.tsx | 8 +++--- packages/react-docs/CHANGELOG.json | 8 ++++++ packages/react-docs/package.json | 3 ++- .../react-docs/src/components/documentation.tsx | 10 ++++++- packages/react-docs/src/docs_info.ts | 4 +-- packages/react-docs/src/types.ts | 6 ++++- packages/sol-compiler/package.json | 2 +- packages/website/md/docs/0xjs/1.0.0/async.md | 26 ++++++++++++++++++ packages/website/md/docs/0xjs/1.0.0/errors.md | 1 + .../website/md/docs/0xjs/1.0.0/installation.md | 31 ++++++++++++++++++++++ .../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/async.md | 26 ------------------ packages/website/md/docs/0xjs/errors.md | 1 - packages/website/md/docs/0xjs/installation.md | 31 ---------------------- packages/website/md/docs/0xjs/introduction.md | 1 - packages/website/md/docs/0xjs/versioning.md | 1 - .../website/md/docs/connect/1.0.0/installation.md | 15 +++++++++++ .../website/md/docs/connect/1.0.0/introduction.md | 1 + packages/website/md/docs/connect/installation.md | 15 ----------- packages/website/md/docs/connect/introduction.md | 1 - .../md/docs/json_schemas/1.0.0/installation.md | 17 ++++++++++++ .../md/docs/json_schemas/1.0.0/introduction.md | 3 +++ .../website/md/docs/json_schemas/1.0.0/schemas.md | 28 +++++++++++++++++++ .../website/md/docs/json_schemas/1.0.0/usage.md | 14 ++++++++++ .../website/md/docs/json_schemas/installation.md | 17 ------------ .../website/md/docs/json_schemas/introduction.md | 3 --- packages/website/md/docs/json_schemas/schemas.md | 28 ------------------- packages/website/md/docs/json_schemas/usage.md | 14 ---------- .../md/docs/order_utils/1.0.0/installation.md | 17 ++++++++++++ .../md/docs/order_utils/1.0.0/introduction.md | 1 + .../website/md/docs/order_utils/installation.md | 17 ------------ .../website/md/docs/order_utils/introduction.md | 1 - .../md/docs/smart_contracts/1.0.0/introduction.md | 8 ++++++ .../md/docs/smart_contracts/introduction.md | 8 ------ .../website/ts/containers/connect_documentation.ts | 12 +++++---- .../ts/containers/ethereum_types_documentation.ts | 8 +++--- .../ts/containers/json_schemas_documentation.ts | 20 +++++++------- .../ts/containers/order_utils_documentation.ts | 12 +++++---- .../ts/containers/smart_contracts_documentation.ts | 8 +++--- .../ts/containers/sol_compiler_documentation.ts | 14 +++++----- .../website/ts/containers/sol_cov_documentation.ts | 14 +++++----- .../ts/containers/subproviders_documentation.ts | 14 +++++----- .../ts/containers/web3_wrapper_documentation.ts | 12 +++++---- .../ts/containers/zero_ex_js_documentation.ts | 24 +++++++++-------- 45 files changed, 275 insertions(+), 232 deletions(-) create mode 100644 packages/website/md/docs/0xjs/1.0.0/async.md create mode 100644 packages/website/md/docs/0xjs/1.0.0/errors.md create mode 100644 packages/website/md/docs/0xjs/1.0.0/installation.md create mode 100644 packages/website/md/docs/0xjs/1.0.0/introduction.md create mode 100644 packages/website/md/docs/0xjs/1.0.0/versioning.md delete mode 100644 packages/website/md/docs/0xjs/async.md delete mode 100644 packages/website/md/docs/0xjs/errors.md delete mode 100644 packages/website/md/docs/0xjs/installation.md delete mode 100644 packages/website/md/docs/0xjs/introduction.md delete mode 100644 packages/website/md/docs/0xjs/versioning.md create mode 100644 packages/website/md/docs/connect/1.0.0/installation.md create mode 100644 packages/website/md/docs/connect/1.0.0/introduction.md delete mode 100644 packages/website/md/docs/connect/installation.md delete mode 100644 packages/website/md/docs/connect/introduction.md create mode 100644 packages/website/md/docs/json_schemas/1.0.0/installation.md create mode 100644 packages/website/md/docs/json_schemas/1.0.0/introduction.md create mode 100644 packages/website/md/docs/json_schemas/1.0.0/schemas.md create mode 100644 packages/website/md/docs/json_schemas/1.0.0/usage.md delete mode 100644 packages/website/md/docs/json_schemas/installation.md delete mode 100644 packages/website/md/docs/json_schemas/introduction.md delete mode 100644 packages/website/md/docs/json_schemas/schemas.md delete mode 100644 packages/website/md/docs/json_schemas/usage.md create mode 100644 packages/website/md/docs/order_utils/1.0.0/installation.md create mode 100644 packages/website/md/docs/order_utils/1.0.0/introduction.md delete mode 100644 packages/website/md/docs/order_utils/installation.md delete mode 100644 packages/website/md/docs/order_utils/introduction.md create mode 100644 packages/website/md/docs/smart_contracts/1.0.0/introduction.md delete mode 100644 packages/website/md/docs/smart_contracts/introduction.md (limited to 'packages') diff --git a/packages/react-docs-example/ts/docs.tsx b/packages/react-docs-example/ts/docs.tsx index b70de1257..bb605806f 100644 --- a/packages/react-docs-example/ts/docs.tsx +++ b/packages/react-docs-example/ts/docs.tsx @@ -14,7 +14,7 @@ import * as v0TypeDocJson from './json/0.1.12.json'; import * as v2TypeDocJson from './json/0.2.0.json'; // tslint:disable-next-line:no-implicit-dependencies no-var-requires -const IntroMarkdown = require('md/introduction'); +const IntroMarkdownV1 = require('md/introduction'); const docSections = { introduction: 'introduction', @@ -32,8 +32,10 @@ const docsInfoConfig: DocsInfoConfig = { web3Wrapper: [docSections.web3Wrapper], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + }, }, sectionNameToModulePath: { [docSections.web3Wrapper]: ['"web3-wrapper/src/index"'], diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 30e48197d..b36ac9e4f 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "0.0.15", + "changes": [ + { + "note": "Nest MD files under versions so that you can update them for future versions" + } + ] + }, { "timestamp": 1529397769, "version": "0.0.14", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 8c70f4f6d..1a7c016ed 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -52,7 +52,8 @@ "react-dom": "15.6.1", "react-markdown": "^3.2.2", "react-scroll": "^1.5.2", - "react-tooltip": "^3.2.7" + "react-tooltip": "^3.2.7", + "semver": "5.5.0" }, "publishConfig": { "access": "public" diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx index a4e6f4f6e..7030001e8 100644 --- a/packages/react-docs/src/components/documentation.tsx +++ b/packages/react-docs/src/components/documentation.tsx @@ -12,6 +12,7 @@ import { import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; import * as React from 'react'; +import * as semver from 'semver'; import { DocsInfo } from '../docs_info'; import { @@ -180,7 +181,14 @@ export class Documentation extends React.Component { + return semver.lte(mdVersion, this.props.selectedVersion); + }); + const sortedEligibleVersions = eligibleVersions.sort(semver.rcompare.bind(semver)); + const closestVersion = sortedEligibleVersions[0]; + const markdownFileIfExists = this.props.docsInfo.sectionNameToMarkdownByVersion[closestVersion][sectionName]; if (!_.isUndefined(markdownFileIfExists)) { return ( +``` + +### 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/1.0.0/introduction.md b/packages/website/md/docs/0xjs/1.0.0/introduction.md new file mode 100644 index 000000000..008376d33 --- /dev/null +++ b/packages/website/md/docs/0xjs/1.0.0/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/1.0.0/versioning.md b/packages/website/md/docs/0xjs/1.0.0/versioning.md new file mode 100644 index 000000000..6bcaa5b4d --- /dev/null +++ b/packages/website/md/docs/0xjs/1.0.0/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/async.md b/packages/website/md/docs/0xjs/async.md deleted file mode 100644 index 8abaef331..000000000 --- a/packages/website/md/docs/0xjs/async.md +++ /dev/null @@ -1,26 +0,0 @@ -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/errors.md b/packages/website/md/docs/0xjs/errors.md deleted file mode 100644 index e97973ccf..000000000 --- a/packages/website/md/docs/0xjs/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/installation.md b/packages/website/md/docs/0xjs/installation.md deleted file mode 100644 index ac0a47699..000000000 --- a/packages/website/md/docs/0xjs/installation.md +++ /dev/null @@ -1,31 +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 { 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/introduction.md b/packages/website/md/docs/0xjs/introduction.md deleted file mode 100644 index 008376d33..000000000 --- a/packages/website/md/docs/0xjs/introduction.md +++ /dev/null @@ -1 +0,0 @@ -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/versioning.md b/packages/website/md/docs/0xjs/versioning.md deleted file mode 100644 index 6bcaa5b4d..000000000 --- a/packages/website/md/docs/0xjs/versioning.md +++ /dev/null @@ -1 +0,0 @@ -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/connect/1.0.0/installation.md b/packages/website/md/docs/connect/1.0.0/installation.md new file mode 100644 index 000000000..950bf92ca --- /dev/null +++ b/packages/website/md/docs/connect/1.0.0/installation.md @@ -0,0 +1,15 @@ +**Install** + +```bash +npm install @0xproject/connect --save +``` + +**Import** + +```javascript +import { HttpClient } from '@0xproject/connect'; +``` + +### Wiki + +Check out our [0x Connect introduction tutorial](https://0xproject.com/wiki#Intro-Tutorial) for information on how to integrate relayers into your application. diff --git a/packages/website/md/docs/connect/1.0.0/introduction.md b/packages/website/md/docs/connect/1.0.0/introduction.md new file mode 100644 index 000000000..4e3039442 --- /dev/null +++ b/packages/website/md/docs/connect/1.0.0/introduction.md @@ -0,0 +1 @@ +Welcome to the [0x Connect](https://github.com/0xProject/0x-monorepo/tree/development/packages/connect) documentation! 0x Connect is a Javascript library that makes it easy to interact with relayers that conform to the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api). Functionality includes getting supported token pairs from a relayer, getting orders filtered by different attributes, getting individual orders specified by order hash, getting orderbooks for specific token pairs, getting fee information, and submitting orders. diff --git a/packages/website/md/docs/connect/installation.md b/packages/website/md/docs/connect/installation.md deleted file mode 100644 index 950bf92ca..000000000 --- a/packages/website/md/docs/connect/installation.md +++ /dev/null @@ -1,15 +0,0 @@ -**Install** - -```bash -npm install @0xproject/connect --save -``` - -**Import** - -```javascript -import { HttpClient } from '@0xproject/connect'; -``` - -### Wiki - -Check out our [0x Connect introduction tutorial](https://0xproject.com/wiki#Intro-Tutorial) for information on how to integrate relayers into your application. diff --git a/packages/website/md/docs/connect/introduction.md b/packages/website/md/docs/connect/introduction.md deleted file mode 100644 index 4e3039442..000000000 --- a/packages/website/md/docs/connect/introduction.md +++ /dev/null @@ -1 +0,0 @@ -Welcome to the [0x Connect](https://github.com/0xProject/0x-monorepo/tree/development/packages/connect) documentation! 0x Connect is a Javascript library that makes it easy to interact with relayers that conform to the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api). Functionality includes getting supported token pairs from a relayer, getting orders filtered by different attributes, getting individual orders specified by order hash, getting orderbooks for specific token pairs, getting fee information, and submitting orders. diff --git a/packages/website/md/docs/json_schemas/1.0.0/installation.md b/packages/website/md/docs/json_schemas/1.0.0/installation.md new file mode 100644 index 000000000..50a37bae1 --- /dev/null +++ b/packages/website/md/docs/json_schemas/1.0.0/installation.md @@ -0,0 +1,17 @@ +**Install** + +```bash +yarn add @0xproject/json-schemas +``` + +**Import** + +```javascript +import { schemas } from '@0xproject/json-schemas'; +``` + +or + +```javascript +var schemas = require('@0xproject/json-schemas').schemas; +``` 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 new file mode 100644 index 000000000..a27f4b521 --- /dev/null +++ b/packages/website/md/docs/json_schemas/1.0.0/introduction.md @@ -0,0 +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...). diff --git a/packages/website/md/docs/json_schemas/1.0.0/schemas.md b/packages/website/md/docs/json_schemas/1.0.0/schemas.md new file mode 100644 index 000000000..fcf5d8df6 --- /dev/null +++ b/packages/website/md/docs/json_schemas/1.0.0/schemas.md @@ -0,0 +1,28 @@ +0x Protocol Schemas + +* [Basic types](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/basic_type_schemas.ts) (e.g Ethereum address, number) +* [ECSignature](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/ec_signature_schema.ts) +* [Order/SignedOrder](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_schemas.ts) +* [OrderHash](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_hash_schema.ts) + +0x.js Schemas + +* [BlockRange](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/block_range_schema.ts) +* [IndexFilter Values](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/index_filter_values_schema.ts) +* [OrderFillRequests](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_fill_requests_schema.ts) +* [OrderCancellationRequests](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_cancel_schema.ts) +* [OrderFillOrKillRequests](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.ts) +* [SignedOrders](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/signed_orders_schema.ts) +* [Token](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/token_schema.ts) +* [TxData](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/tx_data_schema.ts) + +Standard Relayer API Schemas + +* [Error response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_error_response_schema.ts) +* [Fees payload](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_fees_payload_schema.ts) +* [Fees response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_fees_response_schema.ts) +* [Orderbook channel subscribe](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orberbook_channel_subscribe_schema.ts) +* [Orderbook channel snapshot](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orderbook_channel_snapshot_schema.ts) +* [Orderbook channel update](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orderbook_channel_update_response_schema.ts) +* [Orderbook response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orderbook_response_schema.ts) +* [Token pairs response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_token_pairs_response_schema.ts) diff --git a/packages/website/md/docs/json_schemas/1.0.0/usage.md b/packages/website/md/docs/json_schemas/1.0.0/usage.md new file mode 100644 index 000000000..68b801153 --- /dev/null +++ b/packages/website/md/docs/json_schemas/1.0.0/usage.md @@ -0,0 +1,14 @@ +The following example shows you how to validate a 0x order using the `@0xproject/json-schemas` package. + +```javascript +import {SchemaValidator, ValidatorResult, schemas} from '@0xproject/json-schemas'; + +const {orderSchema} = schemas; +const validator = new SchemaValidator(); + +const order = { + ... +}; +const validatorResult: ValidatorResult = validator.validate(order, orderSchema); // Contains all errors +const isValid: boolean = validator.isValid(order, orderSchema); // Only returns boolean +``` diff --git a/packages/website/md/docs/json_schemas/installation.md b/packages/website/md/docs/json_schemas/installation.md deleted file mode 100644 index 50a37bae1..000000000 --- a/packages/website/md/docs/json_schemas/installation.md +++ /dev/null @@ -1,17 +0,0 @@ -**Install** - -```bash -yarn add @0xproject/json-schemas -``` - -**Import** - -```javascript -import { schemas } from '@0xproject/json-schemas'; -``` - -or - -```javascript -var schemas = require('@0xproject/json-schemas').schemas; -``` diff --git a/packages/website/md/docs/json_schemas/introduction.md b/packages/website/md/docs/json_schemas/introduction.md deleted file mode 100644 index a27f4b521..000000000 --- a/packages/website/md/docs/json_schemas/introduction.md +++ /dev/null @@ -1,3 +0,0 @@ -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...). diff --git a/packages/website/md/docs/json_schemas/schemas.md b/packages/website/md/docs/json_schemas/schemas.md deleted file mode 100644 index fcf5d8df6..000000000 --- a/packages/website/md/docs/json_schemas/schemas.md +++ /dev/null @@ -1,28 +0,0 @@ -0x Protocol Schemas - -* [Basic types](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/basic_type_schemas.ts) (e.g Ethereum address, number) -* [ECSignature](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/ec_signature_schema.ts) -* [Order/SignedOrder](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_schemas.ts) -* [OrderHash](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_hash_schema.ts) - -0x.js Schemas - -* [BlockRange](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/block_range_schema.ts) -* [IndexFilter Values](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/index_filter_values_schema.ts) -* [OrderFillRequests](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_fill_requests_schema.ts) -* [OrderCancellationRequests](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_cancel_schema.ts) -* [OrderFillOrKillRequests](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.ts) -* [SignedOrders](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/signed_orders_schema.ts) -* [Token](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/token_schema.ts) -* [TxData](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/tx_data_schema.ts) - -Standard Relayer API Schemas - -* [Error response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_error_response_schema.ts) -* [Fees payload](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_fees_payload_schema.ts) -* [Fees response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_fees_response_schema.ts) -* [Orderbook channel subscribe](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orberbook_channel_subscribe_schema.ts) -* [Orderbook channel snapshot](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orderbook_channel_snapshot_schema.ts) -* [Orderbook channel update](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orderbook_channel_update_response_schema.ts) -* [Orderbook response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_orderbook_response_schema.ts) -* [Token pairs response](https://github.com/0xProject/0x-monorepo/blob/d4c1b3b0bd26e730ce6687469cdf7283877543e1/packages/json-schemas/schemas/relayer_api_token_pairs_response_schema.ts) diff --git a/packages/website/md/docs/json_schemas/usage.md b/packages/website/md/docs/json_schemas/usage.md deleted file mode 100644 index 68b801153..000000000 --- a/packages/website/md/docs/json_schemas/usage.md +++ /dev/null @@ -1,14 +0,0 @@ -The following example shows you how to validate a 0x order using the `@0xproject/json-schemas` package. - -```javascript -import {SchemaValidator, ValidatorResult, schemas} from '@0xproject/json-schemas'; - -const {orderSchema} = schemas; -const validator = new SchemaValidator(); - -const order = { - ... -}; -const validatorResult: ValidatorResult = validator.validate(order, orderSchema); // Contains all errors -const isValid: boolean = validator.isValid(order, orderSchema); // Only returns boolean -``` diff --git a/packages/website/md/docs/order_utils/1.0.0/installation.md b/packages/website/md/docs/order_utils/1.0.0/installation.md new file mode 100644 index 000000000..68a7cf960 --- /dev/null +++ b/packages/website/md/docs/order_utils/1.0.0/installation.md @@ -0,0 +1,17 @@ +**Install** + +```bash +yarn add @0xproject/order-utils +``` + +**Import** + +```javascript +import { createSignedOrderAsync } from '@0xproject/order-utils'; +``` + +or + +```javascript +var createSignedOrderAsync = require('@0xproject/order-utils').createSignedOrderAsync; +``` diff --git a/packages/website/md/docs/order_utils/1.0.0/introduction.md b/packages/website/md/docs/order_utils/1.0.0/introduction.md new file mode 100644 index 000000000..d5f3f2925 --- /dev/null +++ b/packages/website/md/docs/order_utils/1.0.0/introduction.md @@ -0,0 +1 @@ +Welcome to the [@0xproject/order-utils](https://github.com/0xProject/0x-monorepo/tree/development/packages/order-utils) documentation! Order utils is a set of utils around creating, signing, validating 0x orders. diff --git a/packages/website/md/docs/order_utils/installation.md b/packages/website/md/docs/order_utils/installation.md deleted file mode 100644 index 68a7cf960..000000000 --- a/packages/website/md/docs/order_utils/installation.md +++ /dev/null @@ -1,17 +0,0 @@ -**Install** - -```bash -yarn add @0xproject/order-utils -``` - -**Import** - -```javascript -import { createSignedOrderAsync } from '@0xproject/order-utils'; -``` - -or - -```javascript -var createSignedOrderAsync = require('@0xproject/order-utils').createSignedOrderAsync; -``` diff --git a/packages/website/md/docs/order_utils/introduction.md b/packages/website/md/docs/order_utils/introduction.md deleted file mode 100644 index d5f3f2925..000000000 --- a/packages/website/md/docs/order_utils/introduction.md +++ /dev/null @@ -1 +0,0 @@ -Welcome to the [@0xproject/order-utils](https://github.com/0xProject/0x-monorepo/tree/development/packages/order-utils) documentation! Order utils is a set of utils around creating, signing, validating 0x orders. diff --git a/packages/website/md/docs/smart_contracts/1.0.0/introduction.md b/packages/website/md/docs/smart_contracts/1.0.0/introduction.md new file mode 100644 index 000000000..566a573b6 --- /dev/null +++ b/packages/website/md/docs/smart_contracts/1.0.0/introduction.md @@ -0,0 +1,8 @@ +Welcome to the [0x smart contracts](https://github.com/0xProject/contracts) documentation! This documentation is intended for dApp developers who want to integrate 0x exchange functionality directly into their own smart contracts. + +### Helpful wiki articles: + +* [Overview of 0x protocol architecture](https://0xproject.com/wiki#Architecture) +* [0x smart contract interactions](https://0xproject.com/wiki#Contract-Interactions) +* [Deployed smart contract addresses](https://0xproject.com/wiki#Deployed-Addresses) +* [0x protocol message format](https://0xproject.com/wiki#Message-Format) diff --git a/packages/website/md/docs/smart_contracts/introduction.md b/packages/website/md/docs/smart_contracts/introduction.md deleted file mode 100644 index 566a573b6..000000000 --- a/packages/website/md/docs/smart_contracts/introduction.md +++ /dev/null @@ -1,8 +0,0 @@ -Welcome to the [0x smart contracts](https://github.com/0xProject/contracts) documentation! This documentation is intended for dApp developers who want to integrate 0x exchange functionality directly into their own smart contracts. - -### Helpful wiki articles: - -* [Overview of 0x protocol architecture](https://0xproject.com/wiki#Architecture) -* [0x smart contract interactions](https://0xproject.com/wiki#Contract-Interactions) -* [Deployed smart contract addresses](https://0xproject.com/wiki#Deployed-Addresses) -* [0x protocol message format](https://0xproject.com/wiki#Message-Format) diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts index f939ef0df..abf419347 100644 --- a/packages/website/ts/containers/connect_documentation.ts +++ b/packages/website/ts/containers/connect_documentation.ts @@ -10,8 +10,8 @@ import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/connect/introduction'); -const InstallationMarkdown = require('md/docs/connect/installation'); +const IntroMarkdownV1 = require('md/docs/connect/1.0.0/introduction'); +const InstallationMarkdownV1 = require('md/docs/connect/1.0.0/installation'); /* tslint:enable:no-var-requires */ const connectDocSections = { @@ -34,9 +34,11 @@ const docsInfoConfig: DocsInfoConfig = { webSocketOrderbookChannel: [connectDocSections.webSocketOrderbookChannel], types: [connectDocSections.types], }, - sectionNameToMarkdown: { - [connectDocSections.introduction]: IntroMarkdown, - [connectDocSections.installation]: InstallationMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [connectDocSections.introduction]: IntroMarkdownV1, + [connectDocSections.installation]: InstallationMarkdownV1, + }, }, sectionNameToModulePath: { [connectDocSections.httpClient]: ['"src/http_client"'], diff --git a/packages/website/ts/containers/ethereum_types_documentation.ts b/packages/website/ts/containers/ethereum_types_documentation.ts index 285438835..0be8dd3bc 100644 --- a/packages/website/ts/containers/ethereum_types_documentation.ts +++ b/packages/website/ts/containers/ethereum_types_documentation.ts @@ -30,9 +30,11 @@ const docsInfoConfig: DocsInfoConfig = { install: [docSections.installation], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdown, + [docSections.installation]: InstallationMarkdown, + }, }, sectionNameToModulePath: { [docSections.types]: ['"index"'], diff --git a/packages/website/ts/containers/json_schemas_documentation.ts b/packages/website/ts/containers/json_schemas_documentation.ts index 67740d4c6..523777114 100644 --- a/packages/website/ts/containers/json_schemas_documentation.ts +++ b/packages/website/ts/containers/json_schemas_documentation.ts @@ -9,10 +9,10 @@ import { DocPackages } from 'ts/types'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/json_schemas/introduction'); -const InstallationMarkdown = require('md/docs/json_schemas/installation'); -const UsageMarkdown = require('md/docs/json_schemas/usage'); -const SchemasMarkdown = require('md/docs/json_schemas/schemas'); +const IntroMarkdownV1 = require('md/docs/json_schemas/1.0.0/introduction'); +const InstallationMarkdownV1 = require('md/docs/json_schemas/1.0.0/installation'); +const UsageMarkdownV1 = require('md/docs/json_schemas/1.0.0/usage'); +const SchemasMarkdownV1 = require('md/docs/json_schemas/1.0.0/schemas'); /* tslint:enable:no-var-requires */ const docSections = { @@ -35,11 +35,13 @@ const docsInfoConfig: DocsInfoConfig = { schemaValidator: [docSections.schemaValidator], schemas: [docSections.schemas], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, - [docSections.schemas]: SchemasMarkdown, - [docSections.usage]: UsageMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + [docSections.installation]: InstallationMarkdownV1, + [docSections.schemas]: SchemasMarkdownV1, + [docSections.usage]: UsageMarkdownV1, + }, }, sectionNameToModulePath: { [docSections.schemaValidator]: ['"json-schemas/src/schema_validator"'], diff --git a/packages/website/ts/containers/order_utils_documentation.ts b/packages/website/ts/containers/order_utils_documentation.ts index 37b7f2273..c6570f514 100644 --- a/packages/website/ts/containers/order_utils_documentation.ts +++ b/packages/website/ts/containers/order_utils_documentation.ts @@ -10,8 +10,8 @@ import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/order_utils/introduction'); -const InstallationMarkdown = require('md/docs/order_utils/installation'); +const IntroMarkdownV1 = require('md/docs/order_utils/1.0.0/introduction'); +const InstallationMarkdownV1 = require('md/docs/order_utils/1.0.0/installation'); /* tslint:enable:no-var-requires */ const docSections = { @@ -32,9 +32,11 @@ const docsInfoConfig: DocsInfoConfig = { usage: [docSections.usage], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + [docSections.installation]: InstallationMarkdownV1, + }, }, sectionNameToModulePath: { [docSections.usage]: [ diff --git a/packages/website/ts/containers/smart_contracts_documentation.ts b/packages/website/ts/containers/smart_contracts_documentation.ts index c88c3b365..b0a712477 100644 --- a/packages/website/ts/containers/smart_contracts_documentation.ts +++ b/packages/website/ts/containers/smart_contracts_documentation.ts @@ -10,7 +10,7 @@ import { DocPackages, SmartContractDocSections as Sections } from 'ts/types'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/smart_contracts/introduction'); +const IntroMarkdownV1 = require('md/docs/smart_contracts/1.0.0/introduction'); /* tslint:enable:no-var-requires */ const docsInfoConfig: DocsInfoConfig = { @@ -22,8 +22,10 @@ const docsInfoConfig: DocsInfoConfig = { introduction: [Sections.Introduction], contracts: [Sections.Exchange, Sections.TokenRegistry, Sections.ZRXToken, Sections.TokenTransferProxy], }, - sectionNameToMarkdown: { - [Sections.Introduction]: IntroMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [Sections.Introduction]: IntroMarkdownV1, + }, }, sections: { Introduction: Sections.Introduction, diff --git a/packages/website/ts/containers/sol_compiler_documentation.ts b/packages/website/ts/containers/sol_compiler_documentation.ts index 8720e2c1d..b289c8f34 100644 --- a/packages/website/ts/containers/sol_compiler_documentation.ts +++ b/packages/website/ts/containers/sol_compiler_documentation.ts @@ -9,8 +9,8 @@ import { DocPackages } from 'ts/types'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/sol-compiler/introduction'); -const InstallationMarkdown = require('md/docs/sol-compiler/installation'); +const IntroMarkdownV1 = require('md/docs/sol-compiler/introduction'); +const InstallationMarkdownV1 = require('md/docs/sol-compiler/installation'); const UsageMarkdown = require('md/docs/sol-compiler/usage'); /* tslint:enable:no-var-requires */ @@ -34,10 +34,12 @@ const docsInfoConfig: DocsInfoConfig = { compiler: [docSections.compiler], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, - [docSections.usage]: UsageMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + [docSections.installation]: InstallationMarkdownV1, + [docSections.usage]: UsageMarkdown, + }, }, sectionNameToModulePath: { [docSections.compiler]: ['"sol-compiler/src/compiler"'], diff --git a/packages/website/ts/containers/sol_cov_documentation.ts b/packages/website/ts/containers/sol_cov_documentation.ts index a8009071f..d78c450ed 100644 --- a/packages/website/ts/containers/sol_cov_documentation.ts +++ b/packages/website/ts/containers/sol_cov_documentation.ts @@ -9,8 +9,8 @@ import { DocPackages } from 'ts/types'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/sol_cov/introduction'); -const InstallationMarkdown = require('md/docs/sol_cov/installation'); +const IntroMarkdownV1 = require('md/docs/sol_cov/introduction'); +const InstallationMarkdownV1 = require('md/docs/sol_cov/installation'); const UsageMarkdown = require('md/docs/sol_cov/usage'); /* tslint:enable:no-var-requires */ @@ -40,10 +40,12 @@ const docsInfoConfig: DocsInfoConfig = { 'truffle-artifact-adapter': [docSections.truffleArtifactAdapter], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, - [docSections.usage]: UsageMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + [docSections.installation]: InstallationMarkdownV1, + [docSections.usage]: UsageMarkdown, + }, }, sectionNameToModulePath: { [docSections.coverageSubprovider]: ['"sol-cov/src/coverage_subprovider"'], diff --git a/packages/website/ts/containers/subproviders_documentation.ts b/packages/website/ts/containers/subproviders_documentation.ts index 567f6a37e..0e9150d7b 100644 --- a/packages/website/ts/containers/subproviders_documentation.ts +++ b/packages/website/ts/containers/subproviders_documentation.ts @@ -10,8 +10,8 @@ import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/subproviders/introduction'); -const InstallationMarkdown = require('md/docs/subproviders/installation'); +const IntroMarkdownV1 = require('md/docs/subproviders/introduction'); +const InstallationMarkdownV1 = require('md/docs/subproviders/installation'); const LedgerNodeHidMarkdown = require('md/docs/subproviders/ledger_node_hid'); /* tslint:enable:no-var-requires */ @@ -57,10 +57,12 @@ const docsInfoConfig: DocsInfoConfig = { ['nonceTracker-subprovider']: [docSections.nonceTrackerSubprovider], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, - [docSections.ledgerNodeHid]: LedgerNodeHidMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + [docSections.installation]: InstallationMarkdownV1, + [docSections.ledgerNodeHid]: LedgerNodeHidMarkdown, + }, }, sectionNameToModulePath: { [docSections.subprovider]: ['"subproviders/src/subproviders/subprovider"'], diff --git a/packages/website/ts/containers/web3_wrapper_documentation.ts b/packages/website/ts/containers/web3_wrapper_documentation.ts index b04a83ac4..8d98d9476 100644 --- a/packages/website/ts/containers/web3_wrapper_documentation.ts +++ b/packages/website/ts/containers/web3_wrapper_documentation.ts @@ -10,8 +10,8 @@ import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/web3_wrapper/introduction'); -const InstallationMarkdown = require('md/docs/web3_wrapper/installation'); +const IntroMarkdownV1 = require('md/docs/web3_wrapper/introduction'); +const InstallationMarkdownV1 = require('md/docs/web3_wrapper/installation'); /* tslint:enable:no-var-requires */ const docSections = { @@ -32,9 +32,11 @@ const docsInfoConfig: DocsInfoConfig = { web3Wrapper: [docSections.web3Wrapper], types: [docSections.types], }, - sectionNameToMarkdown: { - [docSections.introduction]: IntroMarkdown, - [docSections.installation]: InstallationMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [docSections.introduction]: IntroMarkdownV1, + [docSections.installation]: InstallationMarkdownV1, + }, }, sectionNameToModulePath: { [docSections.web3Wrapper]: ['"web3-wrapper/src/web3_wrapper"'], diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index bd0d1732a..b43a1f645 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -10,11 +10,11 @@ import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; /* tslint:disable:no-var-requires */ -const IntroMarkdown = require('md/docs/0xjs/introduction'); -const InstallationMarkdown = require('md/docs/0xjs/installation'); -const AsyncMarkdown = require('md/docs/0xjs/async'); -const ErrorsMarkdown = require('md/docs/0xjs/errors'); -const versioningMarkdown = require('md/docs/0xjs/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 = require('md/docs/0xjs/1.0.0/errors'); +const versioningMarkdownV1 = require('md/docs/0xjs/1.0.0/versioning'); /* tslint:enable:no-var-requires */ const zeroExJsDocSections = { @@ -54,12 +54,14 @@ const docsInfoConfig: DocsInfoConfig = { orderWatcher: [zeroExJsDocSections.orderWatcher], types: [zeroExJsDocSections.types], }, - sectionNameToMarkdown: { - [zeroExJsDocSections.introduction]: IntroMarkdown, - [zeroExJsDocSections.installation]: InstallationMarkdown, - [zeroExJsDocSections.async]: AsyncMarkdown, - [zeroExJsDocSections.errors]: ErrorsMarkdown, - [zeroExJsDocSections.versioning]: versioningMarkdown, + sectionNameToMarkdownByVersion: { + '0.0.1': { + [zeroExJsDocSections.introduction]: IntroMarkdownV1, + [zeroExJsDocSections.installation]: InstallationMarkdownV1, + [zeroExJsDocSections.async]: AsyncMarkdownV1, + [zeroExJsDocSections.errors]: ErrorsMarkdownV1, + [zeroExJsDocSections.versioning]: versioningMarkdownV1, + }, }, sectionNameToModulePath: { [zeroExJsDocSections.zeroEx]: ['"0x.js/src/0x"', '"src/0x"'], -- cgit From 82771ec64a6fc0d2d260ec4bd44391f451585131 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 9 Jul 2018 19:53:54 +0200 Subject: Remove comment and add assertion --- packages/react-docs/src/components/documentation.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/documentation.tsx index 7030001e8..ff33220d2 100644 --- a/packages/react-docs/src/components/documentation.tsx +++ b/packages/react-docs/src/components/documentation.tsx @@ -182,10 +182,16 @@ export class Documentation extends React.Component { return semver.lte(mdVersion, this.props.selectedVersion); }); + if (_.isEmpty(eligibleVersions)) { + throw new Error( + `No eligible markdown sections found for ${this.props.docsInfo.displayName} version ${ + this.props.selectedVersion + }.`, + ); + } const sortedEligibleVersions = eligibleVersions.sort(semver.rcompare.bind(semver)); const closestVersion = sortedEligibleVersions[0]; const markdownFileIfExists = this.props.docsInfo.sectionNameToMarkdownByVersion[closestVersion][sectionName]; -- cgit From 1aaf633df883f62fad890b2d87a2dc89067821c5 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 9 Jul 2018 19:59:26 +0200 Subject: Add missing import --- packages/react-docs/src/docs_info.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts index e9f3c13fe..810674d51 100644 --- a/packages/react-docs/src/docs_info.ts +++ b/packages/react-docs/src/docs_info.ts @@ -9,6 +9,7 @@ import { DocsInfoTypeConfigs, DocsMenu, DoxityDocObj, + SectionNameToMarkdownByVersion, SectionsMap, SupportedDocJson, TypeDefinitionByName, -- cgit From 55336f96d70d05f07725564bf6aec573dc3246c2 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 18 Jul 2018 15:53:33 -0700 Subject: Fix broken links in sol-cov documentation --- packages/website/md/docs/sol_cov/usage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/website/md/docs/sol_cov/usage.md b/packages/website/md/docs/sol_cov/usage.md index 433cfad96..c747005fb 100644 --- a/packages/website/md/docs/sol_cov/usage.md +++ b/packages/website/md/docs/sol_cov/usage.md @@ -8,7 +8,7 @@ In order to use `CoverageSubprovider` with your favorite framework you need to p ### Sol-compiler -If you are generating your artifacts with [@0xproject/sol-compiler](LINK) you can use the `SolCompilerArtifactsAdapter` we've implemented for you. +If you are generating your artifacts with [@0xproject/sol-compiler](https://0xproject.com/docs/sol-compiler) you can use the `SolCompilerArtifactsAdapter` we've implemented for you. ```typescript import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov'; @@ -19,7 +19,7 @@ const artifactsAdapter = new SolCompilerArtifactsAdapter(artifactsPath, contract ### Truffle -If your project is using [Truffle](LINK), we've written a `TruffleArtifactsAdapter`for you. +If your project is using [Truffle](https://truffleframework.com/), we've written a `TruffleArtifactsAdapter`for you. ```typescript import { TruffleArtifactAdapter } from '@0xproject/sol-cov'; -- cgit From 6529e060575c22612ded98545d1915686c54161d Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 19 Jul 2018 17:51:03 +1000 Subject: Rename call data schema id to CallData. Check for TypedArray when hashing data in order-utils crypto --- packages/json-schemas/schemas/call_data_schema.ts | 2 +- packages/order-utils/src/crypto.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/json-schemas/schemas/call_data_schema.ts b/packages/json-schemas/schemas/call_data_schema.ts index e8fcc7512..b9d00ad2a 100644 --- a/packages/json-schemas/schemas/call_data_schema.ts +++ b/packages/json-schemas/schemas/call_data_schema.ts @@ -1,5 +1,5 @@ export const callDataSchema = { - id: '/TxData', + id: '/CallData', properties: { from: { $ref: '/Address' }, to: { $ref: '/Address' }, diff --git a/packages/order-utils/src/crypto.ts b/packages/order-utils/src/crypto.ts index 517ca2840..0f1504a72 100644 --- a/packages/order-utils/src/crypto.ts +++ b/packages/order-utils/src/crypto.ts @@ -32,7 +32,7 @@ export const crypto = { argTypes.push('address'); } else if (_.isString(arg)) { argTypes.push('string'); - } else if (_.isBuffer(arg)) { + } else if (_.isBuffer(arg) || _.isTypedArray(arg)) { argTypes.push('bytes'); } else if (_.isBoolean(arg)) { argTypes.push('bool'); -- cgit From 81007c453c8885dd1d7c89d22a20d0785bf17c88 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 19 Jul 2018 19:24:26 +1000 Subject: Update CHANGELOG --- packages/json-schemas/CHANGELOG.json | 4 ++++ packages/order-utils/CHANGELOG.json | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'packages') diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 2f8f2573f..b69b440cf 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Added CallData schema", "pr": 821 + }, + { + "note": "Update CallData schema id to CallData", + "pr": 894 } ] }, diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 4358c2c9c..e61033c53 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Export parseECSignature method", "pr": 684 + }, + { + "note": "Handle Typed Arrays when hashing data", + "pr": 894 } ] }, -- cgit From 6f540e3e58e6cf921d038f9537d428d28078836f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 15:50:21 +0200 Subject: Replace lerna-get-packages with our own implementation --- .../src/find_unused_dependencies.ts | 3 +- packages/monorepo-scripts/src/globals.d.ts | 20 +----------- packages/monorepo-scripts/src/prepublish_checks.ts | 1 + packages/monorepo-scripts/src/publish.ts | 2 +- packages/monorepo-scripts/src/test_installation.ts | 3 +- packages/monorepo-scripts/src/types.ts | 14 +++++++++ packages/monorepo-scripts/src/utils/utils.ts | 36 ++++++++++++++++++++-- .../types/lerna-get-packages/index.d.ts | 16 ---------- 8 files changed, 52 insertions(+), 43 deletions(-) delete mode 100644 packages/typescript-typings/types/lerna-get-packages/index.d.ts (limited to 'packages') diff --git a/packages/monorepo-scripts/src/find_unused_dependencies.ts b/packages/monorepo-scripts/src/find_unused_dependencies.ts index 11e48ab13..1a36aceee 100644 --- a/packages/monorepo-scripts/src/find_unused_dependencies.ts +++ b/packages/monorepo-scripts/src/find_unused_dependencies.ts @@ -1,7 +1,6 @@ #!/usr/bin/env node import * as depcheckAsync from 'depcheck'; -import lernaGetPackages = require('lerna-get-packages'); import * as _ from 'lodash'; import { constants } from './constants'; @@ -13,7 +12,7 @@ const IGNORE_PACKAGES = ['@0xproject/sol-compiler']; (async () => { utils.log('*** NOTE: Not all deps listed here are actually not required. ***'); utils.log("*** `depcheck` isn't perfect so double check before actually removing any. ***\n"); - const lernaPackages = lernaGetPackages(constants.monorepoRootPath); + const lernaPackages = utils.getLernaPackages(constants.monorepoRootPath); for (const lernaPackage of lernaPackages) { if (_.includes(IGNORE_PACKAGES, lernaPackage.package.name)) { continue; // skip diff --git a/packages/monorepo-scripts/src/globals.d.ts b/packages/monorepo-scripts/src/globals.d.ts index 1693a6dbb..ccdf90d2a 100644 --- a/packages/monorepo-scripts/src/globals.d.ts +++ b/packages/monorepo-scripts/src/globals.d.ts @@ -13,23 +13,5 @@ declare module 'semver-sort' { const desc: (versions: string[]) => string[]; } -declare interface LernaPackage { - location: string; - package: { - private?: boolean; - version: string; - name: string; - main?: string; - scripts?: { [command: string]: string }; - config?: { - additionalTsTypings?: string[]; - }; - }; -} -declare function lernaGetPackages(path: string): LernaPackage[]; -// lerna-get-packages declarations -declare module 'lerna-get-packages' { - export = lernaGetPackages; -} - declare module 'promisify-child-process'; +declare module '@lerna/project'; diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts index 3b4ff9082..81b2f414b 100644 --- a/packages/monorepo-scripts/src/prepublish_checks.ts +++ b/packages/monorepo-scripts/src/prepublish_checks.ts @@ -4,6 +4,7 @@ import semver = require('semver'); import semverSort = require('semver-sort'); import { constants } from './constants'; +import { LernaPackage } from './types'; import { changelogUtils } from './utils/changelog_utils'; import { npmUtils } from './utils/npm_utils'; import { utils } from './utils/utils'; diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts index 72c6c0a71..94b67eab3 100644 --- a/packages/monorepo-scripts/src/publish.ts +++ b/packages/monorepo-scripts/src/publish.ts @@ -11,7 +11,7 @@ import semverDiff = require('semver-diff'); import semverSort = require('semver-sort'); import { constants } from './constants'; -import { PackageToVersionChange, SemVerIndex, VersionChangelog } from './types'; +import { LernaPackage, PackageToVersionChange, SemVerIndex, VersionChangelog } from './types'; import { changelogUtils } from './utils/changelog_utils'; import { utils } from './utils/utils'; diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index b67154667..34d065c58 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -1,7 +1,6 @@ #!/usr/bin/env node import * as fs from 'fs'; -import lernaGetPackages = require('lerna-get-packages'); import * as _ from 'lodash'; import * as path from 'path'; import { exec as execAsync } from 'promisify-child-process'; @@ -11,7 +10,7 @@ import { utils } from './utils/utils'; (async () => { const monorepoRootPath = path.join(__dirname, '../../..'); - const lernaPackages = lernaGetPackages(monorepoRootPath); + const lernaPackages = utils.getLernaPackages(monorepoRootPath); const installablePackages = _.filter( lernaPackages, lernaPackage => diff --git a/packages/monorepo-scripts/src/types.ts b/packages/monorepo-scripts/src/types.ts index 61bd75732..052a38d1f 100644 --- a/packages/monorepo-scripts/src/types.ts +++ b/packages/monorepo-scripts/src/types.ts @@ -40,3 +40,17 @@ export interface PackageRegistryJson { export interface GitTagsByPackageName { [packageName: string]: string[]; } + +export interface LernaPackage { + location: string; + package: { + private?: boolean; + version: string; + name: string; + main?: string; + scripts?: { [command: string]: string }; + config?: { + additionalTsTypings?: string[]; + }; + }; +} diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts index be3ad950f..78bac1e4e 100644 --- a/packages/monorepo-scripts/src/utils/utils.ts +++ b/packages/monorepo-scripts/src/utils/utils.ts @@ -1,10 +1,10 @@ -import lernaGetPackages = require('lerna-get-packages'); +import * as fs from 'fs'; import * as _ from 'lodash'; import { exec as execAsync } from 'promisify-child-process'; import semver = require('semver'); import { constants } from '../constants'; -import { GitTagsByPackageName, UpdatedPackage } from '../types'; +import { GitTagsByPackageName, LernaPackage, UpdatedPackage } from '../types'; import { changelogUtils } from './changelog_utils'; @@ -12,11 +12,41 @@ export const utils = { log(...args: any[]): void { console.log(...args); // tslint:disable-line:no-console }, + getLernaPackages(rootDir: string): LernaPackage[] { + const rootPackageJsonString = fs.readFileSync(`${rootDir}/package.json`, 'utf8'); + const rootPackageJson = JSON.parse(rootPackageJsonString); + if (_.isUndefined(rootPackageJson.workspaces)) { + throw new Error(`Did not find 'workspaces' key in root package.json`); + } + const lernaPackages = []; + for (const workspace of rootPackageJson.workspaces) { + const workspacePath = workspace.replace('*', ''); + const subpackageNames = fs.readdirSync(`${rootDir}/${workspacePath}`); + for (const subpackageName of subpackageNames) { + if (_.startsWith(subpackageName, '.')) { + continue; + } + const pathToPackageJson = `${rootDir}/${workspacePath}${subpackageName}`; + try { + const packageJsonString = fs.readFileSync(`${pathToPackageJson}/package.json`, 'utf8'); + const packageJson = JSON.parse(packageJsonString); + const lernaPackage = { + location: pathToPackageJson, + package: packageJson, + }; + lernaPackages.push(lernaPackage); + } catch (err) { + utils.log(`Couldn't find a 'package.json' for ${subpackageName}. Skipping...`); + } + } + } + return lernaPackages; + }, async getUpdatedLernaPackagesAsync(shouldIncludePrivate: boolean): Promise { const updatedPublicPackages = await utils.getLernaUpdatedPackagesAsync(shouldIncludePrivate); const updatedPackageNames = _.map(updatedPublicPackages, pkg => pkg.name); - const allLernaPackages = lernaGetPackages(constants.monorepoRootPath); + const allLernaPackages = utils.getLernaPackages(constants.monorepoRootPath); const updatedPublicLernaPackages = _.filter(allLernaPackages, pkg => { return _.includes(updatedPackageNames, pkg.package.name); }); diff --git a/packages/typescript-typings/types/lerna-get-packages/index.d.ts b/packages/typescript-typings/types/lerna-get-packages/index.d.ts deleted file mode 100644 index 0650a542c..000000000 --- a/packages/typescript-typings/types/lerna-get-packages/index.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -declare interface LernaPackage { - location: string; - package: { - private?: boolean; - version: string; - name: string; - main?: string; - config?: { - additionalTsTypings?: string[]; - }; - }; -} -declare function lernaGetPackages(path: string): LernaPackage[]; -declare module 'lerna-get-packages' { - export = lernaGetPackages; -} -- cgit From 74c0fd419b74cdc959add175f575f52306518140 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 15:51:38 +0200 Subject: Upgrade Lerna to 3.0-Beta14 --- packages/monorepo-scripts/package.json | 5 ++--- packages/monorepo-scripts/src/constants.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index f3a6aa793..1d641a7f5 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -33,12 +33,11 @@ "@types/node": "^8.0.53", "@types/opn": "^5.1.0", "@types/rimraf": "^2.0.2", + "@types/semver": "5.5.0", "depcheck": "^0.6.9", - "lerna-get-packages": "^1.0.0", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", - "@types/semver": "5.5.0", "tslint": "5.11.0", "typescript": "2.7.1" }, @@ -56,8 +55,8 @@ "prompt": "^1.0.0", "publish-release": "0xproject/publish-release", "rimraf": "^2.6.2", - "semver-diff": "^2.1.0", "semver": "5.5.0", + "semver-diff": "^2.1.0", "semver-sort": "0.0.4" }, "publishConfig": { diff --git a/packages/monorepo-scripts/src/constants.ts b/packages/monorepo-scripts/src/constants.ts index 3aaf881cb..f08313bd2 100644 --- a/packages/monorepo-scripts/src/constants.ts +++ b/packages/monorepo-scripts/src/constants.ts @@ -3,6 +3,6 @@ import * as path from 'path'; export const constants = { monorepoRootPath: path.join(__dirname, '../../..'), stagingWebsite: 'http://staging-0xproject.s3-website-us-east-1.amazonaws.com', - lernaExecutable: path.join('node_modules', 'lerna', 'bin', 'lerna.js'), + lernaExecutable: path.join('node_modules', 'lerna', 'cli.js'), githubPersonalAccessToken: process.env.GITHUB_PERSONAL_ACCESS_TOKEN_0X_JS, }; -- cgit From 7d840c7a1825f9aad16f3ab644e6f31819fefd59 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 16:26:00 +0200 Subject: Remove unused declaration --- packages/monorepo-scripts/src/globals.d.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/src/globals.d.ts b/packages/monorepo-scripts/src/globals.d.ts index ccdf90d2a..cb6a61b55 100644 --- a/packages/monorepo-scripts/src/globals.d.ts +++ b/packages/monorepo-scripts/src/globals.d.ts @@ -14,4 +14,3 @@ declare module 'semver-sort' { } declare module 'promisify-child-process'; -declare module '@lerna/project'; -- cgit From 1df9370bc21e93267b5432668967118d7001abf2 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 16:26:45 +0200 Subject: Renames to remove mention of Lerna --- .../src/find_unused_dependencies.ts | 10 ++--- packages/monorepo-scripts/src/prepublish_checks.ts | 44 +++++++++++----------- packages/monorepo-scripts/src/publish.ts | 35 ++++++++--------- packages/monorepo-scripts/src/test_installation.ts | 15 +++----- packages/monorepo-scripts/src/types.ts | 4 +- packages/monorepo-scripts/src/utils/utils.ts | 24 ++++++------ 6 files changed, 64 insertions(+), 68 deletions(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/src/find_unused_dependencies.ts b/packages/monorepo-scripts/src/find_unused_dependencies.ts index 1a36aceee..4bb4b7dc5 100644 --- a/packages/monorepo-scripts/src/find_unused_dependencies.ts +++ b/packages/monorepo-scripts/src/find_unused_dependencies.ts @@ -12,15 +12,15 @@ const IGNORE_PACKAGES = ['@0xproject/sol-compiler']; (async () => { utils.log('*** NOTE: Not all deps listed here are actually not required. ***'); utils.log("*** `depcheck` isn't perfect so double check before actually removing any. ***\n"); - const lernaPackages = utils.getLernaPackages(constants.monorepoRootPath); - for (const lernaPackage of lernaPackages) { - if (_.includes(IGNORE_PACKAGES, lernaPackage.package.name)) { + const packages = utils.getPackages(constants.monorepoRootPath); + for (const pkg of packages) { + if (_.includes(IGNORE_PACKAGES, pkg.packageJson.name)) { continue; // skip } - utils.log(`Checking ${lernaPackage.package.name} for unused deps. This might take a while...`); + utils.log(`Checking ${pkg.packageJson.name} for unused deps. This might take a while...`); const configs = {}; - const { dependencies } = await depcheckAsync(lernaPackage.location, configs); + const { dependencies } = await depcheckAsync(pkg.location, configs); if (!_.isEmpty(dependencies)) { _.each(dependencies, dep => { utils.log(dep); diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts index 81b2f414b..431e848ca 100644 --- a/packages/monorepo-scripts/src/prepublish_checks.ts +++ b/packages/monorepo-scripts/src/prepublish_checks.ts @@ -4,35 +4,33 @@ import semver = require('semver'); import semverSort = require('semver-sort'); import { constants } from './constants'; -import { LernaPackage } from './types'; +import { Package } from './types'; import { changelogUtils } from './utils/changelog_utils'; import { npmUtils } from './utils/npm_utils'; import { utils } from './utils/utils'; async function prepublishChecksAsync(): Promise { const shouldIncludePrivate = false; - const updatedPublicLernaPackages = await utils.getUpdatedLernaPackagesAsync(shouldIncludePrivate); + const updatedPublicPackages = await utils.getUpdatedPackagesAsync(shouldIncludePrivate); - await checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(updatedPublicLernaPackages); - await checkChangelogFormatAsync(updatedPublicLernaPackages); - await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicLernaPackages); + await checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(updatedPublicPackages); + await checkChangelogFormatAsync(updatedPublicPackages); + await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicPackages); await checkPublishRequiredSetupAsync(); } -async function checkGitTagsForNextVersionAndDeleteIfExistAsync( - updatedPublicLernaPackages: LernaPackage[], -): Promise { - const packageNames = _.map(updatedPublicLernaPackages, lernaPackage => lernaPackage.package.name); +async function checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicPackages: Package[]): Promise { + const packageNames = _.map(updatedPublicPackages, pkg => pkg.packageJson.name); const localGitTags = await utils.getLocalGitTagsAsync(); const localTagVersionsByPackageName = await utils.getGitTagsByPackageNameAsync(packageNames, localGitTags); const remoteGitTags = await utils.getRemoteGitTagsAsync(); const remoteTagVersionsByPackageName = await utils.getGitTagsByPackageNameAsync(packageNames, remoteGitTags); - for (const lernaPackage of updatedPublicLernaPackages) { - const currentVersion = lernaPackage.package.version; - const packageName = lernaPackage.package.name; - const packageLocation = lernaPackage.location; + for (const pkg of updatedPublicPackages) { + const currentVersion = pkg.packageJson.version; + const packageName = pkg.packageJson.name; + const packageLocation = pkg.location; const nextVersion = await utils.getNextPackageVersionAsync(currentVersion, packageName, packageLocation); const remoteTagVersions = remoteTagVersionsByPackageName[packageName]; @@ -50,13 +48,13 @@ async function checkGitTagsForNextVersionAndDeleteIfExistAsync( } async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync( - updatedPublicLernaPackages: LernaPackage[], + updatedPublicPackages: Package[], ): Promise { utils.log('Check package versions against npmjs.org...'); const versionMismatches = []; - for (const lernaPackage of updatedPublicLernaPackages) { - const packageName = lernaPackage.package.name; - const packageVersion = lernaPackage.package.version; + for (const pkg of updatedPublicPackages) { + const packageName = pkg.packageJson.name; + const packageVersion = pkg.packageJson.version; const packageRegistryJsonIfExists = await npmUtils.getPackageRegistryJsonIfExistsAsync(packageName); if (_.isUndefined(packageRegistryJsonIfExists)) { continue; // noop for packages not yet published to NPM @@ -85,14 +83,14 @@ async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync( } } -async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackage[]): Promise { +async function checkChangelogFormatAsync(updatedPublicPackages: Package[]): Promise { utils.log('Check CHANGELOGs for inconsistencies...'); const changeLogInconsistencies = []; - for (const lernaPackage of updatedPublicLernaPackages) { - const packageName = lernaPackage.package.name; - const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, lernaPackage.location); + for (const pkg of updatedPublicPackages) { + const packageName = pkg.packageJson.name; + const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, pkg.location); - const currentVersion = lernaPackage.package.version; + const currentVersion = pkg.packageJson.version; if (!_.isEmpty(changelog)) { const lastEntry = changelog[0]; const doesLastEntryHaveTimestamp = !_.isUndefined(lastEntry.timestamp); @@ -106,7 +104,7 @@ async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackag // Remove incorrectly added timestamp delete changelog[0].timestamp; // Save updated CHANGELOG.json - await changelogUtils.writeChangelogJsonFileAsync(lernaPackage.location, changelog); + await changelogUtils.writeChangelogJsonFileAsync(pkg.location, changelog); utils.log(`${packageName}: Removed timestamp from latest CHANGELOG.json entry.`); } } diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts index 94b67eab3..c44e1f85e 100644 --- a/packages/monorepo-scripts/src/publish.ts +++ b/packages/monorepo-scripts/src/publish.ts @@ -11,7 +11,7 @@ import semverDiff = require('semver-diff'); import semverSort = require('semver-sort'); import { constants } from './constants'; -import { LernaPackage, PackageToVersionChange, SemVerIndex, VersionChangelog } from './types'; +import { Package, PackageToVersionChange, SemVerIndex, VersionChangelog } from './types'; import { changelogUtils } from './utils/changelog_utils'; import { utils } from './utils/utils'; @@ -34,19 +34,20 @@ const packageNameToWebsitePath: { [name: string]: string } = { 'sol-cov': 'sol-cov', subproviders: 'subproviders', 'order-utils': 'order-utils', + 'ethereum-types': 'ethereum-types', }; (async () => { // Fetch public, updated Lerna packages const shouldIncludePrivate = false; - const updatedPublicLernaPackages = await utils.getUpdatedLernaPackagesAsync(shouldIncludePrivate); + const updatedPublicPackages = await utils.getUpdatedPackagesAsync(shouldIncludePrivate); - await confirmDocPagesRenderAsync(updatedPublicLernaPackages); + await confirmDocPagesRenderAsync(updatedPublicPackages); // Update CHANGELOGs - const updatedPublicLernaPackageNames = _.map(updatedPublicLernaPackages, pkg => pkg.package.name); - utils.log(`Will update CHANGELOGs and publish: \n${updatedPublicLernaPackageNames.join('\n')}\n`); - const packageToVersionChange = await updateChangeLogsAsync(updatedPublicLernaPackages); + const updatedPublicPackageNames = _.map(updatedPublicPackages, pkg => pkg.packageJson.name); + utils.log(`Will update CHANGELOGs and publish: \n${updatedPublicPackageNames.join('\n')}\n`); + const packageToVersionChange = await updateChangeLogsAsync(updatedPublicPackages); // Push changelog changes to Github if (!IS_DRY_RUN) { @@ -65,7 +66,7 @@ const packageNameToWebsitePath: { [name: string]: string } = { process.exit(1); }); -async function confirmDocPagesRenderAsync(packages: LernaPackage[]): Promise { +async function confirmDocPagesRenderAsync(packages: Package[]): Promise { // push docs to staging utils.log("Upload all docJson's to S3 staging..."); await execAsync(`yarn stage_docs`, { cwd: constants.monorepoRootPath }); @@ -76,14 +77,14 @@ async function confirmDocPagesRenderAsync(packages: LernaPackage[]): Promise { - const scriptsIfExists = pkg.package.scripts; + const scriptsIfExists = pkg.packageJson.scripts; if (_.isUndefined(scriptsIfExists)) { throw new Error('Found a public package without any scripts in package.json'); } return !_.isUndefined(scriptsIfExists[DOC_GEN_COMMAND]); }); _.each(packagesWithDocs, pkg => { - const name = pkg.package.name; + const name = pkg.packageJson.name; const nameWithoutPrefix = _.startsWith(name, NPM_NAMESPACE) ? name.split('@0xproject/')[1] : name; const docSegmentIfExists = packageNameToWebsitePath[nameWithoutPrefix]; if (_.isUndefined(docSegmentIfExists)) { @@ -114,15 +115,15 @@ async function pushChangelogsToGithubAsync(): Promise { utils.log(`Pushed CHANGELOG updates to Github`); } -async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[]): Promise { +async function updateChangeLogsAsync(updatedPublicPackages: Package[]): Promise { const packageToVersionChange: PackageToVersionChange = {}; - for (const lernaPackage of updatedPublicLernaPackages) { - const packageName = lernaPackage.package.name; - let changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, lernaPackage.location); + for (const pkg of updatedPublicPackages) { + const packageName = pkg.packageJson.name; + let changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, pkg.location); - const currentVersion = lernaPackage.package.version; + const currentVersion = pkg.packageJson.version; const shouldAddNewEntry = changelogUtils.shouldAddNewChangelogEntry( - lernaPackage.package.name, + pkg.packageJson.name, currentVersion, changelog, ); @@ -157,11 +158,11 @@ async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[]) } // Save updated CHANGELOG.json - await changelogUtils.writeChangelogJsonFileAsync(lernaPackage.location, changelog); + await changelogUtils.writeChangelogJsonFileAsync(pkg.location, changelog); utils.log(`${packageName}: Updated CHANGELOG.json`); // Generate updated CHANGELOG.md const changelogMd = changelogUtils.generateChangelogMd(changelog); - await changelogUtils.writeChangelogMdFileAsync(lernaPackage.location, changelogMd); + await changelogUtils.writeChangelogMdFileAsync(pkg.location, changelogMd); utils.log(`${packageName}: Updated CHANGELOG.md`); } diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index 34d065c58..668d4ef1d 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -10,17 +10,14 @@ import { utils } from './utils/utils'; (async () => { const monorepoRootPath = path.join(__dirname, '../../..'); - const lernaPackages = utils.getLernaPackages(monorepoRootPath); + const packages = utils.getPackages(monorepoRootPath); const installablePackages = _.filter( - lernaPackages, - lernaPackage => - !lernaPackage.package.private && - !_.isUndefined(lernaPackage.package.main) && - lernaPackage.package.main.endsWith('.js'), + packages, + pkg => !pkg.packageJson.private && !_.isUndefined(pkg.packageJson.main) && pkg.packageJson.main.endsWith('.js'), ); - for (const installableLernaPackage of installablePackages) { - const packagePath = installableLernaPackage.location; - const packageName = installableLernaPackage.package.name; + for (const installablePackage of installablePackages) { + const packagePath = installablePackage.location; + const packageName = installablePackage.packageJson.name; utils.log(`Testing ${packageName}`); let result = await execAsync('npm pack', { cwd: packagePath }); const packedPackageFileName = result.stdout.trim(); diff --git a/packages/monorepo-scripts/src/types.ts b/packages/monorepo-scripts/src/types.ts index 052a38d1f..9f991c86c 100644 --- a/packages/monorepo-scripts/src/types.ts +++ b/packages/monorepo-scripts/src/types.ts @@ -41,9 +41,9 @@ export interface GitTagsByPackageName { [packageName: string]: string[]; } -export interface LernaPackage { +export interface Package { location: string; - package: { + packageJson: { private?: boolean; version: string; name: string; diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts index 78bac1e4e..f04b9b671 100644 --- a/packages/monorepo-scripts/src/utils/utils.ts +++ b/packages/monorepo-scripts/src/utils/utils.ts @@ -4,7 +4,7 @@ import { exec as execAsync } from 'promisify-child-process'; import semver = require('semver'); import { constants } from '../constants'; -import { GitTagsByPackageName, LernaPackage, UpdatedPackage } from '../types'; +import { GitTagsByPackageName, Package, UpdatedPackage } from '../types'; import { changelogUtils } from './changelog_utils'; @@ -12,13 +12,13 @@ export const utils = { log(...args: any[]): void { console.log(...args); // tslint:disable-line:no-console }, - getLernaPackages(rootDir: string): LernaPackage[] { + getPackages(rootDir: string): Package[] { const rootPackageJsonString = fs.readFileSync(`${rootDir}/package.json`, 'utf8'); const rootPackageJson = JSON.parse(rootPackageJsonString); if (_.isUndefined(rootPackageJson.workspaces)) { throw new Error(`Did not find 'workspaces' key in root package.json`); } - const lernaPackages = []; + const packages = []; for (const workspace of rootPackageJson.workspaces) { const workspacePath = workspace.replace('*', ''); const subpackageNames = fs.readdirSync(`${rootDir}/${workspacePath}`); @@ -30,27 +30,27 @@ export const utils = { try { const packageJsonString = fs.readFileSync(`${pathToPackageJson}/package.json`, 'utf8'); const packageJson = JSON.parse(packageJsonString); - const lernaPackage = { + const pkg = { location: pathToPackageJson, - package: packageJson, + packageJson, }; - lernaPackages.push(lernaPackage); + packages.push(pkg); } catch (err) { utils.log(`Couldn't find a 'package.json' for ${subpackageName}. Skipping...`); } } } - return lernaPackages; + return packages; }, - async getUpdatedLernaPackagesAsync(shouldIncludePrivate: boolean): Promise { + async getUpdatedPackagesAsync(shouldIncludePrivate: boolean): Promise { const updatedPublicPackages = await utils.getLernaUpdatedPackagesAsync(shouldIncludePrivate); const updatedPackageNames = _.map(updatedPublicPackages, pkg => pkg.name); - const allLernaPackages = utils.getLernaPackages(constants.monorepoRootPath); - const updatedPublicLernaPackages = _.filter(allLernaPackages, pkg => { - return _.includes(updatedPackageNames, pkg.package.name); + const allPackages = utils.getPackages(constants.monorepoRootPath); + const updatedPackages = _.filter(allPackages, pkg => { + return _.includes(updatedPackageNames, pkg.packageJson.name); }); - return updatedPublicLernaPackages; + return updatedPackages; }, async getLernaUpdatedPackagesAsync(shouldIncludePrivate: boolean): Promise { const result = await execAsync(`${constants.lernaExecutable} updated --json`, { -- cgit From f9c4d0925ea18290c6a578b2d42aa9d41c1f680f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 16:32:03 +0200 Subject: Add additional pattern removal and added HACK comment --- packages/monorepo-scripts/src/utils/utils.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts index f04b9b671..862656fbf 100644 --- a/packages/monorepo-scripts/src/utils/utils.ts +++ b/packages/monorepo-scripts/src/utils/utils.ts @@ -20,7 +20,9 @@ export const utils = { } const packages = []; for (const workspace of rootPackageJson.workspaces) { - const workspacePath = workspace.replace('*', ''); + // HACK: Remove allowed wildcards from workspace entries. + // This might be entirely comprehensive. + const workspacePath = workspace.replace('*', '').replace('**/*', ''); const subpackageNames = fs.readdirSync(`${rootDir}/${workspacePath}`); for (const subpackageName of subpackageNames) { if (_.startsWith(subpackageName, '.')) { -- cgit From 9ab6ab1bf99864510fe2a0ed7296d04e103bde65 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 17:22:26 +0200 Subject: Improve log --- packages/monorepo-scripts/src/utils/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts index 862656fbf..8ba59c81d 100644 --- a/packages/monorepo-scripts/src/utils/utils.ts +++ b/packages/monorepo-scripts/src/utils/utils.ts @@ -38,7 +38,7 @@ export const utils = { }; packages.push(pkg); } catch (err) { - utils.log(`Couldn't find a 'package.json' for ${subpackageName}. Skipping...`); + utils.log(`Couldn't find a 'package.json' for ${subpackageName}. Skipping.`); } } } -- cgit From 34df5af2955079dadd7d63c67a3f93cc82adbff3 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 17:46:24 +0200 Subject: Don't export object literal because the docs cannot yet render them, moved type to types file --- packages/web3-wrapper/CHANGELOG.json | 3 +++ packages/web3-wrapper/src/index.ts | 4 ++-- packages/web3-wrapper/src/types.ts | 6 ++++++ packages/web3-wrapper/src/web3_wrapper.ts | 10 ++-------- 4 files changed, 13 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 846e8320e..ae35c874d 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -9,6 +9,9 @@ { "note": "Add `getNodeTypeAsync` method", "pr": 812 + }, + { + "notes": "Stop exporting uniqueVersionIds object" } ] }, diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 19fe0836c..4433b4b54 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -1,3 +1,3 @@ -export { Web3Wrapper, uniqueVersionIds, NodeType } from './web3_wrapper'; -export { Web3WrapperErrors } from './types'; +export { Web3Wrapper } from './web3_wrapper'; +export { Web3WrapperErrors, NodeType } from './types'; export { marshaller } from './marshaller'; diff --git a/packages/web3-wrapper/src/types.ts b/packages/web3-wrapper/src/types.ts index b7b6bd68a..e81039186 100644 --- a/packages/web3-wrapper/src/types.ts +++ b/packages/web3-wrapper/src/types.ts @@ -57,3 +57,9 @@ export interface TxDataRPC extends CallTxDataBaseRPC { export interface CallDataRPC extends CallTxDataBaseRPC { from?: string; } + +// NodeType represents the type of the backing Ethereum node. +export enum NodeType { + Geth = 'GETH', + Ganache = 'GANACHE', +} diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index e828708f0..4439eb284 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -22,24 +22,18 @@ import { import * as _ from 'lodash'; import { marshaller } from './marshaller'; -import { BlockWithoutTransactionDataRPC, BlockWithTransactionDataRPC, Web3WrapperErrors } from './types'; +import { BlockWithoutTransactionDataRPC, BlockWithTransactionDataRPC, NodeType, Web3WrapperErrors } from './types'; import { utils } from './utils'; const BASE_TEN = 10; // These are unique identifiers contained in the response of the // web3_clientVersion call. -export const uniqueVersionIds = { +const uniqueVersionIds = { geth: 'Geth', ganache: 'EthereumJS TestRPC', }; -// NodeType represents the type of the backing Ethereum node. -export enum NodeType { - Geth = 'GETH', - Ganache = 'GANACHE', -} - /** * An alternative to the Web3.js library that provides a consistent, clean, promise-based interface. */ -- cgit From cc223b9eaba4710767227644d2db63298a6b8ecb Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 19:01:25 +0200 Subject: Compare host rather then origin so that it comes without the http/https prefix --- packages/website/ts/utils/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index e656d5963..439af5e4b 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -334,7 +334,7 @@ export const utils = { return utils.isDogfood() ? configs.BACKEND_BASE_STAGING_URL : configs.BACKEND_BASE_PROD_URL; }, isDevelopment(): boolean { - return _.includes(configs.DOMAINS_DEVELOPMENT, window.location.origin); + return _.includes(configs.DOMAINS_DEVELOPMENT, window.location.host); }, isStaging(): boolean { return _.includes(window.location.href, configs.DOMAIN_STAGING); -- cgit From b72857cd8b8a391b340d2f09636b140bcfd73a31 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 20:45:00 +0200 Subject: Update doc md files for v2 packages --- packages/website/md/docs/0xjs/2.0.0/introduction.md | 3 +++ packages/website/md/docs/0xjs/2.0.0/versioning.md | 1 + packages/website/md/docs/json_schemas/1.0.0/introduction.md | 2 ++ packages/website/ts/containers/zero_ex_js_documentation.ts | 11 +++++++++++ 4 files changed, 17 insertions(+) create mode 100644 packages/website/md/docs/0xjs/2.0.0/introduction.md create mode 100644 packages/website/md/docs/0xjs/2.0.0/versioning.md (limited to 'packages') diff --git a/packages/website/md/docs/0xjs/2.0.0/introduction.md b/packages/website/md/docs/0xjs/2.0.0/introduction.md new file mode 100644 index 000000000..b98aeef38 --- /dev/null +++ b/packages/website/md/docs/0xjs/2.0.0/introduction.md @@ -0,0 +1,3 @@ +**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) 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 new file mode 100644 index 000000000..5fe66ad9a --- /dev/null +++ b/packages/website/md/docs/0xjs/2.0.0/versioning.md @@ -0,0 +1 @@ +Since v1.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/md/docs/json_schemas/1.0.0/introduction.md b/packages/website/md/docs/json_schemas/1.0.0/introduction.md index a27f4b521..cc777b1a8 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,5 @@ +**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 [@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...). diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index 2fc08e923..6be54595d 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -15,6 +15,9 @@ 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 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 zeroExJsDocSections = { @@ -62,6 +65,14 @@ const docsInfoConfig: DocsInfoConfig = { [zeroExJsDocSections.errors]: ErrorsMarkdownV1, [zeroExJsDocSections.versioning]: versioningMarkdownV1, }, + '1.0.0-rc.1': { + [zeroExJsDocSections.introduction]: IntroMarkdownV2, + [zeroExJsDocSections.versioning]: versioningMarkdownV2, + // These are the same as for V1 + [zeroExJsDocSections.installation]: InstallationMarkdownV1, + [zeroExJsDocSections.async]: AsyncMarkdownV1, + [zeroExJsDocSections.errors]: ErrorsMarkdownV1, + }, }, sectionNameToModulePath: { [zeroExJsDocSections.zeroEx]: ['"0x.js/src/0x"', '"src/0x"'], -- cgit From e53e2ac31befb850045430ff610e1cee7c446de7 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 20:45:20 +0200 Subject: Fix version dropdown so it also renders RC versions properly --- packages/website/ts/utils/doc_utils.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/website/ts/utils/doc_utils.ts b/packages/website/ts/utils/doc_utils.ts index 1627b9b0c..b9084bba7 100644 --- a/packages/website/ts/utils/doc_utils.ts +++ b/packages/website/ts/utils/doc_utils.ts @@ -1,6 +1,5 @@ import { DoxityDocObj, TypeDocNode } from '@0xproject/react-docs'; import { fetchAsync, logUtils } from '@0xproject/utils'; -import findVersions = require('find-versions'); import * as _ from 'lodash'; import { S3FileObject, VersionToFilePath } from 'ts/types'; import convert = require('xml-js'); @@ -10,7 +9,7 @@ export const docUtils = { const versionFilePaths = await docUtils.getVersionFileNamesAsync(s3DocJsonRoot, folderName); const versionToFilePath: VersionToFilePath = {}; _.each(versionFilePaths, filePath => { - const [version] = findVersions(filePath); + const version = filePath.split('/v')[1].replace('.json', ''); versionToFilePath[version] = filePath; }); return versionToFilePath; -- cgit From c51f7a8375c970487a776f56edfc59f277144d44 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 20:51:33 +0200 Subject: Add PR nr. --- packages/web3-wrapper/CHANGELOG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index ae35c874d..f69954bdc 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -11,7 +11,8 @@ "pr": 812 }, { - "notes": "Stop exporting uniqueVersionIds object" + "notes": "Stop exporting uniqueVersionIds object", + "pr": 897 } ] }, -- cgit From e5c5b36a73aad7a84e9540d905bc568997d12c5b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 19 Jul 2018 21:05:37 +0200 Subject: Specify exact version --- packages/website/md/docs/0xjs/2.0.0/versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/website/md/docs/0xjs/2.0.0/versioning.md b/packages/website/md/docs/0xjs/2.0.0/versioning.md index 5fe66ad9a..7f2b6fee9 100644 --- a/packages/website/md/docs/0xjs/2.0.0/versioning.md +++ b/packages/website/md/docs/0xjs/2.0.0/versioning.md @@ -1 +1 @@ -Since v1.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. +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. -- cgit From c39ba37ad89402bf93e8650ff48560460fce9252 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:28:06 +0200 Subject: Change the next ethereum-types version to be 1.0.0 --- packages/ethereum-types/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json index 351e9c23f..d851e6ef2 100644 --- a/packages/ethereum-types/CHANGELOG.json +++ b/packages/ethereum-types/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "0.0.3", + "version": "1.0.0", "changes": [ { "note": "Add `TraceParams` interface for `debug_traceTransaction` parameters", -- cgit From 7679e07957cdb5836fefb689155bf563a97a43c2 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:28:51 +0200 Subject: v1.0.0 --- packages/ethereum-types/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json index e8652383d..6da90f0ca 100644 --- a/packages/ethereum-types/package.json +++ b/packages/ethereum-types/package.json @@ -1,6 +1,6 @@ { "name": "ethereum-types", - "version": "0.0.2", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 3883315447a1681848b19aba1719d8015c7df693 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:39:19 +0200 Subject: Make PR numbers links on Github releases --- packages/monorepo-scripts/CHANGELOG.json | 5 ++++- packages/monorepo-scripts/src/postpublish_utils.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/CHANGELOG.json b/packages/monorepo-scripts/CHANGELOG.json index 8cf8c60c6..51d060e27 100644 --- a/packages/monorepo-scripts/CHANGELOG.json +++ b/packages/monorepo-scripts/CHANGELOG.json @@ -1,10 +1,13 @@ [ { - "version": "0.2.3", + "version": "1.0.0", "changes": [ { "note": "Fix git remote tag removal step & add an additional sanity assertion", "pr": 803 + }, + { + "note": "Make PR numbers links on Github releases" } ] }, diff --git a/packages/monorepo-scripts/src/postpublish_utils.ts b/packages/monorepo-scripts/src/postpublish_utils.ts index 85b32ed83..3ecb7b7c5 100644 --- a/packages/monorepo-scripts/src/postpublish_utils.ts +++ b/packages/monorepo-scripts/src/postpublish_utils.ts @@ -128,7 +128,7 @@ export const postpublishUtils = { _.each(latestLog.changes, change => { notes += `* ${change.note}`; if (change.pr) { - notes += ` (${change.pr})`; + notes += ` (#${change.pr})`; } notes += `\n`; }); -- cgit From f063a5db0fecbb900f9ca3dbf35d993d38f4b820 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:44:09 +0200 Subject: Change all package to depend on the new ethereum-types@1.0.0 --- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/testnet-faucets/package.json | 2 +- packages/types/package.json | 2 +- packages/typescript-typings/package.json | 2 +- packages/utils/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 538eafd59..b9f5709dc 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -110,7 +110,7 @@ "@0xproject/typescript-typings": "^0.4.3", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethers": "3.0.22", "lodash": "^4.17.4" }, diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 5e52662d0..049e9bc46 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -35,7 +35,7 @@ "@0xproject/typescript-typings": "^0.4.3", "@0xproject/utils": "^0.7.3", "chalk": "^2.3.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "glob": "^7.1.2", "handlebars": "^4.0.11", "lodash": "^4.17.4", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 32910cd80..dfb38fa27 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -43,7 +43,7 @@ "typescript": "2.7.1" }, "dependencies": { - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^0.4.3", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index c37030797..2463d91c1 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -83,7 +83,7 @@ "@0xproject/fill-scenarios": "^1.0.0", "@0xproject/json-schemas": "^1.0.0", "@0xproject/types": "^1.0.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethereumjs-blockstream": "5.0.0", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index e3f06f16a..a9a72c239 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -79,7 +79,7 @@ "@0xproject/typescript-typings": "^0.4.3", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", "ethereumjs-util": "^5.1.1", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 3267f98d9..fd5c0b975 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -48,7 +48,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/types": "^0.8.2", "@0xproject/utils": "^0.7.3", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^0.4.3", "@0xproject/web3-wrapper": "^0.7.3", "lodash": "^4.17.4" diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 45eb1ea6d..bb2a43cb7 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -44,7 +44,7 @@ "@0xproject/base-contract": "^0.3.6", "@0xproject/order-utils": "^1.0.0", "@0xproject/types": "1.0.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^0.4.3", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 779be6673..9de26145e 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -41,7 +41,7 @@ "@0xproject/web3-wrapper": "^0.7.3", "@types/mocha": "^5.2.2", "copyfiles": "^2.0.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethers": "3.0.22", "lodash": "^4.17.4", "run-s": "^0.0.0" diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 866de792b..0c61bfdd7 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -58,7 +58,7 @@ "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@ledgerhq/hw-app-eth": "^4.3.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethers": "3.0.22", "lodash": "^4.17.4" }, diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 1ac2804d7..873723e30 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -81,7 +81,7 @@ "@0xproject/web3-wrapper": "^0.7.3", "@types/node": "^8.0.53", "bn.js": "^4.11.8", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethereumjs-abi": "^0.6.4", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 65ead4511..94985c87f 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -88,7 +88,7 @@ "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "ethereumjs-blockstream": "5.0.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "bintrees": "^1.0.2", "ethers": "3.0.22", "lodash": "^4.17.4" diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 534205b47..ef6012409 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -84,7 +84,7 @@ "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@types/yargs": "^11.0.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "chalk": "^2.3.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.4", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index abd70c929..3d9228835 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -56,7 +56,7 @@ "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/dev-utils": "^0.4.6", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", "glob": "^7.1.2", "istanbul": "^0.4.5", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 620a46384..9f428cead 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -47,7 +47,7 @@ "@0xproject/utils": "^0.7.3", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "bip39": "^2.5.0", "bn.js": "^4.11.8", "eth-lightwallet": "^3.0.1", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 793819f39..211a4e27a 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -35,7 +35,7 @@ "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "4.14.104", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "awesome-typescript-loader": "^3.1.3", "gulp": "^3.9.1", "make-promises-safe": "^1.1.0", diff --git a/packages/types/package.json b/packages/types/package.json index fee9d847f..89693794f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -35,7 +35,7 @@ "dependencies": { "@types/node": "^8.0.53", "bignumber.js": "~4.1.0", - "ethereum-types": "^0.0.2" + "ethereum-types": "^1.0.0" }, "publishConfig": { "access": "public" diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index ffc09001e..697b20062 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -25,7 +25,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/typescript-typings#readme", "dependencies": { - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "bignumber.js": "~4.1.0" }, "devDependencies": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 962dca5be..ce71bae79 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -40,7 +40,7 @@ "@types/node": "^8.0.53", "bignumber.js": "~4.1.0", "detect-node": "2.0.3", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "isomorphic-fetch": "^2.2.1", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 13e5d2bcd..03514f011 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -68,7 +68,7 @@ "@0xproject/json-schemas": "^1.0.0", "@0xproject/typescript-typings": "^0.4.3", "@0xproject/utils": "^0.7.3", - "ethereum-types": "^0.0.2", + "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "lodash": "^4.17.4" -- cgit From 1fe1c5321b588272c02cd4b81c1f7a168a8bdec2 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:45:18 +0200 Subject: @0xproject/monorepo-scripts@1.0.0 --- packages/monorepo-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 1d641a7f5..e73a27aae 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/monorepo-scripts", - "version": "0.2.2", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From fd2611794aacefe2fac6818f676da04db7ea8cbe Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:49:03 +0200 Subject: Change all package to depend on the new @0xproject/monorepo-scripts@1.0.0 --- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/assert/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/ethereum-types/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/json-schemas/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-shared/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/tslint-config/package.json | 2 +- packages/types/package.json | 2 +- packages/typescript-typings/package.json | 2 +- packages/utils/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index b9f5709dc..668eb83bf 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -73,7 +73,7 @@ "@0xproject/abi-gen": "^0.3.4", "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 049e9bc46..27c1ee7a0 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -46,7 +46,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/glob": "5.0.35", "@types/handlebars": "^4.0.36", diff --git a/packages/assert/package.json b/packages/assert/package.json index e734fa40b..7ffa914dc 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index dfb38fa27..4ae7f449d 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "chai": "^4.0.1", diff --git a/packages/connect/package.json b/packages/connect/package.json index 71fd60f6a..050be2379 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -62,7 +62,7 @@ "websocket": "^1.0.25" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/fetch-mock": "^5.12.2", "@types/lodash": "4.14.104", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 2463d91c1..40c494a4b 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -46,7 +46,7 @@ "@0xproject/abi-gen": "^0.3.4", "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", "@0xproject/tslint-config": "^0.4.21", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index fd5c0b975..820ebc13b 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json index 6da90f0ca..2fb38da18 100644 --- a/packages/ethereum-types/package.json +++ b/packages/ethereum-types/package.json @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.1", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.20", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index bb2a43cb7..cd30b0530 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -29,7 +29,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md", "devDependencies": { "@0xproject/abi-gen": "^0.3.4", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 09360fa05..2557abfd3 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -53,7 +53,7 @@ "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@0xproject/utils": "^0.7.3", "@types/lodash.foreach": "^4.5.3", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 873723e30..902929b02 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -52,7 +52,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { "@0xproject/dev-utils": "^0.4.6", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 94985c87f..a590ad913 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -50,7 +50,7 @@ "@0xproject/abi-gen": "^0.3.4", "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/tslint-config": "^0.4.21", "@types/bintrees": "^1.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 1ca0e0157..95c42c6e1 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@0xproject/dev-utils": "^0.4.6", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/compare-versions": "^3.0.0", "copyfiles": "^1.2.0", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index f7cafb9df..2dd2c9c91 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@0xproject/dev-utils": "^0.4.6", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index ef6012409..f92bb8e9e 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -54,7 +54,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { "@0xproject/dev-utils": "^0.4.6", - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/mkdirp": "^0.5.2", "@types/require-from-string": "^1.2.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 3d9228835..2693ff956 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -68,7 +68,7 @@ "solidity-parser-antlr": "^0.2.12" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.1", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.20", "@types/istanbul": "^0.4.30", "@types/loglevel": "^1.5.3", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index f3fd62a2e..c8897d00e 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 77d92f96e..41e3110e1 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -48,7 +48,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.48", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 9f428cead..596697c04 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -61,7 +61,7 @@ "web3-provider-engine": "14.0.6" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@0xproject/utils": "^0.7.3", "@types/bip39": "^2.4.0", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index b136b7e4a..48f933840 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/types/package.json b/packages/types/package.json index 89693794f..f8dc98bec 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index 697b20062..d82e93f87 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -29,7 +29,7 @@ "bignumber.js": "~4.1.0" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "copyfiles": "^1.2.0", "shx": "^0.2.2" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index ce71bae79..a78a5497e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 03514f011..7f6c750ea 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", + "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^0.4.21", "@types/lodash": "4.14.104", "chai": "^4.0.1", -- cgit From 91c0d47ad4e9d2016340600ca0d907509310f1e0 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:51:12 +0200 Subject: Change the next @0xproject/typescript-typings version to be 1.0.0 --- packages/typescript-typings/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json index c9dbbc499..a08ded02d 100644 --- a/packages/typescript-typings/CHANGELOG.json +++ b/packages/typescript-typings/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "0.4.4", + "version": "1.0.0", "changes": [ { "note": "Add types for `eth-lightwallet`", -- cgit From a8572b494461ce53be3a96bebb25b3fb228b378e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:51:38 +0200 Subject: @0xproject/typescript-typings@1.0.0 --- packages/typescript-typings/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index d82e93f87..62e09c9b0 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/typescript-typings", - "version": "0.4.3", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From a9fa1a0df678ce7ab38106036868227fd93d8c4d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 21:54:44 +0200 Subject: Change all package to depend on the new @0xproject/typescript-typings@1.0.0 --- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/assert/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/json-schemas/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/testnet-faucets/package.json | 2 +- packages/utils/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- packages/website/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 668eb83bf..13396c95e 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -107,7 +107,7 @@ "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", "@0xproject/types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "ethereum-types": "^1.0.0", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 27c1ee7a0..f0bb17bd1 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -32,7 +32,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md", "dependencies": { - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "chalk": "^2.3.0", "ethereum-types": "^1.0.0", diff --git a/packages/assert/package.json b/packages/assert/package.json index 7ffa914dc..816da2d27 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@0xproject/json-schemas": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "lodash": "^4.17.4", "valid-url": "^1.0.9" diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 4ae7f449d..be8fbb83f 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "ethereum-types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "ethers": "3.0.22", diff --git a/packages/connect/package.json b/packages/connect/package.json index 050be2379..33acc9526 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -54,7 +54,7 @@ "@0xproject/assert": "^0.2.14", "@0xproject/json-schemas": "0.8.3", "@0xproject/types": "^0.8.2", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "lodash": "^4.17.4", "query-string": "^5.0.1", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 40c494a4b..93762386b 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -77,7 +77,7 @@ "@0xproject/assert": "^0.3.0", "@0xproject/base-contract": "^0.3.6", "@0xproject/order-utils": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/fill-scenarios": "^1.0.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index a9a72c239..705c10211 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -76,7 +76,7 @@ "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "ethereum-types": "^1.0.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 820ebc13b..ba45cce23 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -49,7 +49,7 @@ "@0xproject/types": "^0.8.2", "@0xproject/utils": "^0.7.3", "ethereum-types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "lodash": "^4.17.4" }, diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index cd30b0530..69a805f63 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -45,7 +45,7 @@ "@0xproject/order-utils": "^1.0.0", "@0xproject/types": "1.0.0", "ethereum-types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "ethers": "3.0.22", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 2557abfd3..ede3e9286 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -47,7 +47,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md", "dependencies": { - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@types/node": "^8.0.53", "jsonschema": "^1.2.0", "lodash.values": "^4.3.0" diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 9de26145e..ec319e328 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -36,7 +36,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/tslint-config": "^0.4.21", "@0xproject/types": "^0.8.2", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@types/mocha": "^5.2.2", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 0c61bfdd7..37bc6d088 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -54,7 +54,7 @@ "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@ledgerhq/hw-app-eth": "^4.3.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 902929b02..edfeed841 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -76,7 +76,7 @@ "@0xproject/json-schemas": "1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@types/node": "^8.0.53", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index a590ad913..7331e52b4 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -84,7 +84,7 @@ "@0xproject/json-schemas": "1.0.0", "@0xproject/order-utils": "1.0.0", "@0xproject/types": "1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "ethereumjs-blockstream": "5.0.0", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index f92bb8e9e..f9a524ca4 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -80,7 +80,7 @@ "@0xproject/json-schemas": "0.8.3", "@0xproject/sol-resolver": "^0.0.8", "@0xproject/types": "^0.8.2", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@types/yargs": "^11.0.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 2693ff956..bf32c34be 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -52,7 +52,7 @@ "dependencies": { "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/dev-utils": "^0.4.6", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index c8897d00e..66ae10ce6 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@0xproject/types": "^0.8.2", - "@0xproject/typescript-typings": "^0.0.3", + "@0xproject/typescript-typings": "^1.0.0", "lodash": "^4.17.4" }, "publishConfig": { diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 41e3110e1..ae5e75698 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -40,7 +40,7 @@ "@0xproject/order-utils": "^0.0.9", "@0xproject/connect": "0.6.17", "@0xproject/json-schemas": "0.8.3", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "chalk": "^2.3.0", "lodash": "^4.17.4", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 596697c04..a73587724 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -43,7 +43,7 @@ "@0xproject/assert": "^0.3.0", "@0xproject/types": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 211a4e27a..87bc913c7 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -21,7 +21,7 @@ "0x.js": "0.38.5", "@0xproject/subproviders": "^0.10.6", "@0xproject/web3-wrapper": "^0.7.3", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.5", diff --git a/packages/utils/package.json b/packages/utils/package.json index a78a5497e..868d96eb0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "@0xproject/types": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@types/node": "^8.0.53", "bignumber.js": "~4.1.0", "detect-node": "2.0.3", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 7f6c750ea..e7eca46a7 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -66,7 +66,7 @@ "dependencies": { "@0xproject/assert": "0.3.0", "@0xproject/json-schemas": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", diff --git a/packages/website/package.json b/packages/website/package.json index 4cefa19a9..d253b82f4 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -27,7 +27,7 @@ "@0xproject/react-shared": "^0.2.3", "@0xproject/subproviders": "^0.10.6", "@0xproject/types": "^0.8.1", - "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", "accounting": "^0.4.1", -- cgit From 46dedfcb67f1d4ecb60e6bddc26112685b4bf203 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:00:58 +0200 Subject: Change the next @0xproject/tslint-config version to be 1.0.0 --- packages/tslint-config/CHANGELOG.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages') diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json index f2a3456f4..462a01dcc 100644 --- a/packages/tslint-config/CHANGELOG.json +++ b/packages/tslint-config/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Added a bunch of rules", + "pr": 883 + } + ] + }, { "timestamp": 1531149657, "version": "0.4.21", -- cgit From 4af7ff9cc3a3845331b4ce7e9b167a99eaa3f5a6 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:01:18 +0200 Subject: @0xproject/tslint-config@1.0.0 --- packages/tslint-config/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index 48f933840..d96ecbb73 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/tslint-config", - "version": "0.4.21", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 74d54497195c85bdf38bf6c2c8b890d7fa51cb0d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:03:23 +0200 Subject: Change all package to depend on the new @0xproject/tslint-config@1.0.0 --- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/assert/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/ethereum-types/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/json-schemas/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/react-docs-example/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-shared/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/testnet-faucets/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 13396c95e..b86222ee5 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -74,7 +74,7 @@ "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index f0bb17bd1..78471dc03 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/glob": "5.0.35", "@types/handlebars": "^4.0.36", "@types/mkdirp": "^0.5.1", diff --git a/packages/assert/package.json b/packages/assert/package.json index 816da2d27..a5a6f0eb8 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -32,7 +32,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index be8fbb83f..4c44f325d 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", "copyfiles": "^1.2.0", diff --git a/packages/connect/package.json b/packages/connect/package.json index 33acc9526..4d4ca8551 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -63,7 +63,7 @@ }, "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/fetch-mock": "^5.12.2", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 93762386b..67293c105 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -49,7 +49,7 @@ "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 705c10211..5a04d0ff5 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@0xproject/abi-gen": "^0.3.4", "@0xproject/dev-utils": "^0.4.6", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@0xproject/subproviders": "^0.10.6", "@0xproject/sol-cov": "^0.1.3", "@types/lodash": "4.14.104", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index ba45cce23..2785d8fa8 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "chai": "^4.0.1", diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json index 2fb38da18..283baf626 100644 --- a/packages/ethereum-types/package.json +++ b/packages/ethereum-types/package.json @@ -36,7 +36,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.20", + "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 69a805f63..42679ba10 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -31,7 +31,7 @@ "@0xproject/abi-gen": "^0.3.4", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index ede3e9286..eed6e6f08 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@0xproject/utils": "^0.7.3", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index ec319e328..dca1b562f 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -34,7 +34,7 @@ "@0xproject/sol-compiler": "^0.5.4", "@0xproject/sol-cov": "^0.1.3", "@0xproject/subproviders": "^0.10.6", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^0.8.2", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 37bc6d088..11ac60dd3 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@0xproject/abi-gen": "^0.3.4", "@0xproject/dev-utils": "^0.4.6", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^0.8.2", "@types/yargs": "^10.0.0", "yargs": "^10.0.3", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index edfeed841..88d3558cf 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -53,7 +53,7 @@ "devDependencies": { "@0xproject/dev-utils": "^0.4.6", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 7331e52b4..9281d00bf 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -52,7 +52,7 @@ "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json index 2ccba3e41..cb4609cc4 100644 --- a/packages/react-docs-example/package.json +++ b/packages/react-docs-example/package.json @@ -26,7 +26,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/material-ui": "0.18.0", "@types/node": "^8.0.53", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 95c42c6e1..b89ce963b 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -27,7 +27,7 @@ "devDependencies": { "@0xproject/dev-utils": "^0.4.6", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/compare-versions": "^3.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 2dd2c9c91..6e2db2459 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -27,7 +27,7 @@ "devDependencies": { "@0xproject/dev-utils": "^0.4.6", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index f9a524ca4..8f3d911b8 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@0xproject/dev-utils": "^0.4.6", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/mkdirp": "^0.5.2", "@types/require-from-string": "^1.2.0", "@types/semver": "^5.5.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index bf32c34be..f78e21808 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -69,7 +69,7 @@ }, "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.20", + "@0xproject/tslint-config": "^1.0.0", "@types/istanbul": "^0.4.30", "@types/loglevel": "^1.5.3", "@types/mkdirp": "^0.5.1", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 66ae10ce6..d6c9538c0 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -25,7 +25,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index ae5e75698..c6aefb264 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.48", "@types/nock": "^9.1.2", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index a73587724..5f0ac1de5 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -62,7 +62,7 @@ }, "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@0xproject/utils": "^0.7.3", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 87bc913c7..309ed201e 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -31,7 +31,7 @@ "rollbar": "^0.6.5" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "4.14.104", diff --git a/packages/types/package.json b/packages/types/package.json index f8dc98bec..441eac720 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -25,7 +25,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", diff --git a/packages/utils/package.json b/packages/utils/package.json index 868d96eb0..f6580b9b4 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -25,7 +25,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index e7eca46a7..e15da8dad 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -46,7 +46,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", -- cgit From ece6417699e2d45b32313c22f98ded436f015c81 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:05:22 +0200 Subject: Change the next @0xproject/types version to be 1.0.0-rc.1 --- packages/types/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index ea3b49c8a..0254694cb 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.0.0", + "version": "1.0.0-rc.1", "changes": [ { "notes": "Updated types for V2 of 0x protocol" -- cgit From e82d0c21ec2119d596685812535b081c237eca30 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:06:05 +0200 Subject: @0xproject/types@1.0.0-rc.1 --- packages/types/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/types/package.json b/packages/types/package.json index 441eac720..05ee6ac57 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "1.0.0", + "version": "1.0.0-rc.1", "engines": { "node": ">=6.12" }, -- cgit From 267830d46339120ee422734b9104b627d9ed357b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:15:31 +0200 Subject: FIx a typo --- packages/types/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 0254694cb..35090ff2c 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -3,7 +3,7 @@ "version": "1.0.0-rc.1", "changes": [ { - "notes": "Updated types for V2 of 0x protocol" + "note": "Updated types for V2 of 0x protocol" }, { "note": "Add `ECSignatureBuffer`" -- cgit From 534decea9593da90c99facf808dfd69abed34bd0 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:17:55 +0200 Subject: Change all package to depend on the new @0xproject/types@1.0.0-rc.1 --- packages/0x.js/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/utils/package.json | 2 +- packages/website/package.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index b86222ee5..7746d8c61 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -106,7 +106,7 @@ "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", - "@0xproject/types": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/connect/package.json b/packages/connect/package.json index 4d4ca8551..3fb142e29 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -53,7 +53,7 @@ "dependencies": { "@0xproject/assert": "^0.2.14", "@0xproject/json-schemas": "0.8.3", - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "lodash": "^4.17.4", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 67293c105..f17f8b2f4 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -82,7 +82,7 @@ "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/fill-scenarios": "^1.0.0", "@0xproject/json-schemas": "^1.0.0", - "@0xproject/types": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", "ethereumjs-blockstream": "5.0.0", "ethereumjs-util": "^5.1.1", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 5a04d0ff5..93d65dc50 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -75,7 +75,7 @@ "@0xproject/base-contract": "^0.3.6", "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/types": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 2785d8fa8..23ff3d7ed 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -46,7 +46,7 @@ }, "dependencies": { "@0xproject/subproviders": "^0.10.6", - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/utils": "^0.7.3", "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 42679ba10..9c28dae6b 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -43,7 +43,7 @@ "dependencies": { "@0xproject/base-contract": "^0.3.6", "@0xproject/order-utils": "^1.0.0", - "@0xproject/types": "1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index dca1b562f..180d669d6 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -35,7 +35,7 @@ "@0xproject/sol-cov": "^0.1.3", "@0xproject/subproviders": "^0.10.6", "@0xproject/tslint-config": "^1.0.0", - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 11ac60dd3..0e8a59d0e 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -40,7 +40,7 @@ "@0xproject/abi-gen": "^0.3.4", "@0xproject/dev-utils": "^0.4.6", "@0xproject/tslint-config": "^1.0.0", - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@types/yargs": "^10.0.0", "yargs": "^10.0.3", "make-promises-safe": "^1.1.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 88d3558cf..a2303d64b 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -75,7 +75,7 @@ "@0xproject/base-contract": "^0.3.6", "@0xproject/json-schemas": "1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/types": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 9281d00bf..1d9cbb784 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -83,7 +83,7 @@ "@0xproject/fill-scenarios": "1.0.0", "@0xproject/json-schemas": "1.0.0", "@0xproject/order-utils": "1.0.0", - "@0xproject/types": "1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 8f3d911b8..7525fdcf1 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -79,7 +79,7 @@ "@0xproject/assert": "0.2.13", "@0xproject/json-schemas": "0.8.3", "@0xproject/sol-resolver": "^0.0.8", - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index d6c9538c0..8fbc2684f 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -33,7 +33,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "lodash": "^4.17.4" }, diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index c6aefb264..3a68aff65 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -36,7 +36,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md", "dependencies": { "@0xproject/assert": "^0.3.0", - "@0xproject/types": "^0.8.2", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/order-utils": "^0.0.9", "@0xproject/connect": "0.6.17", "@0xproject/json-schemas": "0.8.3", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 5f0ac1de5..f6dc94755 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "@0xproject/assert": "^0.3.0", - "@0xproject/types": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", diff --git a/packages/utils/package.json b/packages/utils/package.json index f6580b9b4..da0da9daf 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -35,7 +35,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/types": "^1.0.0", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@types/node": "^8.0.53", "bignumber.js": "~4.1.0", diff --git a/packages/website/package.json b/packages/website/package.json index d253b82f4..af7680ce1 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -26,7 +26,7 @@ "@0xproject/react-docs": "^0.0.16", "@0xproject/react-shared": "^0.2.3", "@0xproject/subproviders": "^0.10.6", - "@0xproject/types": "^0.8.1", + "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^0.7.3", "@0xproject/web3-wrapper": "^0.7.3", -- cgit From 6bd921d0bc60bedec980bd18ff5a2550d3f4dc8d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:20:08 +0200 Subject: Add a missing CHANGELOG entry --- packages/utils/CHANGELOG.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages') diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index d9eb1d3fc..4bd82d476 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Add `fetchAsync` which adds a default timeout to all requests", + "pr": 874 + } + ] + }, { "timestamp": 1531919263, "version": "0.7.3", -- cgit From bf955bd87feb5cf459e5317ccacf9c4fc76019f6 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:20:35 +0200 Subject: @0xproject/utils@1.0.0 --- packages/utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/utils/package.json b/packages/utils/package.json index da0da9daf..cf676a9fb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/utils", - "version": "0.7.3", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 37ac6749ba4a537e0a0218fa9d7f6b402515c6ff Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:22:51 +0200 Subject: Change all package to depend on the new @0xproject/utils@1.0.0 --- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/assert/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/json-schemas/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 4 ++-- packages/testnet-faucets/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- packages/website/package.json | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 7746d8c61..ba3c89325 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -108,7 +108,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "ethereum-types": "^1.0.0", "ethers": "3.0.22", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 78471dc03..8ca84078b 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -33,7 +33,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md", "dependencies": { "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "chalk": "^2.3.0", "ethereum-types": "^1.0.0", "glob": "^7.1.2", diff --git a/packages/assert/package.json b/packages/assert/package.json index a5a6f0eb8..9d08a071f 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -50,7 +50,7 @@ "dependencies": { "@0xproject/json-schemas": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "lodash": "^4.17.4", "valid-url": "^1.0.9" }, diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 4c44f325d..2972b24e3 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -45,7 +45,7 @@ "dependencies": { "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "ethers": "3.0.22", "lodash": "^4.17.4" diff --git a/packages/connect/package.json b/packages/connect/package.json index 3fb142e29..dba19dcfc 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -55,7 +55,7 @@ "@0xproject/json-schemas": "0.8.3", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "lodash": "^4.17.4", "query-string": "^5.0.1", "sinon": "^4.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index f17f8b2f4..a47751b82 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -78,7 +78,7 @@ "@0xproject/base-contract": "^0.3.6", "@0xproject/order-utils": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/fill-scenarios": "^1.0.0", "@0xproject/json-schemas": "^1.0.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 93d65dc50..b006c24a9 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -77,7 +77,7 @@ "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "ethereum-types": "^1.0.0", "bn.js": "^4.11.8", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 23ff3d7ed..21867f1f8 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -47,7 +47,7 @@ "dependencies": { "@0xproject/subproviders": "^0.10.6", "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 9c28dae6b..95b559114 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -46,7 +46,7 @@ "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "ethers": "3.0.22", "lodash": "^4.17.4" diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index eed6e6f08..ef0b73b7c 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@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 180d669d6..cc008a0e5 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -37,7 +37,7 @@ "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@types/mocha": "^5.2.2", "copyfiles": "^2.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 0e8a59d0e..fc3bff33b 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -55,7 +55,7 @@ "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@ledgerhq/hw-app-eth": "^4.3.0", "ethereum-types": "^1.0.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index a2303d64b..2b986f374 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -77,7 +77,7 @@ "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@types/node": "^8.0.53", "bn.js": "^4.11.8", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 1d9cbb784..ea1e412c5 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -85,7 +85,7 @@ "@0xproject/order-utils": "1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "ethereumjs-blockstream": "5.0.0", "ethereum-types": "^1.0.0", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index b89ce963b..96ff2898a 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@0xproject/react-shared": "^0.2.3", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@types/lodash": "4.14.104", "@types/material-ui": "0.18.0", "@types/node": "^8.0.53", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 7525fdcf1..f47566669 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -81,7 +81,7 @@ "@0xproject/sol-resolver": "^0.0.8", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@types/yargs": "^11.0.0", "ethereum-types": "^1.0.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index f78e21808..bb870c5cc 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -53,7 +53,7 @@ "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/dev-utils": "^0.4.6", "ethereum-types": "^1.0.0", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 3a68aff65..639ddf5de 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -41,7 +41,7 @@ "@0xproject/connect": "0.6.17", "@0xproject/json-schemas": "0.8.3", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "chalk": "^2.3.0", "lodash": "^4.17.4", "newman": "^3.9.3", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index f6dc94755..4532547ae 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -44,7 +44,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", "ethereum-types": "^1.0.0", @@ -63,7 +63,7 @@ "devDependencies": { "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", "@types/hdkey": "^0.7.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 309ed201e..9f9db121e 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -22,7 +22,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index e15da8dad..12b211e96 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -67,7 +67,7 @@ "@0xproject/assert": "0.3.0", "@0xproject/json-schemas": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", diff --git a/packages/website/package.json b/packages/website/package.json index af7680ce1..0b4d6af1f 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -28,7 +28,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^0.7.3", + "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "accounting": "^0.4.1", "basscss": "^8.0.3", -- cgit From 5bd96f6fe9ac4d7ac690c28da5d433f56bec5d3b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:26:13 +0200 Subject: Change the next @0xproject/json-schemas version to be 1.0.0-rc.1 --- packages/json-schemas/CHANGELOG.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index b69b440cf..0729c75e5 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,9 +1,9 @@ [ { - "version": "1.0.0", + "version": "1.0.0-rc.1", "changes": [ { - "note": "Update schemas for V2", + "note": "Update schemas for V2 or 0x Protocol", "pr": 615 }, { -- cgit From 2b0c0a6ff7e573f557f8737ce0f106b243d7feeb Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:26:35 +0200 Subject: @0xproject/json-schemas@1.0.0-rc.1 --- packages/json-schemas/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index ef0b73b7c..fccb62895 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/json-schemas", - "version": "1.0.0", + "version": "1.0.0-rc.1", "engines": { "node": ">=6.12" }, -- cgit From 0f27ce34240bc019ba53a85ee954dd0d4ae21815 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:30:09 +0200 Subject: Change all package to depend on the new @0xproject/json-schemas@1.0.0-rc.1 --- packages/assert/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/assert/package.json b/packages/assert/package.json index 9d08a071f..bbc17398a 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -48,7 +48,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/json-schemas": "^1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "lodash": "^4.17.4", diff --git a/packages/connect/package.json b/packages/connect/package.json index dba19dcfc..5e5d11d5d 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -52,7 +52,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { "@0xproject/assert": "^0.2.14", - "@0xproject/json-schemas": "0.8.3", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index a47751b82..ed40ef872 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -81,7 +81,7 @@ "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/fill-scenarios": "^1.0.0", - "@0xproject/json-schemas": "^1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", "ethereumjs-blockstream": "5.0.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 2b986f374..693a7e878 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -73,7 +73,7 @@ "dependencies": { "@0xproject/assert": "^0.3.0", "@0xproject/base-contract": "^0.3.6", - "@0xproject/json-schemas": "1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index ea1e412c5..eebd5c83f 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -81,7 +81,7 @@ "@0xproject/base-contract": "0.3.6", "@0xproject/contract-wrappers": "0.1.1", "@0xproject/fill-scenarios": "1.0.0", - "@0xproject/json-schemas": "1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/order-utils": "1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index f47566669..9e5d58c6d 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -77,7 +77,7 @@ }, "dependencies": { "@0xproject/assert": "0.2.13", - "@0xproject/json-schemas": "0.8.3", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/sol-resolver": "^0.0.8", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 639ddf5de..df4598c8b 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -39,7 +39,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/order-utils": "^0.0.9", "@0xproject/connect": "0.6.17", - "@0xproject/json-schemas": "0.8.3", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "chalk": "^2.3.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 12b211e96..579adf5e5 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -65,7 +65,7 @@ }, "dependencies": { "@0xproject/assert": "0.3.0", - "@0xproject/json-schemas": "^1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "ethereum-types": "^1.0.0", -- cgit From 761b0063a088560a5a654ae69316efd26b45a3ba Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:33:24 +0200 Subject: @0xproject/sol-resolver@1.0.0 --- packages/sol-resolver/CHANGELOG.json | 2 +- packages/sol-resolver/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index 1e39c1b39..9ebbe1adb 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "0.0.9", + "version": "1.0.0", "changes": [ { "note": "Fix a bug in FsResolver where it tries to read directories as files", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 8fbc2684f..5b1c74279 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/sol-resolver", - "version": "0.0.8", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 2d39329ee7aa570e8c2f97ac37fde18858a8ec43 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:36:40 +0200 Subject: Add monorepo-scripts to sol-resolver --- packages/sol-resolver/package.json | 2 +- packages/sol-resolver/src/monorepo_scripts/postpublish.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 packages/sol-resolver/src/monorepo_scripts/postpublish.ts (limited to 'packages') diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 5b1c74279..0befb5cb6 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -9,7 +9,7 @@ "types": "lib/index.d.ts", "scripts": { "watch_without_deps": "tsc -w", - "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", + "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", "lint": "tslint --project .", "manual:postpublish": "yarn build; node ./scripts/postpublish.js" diff --git a/packages/sol-resolver/src/monorepo_scripts/postpublish.ts b/packages/sol-resolver/src/monorepo_scripts/postpublish.ts new file mode 100644 index 000000000..dcb99d0f7 --- /dev/null +++ b/packages/sol-resolver/src/monorepo_scripts/postpublish.ts @@ -0,0 +1,8 @@ +import { postpublishUtils } from '@0xproject/monorepo-scripts'; + +import * as packageJSON from '../package.json'; +import * as tsConfigJSON from '../tsconfig.json'; + +const cwd = `${__dirname}/..`; +// tslint:disable-next-line:no-floating-promises +postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd); -- cgit From bfe0ba3e9a4ef934703087683a6c80de678028fc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:39:42 +0200 Subject: Change all package to depend on the new @0xproject/sol-resolver@1.0.0 --- packages/sol-compiler/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 9e5d58c6d..cfeb364f8 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -78,7 +78,7 @@ "dependencies": { "@0xproject/assert": "0.2.13", "@0xproject/json-schemas": "^1.0.0-rc.1", - "@0xproject/sol-resolver": "^0.0.8", + "@0xproject/sol-resolver": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", -- cgit From b1aa7725dfab6c8eb84561b084a306621d445008 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:41:35 +0200 Subject: @0xproject/assert@1.0.0 --- packages/assert/CHANGELOG.json | 2 +- packages/assert/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index e72b0e9a4..dd699fc6b 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "0.2.14", + "version": "1.0.0", "changes": [ { "note": diff --git a/packages/assert/package.json b/packages/assert/package.json index bbc17398a..7a4dedbc7 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/assert", - "version": "0.3.0", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 7a8231435bc1b841d299d119bf8efe1de5b6d993 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:43:56 +0200 Subject: Add forgotten file to git --- packages/sol-resolver/src/globals.d.ts | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/sol-resolver/src/globals.d.ts (limited to 'packages') diff --git a/packages/sol-resolver/src/globals.d.ts b/packages/sol-resolver/src/globals.d.ts new file mode 100644 index 000000000..e799b3529 --- /dev/null +++ b/packages/sol-resolver/src/globals.d.ts @@ -0,0 +1,7 @@ +// tslint:disable:completed-docs +declare module '*.json' { + const json: any; + /* tslint:disable */ + export default json; + /* tslint:enable */ +} -- cgit From 1e6b11b27e7ea4263c3c712492d3e9f1be9cf2a0 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:45:22 +0200 Subject: Change all package to depend on the new @0xproject/assert@1.0.0 --- packages/0x.js/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index ba3c89325..88e486d58 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -100,7 +100,7 @@ "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.2.14", + "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^0.3.6", "@0xproject/contract-wrappers": "^0.1.1", "@0xproject/order-utils": "^1.0.0", diff --git a/packages/connect/package.json b/packages/connect/package.json index 5e5d11d5d..a4a8b3df0 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -51,7 +51,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^0.2.14", + "@0xproject/assert": "^1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index ed40ef872..eeebcc2af 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -74,7 +74,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^0.3.0", + "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^0.3.6", "@0xproject/order-utils": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 693a7e878..447d4e61f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -71,7 +71,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^0.3.0", + "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^0.3.6", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^0.5.4", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index eebd5c83f..7f83d8fdc 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -77,7 +77,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "0.3.0", + "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "0.3.6", "@0xproject/contract-wrappers": "0.1.1", "@0xproject/fill-scenarios": "1.0.0", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index cfeb364f8..1b1d970a1 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -76,7 +76,7 @@ "zeppelin-solidity": "1.8.0" }, "dependencies": { - "@0xproject/assert": "0.2.13", + "@0xproject/assert": "^1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/sol-resolver": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index df4598c8b..7de1f75ce 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md", "dependencies": { - "@0xproject/assert": "^0.3.0", + "@0xproject/assert": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/order-utils": "^0.0.9", "@0xproject/connect": "0.6.17", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 4532547ae..7bf4722b7 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -40,7 +40,7 @@ } }, "dependencies": { - "@0xproject/assert": "^0.3.0", + "@0xproject/assert": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/web3-wrapper": "^0.7.3", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 579adf5e5..717570a7c 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -64,7 +64,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "0.3.0", + "@0xproject/assert": "^1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", -- cgit From 0369f5ebc47f9b401e84eb9c8e696e92179feb60 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:46:33 +0200 Subject: @0xproject/abi-gen@1.0.0 --- packages/abi-gen/CHANGELOG.json | 2 +- packages/abi-gen/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 048972041..0207266a2 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "0.4.0", + "version": "1.0.0", "changes": [ { "note": "Convert e_r_c to erc in generated file names", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 8ca84078b..6961b287a 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/abi-gen", - "version": "0.3.4", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From d774dbc432b879956343d9dc583e787397e425b7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:47:58 +0200 Subject: Change all package to depend on the new @0xproject/abi-gen@1.0.0 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-watcher/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 88e486d58..9e95c4ff4 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -70,7 +70,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index eeebcc2af..9013a6f45 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -43,7 +43,7 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index b006c24a9..947b01ebf 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -46,7 +46,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md", "devDependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "@0xproject/tslint-config": "^1.0.0", "@0xproject/subproviders": "^0.10.6", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 95b559114..d98c7a6a5 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -28,7 +28,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md", "devDependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/tslint-config": "^1.0.0", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index cc008a0e5..c63d52468 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -29,7 +29,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/base-contract": "^0.3.6", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/sol-cov": "^0.1.3", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index fc3bff33b..e19a8c042 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -37,7 +37,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 7f83d8fdc..b6cb429d4 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -47,7 +47,7 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.3.4", + "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", -- cgit From cdf85e5eeea2e9c85faec65763334b127585e3cc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:54:32 +0200 Subject: @0xproject/web3-wrapper@1.0.0 --- packages/web3-wrapper/CHANGELOG.json | 2 +- packages/web3-wrapper/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index f69954bdc..8bf123d88 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "0.7.3", + "version": "1.0.0", "changes": [ { "note": "Export `marshaller` utility file.", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 717570a7c..99b407ba5 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.7.3", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 9d06c81078e6e6debfb1b79f1d125bb7f7585eb3 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:56:17 +0200 Subject: FIx a typo --- packages/web3-wrapper/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 8bf123d88..e8f3b5f43 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -11,7 +11,7 @@ "pr": 812 }, { - "notes": "Stop exporting uniqueVersionIds object", + "note": "Stop exporting uniqueVersionIds object", "pr": 897 } ] -- cgit From 8193fdc3047555e6c56ef31b4dc1af7339477463 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 22:57:27 +0200 Subject: Change all package to depend on the new @0xproject/web3-wrapper@1.0.0 --- packages/0x.js/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/testnet-faucets/package.json | 2 +- packages/website/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 9e95c4ff4..1c364a2e1 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -109,7 +109,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "ethereum-types": "^1.0.0", "ethers": "3.0.22", "lodash": "^4.17.4" diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 2972b24e3..8568ee7fa 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -46,7 +46,7 @@ "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "ethers": "3.0.22", "lodash": "^4.17.4" }, diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 9013a6f45..655b0bd02 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -79,7 +79,7 @@ "@0xproject/order-utils": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@0xproject/fill-scenarios": "^1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 947b01ebf..2de87900a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -78,7 +78,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "ethereum-types": "^1.0.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 21867f1f8..0610caa53 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -50,7 +50,7 @@ "@0xproject/utils": "^1.0.0", "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "lodash": "^4.17.4" }, "publishConfig": { diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index d98c7a6a5..ca2b6e058 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -47,7 +47,7 @@ "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "ethers": "3.0.22", "lodash": "^4.17.4" }, diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index c63d52468..3b4574760 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -38,7 +38,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@types/mocha": "^5.2.2", "copyfiles": "^2.0.0", "ethereum-types": "^1.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index e19a8c042..e939f320c 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -56,7 +56,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@ledgerhq/hw-app-eth": "^4.3.0", "ethereum-types": "^1.0.0", "ethers": "3.0.22", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 447d4e61f..46d233e30 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -78,7 +78,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@types/node": "^8.0.53", "bn.js": "^4.11.8", "ethereum-types": "^1.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index b6cb429d4..df6fb2948 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -86,7 +86,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "ethereumjs-blockstream": "5.0.0", "ethereum-types": "^1.0.0", "bintrees": "^1.0.2", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 1b1d970a1..3f9a23b7b 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -82,7 +82,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@types/yargs": "^11.0.0", "ethereum-types": "^1.0.0", "chalk": "^2.3.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index bb870c5cc..981705d59 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -54,7 +54,7 @@ "@0xproject/subproviders": "^0.10.6", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 7bf4722b7..74c71dd15 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -42,7 +42,7 @@ "dependencies": { "@0xproject/assert": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "@ledgerhq/hw-app-eth": "^4.3.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 9f9db121e..bf524b4d0 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -20,7 +20,7 @@ "dependencies": { "0x.js": "0.38.5", "@0xproject/subproviders": "^0.10.6", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "body-parser": "^1.17.1", diff --git a/packages/website/package.json b/packages/website/package.json index 0b4d6af1f..d4d95ff69 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -29,7 +29,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/web3-wrapper": "^1.0.0", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", -- cgit From 76008b41c5e3f6a812d5c617fb5175453af8f3f9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:02:15 +0200 Subject: @0xproject/base-contract@1.0.0 --- packages/base-contract/CHANGELOG.json | 8 ++++++++ packages/base-contract/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index 3376a44f7..6f88328bb 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1531919263, "version": "0.3.6", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 8568ee7fa..43514480f 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/base-contract", - "version": "0.3.6", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From cc0477153becfa4c5ba604ba130d4f04a95f7554 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:03:55 +0200 Subject: Fix the scripts build --- packages/base-contract/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 43514480f..26aacde8e 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -9,7 +9,7 @@ "types": "lib/src/index.d.ts", "scripts": { "watch_without_deps": "tsc -w", - "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", + "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", "test": "yarn run_mocha", "rebuild_and_test": "run-s clean build test", -- cgit From b5d19d3fb109920d3a2dfba14d0b673819376b56 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:05:01 +0200 Subject: Change all package to depend on the new @0xproject/base-contract@1.0.0 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 1c364a2e1..6f772a1e5 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -101,7 +101,7 @@ }, "dependencies": { "@0xproject/assert": "^1.0.0", - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/contract-wrappers": "^0.1.1", "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 655b0bd02..ee25af10a 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -75,7 +75,7 @@ }, "dependencies": { "@0xproject/assert": "^1.0.0", - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 2de87900a..a6f1c1295 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -72,7 +72,7 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0-rc.1", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index ca2b6e058..50dcef31c 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -41,7 +41,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 3b4574760..da2d1cdf8 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -30,7 +30,7 @@ "license": "Apache-2.0", "dependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/sol-cov": "^0.1.3", "@0xproject/subproviders": "^0.10.6", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index e939f320c..5ada934e4 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -50,7 +50,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/subproviders": "^0.10.6", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 46d233e30..2d74f4bb5 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@0xproject/assert": "^1.0.0", - "@0xproject/base-contract": "^0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/types": "^1.0.0-rc.1", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index df6fb2948..0281ec87e 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@0xproject/assert": "^1.0.0", - "@0xproject/base-contract": "0.3.6", + "@0xproject/base-contract": "^1.0.0", "@0xproject/contract-wrappers": "0.1.1", "@0xproject/fill-scenarios": "1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", -- cgit From 9085c674e40afeb8b3e3aada520802a4cd2c20da Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:10:57 +0200 Subject: @0xproject/subproviders@1.0.0 --- packages/subproviders/CHANGELOG.json | 9 +++++++-- packages/subproviders/package.json | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index 6942aa5db..bc427db09 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,9 +1,14 @@ [ { - "version": "0.11.0", + "version": "1.0.0", "changes": [ { - "note": "Add `EthLightwalletSubprovider`" + "note": "Add `RpcSubprovider` with timeout", + "pr": 874 + }, + { + "note": "Add `EthLightwalletSubprovider`", + "pr": 775 } ] }, diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 74c71dd15..5533fa244 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/subproviders", - "version": "0.10.6", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 18b1f016415a851282d4633c317328fd5f3852a3 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:12:44 +0200 Subject: Change all package to depend on the new @0xproject/subproviders@1.0.0 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/testnet-faucets/package.json | 2 +- packages/website/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 6f772a1e5..42ab2c77c 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -105,7 +105,7 @@ "@0xproject/contract-wrappers": "^0.1.1", "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index ee25af10a..0cfe964bb 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -48,7 +48,7 @@ "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index a6f1c1295..9cb00b487 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -49,7 +49,7 @@ "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^0.4.6", "@0xproject/tslint-config": "^1.0.0", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/sol-cov": "^0.1.3", "@types/lodash": "4.14.104", "@types/bn.js": "^4.11.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 0610caa53..d461f769e 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -45,7 +45,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/utils": "^1.0.0", "ethereum-types": "^1.0.0", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index da2d1cdf8..2466c0edf 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -33,7 +33,7 @@ "@0xproject/base-contract": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", "@0xproject/sol-cov": "^0.1.3", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 5ada934e4..50aeb6e3e 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -53,7 +53,7 @@ "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^1.0.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 981705d59..7062ce0ab 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -51,7 +51,7 @@ "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md", "dependencies": { "@0xproject/sol-compiler": "^0.5.4", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^1.0.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index bf524b4d0..7c3ae70cd 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -19,7 +19,7 @@ "license": "Apache-2.0", "dependencies": { "0x.js": "0.38.5", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/web3-wrapper": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/website/package.json b/packages/website/package.json index d4d95ff69..1eabc8120 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -25,7 +25,7 @@ "@0xproject/order-utils": "^0.0.9", "@0xproject/react-docs": "^0.0.16", "@0xproject/react-shared": "^0.2.3", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", -- cgit From 9c8e3bc4c9a79ab1f2f99c978a8d79c11384843a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:14:30 +0200 Subject: @0xproject/dev-utils@1.0.0 --- packages/dev-utils/CHANGELOG.json | 8 ++++++++ packages/dev-utils/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index d092ddf55..4093d352e 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1531919263, "version": "0.4.6", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index d461f769e..f84915a99 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/dev-utils", - "version": "0.4.6", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 4043fa76cc8cc9b76ed18384b441f9f0657b6937 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:16:47 +0200 Subject: Change all package to depend on the new @0xproject/dev-utils@1.0.0 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-shared/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 42ab2c77c..23c3c0f88 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -71,7 +71,7 @@ "license": "Apache-2.0", "devDependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 0cfe964bb..4a687aab8 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 9cb00b487..9caa28304 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -47,7 +47,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md", "devDependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/sol-cov": "^0.1.3", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 2466c0edf..25873f258 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -47,7 +47,7 @@ "run-s": "^0.0.0" }, "devDependencies": { - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^2.0.1", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 50aeb6e3e..55506592f 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -38,7 +38,7 @@ "license": "Apache-2.0", "devDependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@types/yargs": "^10.0.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 2d74f4bb5..2af69fd74 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -51,7 +51,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/bn.js": "^4.11.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 0281ec87e..4fd85bab3 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -48,7 +48,7 @@ }, "devDependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^0.5.4", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 96ff2898a..ddaa4d8eb 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -25,7 +25,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/compare-versions": "^3.0.0", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 6e2db2459..a2ac27d17 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -25,7 +25,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 3f9a23b7b..1ef211930 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -53,7 +53,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/mkdirp": "^0.5.2", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 7062ce0ab..943c26653 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -55,7 +55,7 @@ "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^1.0.0", - "@0xproject/dev-utils": "^0.4.6", + "@0xproject/dev-utils": "^1.0.0", "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", "glob": "^7.1.2", -- cgit From c9b213839a29993067dd85619338e3fc29b89bf9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:19:38 +0200 Subject: @0xproject/sol-compiler@1.0.0 --- packages/sol-compiler/CHANGELOG.json | 8 ++++++++ packages/sol-compiler/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 3633cc5db..ff5dac15e 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1531919263, "version": "0.5.4", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 1ef211930..edf9d3b51 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/sol-compiler", - "version": "0.5.4", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 1a1b7a2bc4e9984bfe6d8abecf842b4d9f6c17d8 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:21:29 +0200 Subject: Change all package to depend on the new @0xproject/sol-compiler@1.0.0 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sol-cov/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 23c3c0f88..61d5cae2d 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -104,7 +104,7 @@ "@0xproject/base-contract": "^1.0.0", "@0xproject/contract-wrappers": "^0.1.1", "@0xproject/order-utils": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 4a687aab8..5f8ed09dc 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -47,7 +47,7 @@ "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 9caa28304..370c23e80 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -74,7 +74,7 @@ "dependencies": { "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 50dcef31c..dc314de98 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 25873f258..1eb7a4821 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -31,7 +31,7 @@ "dependencies": { "@0xproject/abi-gen": "^1.0.0", "@0xproject/base-contract": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/sol-cov": "^0.1.3", "@0xproject/subproviders": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 55506592f..d234d66f7 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -52,7 +52,7 @@ "dependencies": { "@0xproject/base-contract": "^1.0.0", "@0xproject/order-utils": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 2af69fd74..a815e15ce 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -74,7 +74,7 @@ "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 4fd85bab3..1388691af 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -51,7 +51,7 @@ "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^0.0.10", "@0xproject/monorepo-script": "^1.0.0", - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 943c26653..ea0b3f46b 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -50,7 +50,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md", "dependencies": { - "@0xproject/sol-compiler": "^0.5.4", + "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", -- cgit From 114b31a813d3505340d8c5a9a5bf9bd025fd6033 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:23:37 +0200 Subject: @0xproject/order-utils@1.0.0-rc.1 --- packages/order-utils/CHANGELOG.json | 2 +- packages/order-utils/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index e61033c53..5d92cb318 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.0.0", + "version": "1.0.0-rc.1", "changes": [ { "note": "Refactor to work with V2 of 0x protocol", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index a815e15ce..168a1deba 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/order-utils", - "version": "1.0.0", + "version": "1.0.0-rc.1", "engines": { "node": ">=6.12" }, -- cgit From 21effcaa8b0eae74a909c1d0f09fda112457b996 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:26:32 +0200 Subject: Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contracts/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/migrations/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/website/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 61d5cae2d..5bef28c31 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -103,7 +103,7 @@ "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^1.0.0", "@0xproject/contract-wrappers": "^0.1.1", - "@0xproject/order-utils": "^1.0.0", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 5f8ed09dc..635d7d088 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -76,7 +76,7 @@ "dependencies": { "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^1.0.0", - "@0xproject/order-utils": "^1.0.0", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^1.0.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 370c23e80..4ece26d9e 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -73,7 +73,7 @@ }, "dependencies": { "@0xproject/base-contract": "^1.0.0", - "@0xproject/order-utils": "^1.0.0", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index dc314de98..0ff1fbbb5 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@0xproject/base-contract": "^1.0.0", - "@0xproject/order-utils": "^1.0.0", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index d234d66f7..f0d85f7f1 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -51,7 +51,7 @@ }, "dependencies": { "@0xproject/base-contract": "^1.0.0", - "@0xproject/order-utils": "^1.0.0", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 1388691af..9f7a1639a 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -82,7 +82,7 @@ "@0xproject/contract-wrappers": "0.1.1", "@0xproject/fill-scenarios": "1.0.0", "@0xproject/json-schemas": "^1.0.0-rc.1", - "@0xproject/order-utils": "1.0.0", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 7de1f75ce..3c56fea7b 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -37,7 +37,7 @@ "dependencies": { "@0xproject/assert": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/order-utils": "^0.0.9", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/connect": "0.6.17", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", diff --git a/packages/website/package.json b/packages/website/package.json index 1eabc8120..4d2fd5aac 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -22,7 +22,7 @@ "license": "Apache-2.0", "dependencies": { "@0xproject/contract-wrappers": "^0.0.5", - "@0xproject/order-utils": "^0.0.9", + "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/react-docs": "^0.0.16", "@0xproject/react-shared": "^0.2.3", "@0xproject/subproviders": "^1.0.0", -- cgit From 6f276223c60379cad5b309f88031aadc93135588 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:28:05 +0200 Subject: @0xproject/fill-scenarios@1.0.0-rc.1 --- packages/fill-scenarios/CHANGELOG.json | 2 +- packages/fill-scenarios/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index b22976d9b..0819d446c 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.0.0", + "version": "1.0.0-rc.1", "changes": [ { "note": "Make fill-scenarios compatible with V2 of 0x protocol", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 0ff1fbbb5..cd725dc86 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/fill-scenarios", - "version": "1.0.0", + "version": "1.0.0-rc.1", "description": "0x order fill scenario generator", "main": "lib/index.js", "types": "lib/index.d.ts", -- cgit From eae08ea1e43a9ecde3c4ed8cdc689d93222e3f8c Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:32:31 +0200 Subject: Change all package to depend on the new @0xproject/fill-scenarios@1.0.0-rc.1 --- packages/contract-wrappers/package.json | 2 +- packages/order-watcher/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 635d7d088..488abc115 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -80,7 +80,7 @@ "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "@0xproject/web3-wrapper": "^1.0.0", - "@0xproject/fill-scenarios": "^1.0.0", + "@0xproject/fill-scenarios": "^1.0.0-rc.1", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", "ethereum-types": "^1.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 9f7a1639a..85b737331 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -80,7 +80,7 @@ "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^1.0.0", "@0xproject/contract-wrappers": "0.1.1", - "@0xproject/fill-scenarios": "1.0.0", + "@0xproject/fill-scenarios": "^1.0.0-rc.1", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/types": "^1.0.0-rc.1", -- cgit From 9c03b54d75ae77b68c8d5c2530c5afa8c8861fc3 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:32:46 +0200 Subject: Copy postpublish scripts on build in fill-scenarios --- packages/fill-scenarios/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index cd725dc86..2999bffab 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -6,7 +6,7 @@ "types": "lib/index.d.ts", "scripts": { "watch_without_deps": "yarn pre_build && tsc -w", - "build": "yarn pre_build && tsc", + "build": "yarn pre_build && tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "pre_build": "run-s update_artifacts generate_contract_wrappers", "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json lib/artifacts; done;", "generate_contract_wrappers": "abi-gen --abis 'lib/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers", -- cgit From bc9f2a51a2910d3b89dc0b9c14539d1006866c5e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:35:14 +0200 Subject: @0xproject/react-shared@1.0.0 --- packages/react-shared/CHANGELOG.json | 8 ++++++++ packages/react-shared/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index a96540f10..5e0e40a70 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1531919263, "version": "0.2.3", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index a2ac27d17..93dec2568 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/react-shared", - "version": "0.2.3", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 6486fced34d062607e2cd7b8db7238256b0de271 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:37:01 +0200 Subject: Change all package to depend on the new @0xproject/react-shared@1.0.0 --- packages/react-docs/package.json | 2 +- packages/website/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index ddaa4d8eb..7e7db4610 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -36,7 +36,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/react-shared": "^0.2.3", + "@0xproject/react-shared": "^1.0.0", "@0xproject/utils": "^1.0.0", "@types/lodash": "4.14.104", "@types/material-ui": "0.18.0", diff --git a/packages/website/package.json b/packages/website/package.json index 4d2fd5aac..ca0b4966f 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -24,7 +24,7 @@ "@0xproject/contract-wrappers": "^0.0.5", "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/react-docs": "^0.0.16", - "@0xproject/react-shared": "^0.2.3", + "@0xproject/react-shared": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", -- cgit From f364b5c5abcbf5b2b07d6540b27ea7ba67d20cbc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:38:13 +0200 Subject: @0xproject/react-docs@1.0.0 --- packages/react-docs/CHANGELOG.json | 8 ++++++++ packages/react-docs/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index f4af828d7..61ccf1dea 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "0.0.17", "changes": [ diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 7e7db4610..39bffe67f 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/react-docs", - "version": "0.0.16", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 8bd4e38d021d806c2ff442e3475a30e55655825c Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:39:28 +0200 Subject: Change all package to depend on the new @0xproject/react-docs@1.0.0 --- packages/react-docs-example/package.json | 2 +- packages/website/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json index cb4609cc4..f71b718de 100644 --- a/packages/react-docs-example/package.json +++ b/packages/react-docs-example/package.json @@ -50,7 +50,7 @@ "webpack-dev-server": "^2.11.1" }, "dependencies": { - "@0xproject/react-docs": "^0.0.16", + "@0xproject/react-docs": "^1.0.0", "basscss": "^8.0.3", "lodash": "^4.17.4", "material-ui": "^0.17.1", diff --git a/packages/website/package.json b/packages/website/package.json index ca0b4966f..569ec1fc8 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -23,7 +23,7 @@ "dependencies": { "@0xproject/contract-wrappers": "^0.0.5", "@0xproject/order-utils": "^1.0.0-rc.1", - "@0xproject/react-docs": "^0.0.16", + "@0xproject/react-docs": "^1.0.0", "@0xproject/react-shared": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", -- cgit From 617ef5b6cefcdac67ba6af7af24d8f8cbdb6a874 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:42:28 +0200 Subject: @0xproject/sol-cov@1.0.0 --- packages/sol-cov/CHANGELOG.json | 16 +++++++++------- packages/sol-cov/package.json | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json index 038ba5654..7308bffb6 100644 --- a/packages/sol-cov/CHANGELOG.json +++ b/packages/sol-cov/CHANGELOG.json @@ -1,13 +1,14 @@ [ { - "version": "0.2.0", + "version": "1.0.0", "changes": [ { - "note": "Add artifact adapter as a parameter for CoverageSubprovider. Export AbstractArtifactAdapter", + "note": + "Add artifact adapter as a parameter for `CoverageSubprovider`. Export `AbstractArtifactAdapter`", "pr": 589 }, { - "note": "Implement SolCompilerArtifactAdapter and TruffleArtifactAdapter", + "note": "Implement `SolCompilerArtifactAdapter` and `TruffleArtifactAdapter`", "pr": 589 }, { @@ -19,7 +20,7 @@ "pr": 589 }, { - "note": "Fixed a bug causing RegExp to crash if contract code is longer that 32767 characters", + "note": "Fixed a bug causing `RegExp` to crash if contract code is longer that 32767 characters", "pr": 675 }, { @@ -55,11 +56,12 @@ "pr": 675 }, { - "note": "Fix solcVersion regex in parameter validation", + "note": "Fix `solcVersion` regex in parameter validation", "pr": 690 }, { - "note": "Fix a bug when in TruffleArtifactsAdapter causing it to throw if compiler.json is not there", + "note": + "Fix a bug when in `TruffleArtifactsAdapter` causing it to throw if `compiler.json` is not there", "pr": 690 }, { @@ -67,7 +69,7 @@ "pr": 690 }, { - "note": "Create `RevertTraceSubprovider` which prints a stack trace when a REVERT is detected", + "note": "Create `RevertTraceSubprovider` which prints a stack trace when a `REVERT` is detected", "pr": 705 }, { diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index ea0b3f46b..d838ee420 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/sol-cov", - "version": "0.1.3", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From d5e633c38f76f09f6cf4084a7c5eac6372bda6d3 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:44:51 +0200 Subject: Change all package to depend on the new @0xproject/sol-cov@1.0.0 --- packages/contracts/package.json | 2 +- packages/metacoin/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 4ece26d9e..7f0e97158 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -50,7 +50,7 @@ "@0xproject/dev-utils": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/subproviders": "^1.0.0", - "@0xproject/sol-cov": "^0.1.3", + "@0xproject/sol-cov": "^1.0.0", "@types/lodash": "4.14.104", "@types/bn.js": "^4.11.0", "@types/node": "^8.0.53", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 1eb7a4821..66e0e5cf0 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -32,7 +32,7 @@ "@0xproject/abi-gen": "^1.0.0", "@0xproject/base-contract": "^1.0.0", "@0xproject/sol-compiler": "^1.0.0", - "@0xproject/sol-cov": "^0.1.3", + "@0xproject/sol-cov": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", -- cgit From 67ad21b3688bdd80d07378737cb29453e03b299b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:46:23 +0200 Subject: @0xproject/migrations@1.0.0 --- packages/migrations/CHANGELOG.json | 8 ++++++++ packages/migrations/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index ac9309a3b..f57b10f2a 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Added migrations for 0x Protocol v2" + } + ] + }, { "timestamp": 1531919263, "version": "0.0.10", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index f0d85f7f1..b5efeafd1 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/migrations", - "version": "0.0.10", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 161f96c07d489568e81f5dfec430ade564856937 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:50:46 +0200 Subject: Change all package to depend on the new @0xproject/migrations@1.0.0 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/migrations/package.json | 3 ++- packages/order-watcher/package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 5bef28c31..4c1105d02 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -72,7 +72,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", - "@0xproject/migrations": "^0.0.10", + "@0xproject/migrations": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 488abc115..4fea25241 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", - "@0xproject/migrations": "^0.0.10", + "@0xproject/migrations": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index b5efeafd1..b6eb77569 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -9,7 +9,8 @@ "types": "lib/index.d.ts", "scripts": { "watch_without_deps": "yarn pre_build && tsc -w", - "build": "yarn pre_build && tsc", + "build": "yarn pre_build && tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "pre_build": "run-s copy_artifacts generate_contract_wrappers", "copy_artifacts": "copyfiles 'artifacts/**/*' ./lib", "clean": "shx rm -rf lib src/contract_wrappers", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 85b737331..df9b00f65 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", - "@0xproject/migrations": "^0.0.10", + "@0xproject/migrations": "^1.0.0", "@0xproject/monorepo-script": "^1.0.0", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", -- cgit From dff0fc65bf402b5889f39fe52de5b64c75331fad Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 19 Jul 2018 23:54:10 +0200 Subject: @0xproject/contract-wrappers@1.0.0-rc.1 --- packages/contract-wrappers/CHANGELOG.json | 8 ++++---- packages/contract-wrappers/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index c6b5d07f7..1aa4d0b64 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,16 +1,16 @@ [ { - "version": "1.0.0", + "version": "1.0.0-rc.1", "changes": [ { - "note": "Update blockstream to v5.0 and propogate up caught errors to active subscriptions" + "note": "Update blockstream to v5.0 and propogate up caught errors to active subscriptions", + "pr": 815 }, { "note": "Update to v2 of 0x rpotocol", "pr": 822 } - ], - "timestamp": 1531149657 + ] }, { "timestamp": 1531919263, diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 4fea25241..0b6d44f6a 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/contract-wrappers", - "version": "0.1.1", + "version": "1.0.0-rc.1", "description": "Smart TS wrappers for 0x smart contracts", "keywords": [ "0xproject", -- cgit From 0f9c262bb07128539dbfff3b0454b0121ba48c17 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:01:24 +0200 Subject: Change all package to depend on the new @0xproject/contract-wrappers@1.0.0-rc.1 --- packages/0x.js/package.json | 2 +- packages/contract-wrappers/package.json | 8 -------- packages/order-watcher/package.json | 2 +- packages/website/package.json | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 4c1105d02..db509ca61 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -102,7 +102,7 @@ "dependencies": { "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^1.0.0", - "@0xproject/contract-wrappers": "^0.1.1", + "@0xproject/contract-wrappers": "^1.0.0-rc.1", "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 0b6d44f6a..4e6243d11 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -26,14 +26,6 @@ "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit", "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, - "config": { - "postpublish": { - "assets": [ - "packages/contract-wrappers/_bundles/index.js", - "packages/contract-wrappers/_bundles/index.min.js" - ] - } - }, "repository": { "type": "git", "url": "https://github.com/0xProject/0x-monorepo" diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index df9b00f65..377514ea8 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -79,7 +79,7 @@ "dependencies": { "@0xproject/assert": "^1.0.0", "@0xproject/base-contract": "^1.0.0", - "@0xproject/contract-wrappers": "0.1.1", + "@0xproject/contract-wrappers": "^1.0.0-rc.1", "@0xproject/fill-scenarios": "^1.0.0-rc.1", "@0xproject/json-schemas": "^1.0.0-rc.1", "@0xproject/order-utils": "^1.0.0-rc.1", diff --git a/packages/website/package.json b/packages/website/package.json index 569ec1fc8..ae4798041 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -21,7 +21,7 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "@0xproject/contract-wrappers": "^0.0.5", + "@0xproject/contract-wrappers": "^1.0.0-rc.1", "@0xproject/order-utils": "^1.0.0-rc.1", "@0xproject/react-docs": "^1.0.0", "@0xproject/react-shared": "^1.0.0", -- cgit From 48c5d69c9d245f2f8a6c0517d6c0ada933e0125a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:05:25 +0200 Subject: Add monorepo-scripts postpublish.ts --- packages/migrations/src/monorepo_scripts/postpublish.ts | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/migrations/src/monorepo_scripts/postpublish.ts (limited to 'packages') diff --git a/packages/migrations/src/monorepo_scripts/postpublish.ts b/packages/migrations/src/monorepo_scripts/postpublish.ts new file mode 100644 index 000000000..dcb99d0f7 --- /dev/null +++ b/packages/migrations/src/monorepo_scripts/postpublish.ts @@ -0,0 +1,8 @@ +import { postpublishUtils } from '@0xproject/monorepo-scripts'; + +import * as packageJSON from '../package.json'; +import * as tsConfigJSON from '../tsconfig.json'; + +const cwd = `${__dirname}/..`; +// tslint:disable-next-line:no-floating-promises +postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd); -- cgit From 08c291bd3f44de424908dd50c208839bca848de5 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:05:44 +0200 Subject: @0xproject/order-watcher@1.0.0-rc.1 --- packages/order-watcher/CHANGELOG.json | 9 +++++++++ packages/order-watcher/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index a8f935f6d..5d9d5705b 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.0-rc.1", + "changes": [ + { + "note": "Add support for ERC721 event watching and Exchange V2 events", + "pr": 887 + } + ] + }, { "timestamp": 1531919263, "version": "0.0.8", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 377514ea8..259d8f850 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/order-watcher", - "version": "0.0.8", + "version": "1.0.0-rc.1", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", -- cgit From 5e015872efa736d4830727b2b7ac8c4b4982f180 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:07:25 +0200 Subject: Remove bundles config --- packages/order-watcher/package.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 259d8f850..c48f025e8 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -30,13 +30,7 @@ }, "config": { "compact_artifacts": "Exchange DummyToken ZRXToken Token EtherToken TokenTransferProxy TokenRegistry", - "contracts": "Exchange DummyToken ZRXToken Token WETH9 TokenTransferProxy_v1 MultiSigWallet MultiSigWalletWithTimeLock MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress MaliciousToken TokenRegistry Arbitrage EtherDelta AccountLevels", - "postpublish": { - "assets": [ - "packages/order-watcher/_bundles/index.js", - "packages/order-watcher/_bundles/index.min.js" - ] - } + "contracts": "Exchange DummyToken ZRXToken Token WETH9 TokenTransferProxy_v1 MultiSigWallet MultiSigWalletWithTimeLock MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress MaliciousToken TokenRegistry Arbitrage EtherDelta AccountLevels" }, "repository": { "type": "git", -- cgit From 52693f7d0acc1ebb776a08fe18dedc15c7d7f09c Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:11:00 +0200 Subject: 0x.js@1.0.0-rc.1 --- packages/0x.js/CHANGELOG.json | 18 +++++++----------- packages/0x.js/package.json | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 27dafe4ca..020ae0d65 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,32 +1,32 @@ [ { - "version": "1.0.0", + "version": "1.0.0-rc.1", "changes": [ { "note": "Remove tokenRegistry wrapper", "pr": 863 }, { - "note": "Rename zeroEx.token to zeroEx.erc20Token, and add zeroEx.erc721Token", + "note": "Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token`", "pr": 863 }, { - "note": "Rename zeroEx.proxy to zeroEx.erc20Proxy and add zeroEx.erc721Proxy", + "note": "Rename `zeroEx.proxy` to `zeroEx.erc20Proxy` and add `zeroEx.erc721Proxy`", "pr": 863 }, { "note": - "Refactored ZeroEx.isValidSignature to zeroEx.isValidSignatureAsync. It is now async so that it can verify contract-dependent signature types", + "Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types", "pr": 863 }, { "note": - "Refactored signOrderHashAsync to ecSignOrderHashAsync. There are now many non-ECSignature ways to sign orders too.", + "Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too.", "pr": 863 }, { "note": - "Removed createOrderWatcherAsync method. Will be added back once OrderWatcher is refactored for V2", + "Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2", "pr": 863 }, { @@ -34,11 +34,7 @@ "pr": 863 }, { - "note": "Remove stateLayer config from OrderWatcher. It now always operates on the latest block", - "pr": 875 - }, - { - "note": "Export ZeroEx.assetData with methods to decode/encode assetData fields found in 0x orders", + "note": "Export `ZeroEx.assetData` with methods to decode/encode assetData fields found in 0x orders", "pr": 884 } ] diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index db509ca61..ccd9327a3 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.38.6", + "version": "1.0.0-rc.1", "engines": { "node": ">=6.12" }, -- cgit From eb9f7c2c9d74261f0004d4c3e1adc4aa357f1531 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:21:59 +0200 Subject: Fix scoping of assets in 0x.js --- packages/0x.js/package.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index ccd9327a3..e6d54b813 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -41,8 +41,8 @@ "contracts": "ZRXToken", "postpublish": { "assets": [ - "packages/0x.js/_bundles/index.js", - "packages/0x.js/_bundles/index.min.js" + "_bundles/index.js", + "_bundles/index.min.js" ], "docPublishConfigs": { "extraFileIncludes": [ @@ -51,13 +51,11 @@ "../contract-wrappers/src/types.ts", "../contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts", "../contract-wrappers/src/contract_wrappers/exchange_wrapper.ts", - "../contract-wrappers/src/contract_wrappers/token_registry_wrapper.ts", - "../contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper.ts", - "../contract-wrappers/src/contract_wrappers/token_wrapper.ts", - "../order-watcher/src/order_watcher/order_watcher.ts", - "./src/generated_contract_wrappers/ether_token.ts", - "./src/generated_contract_wrappers/token.ts", - "./src/generated_contract_wrappers/exchange.ts" + "../contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts", + "../contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts", + "../contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts", + "../contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts", + "../order-watcher/src/order_watcher/order_watcher.ts" ], "s3BucketPath": "s3://doc-jsons/0x.js/", "s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/" -- cgit From ed19067096999e3c86f3a67ce8a87a2904ff09ef Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 20 Jul 2018 00:39:23 +0200 Subject: Move methods in `ZeroEx.assetData` to `ZeroEx` itself --- packages/0x.js/CHANGELOG.json | 8 +++++++ packages/0x.js/src/0x.ts | 55 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 020ae0d65..7d6139658 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0-rc.2", + "changes": [ + { + "note": "Remove `zeroEx.assetData` and instead re-export it's static functions directly off `ZeroEx`" + } + ] + }, { "version": "1.0.0-rc.1", "changes": [ diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts index 7c06a53af..2a2b82f63 100644 --- a/packages/0x.js/src/0x.ts +++ b/packages/0x.js/src/0x.ts @@ -38,10 +38,6 @@ export class ZeroEx { * this constant for your convenience. */ public static NULL_ADDRESS = constants.NULL_ADDRESS; - /** - * A set of methods to easily decode/encode assetData fields found in 0x orders. - */ - public static assetData = assetDataUtils; /** * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract. */ @@ -125,6 +121,57 @@ export class ZeroEx { const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amount, decimals); return baseUnitAmount; } + /** + * Encodes an ERC20 token address into a hex encoded assetData string, usable in the makerAssetData or + * takerAssetData fields in a 0x order. + * @param tokenAddress The ERC20 token address to encode + * @return The hex encoded assetData string + */ + public static encodeERC20AssetData(tokenAddress: string): string { + return assetDataUtils.encodeERC20AssetData(tokenAddress); + } + /** + * Decodes an ERC20 assetData hex string into it's corresponding ERC20 tokenAddress & assetProxyId + * @param assetData Hex encoded assetData string to decode + * @return An object containing the decoded tokenAddress & assetProxyId + */ + public static decodeERC20AssetData(assetData: string): ERC20AssetData { + return assetDataUtils.decodeERC20AssetData(assetData); + } + /** + * Encodes an ERC721 token address into a hex encoded assetData string, usable in the makerAssetData or + * takerAssetData fields in a 0x order. + * @param tokenAddress The ERC721 token address to encode + * @param tokenId The ERC721 tokenId to encode + * @return The hex encoded assetData string + */ + public static encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber): string { + return assetDataUtils.encodeERC721AssetData(tokenAddress, tokenId); + } + /** + * Decodes an ERC721 assetData hex string into it's corresponding ERC721 tokenAddress, tokenId & assetProxyId + * @param assetData Hex encoded assetData string to decode + * @return An object containing the decoded tokenAddress, tokenId & assetProxyId + */ + public static decodeERC721AssetData(assetData: string): ERC721AssetData { + return assetDataUtils.decodeERC721AssetData(assetData); + } + /** + * Decode and return the assetProxyId from the assetData + * @param assetData Hex encoded assetData string to decode + * @return The assetProxyId + */ + public static decodeAssetProxyId(assetData: string): AssetProxyId { + return assetDataUtils.decodeAssetProxyId(assetData); + } + /** + * Decode any assetData into it's corresponding assetData object + * @param assetData Hex encoded assetData string to decode + * @return Either a ERC20 or ERC721 assetData object + */ + public static decodeAssetDataOrThrow(assetData: string): ERC20AssetData | ERC721AssetData { + return assetDataUtils.decodeAssetDataOrThrow(assetData); + } /** * Instantiates a new ZeroEx instance that provides the public interface to the 0x.js library. * @param provider The Provider instance you would like the 0x.js library to use for interacting with -- cgit From f76be4f016fb6910ecef8453380e79be58c8e1dc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:45:19 +0200 Subject: 0x.js@1.0.0-rc.2 --- packages/0x.js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index e6d54b813..5087f55a1 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "engines": { "node": ">=6.12" }, -- cgit From 846a447c4d5861511d62ad79e5793e0c271df0b2 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:50:13 +0200 Subject: Remove rc versions from unmigrated packages --- packages/connect/package.json | 4 ++-- packages/sra-report/package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/connect/package.json b/packages/connect/package.json index a4a8b3df0..a0e13e760 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -52,8 +52,8 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { "@0xproject/assert": "^1.0.0", - "@0xproject/json-schemas": "^1.0.0-rc.1", - "@0xproject/types": "^1.0.0-rc.1", + "@0xproject/json-schemas": "^0.8.3", + "@0xproject/types": "^0.8.2", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "lodash": "^4.17.4", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 3c56fea7b..eda532df8 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -36,10 +36,10 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md", "dependencies": { "@0xproject/assert": "^1.0.0", - "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/order-utils": "^1.0.0-rc.1", + "@0xproject/types": "^0.8.2", + "@0xproject/order-utils": "^0.0.9", "@0xproject/connect": "0.6.17", - "@0xproject/json-schemas": "^1.0.0-rc.1", + "@0xproject/json-schemas": "^0.8.3", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", "chalk": "^2.3.0", -- cgit From 681a58263065da25ade7f0738a991c954925fd52 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 00:54:44 +0200 Subject: FIx a typo --- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/assert/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/ethereum-types/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/json-schemas/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-shared/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/tslint-config/package.json | 2 +- packages/types/package.json | 2 +- packages/typescript-typings/package.json | 2 +- packages/utils/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) (limited to 'packages') diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 5087f55a1..06ffe2daf 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -71,7 +71,7 @@ "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 6961b287a..41561268c 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -46,7 +46,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/glob": "5.0.35", "@types/handlebars": "^4.0.36", diff --git a/packages/assert/package.json b/packages/assert/package.json index 7a4dedbc7..1094cba85 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 26aacde8e..ebd7e1bc3 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", diff --git a/packages/connect/package.json b/packages/connect/package.json index a0e13e760..679044552 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -62,7 +62,7 @@ "websocket": "^1.0.25" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/fetch-mock": "^5.12.2", "@types/lodash": "4.14.104", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 4e6243d11..4f2f773fd 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -38,7 +38,7 @@ "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/subproviders": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index f84915a99..7a1f3c4ff 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json index 283baf626..5a3a8c0f3 100644 --- a/packages/ethereum-types/package.json +++ b/packages/ethereum-types/package.json @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 2999bffab..b6b1d8dce 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -29,7 +29,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md", "devDependencies": { "@0xproject/abi-gen": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index fccb62895..87182831f 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -53,7 +53,7 @@ "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/utils": "^1.0.0", "@types/lodash.foreach": "^4.5.3", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 168a1deba..b87ae5223 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -52,7 +52,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { "@0xproject/dev-utils": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index c48f025e8..2fc177db5 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -44,7 +44,7 @@ "@0xproject/abi-gen": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", "@0xproject/migrations": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/sol-compiler": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/bintrees": "^1.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 39bffe67f..c3853e6ba 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@0xproject/dev-utils": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/compare-versions": "^3.0.0", "copyfiles": "^1.2.0", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 93dec2568..008972da9 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@0xproject/dev-utils": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index edf9d3b51..99a49e1f2 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -54,7 +54,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { "@0xproject/dev-utils": "^1.0.0", - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/mkdirp": "^0.5.2", "@types/require-from-string": "^1.2.0", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index d838ee420..86808bfc1 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -68,7 +68,7 @@ "solidity-parser-antlr": "^0.2.12" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/istanbul": "^0.4.30", "@types/loglevel": "^1.5.3", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 0befb5cb6..48721b612 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index eda532df8..3b1c4ec00 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -48,7 +48,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.48", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 5533fa244..1aa5514a7 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -61,7 +61,7 @@ "web3-provider-engine": "14.0.6" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/utils": "^1.0.0", "@types/bip39": "^2.4.0", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index d96ecbb73..92c134f4b 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/types/package.json b/packages/types/package.json index 05ee6ac57..bd3417c44 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index 62e09c9b0..8b7a640c9 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -29,7 +29,7 @@ "bignumber.js": "~4.1.0" }, "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "copyfiles": "^1.2.0", "shx": "^0.2.2" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index cf676a9fb..7e3d46ce7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 99b407ba5..d9c577ea9 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/monorepo-script": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", -- cgit From 56137d060529209185f5ad390f6a855bb694660e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 01:01:54 +0200 Subject: Use old assert version in @0xproject/connect --- packages/connect/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/connect/package.json b/packages/connect/package.json index 679044552..33b1ad930 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -51,7 +51,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^1.0.0", + "@0xproject/assert": "^0.2.14", "@0xproject/json-schemas": "^0.8.3", "@0xproject/types": "^0.8.2", "@0xproject/typescript-typings": "^1.0.0", -- cgit From 78707bd3cad49ab495700bb48394f10ed8944ec0 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 01:03:15 +0200 Subject: @0xproject/connect@1.0.0 --- packages/connect/CHANGELOG.json | 2 +- packages/connect/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index c4813f589..bb93826f1 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -4,7 +4,7 @@ "changes": [ { "note": - "Remove WebSocketOrderbookChannel from the public interface and replace with orderbookChannelFactory" + "Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`" } ] }, diff --git a/packages/connect/package.json b/packages/connect/package.json index 33b1ad930..dfa15c3d8 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/connect", - "version": "0.6.17", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 36f8e9f1d5a3d326b78a383497ddb69bf9357db8 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 01:06:14 +0200 Subject: Change all package to depend on the new @0xproject/connect@1.0.0 --- packages/sra-report/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 3b1c4ec00..b3d228c9e 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -38,7 +38,7 @@ "@0xproject/assert": "^1.0.0", "@0xproject/types": "^0.8.2", "@0xproject/order-utils": "^0.0.9", - "@0xproject/connect": "0.6.17", + "@0xproject/connect": "^1.0.0", "@0xproject/json-schemas": "^0.8.3", "@0xproject/typescript-typings": "^1.0.0", "@0xproject/utils": "^1.0.0", -- cgit From 60b501b1370568aba34a20f32c895336a7d0a7c7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 01:07:44 +0200 Subject: @0xproject/sra-report@1.0.0 --- packages/sra-report/CHANGELOG.json | 8 ++++++++ packages/sra-report/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sra-report/CHANGELOG.json b/packages/sra-report/CHANGELOG.json index 7ce8bf0c1..c5220c493 100644 --- a/packages/sra-report/CHANGELOG.json +++ b/packages/sra-report/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1531919263, "version": "0.1.6", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index b3d228c9e..4c62627cb 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/sra-report", - "version": "0.1.6", + "version": "1.0.0", "engines": { "node": ">=6.12" }, -- cgit From 71e386d5fa30f6bc74088039c25e79fcb8ee1f33 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 20 Jul 2018 01:22:48 +0200 Subject: Update website package.json with original imports --- packages/website/package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/website/package.json b/packages/website/package.json index ae4798041..4cefa19a9 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -21,15 +21,15 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "@0xproject/contract-wrappers": "^1.0.0-rc.1", - "@0xproject/order-utils": "^1.0.0-rc.1", - "@0xproject/react-docs": "^1.0.0", - "@0xproject/react-shared": "^1.0.0", - "@0xproject/subproviders": "^1.0.0", - "@0xproject/types": "^1.0.0-rc.1", - "@0xproject/typescript-typings": "^1.0.0", - "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^1.0.0", + "@0xproject/contract-wrappers": "^0.0.5", + "@0xproject/order-utils": "^0.0.9", + "@0xproject/react-docs": "^0.0.16", + "@0xproject/react-shared": "^0.2.3", + "@0xproject/subproviders": "^0.10.6", + "@0xproject/types": "^0.8.1", + "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/utils": "^0.7.3", + "@0xproject/web3-wrapper": "^0.7.3", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", -- cgit From 0a3ba4d27dee67ca3072782679cb7f6896c4d73b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 02:06:11 +0200 Subject: Fix linter error --- packages/migrations/package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index b6eb77569..2356dc1e4 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -39,6 +39,7 @@ "license": "Apache-2.0", "devDependencies": { "@0xproject/abi-gen": "^1.0.0", + "@0xproject/monorepo-scripts": "^1.0.0", "@0xproject/dev-utils": "^1.0.0", "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", -- cgit From 6e15d7bb0f965b2e2f96c2355960b905c6fd8587 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 20 Jul 2018 16:29:47 +0200 Subject: Fix the abi-gen entry point --- packages/abi-gen/CHANGELOG.json | 9 +++++++++ packages/abi-gen/bin/abi-gen.js | 2 +- packages/abi-gen/package.json | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 0207266a2..a8f9c709c 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.1", + "changes": [ + { + "note": "Fix the abi-gen entry point in package.json", + "pr": 901 + } + ] + }, { "version": "1.0.0", "changes": [ diff --git a/packages/abi-gen/bin/abi-gen.js b/packages/abi-gen/bin/abi-gen.js index 8d6bdccf8..73ffe76ed 100755 --- a/packages/abi-gen/bin/abi-gen.js +++ b/packages/abi-gen/bin/abi-gen.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -require('../lib/src/index.js') +require('../lib/src/index.js'); diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 41561268c..d40db09b9 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -5,8 +5,8 @@ "node": ">=6.12" }, "description": "Generate contract wrappers from ABI and handlebars templates", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "lib/src/index.js", + "types": "lib/src/index.d.ts", "scripts": { "watch_without_deps": "tsc -w", "lint": "tslint --project .", -- cgit From 052afb67a4cf60032e6d4f5b67ce0adaeb15da3e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 20 Jul 2018 16:14:24 +0200 Subject: Add missing dep in migrations --- packages/migrations/package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index b6eb77569..8684e7890 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -43,6 +43,7 @@ "@0xproject/tslint-config": "^1.0.0", "@0xproject/types": "^1.0.0-rc.1", "@types/yargs": "^10.0.0", + "copyfiles": "^1.2.0", "yargs": "^10.0.3", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", -- cgit From 5790ed7ba977adf586ea9290a2694ebdb7684dcc Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 18 Jul 2018 16:09:42 +0200 Subject: Created LibAbiEncoder with `fillOrderNoThrow` --- .../protocol/Exchange/MixinWrapperFunctions.sol | 190 ++---------------- .../2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol | 215 +++++++++++++++++++++ 2 files changed, 235 insertions(+), 170 deletions(-) create mode 100644 packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol (limited to 'packages') diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol index d420f7e85..a5038f5cf 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol @@ -22,12 +22,14 @@ pragma experimental ABIEncoderV2; import "./libs/LibMath.sol"; import "./libs/LibOrder.sol"; import "./libs/LibFillResults.sol"; +import "./libs/LibAbiEncoder.sol"; import "./mixins/MExchangeCore.sol"; contract MixinWrapperFunctions is LibMath, LibFillResults, + LibAbiEncoder, MExchangeCore { /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled. @@ -68,177 +70,25 @@ contract MixinWrapperFunctions is public returns (FillResults memory fillResults) { - // We need to call MExchangeCore.fillOrder using a delegatecall in - // assembly so that we can intercept a call that throws. For this, we - // need the input encoded in memory in the Ethereum ABIv2 format [1]. - - // | Area | Offset | Length | Contents | - // | -------- |--------|---------|-------------------------------------------- | - // | Header | 0x00 | 4 | function selector | - // | Params | | 3 * 32 | function parameters: | - // | | 0x00 | | 1. offset to order (*) | - // | | 0x20 | | 2. takerAssetFillAmount | - // | | 0x40 | | 3. offset to signature (*) | - // | Data | | 12 * 32 | order: | - // | | 0x000 | | 1. senderAddress | - // | | 0x020 | | 2. makerAddress | - // | | 0x040 | | 3. takerAddress | - // | | 0x060 | | 4. feeRecipientAddress | - // | | 0x080 | | 5. makerAssetAmount | - // | | 0x0A0 | | 6. takerAssetAmount | - // | | 0x0C0 | | 7. makerFeeAmount | - // | | 0x0E0 | | 8. takerFeeAmount | - // | | 0x100 | | 9. expirationTimeSeconds | - // | | 0x120 | | 10. salt | - // | | 0x140 | | 11. Offset to makerAssetData (*) | - // | | 0x160 | | 12. Offset to takerAssetData (*) | - // | | 0x180 | 32 | makerAssetData Length | - // | | 0x1A0 | ** | makerAssetData Contents | - // | | 0x1C0 | 32 | takerAssetData Length | - // | | 0x1E0 | ** | takerAssetData Contents | - // | | 0x200 | 32 | signature Length | - // | | 0x220 | ** | signature Contents | - - // * Offsets are calculated from the beginning of the current area: Header, Params, Data: - // An offset stored in the Params area is calculated from the beginning of the Params section. - // An offset stored in the Data area is calculated from the beginning of the Data section. - - // ** The length of dynamic array contents are stored in the field immediately preceeding the contents. - - // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html - - bytes4 fillOrderSelector = this.fillOrder.selector; + // ABI encode calldata for `fillOrder` + ( + uint256 calldataBegin, + uint256 calldataLength + ) = abiEncodeFillOrder( + order, + takerAssetFillAmount, + signature, + this.fillOrder.selector + ); + // Delegate to `fillOrder` and handle any exceptions gracefully assembly { - - // Areas below may use the following variables: - // 1. Start -- Start of this area in memory - // 2. End -- End of this area in memory. This value may - // be precomputed (before writing contents), - // or it may be computed as contents are written. - // 3. Offset -- Current offset into area. If an area's End - // is precomputed, this variable tracks the - // offsets of contents as they are written. - - /////// Setup Header Area /////// - // Load free memory pointer - let headerAreaStart := mload(0x40) - mstore(headerAreaStart, fillOrderSelector) - let headerAreaEnd := add(headerAreaStart, 0x4) - - /////// Setup Params Area /////// - // This area is preallocated and written to later. - // This is because we need to fill in offsets that have not yet been calculated. - let paramsAreaStart := headerAreaEnd - let paramsAreaEnd := add(paramsAreaStart, 0x60) - let paramsAreaOffset := paramsAreaStart - - /////// Setup Data Area /////// - let dataAreaStart := paramsAreaEnd - let dataAreaEnd := dataAreaStart - - // Offset from the source data we're reading from - let sourceOffset := order - // arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array. - let arrayLenBytes := 0 - let arrayLenWords := 0 - - /////// Write order Struct /////// - // Write memory location of Order, relative to the start of the - // parameter list, then increment the paramsAreaOffset respectively. - mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart)) - paramsAreaOffset := add(paramsAreaOffset, 0x20) - - // Write values for each field in the order - // It would be nice to use a loop, but we save on gas by writing - // the stores sequentially. - mstore(dataAreaEnd, mload(sourceOffset)) // makerAddress - mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20))) // takerAddress - mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40))) // feeRecipientAddress - mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60))) // senderAddress - mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80))) // makerAssetAmount - mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0))) // takerAssetAmount - mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0))) // makerFeeAmount - mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0))) // takerFeeAmount - mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100))) // expirationTimeSeconds - mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120))) // salt - mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140))) // Offset to makerAssetData - mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160))) // Offset to takerAssetData - dataAreaEnd := add(dataAreaEnd, 0x180) - sourceOffset := add(sourceOffset, 0x180) - - // Write offset to - mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart)) - - // Calculate length of - sourceOffset := mload(add(order, 0x140)) // makerAssetData - arrayLenBytes := mload(sourceOffset) - sourceOffset := add(sourceOffset, 0x20) - arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20) - - // Write length of - mstore(dataAreaEnd, arrayLenBytes) - dataAreaEnd := add(dataAreaEnd, 0x20) - - // Write contents of - for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} { - mstore(dataAreaEnd, mload(sourceOffset)) - dataAreaEnd := add(dataAreaEnd, 0x20) - sourceOffset := add(sourceOffset, 0x20) - } - - // Write offset to - mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart)) - - // Calculate length of - sourceOffset := mload(add(order, 0x160)) // takerAssetData - arrayLenBytes := mload(sourceOffset) - sourceOffset := add(sourceOffset, 0x20) - arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20) - - // Write length of - mstore(dataAreaEnd, arrayLenBytes) - dataAreaEnd := add(dataAreaEnd, 0x20) - - // Write contents of - for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} { - mstore(dataAreaEnd, mload(sourceOffset)) - dataAreaEnd := add(dataAreaEnd, 0x20) - sourceOffset := add(sourceOffset, 0x20) - } - - /////// Write takerAssetFillAmount /////// - mstore(paramsAreaOffset, takerAssetFillAmount) - paramsAreaOffset := add(paramsAreaOffset, 0x20) - - /////// Write signature /////// - // Write offset to paramsArea - mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart)) - - // Calculate length of signature - sourceOffset := signature - arrayLenBytes := mload(sourceOffset) - sourceOffset := add(sourceOffset, 0x20) - arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20) - - // Write length of signature - mstore(dataAreaEnd, arrayLenBytes) - dataAreaEnd := add(dataAreaEnd, 0x20) - - // Write contents of signature - for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} { - mstore(dataAreaEnd, mload(sourceOffset)) - dataAreaEnd := add(dataAreaEnd, 0x20) - sourceOffset := add(sourceOffset, 0x20) - } - - // Execute delegatecall let success := delegatecall( gas, // forward all gas, TODO: look into gas consumption of assert/throw address, // call address of this contract - headerAreaStart, // pointer to start of input - sub(dataAreaEnd, headerAreaStart), // length of input - headerAreaStart, // write output over input + calldataBegin, // pointer to start of input + calldataLength, // length of input + calldataBegin, // write output over input 128 // output size is 128 bytes ) switch success @@ -249,10 +99,10 @@ contract MixinWrapperFunctions is mstore(add(fillResults, 96), 0) } case 1 { - mstore(fillResults, mload(headerAreaStart)) - mstore(add(fillResults, 32), mload(add(headerAreaStart, 32))) - mstore(add(fillResults, 64), mload(add(headerAreaStart, 64))) - mstore(add(fillResults, 96), mload(add(headerAreaStart, 96))) + mstore(fillResults, mload(calldataBegin)) + mstore(add(fillResults, 32), mload(add(calldataBegin, 32))) + mstore(add(fillResults, 64), mload(add(calldataBegin, 64))) + mstore(add(fillResults, 96), mload(add(calldataBegin, 96))) } } return fillResults; diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol new file mode 100644 index 000000000..5bea607d6 --- /dev/null +++ b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol @@ -0,0 +1,215 @@ +/* + + Copyright 2018 ZeroEx Intl. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + +pragma solidity 0.4.24; +pragma experimental ABIEncoderV2; + +import "./LibOrder.sol"; + + +contract LibAbiEncoder { + + /// @dev ABI encodes calldata for `fillOrder` in memory and returns the address range. + /// This range can be passed into `call` or `delegatecall` to invoke an external + /// call to `fillOrder`. + /// @param order Order struct containing order specifications. + /// @param takerAssetFillAmount Desired amount of takerAsset to sell. + /// @param signature Proof that order has been created by maker. + /// @return calldataBegin Memory address of ABI encoded calldata. + /// @return calldataLength Lenfgth of ABI encoded calldata. + function abiEncodeFillOrder( + LibOrder.Order memory order, + uint256 takerAssetFillAmount, + bytes memory signature, + bytes4 fillOrderSelector + ) + public + returns ( + uint256 calldataBegin, + uint256 calldataLength + ) + { + // We need to call MExchangeCore.fillOrder using a delegatecall in + // assembly so that we can intercept a call that throws. For this, we + // need the input encoded in memory in the Ethereum ABIv2 format [1]. + + // | Area | Offset | Length | Contents | + // | -------- |--------|---------|-------------------------------------------- | + // | Header | 0x00 | 4 | function selector | + // | Params | | 3 * 32 | function parameters: | + // | | 0x00 | | 1. offset to order (*) | + // | | 0x20 | | 2. takerAssetFillAmount | + // | | 0x40 | | 3. offset to signature (*) | + // | Data | | 12 * 32 | order: | + // | | 0x000 | | 1. senderAddress | + // | | 0x020 | | 2. makerAddress | + // | | 0x040 | | 3. takerAddress | + // | | 0x060 | | 4. feeRecipientAddress | + // | | 0x080 | | 5. makerAssetAmount | + // | | 0x0A0 | | 6. takerAssetAmount | + // | | 0x0C0 | | 7. makerFeeAmount | + // | | 0x0E0 | | 8. takerFeeAmount | + // | | 0x100 | | 9. expirationTimeSeconds | + // | | 0x120 | | 10. salt | + // | | 0x140 | | 11. Offset to makerAssetData (*) | + // | | 0x160 | | 12. Offset to takerAssetData (*) | + // | | 0x180 | 32 | makerAssetData Length | + // | | 0x1A0 | ** | makerAssetData Contents | + // | | 0x1C0 | 32 | takerAssetData Length | + // | | 0x1E0 | ** | takerAssetData Contents | + // | | 0x200 | 32 | signature Length | + // | | 0x220 | ** | signature Contents | + + // * Offsets are calculated from the beginning of the current area: Header, Params, Data: + // An offset stored in the Params area is calculated from the beginning of the Params section. + // An offset stored in the Data area is calculated from the beginning of the Data section. + + // ** The length of dynamic array contents are stored in the field immediately preceeding the contents. + + // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html + + assembly { + + // Areas below may use the following variables: + // 1. Start -- Start of this area in memory + // 2. End -- End of this area in memory. This value may + // be precomputed (before writing contents), + // or it may be computed as contents are written. + // 3. Offset -- Current offset into area. If an area's End + // is precomputed, this variable tracks the + // offsets of contents as they are written. + + /////// Setup Header Area /////// + // Load free memory pointer + calldataBegin := mload(0x40) + mstore(calldataBegin, fillOrderSelector) + let headerAreaEnd := add(calldataBegin, 0x4) + + /////// Setup Params Area /////// + // This area is preallocated and written to later. + // This is because we need to fill in offsets that have not yet been calculated. + let paramsAreaStart := headerAreaEnd + let paramsAreaEnd := add(paramsAreaStart, 0x60) + let paramsAreaOffset := paramsAreaStart + + /////// Setup Data Area /////// + let dataAreaStart := paramsAreaEnd + let dataAreaEnd := dataAreaStart + + // Offset from the source data we're reading from + let sourceOffset := order + // arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array. + let arrayLenBytes := 0 + let arrayLenWords := 0 + + /////// Write order Struct /////// + // Write memory location of Order, relative to the start of the + // parameter list, then increment the paramsAreaOffset respectively. + mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart)) + paramsAreaOffset := add(paramsAreaOffset, 0x20) + + // Write values for each field in the order + // It would be nice to use a loop, but we save on gas by writing + // the stores sequentially. + mstore(dataAreaEnd, mload(sourceOffset)) // makerAddress + mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20))) // takerAddress + mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40))) // feeRecipientAddress + mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60))) // senderAddress + mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80))) // makerAssetAmount + mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0))) // takerAssetAmount + mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0))) // makerFeeAmount + mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0))) // takerFeeAmount + mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100))) // expirationTimeSeconds + mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120))) // salt + mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140))) // Offset to makerAssetData + mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160))) // Offset to takerAssetData + dataAreaEnd := add(dataAreaEnd, 0x180) + sourceOffset := add(sourceOffset, 0x180) + + // Write offset to + mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart)) + + // Calculate length of + sourceOffset := mload(add(order, 0x140)) // makerAssetData + arrayLenBytes := mload(sourceOffset) + sourceOffset := add(sourceOffset, 0x20) + arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20) + + // Write length of + mstore(dataAreaEnd, arrayLenBytes) + dataAreaEnd := add(dataAreaEnd, 0x20) + + // Write contents of + for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} { + mstore(dataAreaEnd, mload(sourceOffset)) + dataAreaEnd := add(dataAreaEnd, 0x20) + sourceOffset := add(sourceOffset, 0x20) + } + + // Write offset to + mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart)) + + // Calculate length of + sourceOffset := mload(add(order, 0x160)) // takerAssetData + arrayLenBytes := mload(sourceOffset) + sourceOffset := add(sourceOffset, 0x20) + arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20) + + // Write length of + mstore(dataAreaEnd, arrayLenBytes) + dataAreaEnd := add(dataAreaEnd, 0x20) + + // Write contents of + for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} { + mstore(dataAreaEnd, mload(sourceOffset)) + dataAreaEnd := add(dataAreaEnd, 0x20) + sourceOffset := add(sourceOffset, 0x20) + } + + /////// Write takerAssetFillAmount /////// + mstore(paramsAreaOffset, takerAssetFillAmount) + paramsAreaOffset := add(paramsAreaOffset, 0x20) + + /////// Write signature /////// + // Write offset to paramsArea + mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart)) + + // Calculate length of signature + sourceOffset := signature + arrayLenBytes := mload(sourceOffset) + sourceOffset := add(sourceOffset, 0x20) + arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20) + + // Write length of signature + mstore(dataAreaEnd, arrayLenBytes) + dataAreaEnd := add(dataAreaEnd, 0x20) + + // Write contents of signature + for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} { + mstore(dataAreaEnd, mload(sourceOffset)) + dataAreaEnd := add(dataAreaEnd, 0x20) + sourceOffset := add(sourceOffset, 0x20) + } + + // Set length of calldata + calldataLength := sub(dataAreaEnd, calldataBegin) + } + + return (calldataBegin, calldataLength); + } +} -- cgit From d61759f6dd084e0aad0771f0261fc2a9fe2c06ed Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Thu, 19 Jul 2018 16:02:54 +0200 Subject: Returns byte array instead of memory range for encoding fillOrder calldata --- .../protocol/Exchange/MixinWrapperFunctions.sol | 22 +++++++---------- .../2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol | 28 +++++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'packages') diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol index a5038f5cf..567f26c52 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol @@ -71,14 +71,10 @@ contract MixinWrapperFunctions is returns (FillResults memory fillResults) { // ABI encode calldata for `fillOrder` - ( - uint256 calldataBegin, - uint256 calldataLength - ) = abiEncodeFillOrder( + bytes memory fillOrderCalldata = abiEncodeFillOrder( order, takerAssetFillAmount, - signature, - this.fillOrder.selector + signature ); // Delegate to `fillOrder` and handle any exceptions gracefully @@ -86,9 +82,9 @@ contract MixinWrapperFunctions is let success := delegatecall( gas, // forward all gas, TODO: look into gas consumption of assert/throw address, // call address of this contract - calldataBegin, // pointer to start of input - calldataLength, // length of input - calldataBegin, // write output over input + add(fillOrderCalldata, 32), // pointer to start of input (skip array length in first 32 bytes) + mload(fillOrderCalldata), // length of input + fillOrderCalldata, // write output over input 128 // output size is 128 bytes ) switch success @@ -99,10 +95,10 @@ contract MixinWrapperFunctions is mstore(add(fillResults, 96), 0) } case 1 { - mstore(fillResults, mload(calldataBegin)) - mstore(add(fillResults, 32), mload(add(calldataBegin, 32))) - mstore(add(fillResults, 64), mload(add(calldataBegin, 64))) - mstore(add(fillResults, 96), mload(add(calldataBegin, 96))) + mstore(fillResults, mload(fillOrderCalldata)) + mstore(add(fillResults, 32), mload(add(fillOrderCalldata, 32))) + mstore(add(fillResults, 64), mload(add(fillOrderCalldata, 64))) + mstore(add(fillResults, 96), mload(add(fillOrderCalldata, 96))) } } return fillResults; diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol index 5bea607d6..507e69712 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol @@ -23,6 +23,10 @@ import "./LibOrder.sol"; contract LibAbiEncoder { + + // solhint-disable max-line-length + bytes4 constant internal FILL_ORDER_SELECTOR = bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)")); + // solhint-enable max-line-length /// @dev ABI encodes calldata for `fillOrder` in memory and returns the address range. /// This range can be passed into `call` or `delegatecall` to invoke an external @@ -35,14 +39,10 @@ contract LibAbiEncoder { function abiEncodeFillOrder( LibOrder.Order memory order, uint256 takerAssetFillAmount, - bytes memory signature, - bytes4 fillOrderSelector + bytes memory signature ) public - returns ( - uint256 calldataBegin, - uint256 calldataLength - ) + returns (bytes memory fillOrderCalldata) { // We need to call MExchangeCore.fillOrder using a delegatecall in // assembly so that we can intercept a call that throws. For this, we @@ -83,6 +83,8 @@ contract LibAbiEncoder { // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html + bytes4 fillOrderSelector = FILL_ORDER_SELECTOR; + assembly { // Areas below may use the following variables: @@ -96,9 +98,10 @@ contract LibAbiEncoder { /////// Setup Header Area /////// // Load free memory pointer - calldataBegin := mload(0x40) - mstore(calldataBegin, fillOrderSelector) - let headerAreaEnd := add(calldataBegin, 0x4) + fillOrderCalldata := mload(0x40) + // Leave 0x20 bytes to store the length + mstore(add(fillOrderCalldata, 0x20), fillOrderSelector) + let headerAreaEnd := add(fillOrderCalldata, 0x24) /////// Setup Params Area /////// // This area is preallocated and written to later. @@ -207,9 +210,12 @@ contract LibAbiEncoder { } // Set length of calldata - calldataLength := sub(dataAreaEnd, calldataBegin) + mstore( + fillOrderCalldata, + sub(dataAreaEnd, add(fillOrderCalldata, 0x20)) + ) } - return (calldataBegin, calldataLength); + return fillOrderCalldata; } } -- cgit From 02d50a513af7981a1c7c04e05ce9bf3499b68c73 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 19 Jul 2018 17:31:43 -0700 Subject: Hard code fillOrder selector into abiEncodeFillOrder --- .../src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol index 507e69712..704c7061c 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol @@ -24,10 +24,6 @@ import "./LibOrder.sol"; contract LibAbiEncoder { - // solhint-disable max-line-length - bytes4 constant internal FILL_ORDER_SELECTOR = bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)")); - // solhint-enable max-line-length - /// @dev ABI encodes calldata for `fillOrder` in memory and returns the address range. /// This range can be passed into `call` or `delegatecall` to invoke an external /// call to `fillOrder`. @@ -42,6 +38,7 @@ contract LibAbiEncoder { bytes memory signature ) public + pure returns (bytes memory fillOrderCalldata) { // We need to call MExchangeCore.fillOrder using a delegatecall in @@ -83,8 +80,6 @@ contract LibAbiEncoder { // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html - bytes4 fillOrderSelector = FILL_ORDER_SELECTOR; - assembly { // Areas below may use the following variables: @@ -99,8 +94,10 @@ contract LibAbiEncoder { /////// Setup Header Area /////// // Load free memory pointer fillOrderCalldata := mload(0x40) + // bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)")) + // = 0xb4be83d5 // Leave 0x20 bytes to store the length - mstore(add(fillOrderCalldata, 0x20), fillOrderSelector) + mstore(add(fillOrderCalldata, 0x20), 0xb4be83d500000000000000000000000000000000000000000000000000000000) let headerAreaEnd := add(fillOrderCalldata, 0x24) /////// Setup Params Area /////// -- cgit From cce2127f7252830723fafede929b3ce222afeccd Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Fri, 20 Jul 2018 10:55:47 -0700 Subject: Upgrade some @0xproject packages to 1.0.0 in website --- packages/website/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/website/package.json b/packages/website/package.json index 4cefa19a9..3bcc585c7 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -23,13 +23,13 @@ "dependencies": { "@0xproject/contract-wrappers": "^0.0.5", "@0xproject/order-utils": "^0.0.9", - "@0xproject/react-docs": "^0.0.16", + "@0xproject/react-docs": "^1.0.0", "@0xproject/react-shared": "^0.2.3", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^0.8.1", "@0xproject/typescript-typings": "^0.4.3", - "@0xproject/utils": "^0.7.3", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/utils": "^1.0.0", + "@0xproject/web3-wrapper": "^1.0.0", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", -- cgit From dc151f7290072c9776c9b351ae30bf577fcd1015 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 20 Jul 2018 20:13:53 +0200 Subject: Add missing timestamp to CHANGELOG entries --- packages/0x.js/CHANGELOG.json | 2 ++ packages/abi-gen/CHANGELOG.json | 1 + packages/assert/CHANGELOG.json | 1 + packages/base-contract/CHANGELOG.json | 1 + packages/connect/CHANGELOG.json | 1 + packages/contract-wrappers/CHANGELOG.json | 1 + packages/dev-utils/CHANGELOG.json | 1 + packages/ethereum-types/CHANGELOG.json | 1 + packages/fill-scenarios/CHANGELOG.json | 1 + packages/json-schemas/CHANGELOG.json | 1 + packages/migrations/CHANGELOG.json | 1 + packages/monorepo-scripts/CHANGELOG.json | 1 + packages/order-utils/CHANGELOG.json | 1 + packages/order-watcher/CHANGELOG.json | 1 + packages/react-docs/CHANGELOG.json | 1 + packages/react-shared/CHANGELOG.json | 1 + packages/sol-compiler/CHANGELOG.json | 1 + packages/sol-cov/CHANGELOG.json | 1 + packages/sol-resolver/CHANGELOG.json | 1 + packages/sra-report/CHANGELOG.json | 1 + packages/subproviders/CHANGELOG.json | 1 + packages/tslint-config/CHANGELOG.json | 1 + packages/types/CHANGELOG.json | 1 + packages/typescript-typings/CHANGELOG.json | 1 + packages/utils/CHANGELOG.json | 1 + packages/web3-wrapper/CHANGELOG.json | 1 + 26 files changed, 27 insertions(+) (limited to 'packages') diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 7d6139658..c3b8728c6 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043100, "version": "1.0.0-rc.2", "changes": [ { @@ -8,6 +9,7 @@ ] }, { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index a8f9c709c..4162b943f 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -9,6 +9,7 @@ ] }, { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index dd699fc6b..f06901a44 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index 6f88328bb..f427f0fe5 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index bb93826f1..8ed147e76 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 1aa4d0b64..1e82522df 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 4093d352e..f94fd5f30 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json index d851e6ef2..70a2ffcb0 100644 --- a/packages/ethereum-types/CHANGELOG.json +++ b/packages/ethereum-types/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index 0819d446c..e1e8a9d6d 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 0729c75e5..8bffe6955 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index f57b10f2a..e0a5c8a52 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/monorepo-scripts/CHANGELOG.json b/packages/monorepo-scripts/CHANGELOG.json index 51d060e27..cdac2d278 100644 --- a/packages/monorepo-scripts/CHANGELOG.json +++ b/packages/monorepo-scripts/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 5d92cb318..d74ba90ea 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 5d9d5705b..03b6f0da6 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 61ccf1dea..1bb2da328 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 5e0e40a70..a1fc76193 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index ff5dac15e..762a26a90 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json index 7308bffb6..6b7cdf6e9 100644 --- a/packages/sol-cov/CHANGELOG.json +++ b/packages/sol-cov/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index 9ebbe1adb..0be30856e 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/sra-report/CHANGELOG.json b/packages/sra-report/CHANGELOG.json index c5220c493..0867f0723 100644 --- a/packages/sra-report/CHANGELOG.json +++ b/packages/sra-report/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index bc427db09..c91358aad 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json index 462a01dcc..fb879f169 100644 --- a/packages/tslint-config/CHANGELOG.json +++ b/packages/tslint-config/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 35090ff2c..6189acbbc 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0-rc.1", "changes": [ { diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json index a08ded02d..5a64d0490 100644 --- a/packages/typescript-typings/CHANGELOG.json +++ b/packages/typescript-typings/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 4bd82d476..4ff5236ec 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index e8f3b5f43..200836a82 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,6 @@ [ { + "timestamp": 1532043000, "version": "1.0.0", "changes": [ { -- cgit From d9a282bd92c155edba0fafe688df85a5576f210a Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Fri, 20 Jul 2018 11:56:20 -0700 Subject: Increase node heap size for webpack command --- packages/website/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/website/package.json b/packages/website/package.json index 3bcc585c7..99fd7cff3 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -7,7 +7,7 @@ "private": true, "description": "Website and 0x portal dapp", "scripts": { - "build": "NODE_ENV=production webpack; exit 0;", + "build": "NODE_ENV=production node --max_old_space_size=8192 ../../node_modules/.bin/webpack; exit 0;", "clean": "shx rm -f public/bundle*", "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "watch_without_deps": "webpack-dev-server --content-base public --https", -- cgit From 6ca2a02766a842b6a85eb36b9741ccc8ce225bef Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Fri, 20 Jul 2018 11:58:38 -0700 Subject: Add AbortController polyfill to fetchAsync in utils --- packages/utils/package.json | 1 + packages/utils/src/fetchAsync.ts | 3 +++ 2 files changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/utils/package.json b/packages/utils/package.json index 7e3d46ce7..382604fdd 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -38,6 +38,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@types/node": "^8.0.53", + "abortcontroller-polyfill": "^1.1.9", "bignumber.js": "~4.1.0", "detect-node": "2.0.3", "ethereum-types": "^1.0.0", diff --git a/packages/utils/src/fetchAsync.ts b/packages/utils/src/fetchAsync.ts index c02e5baba..b4c85718d 100644 --- a/packages/utils/src/fetchAsync.ts +++ b/packages/utils/src/fetchAsync.ts @@ -1,5 +1,8 @@ import isNode = require('detect-node'); import 'isomorphic-fetch'; +// WARNING: This needs to be imported after isomorphic-fetch: https://github.com/mo/abortcontroller-polyfill#using-it-on-browsers-without-fetch +// tslint:disable-next-line:ordered-imports +import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'; export const fetchAsync = async ( endpoint: string, -- cgit From fd349b618a48716de1b4ed7fdabd51cbd27f71bb Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Fri, 20 Jul 2018 12:05:47 -0700 Subject: Add changelog entry for @0xproject/utils --- packages/utils/CHANGELOG.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages') diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 4bd82d476..2ce48ab10 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.1", + "changes": [ + { + "note": "Add `AbortController` polyfill to `fetchAsync`", + "pr": 903 + } + ] + }, { "version": "1.0.0", "changes": [ -- cgit