Merge development

This commit is contained in:
Leonid Logvinov 2019-01-10 11:51:13 +01:00
commit cee2954245
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
431 changed files with 19371 additions and 1907 deletions

View File

@ -4,7 +4,7 @@ jobs:
build: build:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
environment: environment:
CONTRACTS_COMMIT_HASH: '9ed05f5' CONTRACTS_COMMIT_HASH: '9ed05f5'
working_directory: ~/repo working_directory: ~/repo
@ -16,7 +16,7 @@ jobs:
command: sudo npm install --global yarn@1.9.4 command: sudo npm install --global yarn@1.9.4
- run: - run:
name: yarn name: yarn
command: yarn --frozen-lockfile install || yarn --frozen-lockfile install command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
- run: yarn build:ci:no_website - run: yarn build:ci:no_website
- run: yarn build:ts - run: yarn build:ts
- save_cache: - save_cache:
@ -26,7 +26,7 @@ jobs:
build-website: build-website:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -35,7 +35,7 @@ jobs:
- run: cd packages/website && yarn build:prod - run: cd packages/website && yarn build:prod
test-contracts-ganache: test-contracts-ganache:
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -49,7 +49,7 @@ jobs:
- run: yarn wsrun test:circleci @0x/contracts-protocol - run: yarn wsrun test:circleci @0x/contracts-protocol
test-contracts-geth: test-contracts-geth:
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
- image: 0xorg/devnet - image: 0xorg/devnet
working_directory: ~/repo working_directory: ~/repo
steps: steps:
@ -67,7 +67,7 @@ jobs:
test-publish: test-publish:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
- image: 0xorg/verdaccio - image: 0xorg/verdaccio
working_directory: ~/repo working_directory: ~/repo
steps: steps:
@ -77,7 +77,7 @@ jobs:
- run: yarn test:publish:circleci - run: yarn test:publish:circleci
test-doc-generation: test-doc-generation:
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -100,7 +100,7 @@ jobs:
- ~/repo/packages/pipeline/coverage/lcov.info - ~/repo/packages/pipeline/coverage/lcov.info
test-rest: test-rest:
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -188,9 +188,7 @@ jobs:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/python - image: circleci/python
- image: 0xorg/ganache-cli - image: 0xorg/ganache-cli:2.2.2
command: |
ganache-cli --gasLimit 10000000 --noVMErrorsOnRPCResponse --db /snapshot --noVMErrorsOnRPCResponse -p 8545 --networkId 50 -m "concert load couple harbor equip island argue ramp clarify fence smart topic"
- image: 0xorg/launch-kit-ci - image: 0xorg/launch-kit-ci
command: | command: |
yarn start:ts -p 3000:3000 yarn start:ts -p 3000:3000
@ -202,31 +200,34 @@ jobs:
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- run: - run:
command: | command: |
cd python-packages/order_utils cd python-packages
python -m ensurepip python -m ensurepip
python -m pip install -e .[dev] ./install
- run:
command: |
cd python-packages/sra_client
python -m ensurepip
python -m pip install -e .
- save_cache: - save_cache:
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
paths: paths:
- '/usr/local/bin' - '/usr/local/bin'
- '/usr/local/lib/python3.7/site-packages' - '/usr/local/lib/python3.7/site-packages'
- '.eggs'
- '.mypy_cache'
- '.pytest_cache'
- '.tox'
- run: - run:
command: | command: |
cd python-packages/order_utils cd python-packages
coverage run setup.py test ./cmd_pkgs_in_dep_order.py coverage run setup.py test
- run: - save_cache:
command: | key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
cd python-packages/sra_client paths:
coverage run setup.py test - ~/repo/python-packages/contract_addresses/.coverage
- save_cache:
key: coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/repo/python-packages/contract_artifacts/.coverage
- save_cache:
key: coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/repo/python-packages/contract_demo/.coverage
- save_cache:
key: coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/repo/python-packages/json_schemas/.coverage
- save_cache: - save_cache:
key: coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }} key: coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
paths: paths:
@ -249,7 +250,7 @@ jobs:
command: | command: |
cd python-packages/order_utils cd python-packages/order_utils
python -m ensurepip python -m ensurepip
python -m pip install -e .[dev] python -m pip install .
- save_cache: - save_cache:
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
paths: paths:
@ -275,22 +276,14 @@ jobs:
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- run: - run:
command: | command: |
cd python-packages/order_utils
python -m ensurepip python -m ensurepip
python -m pip install -e .[dev] cd python-packages
- save_cache: ./install
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} ./lint
paths:
- '/usr/local/bin'
- '/usr/local/lib/python3.7/site-packages'
- run:
command: |
cd python-packages/order_utils
python setup.py lint
static-tests: static-tests:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
steps: steps:
- restore_cache: - restore_cache:
keys: keys:
@ -301,7 +294,7 @@ jobs:
- run: yarn bundlewatch - run: yarn bundlewatch
submit-coverage: submit-coverage:
docker: docker:
- image: circleci/node:9 - image: circleci/node:9-browsers
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -355,6 +348,21 @@ jobs:
- restore_cache: - restore_cache:
keys: keys:
- coverage-contracts-{{ .Environment.CIRCLE_SHA1 }} - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache:
keys:
- coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache:
keys:
- coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache:
keys:
- coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache:
keys:
- coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache:
keys:
- coverage-python-sra-client-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache: - restore_cache:
keys: keys:
- coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }} - coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
@ -392,7 +400,9 @@ workflows:
requires: requires:
- test-rest - test-rest
- test-python - test-python
- static-tests-python:
requires:
- test-python
- test-python - test-python
- static-tests-python
# skip python tox run for now, as we don't yet have multiple test environments to support. # skip python tox run for now, as we don't yet have multiple test environments to support.
#- test-rest-python #- test-rest-python

View File

@ -18,12 +18,16 @@ lib
/contracts/extensions/generated-artifacts /contracts/extensions/generated-artifacts
/packages/abi-gen-wrappers/src/generated-wrappers /packages/abi-gen-wrappers/src/generated-wrappers
/packages/contract-artifacts/artifacts /packages/contract-artifacts/artifacts
/python-packages/order_utils/src/zero_ex/contract_artifacts/artifacts /python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts
/packages/json-schemas/schemas /packages/json-schemas/schemas
/python-packages/order_utils/src/zero_ex/json_schemas/schemas /python-packages/json_schemas/src/zero_ex/json_schemas/schemas
/packages/metacoin/src/contract_wrappers /packages/metacoin/src/contract_wrappers
/packages/metacoin/artifacts /packages/metacoin/artifacts
/packages/sra-spec/public/ /packages/sra-spec/public/
/packages/dev-tools-pages/ts/**/data.json
package.json package.json
scripts/postpublish_utils.js scripts/postpublish_utils.js
packages/sol-coverage/test/fixtures/artifacts packages/sol-coverage/test/fixtures/artifacts
.pytest_cache
.mypy_cache
.tox

View File

@ -1,4 +1,4 @@
<img src="https://github.com/0xProject/branding/blob/master/0x_Black_CMYK.png" width="200px" > <img src="https://github.com/0xProject/branding/blob/master/0x%20Logo/PNG/0x-Logo-Black.png" width="150px" >
--- ---
@ -24,10 +24,13 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
### Python Packages ### Python Packages
| Package | Version | Description | | Package | Version | Description |
| ------------------------------------------------ | ----------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
| [`0x-order-utils`](/python-packages/order_utils) | [![PyPI](https://img.shields.io/pypi/v/0x-order-utils.svg)](https://pypi.org/project/0x-order-utils/) | A set of utilities for generating, parsing, signing and validating 0x orders | | [`0x-contract-addresses`](/python-packages/contract_addresses) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-addresses.svg)](https://pypi.org/project/0x-contract-addresses/) | A tiny utility library for getting known deployed contract addresses for a particular network |
| [`0x-sra-client`](/python-packages/sra_client) | [![PyPI](https://img.shields.io/pypi/v/0x-sra-client.svg)](https://pypi.org/project/0x-sra-client/) | A Python client for interacting with servers conforming to the Standard Relayer API specification | | [`0x-contract-artifacts`](/python-packages/contract_artifacts) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-artifacts.svg)](https://pypi.org/project/0x-contract-artifacts/) | 0x smart contract compilation artifacts |
| [`0x-json-schemas`](/python-packages/json_schemas) | [![PyPI](https://img.shields.io/pypi/v/0x-json-schemas.svg)](https://pypi.org/project/0x-json-schemas/) | 0x-related JSON schemas |
| [`0x-order-utils`](/python-packages/order_utils) | [![PyPI](https://img.shields.io/pypi/v/0x-order-utils.svg)](https://pypi.org/project/0x-order-utils/) | A set of utilities for generating, parsing, signing and validating 0x orders |
| [`0x-sra-client`](/python-packages/sra_client) | [![PyPI](https://img.shields.io/pypi/v/0x-sra-client.svg)](https://pypi.org/project/0x-sra-client/) | A Python client for interacting with servers conforming to the Standard Relayer API specification |
### Typescript/Javascript Packages ### Typescript/Javascript Packages

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1544741676, "timestamp": 1544741676,
"version": "1.0.2", "version": "1.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-examples", "name": "@0x/contracts-examples",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -33,11 +33,11 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -52,24 +52,23 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-interfaces": "^1.0.2", "@0x/contracts-interfaces": "^1.0.3",
"@0x/contracts-libs": "^1.0.2", "@0x/contracts-libs": "^1.0.3",
"@0x/contracts-multisig": "^1.0.2", "@0x/contracts-multisig": "^1.0.3",
"@0x/contracts-tokens": "^1.0.2", "@0x/contracts-tokens": "^1.0.3",
"@0x/contracts-utils": "^1.0.2", "@0x/contracts-utils": "^1.0.3",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",

View File

@ -6,7 +6,8 @@
"note": "Added Dutch Auction Wrapper", "note": "Added Dutch Auction Wrapper",
"pr": 1465 "pr": 1465
} }
] ],
"timestamp": 1547040760
}, },
{ {
"version": "1.1.0", "version": "1.1.0",

View File

@ -5,6 +5,16 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.2.0 - _January 9, 2019_
* Added Dutch Auction Wrapper (#1465)
## v1.1.0 - _Invalid date_
* Added Balance Threshold Filter (#1383)
* Add OrderMatcher (#1117)
* Add OrderValidator (#1464)
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-extensions", "name": "@0x/contracts-extensions",
"version": "1.0.2", "version": "1.2.0",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,12 +44,12 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/contract-wrappers": "^4.1.3", "@0x/contract-wrappers": "^4.2.0",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -64,24 +64,23 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-interfaces": "^1.0.2", "@0x/contracts-interfaces": "^1.0.3",
"@0x/contracts-libs": "^1.0.2", "@0x/contracts-libs": "^1.0.3",
"@0x/contracts-protocol": "^2.1.59", "@0x/contracts-protocol": "^2.2.0",
"@0x/contracts-tokens": "^1.0.2", "@0x/contracts-tokens": "^1.0.3",
"@0x/contracts-utils": "^1.0.2", "@0x/contracts-utils": "^1.0.3",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1544741676, "timestamp": 1544741676,
"version": "1.0.2", "version": "1.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-interfaces", "name": "@0x/contracts-interfaces",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -30,8 +30,8 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/interfaces/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/interfaces/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
@ -41,13 +41,13 @@
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-libs": "^1.0.2", "@0x/contracts-libs": "^1.0.3",
"@0x/contracts-utils": "^1.0.2", "@0x/contracts-utils": "^1.0.3",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"lodash": "^4.17.5" "lodash": "^4.17.5"
}, },

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1544741676, "timestamp": 1544741676,
"version": "1.0.2", "version": "1.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-libs", "name": "@0x/contracts-libs",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,11 +44,11 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -63,21 +63,20 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-multisig": "^1.0.2", "@0x/contracts-multisig": "^1.0.3",
"@0x/contracts-utils": "^1.0.2", "@0x/contracts-utils": "^1.0.3",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1544741676, "timestamp": 1544741676,
"version": "1.0.2", "version": "1.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-multisig", "name": "@0x/contracts-multisig",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,11 +44,11 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/ethereumjs-abi": "^0.6.0", "@types/ethereumjs-abi": "^0.6.0",
@ -63,19 +63,18 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"lodash": "^4.17.5" "lodash": "^4.17.5"
}, },

View File

@ -14,7 +14,8 @@
"note": "Move OrderValidator to extensions", "note": "Move OrderValidator to extensions",
"pr": 1464 "pr": 1464
} }
] ],
"timestamp": 1547040760
}, },
{ {
"timestamp": 1544741676, "timestamp": 1544741676,

View File

@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.2.0 - _January 9, 2019_
* Added LibAddressArray (#1383)
* Add validation and comments to MultiAssetProxy (#1455)
* Move OrderValidator to extensions (#1464)
## v2.1.59 - _December 13, 2018_ ## v2.1.59 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-protocol", "name": "@0x/contracts-protocol",
"version": "2.1.59", "version": "2.2.0",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,10 +44,10 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -62,26 +62,25 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-examples": "^1.0.2", "@0x/contracts-examples": "^1.0.3",
"@0x/contracts-interfaces": "^1.0.2", "@0x/contracts-interfaces": "^1.0.3",
"@0x/contracts-libs": "^1.0.2", "@0x/contracts-libs": "^1.0.3",
"@0x/contracts-multisig": "^1.0.2", "@0x/contracts-multisig": "^1.0.3",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/contracts-tokens": "^1.0.2", "@0x/contracts-tokens": "^1.0.3",
"@0x/contracts-utils": "^1.0.2", "@0x/contracts-utils": "^1.0.3",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "1.0.2", "version": "1.0.2",
"changes": [ "changes": [

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-test-utils", "name": "@0x/contracts-test-utils",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -40,19 +40,19 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/abi-gen": "^1.0.19",
"@0x/dev-utils": "^1.0.21",
"@0x/order-utils": "^3.0.7",
"@0x/sol-compiler": "^1.1.16",
"@0x/sol-coverage": "^1.0.0", "@0x/sol-coverage": "^1.0.0",
"@0x/sol-profiler": "^1.0.0", "@0x/sol-profiler": "^1.0.0",
"@0x/sol-trace": "^1.0.0", "@0x/sol-trace": "^1.0.0",
"@0x/subproviders": "^2.1.8", "@0x/abi-gen": "^1.0.20",
"@0x/dev-utils": "^1.0.22",
"@0x/order-utils": "^3.1.0",
"@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/ethereumjs-abi": "^0.6.0", "@types/ethereumjs-abi": "^0.6.0",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1544741676, "timestamp": 1544741676,
"version": "1.0.2", "version": "1.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-tokens", "name": "@0x/contracts-tokens",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,11 +44,11 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -63,23 +63,22 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-interfaces": "^1.0.2", "@0x/contracts-interfaces": "^1.0.3",
"@0x/contracts-libs": "^1.0.2", "@0x/contracts-libs": "^1.0.3",
"@0x/contracts-multisig": "^1.0.2", "@0x/contracts-multisig": "^1.0.3",
"@0x/contracts-utils": "^1.0.2", "@0x/contracts-utils": "^1.0.3",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1544741676, "timestamp": 1544741676,
"version": "1.0.2", "version": "1.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_ ## v1.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-utils", "name": "@0x/contracts-utils",
"version": "1.0.2", "version": "1.0.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,11 +44,11 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/sol-compiler": "^1.1.16", "@0x/sol-compiler": "^2.0.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -64,20 +64,19 @@
"mocha": "^4.1.0", "mocha": "^4.1.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solc": "^0.4.24",
"solhint": "^1.4.1", "solhint": "^1.4.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1", "typescript": "3.0.1",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contracts-multisig": "^1.0.2", "@0x/contracts-multisig": "^1.0.3",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5" "lodash": "^4.17.5"

View File

@ -7,7 +7,8 @@
"Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`.", "Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`.",
"pr": 1363 "pr": 1363
} }
] ],
"timestamp": 1547040760
}, },
{ {
"version": "2.0.8", "version": "2.0.8",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.0.0 - _January 9, 2019_
* Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`. (#1363)
## v2.0.8 - _December 13, 2018_ ## v2.0.8 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "0x.js", "name": "0x.js",
"version": "2.0.8", "version": "3.0.0",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -42,10 +42,10 @@
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"devDependencies": { "devDependencies": {
"@0x/abi-gen-wrappers": "^2.0.2", "@0x/abi-gen-wrappers": "^2.1.0",
"@0x/contract-addresses": "^2.0.0", "@0x/contract-addresses": "^2.1.0",
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/migrations": "^2.2.2", "@0x/migrations": "^2.3.0",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42", "@types/mocha": "^2.2.42",
@ -72,16 +72,16 @@
"webpack": "^4.20.2" "webpack": "^4.20.2"
}, },
"dependencies": { "dependencies": {
"@0x/assert": "^1.0.20", "@0x/assert": "^1.0.21",
"@0x/base-contract": "^3.0.10", "@0x/base-contract": "^3.0.11",
"@0x/contract-wrappers": "^4.1.3", "@0x/contract-wrappers": "^4.2.0",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/order-watcher": "^2.2.8", "@0x/order-watcher": "^2.4.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"@types/web3-provider-engine": "^14.0.0", "@types/web3-provider-engine": "^14.0.0",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"ethers": "~4.0.4", "ethers": "~4.0.4",

View File

@ -6,7 +6,8 @@
"note": "Added Dutch Auction Wrapper", "note": "Added Dutch Auction Wrapper",
"pr": 1465 "pr": 1465
} }
] ],
"timestamp": 1547040760
}, },
{ {
"version": "2.0.2", "version": "2.0.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.1.0 - _January 9, 2019_
* Added Dutch Auction Wrapper (#1465)
## v2.0.2 - _December 13, 2018_ ## v2.0.2 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/abi-gen-wrappers", "name": "@0x/abi-gen-wrappers",
"version": "2.0.2", "version": "2.1.0",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -30,19 +30,19 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^1.0.19", "@0x/abi-gen": "^1.0.20",
"@0x/abi-gen-templates": "^1.0.1", "@0x/abi-gen-templates": "^1.0.1",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"ethers": "~4.0.4", "ethers": "~4.0.4",
"lodash": "^4.17.5", "lodash": "^4.17.5",
"shx": "^0.2.2" "shx": "^0.2.2"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.10" "@0x/base-contract": "^3.0.11"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.20",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "1.0.19", "version": "1.0.19",
"changes": [ "changes": [

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.20 - _January 9, 2019_
* Dependencies updated
## v1.0.19 - _December 13, 2018_ ## v1.0.19 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/abi-gen", "name": "@0x/abi-gen",
"version": "1.0.19", "version": "1.0.20",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -32,7 +32,7 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": { "dependencies": {
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"chalk": "^2.3.0", "chalk": "^2.3.0",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"glob": "^7.1.2", "glob": "^7.1.2",

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "1.0.21",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "1.0.20", "version": "1.0.20",
"changes": [ "changes": [

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.0.21 - _January 9, 2019_
* Dependencies updated
## v1.0.20 - _December 13, 2018_ ## v1.0.20 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/assert", "name": "@0x/assert",
"version": "1.0.20", "version": "1.0.21",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,9 +44,9 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/json-schemas": "^2.1.4", "@0x/json-schemas": "^2.1.5",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"lodash": "^4.17.5", "lodash": "^4.17.5",
"valid-url": "^1.0.9" "valid-url": "^1.0.9"
}, },

View File

@ -1,4 +1,22 @@
[ [
{
"version": "4.0.0",
"changes": [
{
"note": "Raise custom InsufficientAssetLiquidityError error with amountAvailableToFill attribute",
"pr": 1437
}
]
},
{
"timestamp": 1547040760,
"version": "3.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "3.0.4", "version": "3.0.4",
"changes": [ "changes": [

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.0.5 - _January 9, 2019_
* Dependencies updated
## v3.0.4 - _December 13, 2018_ ## v3.0.4 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,7 +1,5 @@
## @0x/asset-buyer ## @0x/asset-buyer
**Warning: In Beta, has not been extensively tested.**
Convenience package for buying assets represented on the Ethereum blockchain using 0x. In its simplest form, the package helps in the usage of the [0x forwarder contract](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md), which allows users to execute [Wrapped Ether](https://weth.io/) based 0x orders without having to set allowances, wrap Ether or own ZRX, meaning they can buy tokens with Ether alone. Given some liquidity (0x signed orders), it helps estimate the Ether cost of buying a certain asset (giving a range) and then buying that asset. Convenience package for buying assets represented on the Ethereum blockchain using 0x. In its simplest form, the package helps in the usage of the [0x forwarder contract](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md), which allows users to execute [Wrapped Ether](https://weth.io/) based 0x orders without having to set allowances, wrap Ether or own ZRX, meaning they can buy tokens with Ether alone. Given some liquidity (0x signed orders), it helps estimate the Ether cost of buying a certain asset (giving a range) and then buying that asset.
In its more advanced and useful form, it integrates with the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api) and takes care of sourcing liquidity for you given an SRA compliant endpoint. The final result is a library that tells you what assets are available, provides an Ether based quote for any asset desired, and allows you to buy that asset using Ether alone. In its more advanced and useful form, it integrates with the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api) and takes care of sourcing liquidity for you given an SRA compliant endpoint. The final result is a library that tells you what assets are available, provides an Ether based quote for any asset desired, and allows you to buy that asset using Ether alone.

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/asset-buyer", "name": "@0x/asset-buyer",
"version": "3.0.4", "version": "3.0.5",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -36,16 +36,16 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
"dependencies": { "dependencies": {
"@0x/assert": "^1.0.20", "@0x/assert": "^1.0.21",
"@0x/connect": "^3.0.10", "@0x/connect": "^3.0.11",
"@0x/contract-wrappers": "^4.1.3", "@0x/contract-wrappers": "^4.2.0",
"@0x/json-schemas": "^2.1.4", "@0x/json-schemas": "^2.1.5",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"lodash": "^4.17.5" "lodash": "^4.17.5"
}, },

View File

@ -0,0 +1,22 @@
import { BigNumber } from '@0x/utils';
import { AssetBuyerError } from './types';
/**
* Error class representing insufficient asset liquidity
*/
export class InsufficientAssetLiquidityError extends Error {
/**
* The amount availabe to fill (in base units) factoring in slippage.
*/
public amountAvailableToFill: BigNumber;
/**
* @param amountAvailableToFill The amount availabe to fill (in base units) factoring in slippage
*/
constructor(amountAvailableToFill: BigNumber) {
super(AssetBuyerError.InsufficientAssetLiquidity);
this.amountAvailableToFill = amountAvailableToFill;
// Setting prototype so instanceof works. See https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
Object.setPrototypeOf(this, InsufficientAssetLiquidityError.prototype);
}
}

View File

@ -9,6 +9,7 @@ export { SignedOrder } from '@0x/types';
export { BigNumber } from '@0x/utils'; export { BigNumber } from '@0x/utils';
export { AssetBuyer } from './asset_buyer'; export { AssetBuyer } from './asset_buyer';
export { InsufficientAssetLiquidityError } from './errors';
export { BasicOrderProvider } from './order_providers/basic_order_provider'; export { BasicOrderProvider } from './order_providers/basic_order_provider';
export { StandardRelayerAPIOrderProvider } from './order_providers/standard_relayer_api_order_provider'; export { StandardRelayerAPIOrderProvider } from './order_providers/standard_relayer_api_order_provider';
export { export {

View File

@ -102,7 +102,7 @@ export interface AssetBuyerOpts {
} }
/** /**
* Possible errors thrown by an AssetBuyer instance or associated static methods. * Possible error messages thrown by an AssetBuyer instance or associated static methods.
*/ */
export enum AssetBuyerError { export enum AssetBuyerError {
NoEtherTokenContractFound = 'NO_ETHER_TOKEN_CONTRACT_FOUND', NoEtherTokenContractFound = 'NO_ETHER_TOKEN_CONTRACT_FOUND',

View File

@ -3,6 +3,7 @@ import { BigNumber } from '@0x/utils';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { constants } from '../constants'; import { constants } from '../constants';
import { InsufficientAssetLiquidityError } from '../errors';
import { AssetBuyerError, BuyQuote, BuyQuoteInfo, OrdersAndFillableAmounts } from '../types'; import { AssetBuyerError, BuyQuote, BuyQuoteInfo, OrdersAndFillableAmounts } from '../types';
import { orderUtils } from './order_utils'; import { orderUtils } from './order_utils';
@ -33,7 +34,18 @@ export const buyQuoteCalculator = {
}); });
// if we do not have enough orders to cover the desired assetBuyAmount, throw // if we do not have enough orders to cover the desired assetBuyAmount, throw
if (remainingFillAmount.gt(constants.ZERO_AMOUNT)) { if (remainingFillAmount.gt(constants.ZERO_AMOUNT)) {
throw new Error(AssetBuyerError.InsufficientAssetLiquidity); // We needed the amount they requested to buy, plus the amount for slippage
const totalAmountRequested = assetBuyAmount.plus(slippageBufferAmount);
const amountAbleToFill = totalAmountRequested.minus(remainingFillAmount);
// multiplierNeededWithSlippage represents what we need to multiply the assetBuyAmount by
// in order to get the total amount needed considering slippage
// i.e. if slippagePercent was 0.2 (20%), multiplierNeededWithSlippage would be 1.2
const multiplierNeededWithSlippage = new BigNumber(1).plus(slippagePercentage);
// Given amountAvailableToFillConsideringSlippage * multiplierNeededWithSlippage = amountAbleToFill
// We divide amountUnableToFill by multiplierNeededWithSlippage to determine amountAvailableToFillConsideringSlippage
const amountAvailableToFillConsideringSlippage = amountAbleToFill.div(multiplierNeededWithSlippage).floor();
throw new InsufficientAssetLiquidityError(amountAvailableToFillConsideringSlippage);
} }
// if we are not buying ZRX: // if we are not buying ZRX:
// given the orders calculated above, find the fee-orders that cover the desired assetBuyAmount (with slippage) // given the orders calculated above, find the fee-orders that cover the desired assetBuyAmount (with slippage)

View File

@ -1,4 +1,5 @@
import { orderFactory } from '@0x/order-utils/lib/src/order_factory'; import { orderFactory } from '@0x/order-utils/lib/src/order_factory';
import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils'; import { BigNumber } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import * as _ from 'lodash'; import * as _ from 'lodash';
@ -8,6 +9,7 @@ import { AssetBuyerError, OrdersAndFillableAmounts } from '../src/types';
import { buyQuoteCalculator } from '../src/utils/buy_quote_calculator'; import { buyQuoteCalculator } from '../src/utils/buy_quote_calculator';
import { chaiSetup } from './utils/chai_setup'; import { chaiSetup } from './utils/chai_setup';
import { testHelpers } from './utils/test_helpers';
chaiSetup.configure(); chaiSetup.configure();
const expect = chai.expect; const expect = chai.expect;
@ -15,6 +17,10 @@ const expect = chai.expect;
// tslint:disable:custom-no-magic-numbers // tslint:disable:custom-no-magic-numbers
describe('buyQuoteCalculator', () => { describe('buyQuoteCalculator', () => {
describe('#calculate', () => { describe('#calculate', () => {
let firstOrder: SignedOrder;
let firstRemainingFillAmount: BigNumber;
let secondOrder: SignedOrder;
let secondRemainingFillAmount: BigNumber;
let ordersAndFillableAmounts: OrdersAndFillableAmounts; let ordersAndFillableAmounts: OrdersAndFillableAmounts;
let smallFeeOrderAndFillableAmount: OrdersAndFillableAmounts; let smallFeeOrderAndFillableAmount: OrdersAndFillableAmounts;
let allFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts; let allFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts;
@ -24,18 +30,18 @@ describe('buyQuoteCalculator', () => {
// the second order has a rate of 2 makerAsset / WETH with a takerFee of 100 ZRX and has 200 / 200 makerAsset units left to fill (completely fillable) // the second order has a rate of 2 makerAsset / WETH with a takerFee of 100 ZRX and has 200 / 200 makerAsset units left to fill (completely fillable)
// generate one order for fees // generate one order for fees
// the fee order has a rate of 1 ZRX / WETH with no taker fee and has 100 ZRX left to fill (completely fillable) // the fee order has a rate of 1 ZRX / WETH with no taker fee and has 100 ZRX left to fill (completely fillable)
const firstOrder = orderFactory.createSignedOrderFromPartial({ firstOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(400), makerAssetAmount: new BigNumber(400),
takerAssetAmount: new BigNumber(100), takerAssetAmount: new BigNumber(100),
takerFee: new BigNumber(200), takerFee: new BigNumber(200),
}); });
const firstRemainingFillAmount = new BigNumber(200); firstRemainingFillAmount = new BigNumber(200);
const secondOrder = orderFactory.createSignedOrderFromPartial({ secondOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(200), makerAssetAmount: new BigNumber(200),
takerAssetAmount: new BigNumber(100), takerAssetAmount: new BigNumber(100),
takerFee: new BigNumber(100), takerFee: new BigNumber(100),
}); });
const secondRemainingFillAmount = secondOrder.makerAssetAmount; secondRemainingFillAmount = secondOrder.makerAssetAmount;
ordersAndFillableAmounts = { ordersAndFillableAmounts = {
orders: [firstOrder, secondOrder], orders: [firstOrder, secondOrder],
remainingFillableMakerAssetAmounts: [firstRemainingFillAmount, secondRemainingFillAmount], remainingFillableMakerAssetAmounts: [firstRemainingFillAmount, secondRemainingFillAmount],
@ -61,18 +67,137 @@ describe('buyQuoteCalculator', () => {
], ],
}; };
}); });
it('should throw if not enough maker asset liquidity', () => { describe('InsufficientLiquidityError', () => {
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units it('should throw if not enough maker asset liquidity (multiple orders)', () => {
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
const errorFunction = () => {
buyQuoteCalculator.calculate(
ordersAndFillableAmounts,
smallFeeOrderAndFillableAmount,
new BigNumber(500),
0,
0,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(400));
});
it('should throw if not enough maker asset liquidity (multiple orders with 20% slippage)', () => {
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
const errorFunction = () => {
buyQuoteCalculator.calculate(
ordersAndFillableAmounts,
smallFeeOrderAndFillableAmount,
new BigNumber(500),
0,
0.2,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(333));
});
it('should throw if not enough maker asset liquidity (multiple orders with 5% slippage)', () => {
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
const errorFunction = () => {
buyQuoteCalculator.calculate(
ordersAndFillableAmounts,
smallFeeOrderAndFillableAmount,
new BigNumber(600),
0,
0.05,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(380));
});
it('should throw if not enough maker asset liquidity (partially filled order)', () => {
const firstOrderAndFillableAmount: OrdersAndFillableAmounts = {
orders: [firstOrder],
remainingFillableMakerAssetAmounts: [firstRemainingFillAmount],
};
const errorFunction = () => {
buyQuoteCalculator.calculate(
firstOrderAndFillableAmount,
smallFeeOrderAndFillableAmount,
new BigNumber(201),
0,
0,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(200));
});
it('should throw if not enough maker asset liquidity (completely fillable order)', () => {
const completelyFillableOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(123),
takerAssetAmount: new BigNumber(100),
takerFee: new BigNumber(200),
});
const completelyFillableOrdersAndFillableAmount: OrdersAndFillableAmounts = {
orders: [completelyFillableOrder],
remainingFillableMakerAssetAmounts: [completelyFillableOrder.makerAssetAmount],
};
const errorFunction = () => {
buyQuoteCalculator.calculate(
completelyFillableOrdersAndFillableAmount,
smallFeeOrderAndFillableAmount,
new BigNumber(124),
0,
0,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(123));
});
it('should throw with 1 amount available if no slippage', () => {
const smallOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(1),
takerAssetAmount: new BigNumber(1),
takerFee: new BigNumber(0),
});
const errorFunction = () => {
buyQuoteCalculator.calculate(
{ orders: [smallOrder], remainingFillableMakerAssetAmounts: [smallOrder.makerAssetAmount] },
smallFeeOrderAndFillableAmount,
new BigNumber(600),
0,
0,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(1));
});
it('should throw without amount available to fill if amount rounds to 0', () => {
const smallOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(1),
takerAssetAmount: new BigNumber(1),
takerFee: new BigNumber(0),
});
const errorFunction = () => {
buyQuoteCalculator.calculate(
{ orders: [smallOrder], remainingFillableMakerAssetAmounts: [smallOrder.makerAssetAmount] },
smallFeeOrderAndFillableAmount,
new BigNumber(600),
0,
0.2,
false,
);
};
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, undefined);
});
});
it('should not throw if order is fillable', () => {
expect(() => expect(() =>
buyQuoteCalculator.calculate( buyQuoteCalculator.calculate(
ordersAndFillableAmounts, ordersAndFillableAmounts,
smallFeeOrderAndFillableAmount, allFeeOrdersAndFillableAmounts,
new BigNumber(500), new BigNumber(300),
0, 0,
0, 0,
false, false,
), ),
).to.throw(AssetBuyerError.InsufficientAssetLiquidity); ).to.not.throw();
}); });
it('should throw if not enough ZRX liquidity', () => { it('should throw if not enough ZRX liquidity', () => {
// we request 300 makerAsset units but the ZRX order is only enough to fill the first order, which only has 200 makerAssetUnits available // we request 300 makerAsset units but the ZRX order is only enough to fill the first order, which only has 200 makerAssetUnits available

View File

@ -0,0 +1,26 @@
import { BigNumber } from '@0x/utils';
import { InsufficientAssetLiquidityError } from '../../src/errors';
export const testHelpers = {
expectInsufficientLiquidityError: (
expect: Chai.ExpectStatic,
functionWhichTriggersError: () => void,
expectedAmountAvailableToFill?: BigNumber,
): void => {
let wasErrorThrown = false;
try {
functionWhichTriggersError();
} catch (e) {
wasErrorThrown = true;
expect(e).to.be.instanceOf(InsufficientAssetLiquidityError);
if (expectedAmountAvailableToFill) {
expect(e.amountAvailableToFill).to.be.bignumber.equal(expectedAmountAvailableToFill);
} else {
expect(e.amountAvailableToFill).to.be.undefined();
}
}
expect(wasErrorThrown).to.be.true();
},
};

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "3.0.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "3.0.10", "version": "3.0.10",
"changes": [ "changes": [

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.0.11 - _January 9, 2019_
* Dependencies updated
## v3.0.10 - _December 13, 2018_ ## v3.0.10 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/base-contract", "name": "@0x/base-contract",
"version": "3.0.10", "version": "3.0.11",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -41,8 +41,8 @@
}, },
"dependencies": { "dependencies": {
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"ethers": "~4.0.4", "ethers": "~4.0.4",
"lodash": "^4.17.5" "lodash": "^4.17.5"

View File

@ -1,4 +1,13 @@
[ [
{
"timestamp": 1547040760,
"version": "3.0.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "3.0.10", "version": "3.0.10",
"changes": [ "changes": [

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.0.11 - _January 9, 2019_
* Dependencies updated
## v3.0.10 - _December 13, 2018_ ## v3.0.10 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/connect", "name": "@0x/connect",
"version": "3.0.10", "version": "3.0.11",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -44,12 +44,12 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": { "dependencies": {
"@0x/assert": "^1.0.20", "@0x/assert": "^1.0.21",
"@0x/json-schemas": "^2.1.4", "@0x/json-schemas": "^2.1.5",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"lodash": "^4.17.5", "lodash": "^4.17.5",
"query-string": "^5.0.1", "query-string": "^5.0.1",
"sinon": "^4.0.0", "sinon": "^4.0.0",

View File

@ -6,7 +6,8 @@
"note": "Added testnet entries for Dutch Auction contract (kovan,rinkeby,ropsten)", "note": "Added testnet entries for Dutch Auction contract (kovan,rinkeby,ropsten)",
"pr": 1465 "pr": 1465
} }
] ],
"timestamp": 1547040760
}, },
{ {
"version": "2.0.0", "version": "2.0.0",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.1.0 - _January 9, 2019_
* Added testnet entries for Dutch Auction contract (kovan,rinkeby,ropsten) (#1465)
## v2.0.0 - _November 28, 2018_ ## v2.0.0 - _November 28, 2018_
* Redeployed Rinkeby with testnet Exchange artifact (#1318) * Redeployed Rinkeby with testnet Exchange artifact (#1318)

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contract-addresses", "name": "@0x/contract-addresses",
"version": "2.0.0", "version": "2.1.0",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },

View File

@ -6,7 +6,8 @@
"pr": 1465, "pr": 1465,
"note": "Added artifact for Dutch Auction contract" "note": "Added artifact for Dutch Auction contract"
} }
] ],
"timestamp": 1547040760
}, },
{ {
"version": "1.1.2", "version": "1.1.2",

View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.2.0 - _January 9, 2019_
* Added artifact for Dutch Auction contract (#1465)
## v1.1.2 - _November 28, 2018_ ## v1.1.2 - _November 28, 2018_
* Update Exchange artifact to receive ZRX asset data as a constructor argument (#1309) * Update Exchange artifact to receive ZRX asset data as a constructor argument (#1309)

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contract-artifacts", "name": "@0x/contract-artifacts",
"version": "1.1.2", "version": "1.2.0",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },

View File

@ -6,7 +6,8 @@
"note": "Added Dutch Auction wrapper", "note": "Added Dutch Auction wrapper",
"pr": 1465 "pr": 1465
} }
] ],
"timestamp": 1547040760
}, },
{ {
"version": "4.1.4", "version": "4.1.4",

View File

@ -5,6 +5,15 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v4.2.0 - _January 9, 2019_
* Added Dutch Auction wrapper (#1465)
## v4.1.4 - _Invalid date_
* Add support for Trust Wallet signature denial error
* Add balance and allowance queries for `MultiAssetProxy` (#1363)
## v4.1.3 - _December 13, 2018_ ## v4.1.3 - _December 13, 2018_
* Dependencies updated * Dependencies updated

View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contract-wrappers", "name": "@0x/contract-wrappers",
"version": "4.1.3", "version": "4.2.0",
"description": "Smart TS wrappers for 0x smart contracts", "description": "Smart TS wrappers for 0x smart contracts",
"keywords": [ "keywords": [
"0xproject", "0xproject",
@ -37,9 +37,9 @@
"node": ">=6.0.0" "node": ">=6.0.0"
}, },
"devDependencies": { "devDependencies": {
"@0x/dev-utils": "^1.0.21", "@0x/dev-utils": "^1.0.22",
"@0x/migrations": "^2.2.2", "@0x/migrations": "^2.3.0",
"@0x/subproviders": "^2.1.8", "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0", "@0x/tslint-config": "^2.0.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42", "@types/mocha": "^2.2.42",
@ -65,20 +65,20 @@
"web3-provider-engine": "14.0.6" "web3-provider-engine": "14.0.6"
}, },
"dependencies": { "dependencies": {
"@0x/abi-gen-wrappers": "^2.0.2", "@0x/abi-gen-wrappers": "^2.1.0",
"@0x/assert": "^1.0.20", "@0x/assert": "^1.0.21",
"@0x/contract-addresses": "^2.0.0", "@0x/contract-addresses": "^2.1.0",
"@0x/contract-artifacts": "^1.1.2", "@0x/contract-artifacts": "^1.2.0",
"@0x/contracts-test-utils": "^1.0.2", "@0x/contracts-test-utils": "^1.0.3",
"@0x/fill-scenarios": "^1.0.16", "@0x/fill-scenarios": "^1.1.0",
"@0x/json-schemas": "^2.1.4", "@0x/json-schemas": "^2.1.5",
"@0x/order-utils": "^3.0.7", "@0x/order-utils": "^3.1.0",
"@0x/types": "^1.4.1", "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6", "@0x/typescript-typings": "^3.0.6",
"@0x/utils": "^2.0.8", "@0x/utils": "^2.1.1",
"@0x/web3-wrapper": "^3.2.1", "@0x/web3-wrapper": "^3.2.2",
"ethereumjs-abi": "0.6.5",
"ethereum-types": "^1.1.4", "ethereum-types": "^1.1.4",
"ethereumjs-abi": "0.6.5",
"ethereumjs-blockstream": "6.0.0", "ethereumjs-blockstream": "6.0.0",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"ethers": "~4.0.4", "ethers": "~4.0.4",

3
packages/dev-tools-pages/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
public
assets/fonts/*.woff
assets/fonts/*.woff2

View File

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
<ul>
<li><a href="/compiler">Compiler</a></li>
<li><a href="/cov">Cov</a></li>
<li><a href="/profiler">Profiler</a></li>
<li><a href="/trace">Trace</a></li>
</ul>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="preload" href="/fonts/MaisonNeue-Book-subset.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/MaisonNeue-Bold-subset.woff2" as="font" type="font/woff2" crossorigin>
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<div id="app"></div>
</body>
</html>

View File

@ -1,13 +1,13 @@
{ {
"name": "@0x/dev-tools-pages", "name": "@0x/dev-tools-pages",
"version": "0.0.10", "version": "0.0.11",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
"private": true, "private": true,
"description": "0x Dev tools pages", "description": "0x Dev tools pages",
"scripts": { "scripts": {
"build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production", "build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production && react-snap",
"build:ci": "yarn build", "build:ci": "yarn build",
"build:dev": "../../node_modules/.bin/webpack --mode development", "build:dev": "../../node_modules/.bin/webpack --mode development",
"clean": "shx rm -f public/bundle*", "clean": "shx rm -f public/bundle*",
@ -16,33 +16,43 @@
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@0x/react-shared": "^1.0.25", "@0x/react-shared": "^1.1.0",
"basscss": "^8.0.3", "basscss": "^8.0.3",
"bowser": "^1.9.3", "bowser": "^1.9.3",
"highlight.js": "^9.13.1",
"less": "^2.7.2", "less": "^2.7.2",
"lodash": "^4.17.5",
"polished": "^1.9.2", "polished": "^1.9.2",
"react": "^16.4.2", "react": "^16.5.2",
"react-document-title": "^2.0.3", "react-dom": "^16.5.2",
"react-dom": "^16.4.2", "react-loadable": "^5.5.0",
"react-helmet": "^5.2.0", "react-lottie": "^1.2.3",
"styled-components": "^3.3.0" "react-tabs": "^2.3.0",
"styled-components": "^4.1.1",
"styled-normalize": "^8.0.1"
}, },
"devDependencies": { "devDependencies": {
"@types/highlight.js": "^9.12.3",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/node": "*", "@types/node": "*",
"@types/react": "^16.4.2", "@types/react": "^16.4.2",
"@types/react-dom": "^16.0.7", "@types/react-dom": "^16.0.7",
"@types/react-helmet": "^5.0.6", "@types/react-loadable": "^5.4.1",
"@types/react-lottie": "^1.2.0",
"@types/react-router-dom": "^4.0.4", "@types/react-router-dom": "^4.0.4",
"@types/react-tabs": "^2.3.0",
"@types/react-tap-event-plugin": "0.0.30", "@types/react-tap-event-plugin": "0.0.30",
"@types/styled-components": "^4.0.0", "@types/styled-components": "4.1.1",
"awesome-typescript-loader": "^5.2.1", "awesome-typescript-loader": "^5.2.1",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.4",
"copyfiles": "^2.0.0", "copyfiles": "^2.0.0",
"css-loader": "0.23.x", "css-loader": "0.23.x",
"html-webpack-plugin": "^3.2.0",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"react-snap": "^1.19.0",
"react-svg-loader": "^2.1.0",
"shx": "^0.2.2", "shx": "^0.2.2",
"source-map-loader": "^0.2.4", "source-map-loader": "^0.2.4",
"style-loader": "0.23.x", "style-loader": "0.23.x",
@ -52,7 +62,15 @@
"typescript": "3.0.1", "typescript": "3.0.1",
"uglifyjs-webpack-plugin": "^2.0.1", "uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.20.2", "webpack": "^4.20.2",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "3.1.2", "webpack-cli": "3.1.2",
"webpack-dev-server": "^3.1.9" "webpack-dev-server": "^3.1.9"
},
"reactSnap": {
"source": "public",
"puppeteerArgs": [
"--no-sandbox",
"--disable-setuid-sandbox"
]
} }
} }

View File

@ -0,0 +1,72 @@
const pages = [
{
title: 'sol-compiler',
filename: 'compiler/index.html',
template: 'assets/index.html',
chunks: ['compiler'],
favicon: 'assets/favicons/compiler.ico',
minify: true,
meta: {
description: 'Solidity compilation that just works',
'og-title': { property: 'og:title', content: 'sol-compiler' },
'og-description': { property: 'og:description', content: 'Solidity compilation that just works' },
'og-type': { property: 'og:type', content: 'website' },
'og-image': { property: 'og:image', content: '/images/og-compiler' },
'twitter:site': '@0xproject',
'twitter:image': '/images/og-compiler',
},
},
{
title: 'sol-cov',
filename: 'cov/index.html',
template: 'assets/index.html',
chunks: ['cov'],
favicon: 'assets/favicons/cov.ico',
minify: true,
meta: {
description: 'Solidity code coverage',
'og-title': { property: 'og:title', content: 'sol-cov' },
'og-description': { property: 'og:description', content: 'Solidity code coverage' },
'og-type': { property: 'og:type', content: 'website' },
'og-image': { property: 'og:image', content: '/images/og-cov' },
'twitter:site': '@0xproject',
'twitter:image': '/images/og-cov',
},
},
{
title: 'sol-profiler',
filename: 'profiler/index.html',
template: 'assets/index.html',
chunks: ['profiler'],
favicon: 'assets/favicons/profiler.ico',
minify: true,
meta: {
description: 'Gas profiling for Solidity',
'og-title': { property: 'og:title', content: 'sol-profiler' },
'og-description': { property: 'og:description', content: 'Gas profiling for Solidity' },
'og-type': { property: 'og:type', content: 'website' },
'og-image': { property: 'og:image', content: '/images/og-profiler' },
'twitter:site': '@0xproject',
'twitter:image': '/images/og-profiler',
},
},
{
title: 'sol-trace',
filename: 'trace/index.html',
template: 'assets/index.html',
chunks: ['trace'],
favicon: 'assets/favicons/trace.ico',
minify: true,
meta: {
description: 'Human-readable stack traces',
'og-title': { property: 'og:title', content: 'sol-trace' },
'og-description': { property: 'og:description', content: 'Human-readable stack traces' },
'og-type': { property: 'og:type', content: 'website' },
'og-image': { property: 'og:image', content: '/images/og-trace' },
'twitter:site': '@0xproject',
'twitter:image': '/images/og-trace',
},
},
];
module.exports = pages;

View File

@ -1,85 +0,0 @@
/* Custom Basscss Responsive Utilities */
@media (max-width: 52em) {
.sm-center {
text-align: center;
}
.sm-align-middle {
vertical-align: middle;
}
.sm-align-top {
vertical-align: top;
}
.sm-left-align {
text-align: left;
}
.sm-right-align {
text-align: right;
}
.sm-table-cell {
display: table-cell;
}
.sm-mx-auto {
margin-left: auto;
margin-right: auto;
}
.sm-right {
float: right;
}
}
@media (min-width: 52em) {
.md-center {
text-align: center;
}
.md-align-middle {
vertical-align: middle;
}
.md-align-top {
vertical-align: top;
}
.md-left-align {
text-align: left;
}
.md-right-align {
text-align: right;
}
.md-table-cell {
display: table-cell;
}
.md-mx-auto {
margin-left: auto;
margin-right: auto;
}
.md-right {
float: right;
}
}
@media (min-width: 64em) {
.lg-center {
text-align: center;
}
.lg-align-middle {
vertical-align: middle;
}
.lg-align-top {
vertical-align: top;
}
.lg-left-align {
text-align: left;
}
.lg-right-align {
text-align: right;
}
.lg-table-cell {
display: table-cell;
}
.lg-mx-auto {
margin-left: auto;
margin-right: auto;
}
.lg-right {
float: right;
}
}

View File

@ -1,453 +0,0 @@
/* Basscss Responsive Margin */
@media (max-width: 52em) {
/* Modified by Fabio Berger to max-width from min-width */
.sm-m0 {
margin: 0;
}
.sm-mt0 {
margin-top: 0;
}
.sm-mr0 {
margin-right: 0;
}
.sm-mb0 {
margin-bottom: 0;
}
.sm-ml0 {
margin-left: 0;
}
.sm-mx0 {
margin-left: 0;
margin-right: 0;
}
.sm-my0 {
margin-top: 0;
margin-bottom: 0;
}
.sm-m1 {
margin: 0.5rem;
}
.sm-mt1 {
margin-top: 0.5rem;
}
.sm-mr1 {
margin-right: 0.5rem;
}
.sm-mb1 {
margin-bottom: 0.5rem;
}
.sm-ml1 {
margin-left: 0.5rem;
}
.sm-mx1 {
margin-left: 0.5rem;
margin-right: 0.5rem;
}
.sm-my1 {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
.sm-m2 {
margin: 1rem;
}
.sm-mt2 {
margin-top: 1rem;
}
.sm-mr2 {
margin-right: 1rem;
}
.sm-mb2 {
margin-bottom: 1rem;
}
.sm-ml2 {
margin-left: 1rem;
}
.sm-mx2 {
margin-left: 1rem;
margin-right: 1rem;
}
.sm-my2 {
margin-top: 1rem;
margin-bottom: 1rem;
}
.sm-m3 {
margin: 2rem;
}
.sm-mt3 {
margin-top: 2rem;
}
.sm-mr3 {
margin-right: 2rem;
}
.sm-mb3 {
margin-bottom: 2rem;
}
.sm-ml3 {
margin-left: 2rem;
}
.sm-mx3 {
margin-left: 2rem;
margin-right: 2rem;
}
.sm-my3 {
margin-top: 2rem;
margin-bottom: 2rem;
}
.sm-m4 {
margin: 4rem;
}
.sm-mt4 {
margin-top: 4rem;
}
.sm-mr4 {
margin-right: 4rem;
}
.sm-mb4 {
margin-bottom: 4rem;
}
.sm-ml4 {
margin-left: 4rem;
}
.sm-mx4 {
margin-left: 4rem;
margin-right: 4rem;
}
.sm-my4 {
margin-top: 4rem;
margin-bottom: 4rem;
}
.sm-mxn1 {
margin-left: -0.5rem;
margin-right: -0.5rem;
}
.sm-mxn2 {
margin-left: -1rem;
margin-right: -1rem;
}
.sm-mxn3 {
margin-left: -2rem;
margin-right: -2rem;
}
.sm-mxn4 {
margin-left: -4rem;
margin-right: -4rem;
}
.sm-ml-auto {
margin-left: auto;
}
.sm-mr-auto {
margin-right: auto;
}
.sm-mx-auto {
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 52em) {
.md-m0 {
margin: 0;
}
.md-mt0 {
margin-top: 0;
}
.md-mr0 {
margin-right: 0;
}
.md-mb0 {
margin-bottom: 0;
}
.md-ml0 {
margin-left: 0;
}
.md-mx0 {
margin-left: 0;
margin-right: 0;
}
.md-my0 {
margin-top: 0;
margin-bottom: 0;
}
.md-m1 {
margin: 0.5rem;
}
.md-mt1 {
margin-top: 0.5rem;
}
.md-mr1 {
margin-right: 0.5rem;
}
.md-mb1 {
margin-bottom: 0.5rem;
}
.md-ml1 {
margin-left: 0.5rem;
}
.md-mx1 {
margin-left: 0.5rem;
margin-right: 0.5rem;
}
.md-my1 {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
.md-m2 {
margin: 1rem;
}
.md-mt2 {
margin-top: 1rem;
}
.md-mr2 {
margin-right: 1rem;
}
.md-mb2 {
margin-bottom: 1rem;
}
.md-ml2 {
margin-left: 1rem;
}
.md-mx2 {
margin-left: 1rem;
margin-right: 1rem;
}
.md-my2 {
margin-top: 1rem;
margin-bottom: 1rem;
}
.md-m3 {
margin: 2rem;
}
.md-mt3 {
margin-top: 2rem;
}
.md-mr3 {
margin-right: 2rem;
}
.md-mb3 {
margin-bottom: 2rem;
}
.md-ml3 {
margin-left: 2rem;
}
.md-mx3 {
margin-left: 2rem;
margin-right: 2rem;
}
.md-my3 {
margin-top: 2rem;
margin-bottom: 2rem;
}
.md-m4 {
margin: 4rem;
}
.md-mt4 {
margin-top: 4rem;
}
.md-mr4 {
margin-right: 4rem;
}
.md-mb4 {
margin-bottom: 4rem;
}
.md-ml4 {
margin-left: 4rem;
}
.md-mx4 {
margin-left: 4rem;
margin-right: 4rem;
}
.md-my4 {
margin-top: 4rem;
margin-bottom: 4rem;
}
.md-mxn1 {
margin-left: -0.5rem;
margin-right: -0.5rem;
}
.md-mxn2 {
margin-left: -1rem;
margin-right: -1rem;
}
.md-mxn3 {
margin-left: -2rem;
margin-right: -2rem;
}
.md-mxn4 {
margin-left: -4rem;
margin-right: -4rem;
}
.md-ml-auto {
margin-left: auto;
}
.md-mr-auto {
margin-right: auto;
}
.md-mx-auto {
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 64em) {
.lg-m0 {
margin: 0;
}
.lg-mt0 {
margin-top: 0;
}
.lg-mr0 {
margin-right: 0;
}
.lg-mb0 {
margin-bottom: 0;
}
.lg-ml0 {
margin-left: 0;
}
.lg-mx0 {
margin-left: 0;
margin-right: 0;
}
.lg-my0 {
margin-top: 0;
margin-bottom: 0;
}
.lg-m1 {
margin: 0.5rem;
}
.lg-mt1 {
margin-top: 0.5rem;
}
.lg-mr1 {
margin-right: 0.5rem;
}
.lg-mb1 {
margin-bottom: 0.5rem;
}
.lg-ml1 {
margin-left: 0.5rem;
}
.lg-mx1 {
margin-left: 0.5rem;
margin-right: 0.5rem;
}
.lg-my1 {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
.lg-m2 {
margin: 1rem;
}
.lg-mt2 {
margin-top: 1rem;
}
.lg-mr2 {
margin-right: 1rem;
}
.lg-mb2 {
margin-bottom: 1rem;
}
.lg-ml2 {
margin-left: 1rem;
}
.lg-mx2 {
margin-left: 1rem;
margin-right: 1rem;
}
.lg-my2 {
margin-top: 1rem;
margin-bottom: 1rem;
}
.lg-m3 {
margin: 2rem;
}
.lg-mt3 {
margin-top: 2rem;
}
.lg-mr3 {
margin-right: 2rem;
}
.lg-mb3 {
margin-bottom: 2rem;
}
.lg-ml3 {
margin-left: 2rem;
}
.lg-mx3 {
margin-left: 2rem;
margin-right: 2rem;
}
.lg-my3 {
margin-top: 2rem;
margin-bottom: 2rem;
}
.lg-m4 {
margin: 4rem;
}
.lg-mt4 {
margin-top: 4rem;
}
.lg-mr4 {
margin-right: 4rem;
}
.lg-mb4 {
margin-bottom: 4rem;
}
.lg-ml4 {
margin-left: 4rem;
}
.lg-mx4 {
margin-left: 4rem;
margin-right: 4rem;
}
.lg-my4 {
margin-top: 4rem;
margin-bottom: 4rem;
}
.lg-mxn1 {
margin-left: -0.5rem;
margin-right: -0.5rem;
}
.lg-mxn2 {
margin-left: -1rem;
margin-right: -1rem;
}
.lg-mxn3 {
margin-left: -2rem;
margin-right: -2rem;
}
.lg-mxn4 {
margin-left: -4rem;
margin-right: -4rem;
}
.lg-ml-auto {
margin-left: auto;
}
.lg-mr-auto {
margin-right: auto;
}
.lg-mx-auto {
margin-left: auto;
margin-right: auto;
}
}

View File

@ -1,134 +0,0 @@
/* Basscss Responsive Padding */
/* Modified by Fabio Berger to include xs prefix */
@media (max-width: 52em) { /* Modified by Fabio Berger to max-width from min-width */
.sm-p0 { padding: 0 }
.sm-pt0 { padding-top: 0 }
.sm-pr0 { padding-right: 0 }
.sm-pb0 { padding-bottom: 0 }
.sm-pl0 { padding-left: 0 }
.sm-px0 { padding-left: 0; padding-right: 0 }
.sm-py0 { padding-top: 0; padding-bottom: 0 }
.sm-p1 { padding: .5rem }
.sm-pt1 { padding-top: .5rem }
.sm-pr1 { padding-right: .5rem }
.sm-pb1 { padding-bottom: .5rem }
.sm-pl1 { padding-left: .5rem }
.sm-px1 { padding-left: .5rem; padding-right: .5rem }
.sm-py1 { padding-top: .5rem; padding-bottom: .5rem }
.sm-p2 { padding: 1rem }
.sm-pt2 { padding-top: 1rem }
.sm-pr2 { padding-right: 1rem }
.sm-pb2 { padding-bottom: 1rem }
.sm-pl2 { padding-left: 1rem }
.sm-px2 { padding-left: 1rem; padding-right: 1rem }
.sm-py2 { padding-top: 1rem; padding-bottom: 1rem }
.sm-p3 { padding: 2rem }
.sm-pt3 { padding-top: 2rem }
.sm-pr3 { padding-right: 2rem }
.sm-pb3 { padding-bottom: 2rem }
.sm-pl3 { padding-left: 2rem }
.sm-px3 { padding-left: 2rem; padding-right: 2rem }
.sm-py3 { padding-top: 2rem; padding-bottom: 2rem }
.sm-p4 { padding: 4rem }
.sm-pt4 { padding-top: 4rem }
.sm-pr4 { padding-right: 4rem }
.sm-pb4 { padding-bottom: 4rem }
.sm-pl4 { padding-left: 4rem }
.sm-px4 { padding-left: 4rem; padding-right: 4rem }
.sm-py4 { padding-top: 4rem; padding-bottom: 4rem }
}
@media (min-width: 52em) {
.md-p0 { padding: 0 }
.md-pt0 { padding-top: 0 }
.md-pr0 { padding-right: 0 }
.md-pb0 { padding-bottom: 0 }
.md-pl0 { padding-left: 0 }
.md-px0 { padding-left: 0; padding-right: 0 }
.md-py0 { padding-top: 0; padding-bottom: 0 }
.md-p1 { padding: .5rem }
.md-pt1 { padding-top: .5rem }
.md-pr1 { padding-right: .5rem }
.md-pb1 { padding-bottom: .5rem }
.md-pl1 { padding-left: .5rem }
.md-px1 { padding-left: .5rem; padding-right: .5rem }
.md-py1 { padding-top: .5rem; padding-bottom: .5rem }
.md-p2 { padding: 1rem }
.md-pt2 { padding-top: 1rem }
.md-pr2 { padding-right: 1rem }
.md-pb2 { padding-bottom: 1rem }
.md-pl2 { padding-left: 1rem }
.md-px2 { padding-left: 1rem; padding-right: 1rem }
.md-py2 { padding-top: 1rem; padding-bottom: 1rem }
.md-p3 { padding: 2rem }
.md-pt3 { padding-top: 2rem }
.md-pr3 { padding-right: 2rem }
.md-pb3 { padding-bottom: 2rem }
.md-pl3 { padding-left: 2rem }
.md-px3 { padding-left: 2rem; padding-right: 2rem }
.md-py3 { padding-top: 2rem; padding-bottom: 2rem }
.md-p4 { padding: 4rem }
.md-pt4 { padding-top: 4rem }
.md-pr4 { padding-right: 4rem }
.md-pb4 { padding-bottom: 4rem }
.md-pl4 { padding-left: 4rem }
.md-px4 { padding-left: 4rem; padding-right: 4rem }
.md-py4 { padding-top: 4rem; padding-bottom: 4rem }
}
@media (min-width: 64em) {
.lg-p0 { padding: 0 }
.lg-pt0 { padding-top: 0 }
.lg-pr0 { padding-right: 0 }
.lg-pb0 { padding-bottom: 0 }
.lg-pl0 { padding-left: 0 }
.lg-px0 { padding-left: 0; padding-right: 0 }
.lg-py0 { padding-top: 0; padding-bottom: 0 }
.lg-p1 { padding: .5rem }
.lg-pt1 { padding-top: .5rem }
.lg-pr1 { padding-right: .5rem }
.lg-pb1 { padding-bottom: .5rem }
.lg-pl1 { padding-left: .5rem }
.lg-px1 { padding-left: .5rem; padding-right: .5rem }
.lg-py1 { padding-top: .5rem; padding-bottom: .5rem }
.lg-p2 { padding: 1rem }
.lg-pt2 { padding-top: 1rem }
.lg-pr2 { padding-right: 1rem }
.lg-pb2 { padding-bottom: 1rem }
.lg-pl2 { padding-left: 1rem }
.lg-px2 { padding-left: 1rem; padding-right: 1rem }
.lg-py2 { padding-top: 1rem; padding-bottom: 1rem }
.lg-p3 { padding: 2rem }
.lg-pt3 { padding-top: 2rem }
.lg-pr3 { padding-right: 2rem }
.lg-pb3 { padding-bottom: 2rem }
.lg-pl3 { padding-left: 2rem }
.lg-px3 { padding-left: 2rem; padding-right: 2rem }
.lg-py3 { padding-top: 2rem; padding-bottom: 2rem }
.lg-p4 { padding: 4rem }
.lg-pt4 { padding-top: 4rem }
.lg-pr4 { padding-right: 4rem }
.lg-pb4 { padding-bottom: 4rem }
.lg-pl4 { padding-left: 4rem }
.lg-px4 { padding-left: 4rem; padding-right: 4rem }
.lg-py4 { padding-top: 4rem; padding-bottom: 4rem }
}

View File

@ -1,35 +0,0 @@
/* Basscss Responsive Type Scale */
/* Modified by Fabio Berger to include xs prefix */
@media (max-width: 52em) { /* Modified by Fabio Berger to max-width from min-width */
.sm-h00 { font-size: 4rem }
.sm-h0 { font-size: 3rem }
.sm-h1 { font-size: 2rem }
.sm-h2 { font-size: 1.5rem }
.sm-h3 { font-size: 1.25rem }
.sm-h4 { font-size: 1rem }
.sm-h5 { font-size: .875rem }
.sm-h6 { font-size: .75rem }
}
@media (min-width: 52em) {
.md-h00 { font-size: 4rem }
.md-h0 { font-size: 3rem }
.md-h1 { font-size: 2rem }
.md-h2 { font-size: 1.5rem }
.md-h3 { font-size: 1.25rem }
.md-h4 { font-size: 1rem }
.md-h5 { font-size: .875rem }
.md-h6 { font-size: .75rem }
}
@media (min-width: 64em) {
.lg-h00 { font-size: 4rem }
.lg-h0 { font-size: 3rem }
.lg-h1 { font-size: 2rem }
.lg-h2 { font-size: 1.5rem }
.lg-h3 { font-size: 1.25rem }
.lg-h4 { font-size: 1rem }
.lg-h5 { font-size: .875rem }
.lg-h6 { font-size: .75rem }
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -1,26 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="" />
<meta property="og:type" content="website" />
<meta property="og:title" content="0x" />
<meta property="og:description" content="" />
<meta property="og:image" content="/images/og_image.png" />
<title>0x: The Protocol for Trading Tokens</title>
<link rel="icon" type="image/png" href="/images/favicon/favicon-2-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="/images/favicon/favicon-2-16x16.png" sizes="16x16" />
<link rel="stylesheet" href="/css/basscss_responsive_custom.css">
<link rel="stylesheet" href="/css/basscss_responsive_padding.css">
<link rel="stylesheet" href="/css/basscss_responsive_margin.css">
<link rel="stylesheet" href="/css/basscss_responsive_type_scale.css">
</head>
<body style="margin: 0px; min-width: 355px;">
<div id="app"></div>
<script type="text/javascript" crossorigin="anonymous" src="/bundle.js" charset="utf-8"></script>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,11 @@
import * as React from 'react';
import { BaseAnimation } from '../index';
import * as animationData from './data.json';
const CompilerAnimation: React.StatelessComponent<{}> = () => (
<BaseAnimation animationData={animationData} width={2150} height={700} />
);
export { CompilerAnimation };

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,11 @@
import * as React from 'react';
import { BaseAnimation } from '../index';
import * as animationData from './data.json';
const CovAnimation: React.StatelessComponent<{}> = () => (
<BaseAnimation animationData={animationData} width={1981} height={660} />
);
export { CovAnimation };

View File

@ -0,0 +1,96 @@
import * as React from 'react';
import Lottie from 'react-lottie';
import styled from 'styled-components';
import { media } from 'ts/variables';
interface AnimationProps {
animationData: object;
width: number;
height: number;
}
interface AnimationState {
width?: number | undefined;
height?: number | undefined;
}
class BaseAnimation extends React.PureComponent<AnimationProps, AnimationState> {
public state: AnimationState = {
height: undefined,
width: undefined,
};
private _timeout = undefined as number;
public componentDidMount(): void {
this._updateAnimationSize();
window.addEventListener('resize', this._handleResize.bind(this));
}
public componentWillUnmount(): void {
window.removeEventListener('resize', this._handleResize.bind(this));
}
public render(): React.ReactNode {
const { animationData } = this.props;
const height = this.state.height || this.props.height;
const width = this.state.width || this.props.width;
return (
<Container height={height}>
<InnerContainer>
<Lottie
width={width}
height={height}
options={{
loop: true,
autoplay: true,
animationData,
}}
/>
</InnerContainer>
</Container>
);
}
private _handleResize(): void {
clearTimeout(this._timeout);
this._timeout = window.setTimeout(this._updateAnimationSize.bind(this), 50);
}
private _updateAnimationSize(): void {
const windowWidth = window.innerWidth;
let width;
let height;
if (windowWidth <= 1000) {
const maxWidth = windowWidth + 250;
const ratio = maxWidth / this.props.width;
height = Math.round(this.props.height * ratio);
width = Math.round(this.props.width * ratio);
}
this.setState({ width, height });
}
}
const Container =
styled.div <
AnimationProps >
`
width: 100%;
height: ${props => props.height}px;
position: absolute;
top: 40%;
left: 0;
z-index: -1;
overflow: hidden;
${media.large`
top: 100%;
transform: translateY(-50%);
`};
`;
const InnerContainer = styled.div`
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
`;
export { BaseAnimation };

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,11 @@
import * as React from 'react';
import { BaseAnimation } from '../index';
import * as animationData from './data.json';
const ProfilerAnimation: React.StatelessComponent<{}> = () => (
<BaseAnimation animationData={animationData} width={1985} height={657} />
);
export { ProfilerAnimation };

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,11 @@
import * as React from 'react';
import { BaseAnimation } from '../index';
import * as animationData from './data.json';
const TraceAnimation: React.StatelessComponent<{}> = () => (
<BaseAnimation animationData={animationData} width={2241} height={610} />
);
export { TraceAnimation };

View File

@ -0,0 +1,26 @@
import * as React from 'react';
import { ThemeProvider } from 'styled-components';
import { Footer } from 'ts/components/footer';
import { Header } from 'ts/components/header';
import { ThemeContext } from 'ts/context';
import { GlobalStyles } from 'ts/globalStyles';
interface BaseProps {
context: any;
}
const Base: React.StatelessComponent<BaseProps> = props => (
<ThemeContext.Provider value={props.context}>
<ThemeProvider theme={props.context}>
<React.Fragment>
<GlobalStyles colors={props.context.colors} />
<Header />
{props.children}
<Footer />
</React.Fragment>
</ThemeProvider>
</ThemeContext.Provider>
);
export { Base };

View File

@ -0,0 +1,12 @@
import styled from 'styled-components';
import { media } from 'ts/variables';
const Breakout = styled.div`
${media.small`
margin-left: -2.5rem;
width: calc(100% + 5rem);
`};
`;
export { Breakout };

Some files were not shown because too many files have changed in this diff Show More