crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into 3.0

Browse Source
This commit is contained in:
Alex Towle 2019-08-16 23:32:51 -07:00
commit 22c8a25a26
637 changed files with 26270 additions and 17410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
.circleci/config.yml
View File

@ -7,18 +7,23 @@ jobs:
build: build:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
environment: environment:
CONTRACTS_COMMIT_HASH: '9ed05f5' CONTRACTS_COMMIT_HASH: '9ed05f5'
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- checkout - checkout
- run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
- run: # HACK(feuGeneA): commented out this hack as we're changing
# HACK(albrow): Without this, yarn commands will sometimes # from a circleci-maintained container to a different
# fail with a "permission denied" error. # container, and this hack may not apply anymore, as
name: Set npm path # suggested by the non-existance of `/home/circleci/.bashrc`
command: npm set prefix=/home/circleci/npm && echo 'export PATH=$HOME/circleci/npm/bin:$PATH' >> /home/circleci/.bashrc # when running the command below.
# - run:
# # HACK(albrow): Without this, yarn commands will sometimes
# # fail with a "permission denied" error.
# name: Set npm path
# command: npm set prefix=/home/circleci/npm && echo 'export PATH=$HOME/circleci/npm/bin:$PATH' >> /home/circleci/.bashrc
- run: - run:
name: install-yarn name: install-yarn
command: npm install --global yarn@1.9.4 command: npm install --global yarn@1.9.4
@ -40,10 +45,12 @@ jobs:
path: ~/repo/packages/python-contract-wrappers/generated path: ~/repo/packages/python-contract-wrappers/generated
- store_artifacts: - store_artifacts:
path: ~/repo/packages/abi-gen/test-cli/output path: ~/repo/packages/abi-gen/test-cli/output
- store_artifacts:
path: ~/repo/packages/abi-gen-wrappers/generated_docs
build-3.0: build-3.0:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
environment: environment:
CONTRACTS_COMMIT_HASH: '9ed05f5' CONTRACTS_COMMIT_HASH: '9ed05f5'
working_directory: ~/repo working_directory: ~/repo
@ -52,7 +59,7 @@ jobs:
- run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
- run: - run:
name: install-yarn name: install-yarn
command: sudo npm install --global yarn@1.9.4 command: npm install --global yarn@1.9.4
- run: - run:
name: yarn name: yarn
command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
@ -66,7 +73,7 @@ jobs:
build-website: build-website:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -74,8 +81,9 @@ jobs:
- repo-{{ .Environment.CIRCLE_SHA1 }} - repo-{{ .Environment.CIRCLE_SHA1 }}
- run: cd packages/website && yarn build:prod - run: cd packages/website && yarn build:prod
test-contracts-ganache: test-contracts-ganache:
resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -83,8 +91,9 @@ jobs:
- repo-{{ .Environment.CIRCLE_SHA1 }} - repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-staking - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-staking
test-contracts-ganache-3.0: test-contracts-ganache-3.0:
resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -101,7 +110,7 @@ jobs:
# - run: yarn wsrun test:circleci @0x/contracts-coordinator # - run: yarn wsrun test:circleci @0x/contracts-coordinator
test-contracts-geth: test-contracts-geth:
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
- image: 0xorg/devnet - image: 0xorg/devnet
working_directory: ~/repo working_directory: ~/repo
steps: steps:
@ -114,7 +123,7 @@ jobs:
test-publish: test-publish:
resource_class: medium+ resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
- image: 0xorg/verdaccio - image: 0xorg/verdaccio
working_directory: ~/repo working_directory: ~/repo
steps: steps:
@ -124,7 +133,7 @@ jobs:
- run: yarn test:publish:circleci - run: yarn test:publish:circleci
test-doc-generation: test-doc-generation:
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -133,7 +142,7 @@ jobs:
- run: yarn test:generate_docs:circleci - run: yarn test:generate_docs:circleci
test-rest: test-rest:
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -150,7 +159,6 @@ jobs:
- run: yarn wsrun test:circleci @0x/dev-utils - run: yarn wsrun test:circleci @0x/dev-utils
- run: yarn wsrun test:circleci @0x/json-schemas - run: yarn wsrun test:circleci @0x/json-schemas
- run: yarn wsrun test:circleci @0x/order-utils - run: yarn wsrun test:circleci @0x/order-utils
- run: yarn wsrun test:circleci @0x/order-watcher
- run: yarn wsrun test:circleci @0x/sol-compiler - run: yarn wsrun test:circleci @0x/sol-compiler
- run: yarn wsrun test:circleci @0x/sol-tracing-utils - run: yarn wsrun test:circleci @0x/sol-tracing-utils
- run: yarn wsrun test:circleci @0x/sol-doc - run: yarn wsrun test:circleci @0x/sol-doc
@ -194,10 +202,6 @@ jobs:
key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }} key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
paths: paths:
- ~/repo/packages/order-utils/coverage/lcov.info - ~/repo/packages/order-utils/coverage/lcov.info
- save_cache:
key: coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/repo/packages/order-watcher/coverage/lcov.info
- save_cache: - save_cache:
key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }} key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
paths: paths:
@ -219,8 +223,9 @@ jobs:
paths: paths:
- ~/repo/packages/web3-wrapper/coverage/lcov.info - ~/repo/packages/web3-wrapper/coverage/lcov.info
test-rest-3.0: test-rest-3.0:
resource_class: medium+
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -290,18 +295,17 @@ jobs:
test-python: test-python:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/python - image: nikolaik/python-nodejs:python3.7-nodejs8
- image: 0xorg/ganache-cli:2.2.2 - image: 0xorg/ganache-cli:2.2.2
- image: 0xorg/launch-kit-ci - image: 0xorg/launch-kit-backend:74bcc39
environment: environment:
RPC_URL: http://localhost:8545 RPC_URL: http://localhost:8545
NETWORK_ID: 50 NETWORK_ID: 50
WHITELIST_ALL_TOKENS: True WHITELIST_ALL_TOKENS: True
command: bash -c "until curl -sfd'{\"method\":\"net_listening\"}' http://localhost:8545 | grep true; do continue; done; forever ts/lib/index.js" command: |
sh -c "until printf 'POST /\r\nContent-Length: 26\r\n\r\n{\"method\":\"net_listening\"}' | nc localhost 8545 | grep true; do continue; done; node_modules/.bin/forever ts/lib/index.js"
steps: steps:
- checkout - checkout
- run: sudo chown -R circleci:circleci /usr/local/bin
- run: sudo chown -R circleci:circleci /usr/local/lib/python3.7
- restore_cache: - restore_cache:
key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache: - restore_cache:
@ -320,7 +324,7 @@ jobs:
- run: - run:
command: | command: |
cd python-packages cd python-packages
./parallel coverage run setup.py test ./parallel_without_sra_client coverage run setup.py test
./build_docs ./build_docs
- save_cache: - save_cache:
key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }} key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
@ -367,11 +371,9 @@ jobs:
test-rest-python: test-rest-python:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/python - image: nikolaik/python-nodejs:python3.7-nodejs8
steps: steps:
- checkout - checkout
- run: sudo chown -R circleci:circleci /usr/local/bin
- run: sudo chown -R circleci:circleci /usr/local/lib/python3.7
- restore_cache: - restore_cache:
key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- run: - run:
@ -395,11 +397,9 @@ jobs:
static-tests-python: static-tests-python:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/python - image: nikolaik/python-nodejs:python3.7-nodejs8
steps: steps:
- checkout - checkout
- run: sudo chown -R circleci:circleci /usr/local/bin
- run: sudo chown -R circleci:circleci /usr/local/lib/python3.7
- restore_cache: - restore_cache:
key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache: - restore_cache:
@ -414,7 +414,7 @@ jobs:
static-tests: static-tests:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
steps: steps:
- restore_cache: - restore_cache:
keys: keys:
@ -427,7 +427,7 @@ jobs:
static-tests-3.0: static-tests-3.0:
working_directory: ~/repo working_directory: ~/repo
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
steps: steps:
- restore_cache: - restore_cache:
keys: keys:
@ -437,7 +437,7 @@ jobs:
- run: yarn deps_versions:ci - run: yarn deps_versions:ci
submit-coverage: submit-coverage:
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
@ -470,9 +470,6 @@ jobs:
- restore_cache: - restore_cache:
keys: keys:
- coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }} - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache:
keys:
- coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }}
- restore_cache: - restore_cache:
keys: keys:
- coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }} - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
@ -512,7 +509,7 @@ jobs:
- run: yarn report_coverage - run: yarn report_coverage
submit-coverage-3.0: submit-coverage-3.0:
docker: docker:
- image: circleci/node:9-browsers - image: nikolaik/python-nodejs:python3.7-nodejs8
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:

1
.gitattributes vendored
View File

@ -4,4 +4,5 @@
*.svg linguist-generated=true *.svg linguist-generated=true
packages/contract-artifacts/artifacts/*json linguist-generated=true packages/contract-artifacts/artifacts/*json linguist-generated=true
packages/abi-gen-wrappers/src/generated-wrappers/*.ts linguist-generated=true packages/abi-gen-wrappers/src/generated-wrappers/*.ts linguist-generated=true
packages/contract-wrappers/src/generated-wrappers/*.ts linguist-generated=true

3
.github/autolabeler.yml vendored
View File

@ -21,10 +21,7 @@ contracts: ['contracts']
@0x/utils: ['packages/utils'] @0x/utils: ['packages/utils']
@0x/tslint-config: ['packages/tslint-config'] @0x/tslint-config: ['packages/tslint-config']
@0x/asset-buyer: ['packages/asset-buyer'] @0x/asset-buyer: ['packages/asset-buyer']
@0x/order-watcher: ['packages/order-watcher']
@0x/react-docs: ['packages/react-docs']
@0x/order-utils: ['packages/order-utils'] @0x/order-utils: ['packages/order-utils']
@0x/react-shared: ['packages/react-shared']
@0x/assert: ['packages/assert'] @0x/assert: ['packages/assert']
@0x/base-contract: ['packages/base-contract'] @0x/base-contract: ['packages/base-contract']
@0x/typescript-typings: ['packages/typescript-typings'] @0x/typescript-typings: ['packages/typescript-typings']

19
.gitignore vendored
View File

@ -77,7 +77,6 @@ TODO.md
packages/website/public/bundle* packages/website/public/bundle*
packages/dev-tools-pages/public/bundle* packages/dev-tools-pages/public/bundle*
packages/react-docs/example/public/bundle*
# server cli # server cli
packages/testnet-faucets/server/ packages/testnet-faucets/server/
@ -117,6 +116,24 @@ contracts/exchange-forwarder/generated-wrappers/
contracts/dev-utils/generated-wrappers/ contracts/dev-utils/generated-wrappers/
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc20_token/__init__.py python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc20_token/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/exchange/__init__.py python-packages/contract_wrappers/src/zero_ex/contract_wrappers/exchange/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/asset_proxy_owner/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/coordinator/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/coordinator_registry/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/dummy_erc20_token/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/dummy_erc721_token/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/dutch_auction/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc20_proxy/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc721_proxy/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc721_token/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/eth_balance_checker/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/forwarder/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_asset_proxy/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_validator/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_wallet/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/multi_asset_proxy/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/order_validator/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/weth9/__init__.py
python-packages/contract_wrappers/src/zero_ex/contract_wrappers/zrx_token/__init__.py
# cli test output # cli test output
packages/abi-gen/test-cli/output packages/abi-gen/test-cli/output

28
README.md
View File

@ -28,6 +28,7 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
| [`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-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-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-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-contract-wrappers`](/python-packages/contract_wrappers) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-wrappers.svg)](https://pypi.org/project/0x-contract-wrappers/) | 0x smart contract wrappers |
| [`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-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-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 | | [`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 |
@ -63,8 +64,7 @@ These packages are all under development. See [/contracts/README.md](/contracts/
| [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. | | [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. |
| [`@0x/contract-wrappers`](/packages/contract-wrappers) | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers) | JS/TS wrappers for interacting with the 0x smart contracts | | [`@0x/contract-wrappers`](/packages/contract-wrappers) | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers) | JS/TS wrappers for interacting with the 0x smart contracts |
| [`@0x/order-utils`](/packages/order-utils) | [![npm](https://img.shields.io/npm/v/@0x/order-utils.svg)](https://www.npmjs.com/package/@0x/order-utils) | A set of utilities for generating, parsing, signing and validating 0x orders | | [`@0x/order-utils`](/packages/order-utils) | [![npm](https://img.shields.io/npm/v/@0x/order-utils.svg)](https://www.npmjs.com/package/@0x/order-utils) | A set of utilities for generating, parsing, signing and validating 0x orders |
| [`@0x/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0x/json-schemas.svg)](https://www.npmjs.com/package/@0x/json-schemas) | 0x-related JSON schemas | | [`@0x/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0x/json-schemas.svg)](https://www.npmjs.com/package/@0x/json-schemas) | 0x-related JSON schemas | |
| [`@0x/order-watcher`](/packages/order-watcher) | [![npm](https://img.shields.io/npm/v/@0x/order-watcher.svg)](https://www.npmjs.com/package/@0x/order-watcher) | An order watcher daemon that watches for order validity |
| [`@0x/migrations`](/packages/migrations) | [![npm](https://img.shields.io/npm/v/@0x/migrations.svg)](https://www.npmjs.com/package/@0x/migrations) | Migration tool for deploying 0x smart contracts on private testnets | | [`@0x/migrations`](/packages/migrations) | [![npm](https://img.shields.io/npm/v/@0x/migrations.svg)](https://www.npmjs.com/package/@0x/migrations) | Migration tool for deploying 0x smart contracts on private testnets |
| [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts | | [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts |
| [`@0x/abi-gen-wrappers`](/packages/abi-gen-wrappers) | [![npm](https://img.shields.io/npm/v/@0x/abi-gen-wrappers.svg)](https://www.npmjs.com/package/@0x/abi-gen-wrappers) | Low-level 0x smart contract wrappers generated using `@0x/abi-gen` | | [`@0x/abi-gen-wrappers`](/packages/abi-gen-wrappers) | [![npm](https://img.shields.io/npm/v/@0x/abi-gen-wrappers.svg)](https://www.npmjs.com/package/@0x/abi-gen-wrappers) | Low-level 0x smart contract wrappers generated using `@0x/abi-gen` |
@ -88,19 +88,17 @@ These packages are all under development. See [/contracts/README.md](/contracts/
#### Utilities #### Utilities
| Package | Version | Description | | Package | Version | Description |
| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | | -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------- |
| [`@0x/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0x/abi-gen.svg)](https://www.npmjs.com/package/@0x/abi-gen) | Tool to generate TS wrappers from smart contract ABIs | | [`@0x/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0x/abi-gen.svg)](https://www.npmjs.com/package/@0x/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
| [`@0x/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0x/tslint-config.svg)](https://www.npmjs.com/package/@0x/tslint-config) | Custom TSLint rules used by the 0x core team | | [`@0x/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0x/tslint-config.svg)](https://www.npmjs.com/package/@0x/tslint-config) | Custom TSLint rules used by the 0x core team |
| [`@0x/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types) | Shared type declarations | | [`@0x/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types) | Shared type declarations |
| [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages | | [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages |
| [`@0x/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils) | Shared utilities | | [`@0x/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils) | Shared utilities |
| [`@0x/react-docs`](/packages/react-docs) | [![npm](https://img.shields.io/npm/v/@0x/react-docs.svg)](https://www.npmjs.com/package/@0x/react-docs) | React documentation component for rendering TypeDoc & sol-doc generated JSON | | [`@0x/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert) | Type and schema assertions used by our packages |
| [`@0x/react-shared`](/packages/react-shared) | [![npm](https://img.shields.io/npm/v/@0x/react-shared.svg)](https://www.npmjs.com/package/@0x/react-shared) | 0x shared react components | | [`@0x/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts |
| [`@0x/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert) | Type and schema assertions used by our packages | | [`@0x/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils) | Dev utils to be shared across 0x packages |
| [`@0x/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts | | [`@0x/fill-scenarios`](/packages/fill-scenarios) | [![npm](https://img.shields.io/npm/v/@0x/fill-scenarios.svg)](https://www.npmjs.com/package/@0x/fill-scenarios) | 0x order fill scenario generator |
| [`@0x/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils) | Dev utils to be shared across 0x packages |
| [`@0x/fill-scenarios`](/packages/fill-scenarios) | [![npm](https://img.shields.io/npm/v/@0x/fill-scenarios.svg)](https://www.npmjs.com/package/@0x/fill-scenarios) | 0x order fill scenario generator |
#### Private Packages #### Private Packages

28
contracts/asset-proxy/CHANGELOG.json
View File

@ -16,6 +16,34 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "2.2.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.2.4",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564607468
},
{
"timestamp": 1563957393,
"version": "2.2.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "2.2.2", "version": "2.2.2",

12
contracts/asset-proxy/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.2.5 - _August 8, 2019_
* Dependencies updated
## v2.2.4 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v2.2.3 - _July 24, 2019_
* Dependencies updated
## v2.2.2 - _July 15, 2019_ ## v2.2.2 - _July 15, 2019_
* Dependencies updated * Dependencies updated

37
contracts/asset-proxy/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-asset-proxy", "name": "@0x/contracts-asset-proxy",
"version": "2.2.2", "version": "2.2.5",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,17 +69,17 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-erc1155": "^1.1.9", "@0x/contracts-erc1155": "^1.1.12",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-erc721": "^2.1.9", "@0x/contracts-erc721": "^2.1.12",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },

1
contracts/asset-proxy/test/authorizable.ts
View File

@ -39,6 +39,7 @@ describe('Authorizable', () => {
artifacts.MixinAuthorizable, artifacts.MixinAuthorizable,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
}); });

5
contracts/asset-proxy/test/erc1155_proxy.ts
View File

@ -23,7 +23,7 @@ import { LogWithDecodedArgs } from 'ethereum-types';
import * as ethUtil from 'ethereumjs-util'; import * as ethUtil from 'ethereumjs-util';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { ERC1155ProxyWrapper, ERC721ProxyContract } from '../src'; import { artifacts, ERC1155ProxyContract, ERC1155ProxyWrapper } from '../src';
chaiSetup.configure(); chaiSetup.configure();
const expect = chai.expect; const expect = chai.expect;
@ -51,7 +51,7 @@ describe('ERC1155Proxy', () => {
let receiver: string; let receiver: string;
let receiverContract: string; let receiverContract: string;
// contracts & wrappers // contracts & wrappers
let erc1155Proxy: ERC721ProxyContract; let erc1155Proxy: ERC1155ProxyContract;
let erc1155Receiver: DummyERC1155ReceiverContract; let erc1155Receiver: DummyERC1155ReceiverContract;
let erc1155ProxyWrapper: ERC1155ProxyWrapper; let erc1155ProxyWrapper: ERC1155ProxyWrapper;
let erc1155Contract: ERC1155MintableContract; let erc1155Contract: ERC1155MintableContract;
@ -89,6 +89,7 @@ describe('ERC1155Proxy', () => {
erc1155Artifacts.DummyERC1155Receiver, erc1155Artifacts.DummyERC1155Receiver,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
receiverContract = erc1155Receiver.address; receiverContract = erc1155Receiver.address;
await erc1155ProxyWrapper.setBalancesAndAllowancesAsync(); await erc1155ProxyWrapper.setBalancesAndAllowancesAsync();

7
contracts/asset-proxy/test/proxies.ts
View File

@ -31,6 +31,7 @@ import * as _ from 'lodash';
import { import {
artifacts, artifacts,
ERC1155ProxyContract,
ERC1155ProxyWrapper, ERC1155ProxyWrapper,
ERC20ProxyContract, ERC20ProxyContract,
ERC20Wrapper, ERC20Wrapper,
@ -71,7 +72,7 @@ describe('Asset Transfer Proxies', () => {
let erc721AFromTokenId: BigNumber; let erc721AFromTokenId: BigNumber;
let erc721BFromTokenId: BigNumber; let erc721BFromTokenId: BigNumber;
let erc1155Proxy: ERC721ProxyContract; let erc1155Proxy: ERC1155ProxyContract;
let erc1155ProxyWrapper: ERC1155ProxyWrapper; let erc1155ProxyWrapper: ERC1155ProxyWrapper;
let erc1155Contract: ERC1155MintableContract; let erc1155Contract: ERC1155MintableContract;
let erc1155Contract2: ERC1155MintableContract; let erc1155Contract2: ERC1155MintableContract;
@ -100,6 +101,7 @@ describe('Asset Transfer Proxies', () => {
artifacts.MultiAssetProxy, artifacts.MultiAssetProxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
// Configure ERC20Proxy // Configure ERC20Proxy
@ -172,6 +174,7 @@ describe('Asset Transfer Proxies', () => {
erc20Artifacts.DummyNoReturnERC20Token, erc20Artifacts.DummyNoReturnERC20Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
constants.DUMMY_TOKEN_DECIMALS, constants.DUMMY_TOKEN_DECIMALS,
@ -181,6 +184,7 @@ describe('Asset Transfer Proxies', () => {
erc20Artifacts.DummyMultipleReturnERC20Token, erc20Artifacts.DummyMultipleReturnERC20Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
constants.DUMMY_TOKEN_DECIMALS, constants.DUMMY_TOKEN_DECIMALS,
@ -223,6 +227,7 @@ describe('Asset Transfer Proxies', () => {
erc721Artifacts.DummyERC721Receiver, erc721Artifacts.DummyERC721Receiver,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
await erc721Wrapper.setBalancesAndAllowancesAsync(); await erc721Wrapper.setBalancesAndAllowancesAsync();

2
contracts/asset-proxy/test/static_call_proxy.ts
View File

@ -41,12 +41,14 @@ describe('StaticCallProxy', () => {
artifacts.StaticCallProxy, artifacts.StaticCallProxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
staticCallProxy = new IAssetProxyContract(staticCallProxyWithoutTransferFrom.address, provider, txDefaults); staticCallProxy = new IAssetProxyContract(staticCallProxyWithoutTransferFrom.address, provider, txDefaults);
staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync( staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync(
artifacts.TestStaticCallTarget, artifacts.TestStaticCallTarget,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
}); });
beforeEach(async () => { beforeEach(async () => {

2
contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts
View File

@ -54,6 +54,7 @@ export class ERC1155ProxyWrapper {
erc1155Artifacts.ERC1155Mintable, erc1155Artifacts.ERC1155Mintable,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
); );
const erc1155Wrapper = new Erc1155Wrapper(erc1155Contract, this._provider, this._contractOwnerAddress); const erc1155Wrapper = new Erc1155Wrapper(erc1155Contract, this._provider, this._contractOwnerAddress);
this._dummyTokenWrappers.push(erc1155Wrapper); this._dummyTokenWrappers.push(erc1155Wrapper);
@ -69,6 +70,7 @@ export class ERC1155ProxyWrapper {
artifacts.ERC1155Proxy, artifacts.ERC1155Proxy,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
); );
this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync(); this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
return this._proxyContract; return this._proxyContract;

2
contracts/asset-proxy/test/utils/erc20_wrapper.ts
View File

@ -37,6 +37,7 @@ export class ERC20Wrapper {
erc20Artifacts.DummyERC20Token, erc20Artifacts.DummyERC20Token,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
decimals, decimals,
@ -51,6 +52,7 @@ export class ERC20Wrapper {
artifacts.ERC20Proxy, artifacts.ERC20Proxy,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
); );
this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync(); this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
return this._proxyContract; return this._proxyContract;

2
contracts/asset-proxy/test/utils/erc721_wrapper.ts
View File

@ -29,6 +29,7 @@ export class ERC721Wrapper {
erc721Artifacts.DummyERC721Token, erc721Artifacts.DummyERC721Token,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
), ),
@ -41,6 +42,7 @@ export class ERC721Wrapper {
artifacts.ERC721Proxy, artifacts.ERC721Proxy,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
); );
this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync(); this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
return this._proxyContract; return this._proxyContract;

28
contracts/coordinator/CHANGELOG.json
View File

@ -44,6 +44,34 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "2.0.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.0.9",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564607468
},
{
"timestamp": 1563957393,
"version": "2.0.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "2.0.7", "version": "2.0.7",

12
contracts/coordinator/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.0.10 - _August 8, 2019_
* Dependencies updated
## v2.0.9 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v2.0.8 - _July 24, 2019_
* Dependencies updated
## v2.0.7 - _July 15, 2019_ ## v2.0.7 - _July 15, 2019_
* Dependencies updated * Dependencies updated

39
contracts/coordinator/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-coordinator", "name": "@0x/contracts-coordinator",
"version": "2.0.7", "version": "2.0.10",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,18 +69,18 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-asset-proxy": "^2.2.2", "@0x/contracts-asset-proxy": "^2.2.5",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-exchange": "^2.1.8", "@0x/contracts-exchange": "^2.1.11",
"@0x/contracts-exchange-libs": "^3.0.2", "@0x/contracts-exchange-libs": "^3.0.5",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },

1
contracts/coordinator/test/coordinator.ts
View File

@ -96,6 +96,7 @@ describe('Coordinator tests', () => {
artifacts.Coordinator, artifacts.Coordinator,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchange.address, exchange.address,
new BigNumber(chainId), new BigNumber(chainId),
); );

1
contracts/coordinator/test/libs.ts
View File

@ -27,6 +27,7 @@ describe('Libs tests', () => {
artifacts.Coordinator, artifacts.Coordinator,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchangeAddress, exchangeAddress,
new BigNumber(chainId), new BigNumber(chainId),
); );

1
contracts/coordinator/test/mixins.ts
View File

@ -48,6 +48,7 @@ describe('Mixins tests', () => {
artifacts.Coordinator, artifacts.Coordinator,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchangeAddress, exchangeAddress,
new BigNumber(chainId), new BigNumber(chainId),
); );

1
contracts/coordinator/test/utils/coordinator_registry_wrapper.ts
View File

@ -24,6 +24,7 @@ export class CoordinatorRegistryWrapper {
artifacts.CoordinatorRegistry, artifacts.CoordinatorRegistry,
this._provider, this._provider,
txDefaults, txDefaults,
artifacts,
); );
if (this._coordinatorRegistryContract === undefined) { if (this._coordinatorRegistryContract === undefined) {
throw new Error(`Failed to deploy Coordinator Registry contract.`); throw new Error(`Failed to deploy Coordinator Registry contract.`);

37
contracts/dev-utils/CHANGELOG.json
View File

@ -12,6 +12,43 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "0.0.7",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1564607468,
"version": "0.0.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.0.5",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564604963
},
{
"timestamp": 1563957393,
"version": "0.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "0.0.4", "version": "0.0.4",

16
contracts/dev-utils/CHANGELOG.md
View File

@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v0.0.7 - _August 8, 2019_
* Dependencies updated
## v0.0.6 - _July 31, 2019_
* Dependencies updated
## v0.0.5 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v0.0.5 - _July 24, 2019_
* Dependencies updated
## v0.0.4 - _July 15, 2019_ ## v0.0.4 - _July 15, 2019_
* Dependencies updated * Dependencies updated

43
contracts/dev-utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-dev-utils", "name": "@0x/contracts-dev-utils",
"version": "0.0.4", "version": "0.0.7",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/dev-utils/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/dev-utils/README.md",
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,20 +69,20 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-asset-proxy": "^2.2.2", "@0x/contracts-asset-proxy": "^2.2.5",
"@0x/contracts-erc1155": "^1.1.9", "@0x/contracts-erc1155": "^1.1.12",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-erc721": "^2.1.9", "@0x/contracts-erc721": "^2.1.12",
"@0x/contracts-exchange": "^2.1.8", "@0x/contracts-exchange": "^2.1.11",
"@0x/contracts-exchange-libs": "^3.0.2", "@0x/contracts-exchange-libs": "^3.0.5",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"ethereumjs-util": "^5.1.1" "ethereumjs-util": "^5.1.1"
}, },
"publishConfig": { "publishConfig": {

11
contracts/dev-utils/test/lib_asset_data.ts
View File

@ -92,6 +92,7 @@ describe('LibAssetData', () => {
exchangeArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
@ -99,26 +100,31 @@ describe('LibAssetData', () => {
proxyArtifacts.ERC20Proxy, proxyArtifacts.ERC20Proxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
proxyArtifacts.ERC721Proxy, proxyArtifacts.ERC721Proxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
erc1155Proxy = await ERC1155ProxyContract.deployFrom0xArtifactAsync( erc1155Proxy = await ERC1155ProxyContract.deployFrom0xArtifactAsync(
proxyArtifacts.ERC1155Proxy, proxyArtifacts.ERC1155Proxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
multiAssetProxy = await MultiAssetProxyContract.deployFrom0xArtifactAsync( multiAssetProxy = await MultiAssetProxyContract.deployFrom0xArtifactAsync(
proxyArtifacts.MultiAssetProxy, proxyArtifacts.MultiAssetProxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
staticCallProxy = await StaticCallProxyContract.deployFrom0xArtifactAsync( staticCallProxy = await StaticCallProxyContract.deployFrom0xArtifactAsync(
proxyArtifacts.StaticCallProxy, proxyArtifacts.StaticCallProxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(erc20Proxy.address); await exchange.registerAssetProxy.awaitTransactionSuccessAsync(erc20Proxy.address);
@ -131,6 +137,7 @@ describe('LibAssetData', () => {
artifacts.LibAssetData, artifacts.LibAssetData,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchange.address, exchange.address,
); );
@ -138,6 +145,7 @@ describe('LibAssetData', () => {
proxyArtifacts.TestStaticCallTarget, proxyArtifacts.TestStaticCallTarget,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
[tokenOwnerAddress] = await web3Wrapper.getAvailableAddressesAsync(); [tokenOwnerAddress] = await web3Wrapper.getAvailableAddressesAsync();
@ -146,6 +154,7 @@ describe('LibAssetData', () => {
erc20Artifacts.DummyERC20Token, erc20Artifacts.DummyERC20Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
'Dummy', 'Dummy',
'DUM', 'DUM',
new BigNumber(1), new BigNumber(1),
@ -156,6 +165,7 @@ describe('LibAssetData', () => {
erc721Artifacts.DummyERC721Token, erc721Artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
'Dummy', 'Dummy',
'DUM', 'DUM',
); );
@ -172,6 +182,7 @@ describe('LibAssetData', () => {
erc1155Artifacts.ERC1155Mintable, erc1155Artifacts.ERC1155Mintable,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
const logDecoder = new LogDecoder(web3Wrapper, erc1155Artifacts); const logDecoder = new LogDecoder(web3Wrapper, erc1155Artifacts);

1
contracts/dev-utils/test/lib_transaction_decoder.ts
View File

@ -39,6 +39,7 @@ describe('LibTransactionDecoder', () => {
artifacts.LibTransactionDecoder, artifacts.LibTransactionDecoder,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
}); });
after(async () => { after(async () => {

3
contracts/dev-utils/test/order_validation_utils.ts
View File

@ -84,6 +84,7 @@ describe('OrderValidationUtils/OrderTransferSimulatorUtils', () => {
exchangeArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
@ -91,6 +92,7 @@ describe('OrderValidationUtils/OrderTransferSimulatorUtils', () => {
proxyArtifacts.MultiAssetProxy, proxyArtifacts.MultiAssetProxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
const exchangeWrapper = new ExchangeWrapper(exchange, provider); const exchangeWrapper = new ExchangeWrapper(exchange, provider);
await exchangeWrapper.registerAssetProxyAsync(erc20Proxy.address, owner); await exchangeWrapper.registerAssetProxyAsync(erc20Proxy.address, owner);
@ -103,6 +105,7 @@ describe('OrderValidationUtils/OrderTransferSimulatorUtils', () => {
artifacts.DevUtils, artifacts.DevUtils,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchange.address, exchange.address,
); );

30
contracts/erc1155/CHANGELOG.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"version": "1.1.10", "version": "1.1.13",
"changes": [ "changes": [
{ {
"note": "Add `mintKnownFungibleTokensAsync()`, `isNonFungibleItemAsync()`, `isFungibleItemAsync()`, `getOwnerOfAsync()`, `getBalanceAsync()` to `Erc1155Wrapper`.", "note": "Add `mintKnownFungibleTokensAsync()`, `isNonFungibleItemAsync()`, `isFungibleItemAsync()`, `getOwnerOfAsync()`, `getBalanceAsync()` to `Erc1155Wrapper`.",
@ -8,6 +8,34 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "1.1.12",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "1.1.11",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564604963
},
{
"timestamp": 1563957393,
"version": "1.1.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "1.1.9", "version": "1.1.9",

12
contracts/erc1155/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.1.12 - _August 8, 2019_
* Dependencies updated
## v1.1.11 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v1.1.10 - _July 24, 2019_
* Dependencies updated
## v1.1.9 - _July 15, 2019_ ## v1.1.9 - _July 15, 2019_
* Dependencies updated * Dependencies updated

29
contracts/erc1155/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-erc1155", "name": "@0x/contracts-erc1155",
"version": "1.1.9", "version": "1.1.12",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,19 +47,20 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -67,14 +68,14 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

2
contracts/erc1155/test/erc1155_token.ts
View File

@ -59,11 +59,13 @@ describe('ERC1155Token', () => {
artifacts.ERC1155Mintable, artifacts.ERC1155Mintable,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
erc1155Receiver = await DummyERC1155ReceiverContract.deployFrom0xArtifactAsync( erc1155Receiver = await DummyERC1155ReceiverContract.deployFrom0xArtifactAsync(
artifacts.DummyERC1155Receiver, artifacts.DummyERC1155Receiver,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
receiver = erc1155Receiver.address; receiver = erc1155Receiver.address;
// create wrapper & mint erc1155 tokens // create wrapper & mint erc1155 tokens

28
contracts/erc20/CHANGELOG.json
View File

@ -1,4 +1,32 @@
[ [
{
"timestamp": 1565296576,
"version": "2.2.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.2.10",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564604963
},
{
"timestamp": 1563957393,
"version": "2.2.9",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "2.2.8", "version": "2.2.8",

12
contracts/erc20/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.2.11 - _August 8, 2019_
* Dependencies updated
## v2.2.10 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v2.2.9 - _July 24, 2019_
* Dependencies updated
## v2.2.8 - _July 15, 2019_ ## v2.2.8 - _July 15, 2019_
* Dependencies updated * Dependencies updated

29
contracts/erc20/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-erc20", "name": "@0x/contracts-erc20",
"version": "2.2.8", "version": "2.2.11",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,13 +69,13 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

1
contracts/erc20/test/unlimited_allowance_token.ts
View File

@ -37,6 +37,7 @@ describe('UnlimitedAllowanceToken', () => {
artifacts.DummyERC20Token, artifacts.DummyERC20Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
constants.DUMMY_TOKEN_DECIMALS, constants.DUMMY_TOKEN_DECIMALS,

13
contracts/erc20/test/weth9.ts
View File

@ -33,10 +33,15 @@ describe('EtherToken', () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync(); const accounts = await web3Wrapper.getAvailableAddressesAsync();
account = accounts[0]; account = accounts[0];
etherToken = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, { etherToken = await WETH9Contract.deployFrom0xArtifactAsync(
gasPrice, artifacts.WETH9,
...txDefaults, provider,
}); {
gasPrice,
...txDefaults,
},
artifacts,
);
}); });
beforeEach(async () => { beforeEach(async () => {
await blockchainLifecycle.startAsync(); await blockchainLifecycle.startAsync();

7
contracts/erc20/test/zrx_token.ts
View File

@ -26,7 +26,12 @@ describe('ZRXToken', () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync(); const accounts = await web3Wrapper.getAvailableAddressesAsync();
owner = accounts[0]; owner = accounts[0];
spender = accounts[1]; spender = accounts[1];
zrxToken = await ZRXTokenContract.deployFrom0xArtifactAsync(artifacts.ZRXToken, provider, txDefaults); zrxToken = await ZRXTokenContract.deployFrom0xArtifactAsync(
artifacts.ZRXToken,
provider,
txDefaults,
artifacts,
);
MAX_UINT = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS; MAX_UINT = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
}); });
beforeEach(async () => { beforeEach(async () => {

28
contracts/erc721/CHANGELOG.json
View File

@ -1,4 +1,32 @@
[ [
{
"timestamp": 1565296576,
"version": "2.1.12",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.1.11",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564604963
},
{
"timestamp": 1563957393,
"version": "2.1.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "2.1.9", "version": "2.1.9",

12
contracts/erc721/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.1.12 - _August 8, 2019_
* Dependencies updated
## v2.1.11 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v2.1.10 - _July 24, 2019_
* Dependencies updated
## v2.1.9 - _July 15, 2019_ ## v2.1.9 - _July 15, 2019_
* Dependencies updated * Dependencies updated

29
contracts/erc721/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-erc721", "name": "@0x/contracts-erc721",
"version": "2.1.9", "version": "2.1.12",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,13 +69,13 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

6
contracts/erc721/test/erc721_token.ts
View File

@ -48,6 +48,7 @@ describe('ERC721Token', () => {
artifacts.DummyERC721Token, artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
); );
@ -55,6 +56,7 @@ describe('ERC721Token', () => {
artifacts.DummyERC721Receiver, artifacts.DummyERC721Receiver,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
logDecoder = new LogDecoder(web3Wrapper, artifacts); logDecoder = new LogDecoder(web3Wrapper, artifacts);
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
@ -176,6 +178,7 @@ describe('ERC721Token', () => {
artifacts.DummyERC721Token, artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
); );
@ -190,6 +193,7 @@ describe('ERC721Token', () => {
artifacts.InvalidERC721Receiver, artifacts.InvalidERC721Receiver,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
const from = owner; const from = owner;
const to = invalidErc721Receiver.address; const to = invalidErc721Receiver.address;
@ -237,6 +241,7 @@ describe('ERC721Token', () => {
artifacts.DummyERC721Token, artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
); );
@ -251,6 +256,7 @@ describe('ERC721Token', () => {
artifacts.InvalidERC721Receiver, artifacts.InvalidERC721Receiver,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
const from = owner; const from = owner;
const to = invalidErc721Receiver.address; const to = invalidErc721Receiver.address;

28
contracts/exchange-forwarder/CHANGELOG.json
View File

@ -1,4 +1,32 @@
[ [
{
"timestamp": 1565296576,
"version": "3.0.9",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.0.8",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564607468
},
{
"timestamp": 1563957393,
"version": "3.0.7",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "3.0.6", "version": "3.0.6",

12
contracts/exchange-forwarder/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.0.9 - _August 8, 2019_
* Dependencies updated
## v3.0.8 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v3.0.7 - _July 24, 2019_
* Dependencies updated
## v3.0.6 - _July 15, 2019_ ## v3.0.6 - _July 15, 2019_
* Dependencies updated * Dependencies updated

41
contracts/exchange-forwarder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-exchange-forwarder", "name": "@0x/contracts-exchange-forwarder",
"version": "3.0.6", "version": "3.0.9",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -46,20 +46,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -67,19 +68,19 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-asset-proxy": "^2.2.2", "@0x/contracts-asset-proxy": "^2.2.5",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-erc721": "^2.1.9", "@0x/contracts-erc721": "^2.1.12",
"@0x/contracts-exchange": "^2.1.8", "@0x/contracts-exchange": "^2.1.11",
"@0x/contracts-exchange-libs": "^3.0.2", "@0x/contracts-exchange-libs": "^3.0.5",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

2
contracts/exchange-forwarder/test/forwarder.ts
View File

@ -102,7 +102,6 @@ describe(ContractName.Forwarder, () => {
exchangeArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData,
new BigNumber(chainId), new BigNumber(chainId),
); );
exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider); exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider);
@ -177,7 +176,6 @@ describe(ContractName.Forwarder, () => {
exchangeArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData,
new BigNumber(chainId), new BigNumber(chainId),
); );
return expectContractCreationFailedAsync( return expectContractCreationFailedAsync(

28
contracts/exchange-libs/CHANGELOG.json
View File

@ -104,6 +104,34 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "3.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.0.4",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564604963
},
{
"timestamp": 1563957393,
"version": "3.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "3.0.2", "version": "3.0.2",

12
contracts/exchange-libs/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.0.5 - _August 8, 2019_
* Dependencies updated
## v3.0.4 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v3.0.3 - _July 24, 2019_
* Dependencies updated
## v3.0.2 - _July 15, 2019_ ## v3.0.2 - _July 15, 2019_
* Dependencies updated * Dependencies updated

32
contracts/exchange-libs/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-exchange-libs", "name": "@0x/contracts-exchange-libs",
"version": "3.0.2", "version": "3.0.5",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,14 +47,15 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/subproviders": "^4.1.1", "@0x/subproviders": "^4.1.1",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
@ -62,7 +63,7 @@
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -70,14 +71,15 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/subproviders": "5.0.1",
"@0x/typescript-typings": "^4.2.3", "@0x/types": "^2.4.1",
"@0x/utils": "^4.4.0", "@0x/typescript-typings": "^4.2.4",
"@0x/web3-wrapper": "^6.0.7", "@0x/utils": "^4.5.0",
"ethereum-types": "^2.1.3", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

2
contracts/exchange-libs/test/lib_eip712_exchange_domain.ts
View File

@ -12,6 +12,7 @@ blockchainTests('LibEIP712ExchangeDomain', env => {
artifacts.TestLibEIP712ExchangeDomain, artifacts.TestLibEIP712ExchangeDomain,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
constants.NULL_ADDRESS, constants.NULL_ADDRESS,
); );
@ -32,6 +33,7 @@ blockchainTests('LibEIP712ExchangeDomain', env => {
artifacts.TestLibEIP712ExchangeDomain, artifacts.TestLibEIP712ExchangeDomain,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
verifyingContractAddress, verifyingContractAddress,
); );

1
contracts/exchange-libs/test/lib_fill_results.ts
View File

@ -58,6 +58,7 @@ blockchainTests('LibFillResults', env => {
artifacts.TestLibFillResults, artifacts.TestLibFillResults,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
); );
}); });

1
contracts/exchange-libs/test/lib_math.ts
View File

@ -20,6 +20,7 @@ blockchainTests('LibMath', env => {
artifacts.TestLibMath, artifacts.TestLibMath,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
); );
}); });

1
contracts/exchange-libs/test/lib_order.ts
View File

@ -41,6 +41,7 @@ blockchainTests('LibOrder', env => {
artifacts.TestLibOrder, artifacts.TestLibOrder,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
); );
}); });

1
contracts/exchange-libs/test/lib_zero_ex_transaction.ts
View File

@ -31,6 +31,7 @@ blockchainTests('LibZeroExTransaction', env => {
artifacts.TestLibZeroExTransaction, artifacts.TestLibZeroExTransaction,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
); );
}); });

28
contracts/exchange/CHANGELOG.json
View File

@ -176,6 +176,34 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "2.1.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.1.10",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564607468
},
{
"timestamp": 1563957393,
"version": "2.1.9",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "2.1.8", "version": "2.1.8",

12
contracts/exchange/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v2.1.11 - _August 8, 2019_
* Dependencies updated
## v2.1.10 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v2.1.9 - _July 24, 2019_
* Dependencies updated
## v2.1.8 - _July 15, 2019_ ## v2.1.8 - _July 15, 2019_
* Dependencies updated * Dependencies updated

41
contracts/exchange/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-exchange", "name": "@0x/contracts-exchange",
"version": "2.1.8", "version": "2.1.11",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,19 +69,19 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-asset-proxy": "^2.2.2", "@0x/contracts-asset-proxy": "^2.2.5",
"@0x/contracts-erc1155": "^1.1.9", "@0x/contracts-erc1155": "^1.1.12",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-erc721": "^2.1.9", "@0x/contracts-erc721": "^2.1.12",
"@0x/contracts-exchange-libs": "^3.0.2", "@0x/contracts-exchange-libs": "^3.0.5",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },

11
contracts/exchange/test/core.ts
View File

@ -1,5 +1,6 @@
import { import {
artifacts as proxyArtifacts, artifacts as proxyArtifacts,
ERC1155ProxyContract,
ERC1155ProxyWrapper, ERC1155ProxyWrapper,
ERC20ProxyContract, ERC20ProxyContract,
ERC20Wrapper, ERC20Wrapper,
@ -67,7 +68,7 @@ blockchainTests.resets('Exchange core', () => {
let exchange: ExchangeContract; let exchange: ExchangeContract;
let erc20Proxy: ERC20ProxyContract; let erc20Proxy: ERC20ProxyContract;
let erc721Proxy: ERC721ProxyContract; let erc721Proxy: ERC721ProxyContract;
let erc1155Proxy: ERC721ProxyContract; let erc1155Proxy: ERC1155ProxyContract;
let multiAssetProxy: MultiAssetProxyContract; let multiAssetProxy: MultiAssetProxyContract;
let validatorWallet: TestValidatorWalletContract; let validatorWallet: TestValidatorWalletContract;
let erc1155Contract: ERC1155MintableContract; let erc1155Contract: ERC1155MintableContract;
@ -111,11 +112,13 @@ blockchainTests.resets('Exchange core', () => {
proxyArtifacts.MultiAssetProxy, proxyArtifacts.MultiAssetProxy,
provider, provider,
txDefaults, txDefaults,
{},
); );
staticCallProxy = await StaticCallProxyContract.deployFrom0xArtifactAsync( staticCallProxy = await StaticCallProxyContract.deployFrom0xArtifactAsync(
proxyArtifacts.StaticCallProxy, proxyArtifacts.StaticCallProxy,
provider, provider,
txDefaults, txDefaults,
{},
); );
const numDummyErc20ToDeploy = 3; const numDummyErc20ToDeploy = 3;
[erc20TokenA, erc20TokenB, feeToken] = await erc20Wrapper.deployDummyTokensAsync( [erc20TokenA, erc20TokenB, feeToken] = await erc20Wrapper.deployDummyTokensAsync(
@ -126,12 +129,13 @@ blockchainTests.resets('Exchange core', () => {
erc20Artifacts.DummyNoReturnERC20Token, erc20Artifacts.DummyNoReturnERC20Token,
provider, provider,
txDefaults, txDefaults,
{},
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
constants.DUMMY_TOKEN_DECIMALS, constants.DUMMY_TOKEN_DECIMALS,
constants.DUMMY_TOKEN_TOTAL_SUPPLY, constants.DUMMY_TOKEN_TOTAL_SUPPLY,
); );
erc20Wrapper.addDummyTokenContract(noReturnErc20Token); erc20Wrapper.addDummyTokenContract((noReturnErc20Token as any) as DummyERC20TokenContract);
[erc721Token] = await erc721Wrapper.deployDummyTokensAsync(); [erc721Token] = await erc721Wrapper.deployDummyTokensAsync();
erc1155Proxy = await erc1155ProxyWrapper.deployProxyAsync(); erc1155Proxy = await erc1155ProxyWrapper.deployProxyAsync();
[erc1155Wrapper] = await erc1155ProxyWrapper.deployDummyContractsAsync(); [erc1155Wrapper] = await erc1155ProxyWrapper.deployDummyContractsAsync();
@ -140,12 +144,14 @@ blockchainTests.resets('Exchange core', () => {
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
validatorWallet = await TestValidatorWalletContract.deployFrom0xArtifactAsync( validatorWallet = await TestValidatorWalletContract.deployFrom0xArtifactAsync(
artifacts.TestValidatorWallet, artifacts.TestValidatorWallet,
provider, provider,
txDefaults, txDefaults,
{},
exchange.address, exchange.address,
); );
// Configure ERC20Proxy // Configure ERC20Proxy
@ -1067,6 +1073,7 @@ blockchainTests.resets('Exchange core', () => {
proxyArtifacts.TestStaticCallTarget, proxyArtifacts.TestStaticCallTarget,
provider, provider,
txDefaults, txDefaults,
{},
); );
}); });
it('should revert if the staticcall is unsuccessful', async () => { it('should revert if the staticcall is unsuccessful', async () => {

4
contracts/exchange/test/dispatcher.ts
View File

@ -29,6 +29,8 @@ import {
TestAssetProxyDispatcherContract, TestAssetProxyDispatcherContract,
} from '../src'; } from '../src';
import { dependencyArtifacts } from './utils/dependency_artifacts';
chaiSetup.configure(); chaiSetup.configure();
const expect = chai.expect; const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@ -76,6 +78,7 @@ describe('AssetProxyDispatcher', () => {
artifacts.TestAssetProxyDispatcher, artifacts.TestAssetProxyDispatcher,
provider, provider,
txDefaults, txDefaults,
dependencyArtifacts,
); );
await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(assetProxyDispatcher.address, { await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(assetProxyDispatcher.address, {
from: owner, from: owner,
@ -126,6 +129,7 @@ describe('AssetProxyDispatcher', () => {
proxyArtifacts.ERC20Proxy, proxyArtifacts.ERC20Proxy,
provider, provider,
txDefaults, txDefaults,
dependencyArtifacts,
); );
const expectedError = new ExchangeRevertErrors.AssetProxyExistsError(proxyAddress); const expectedError = new ExchangeRevertErrors.AssetProxyExistsError(proxyAddress);
const tx = assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(newErc20TransferProxy.address, { const tx = assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(newErc20TransferProxy.address, {

1
contracts/exchange/test/internal.ts
View File

@ -32,6 +32,7 @@ blockchainTests('Exchange core internal functions', env => {
artifacts.TestExchangeInternals, artifacts.TestExchangeInternals,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
new BigNumber(CHAIN_ID), new BigNumber(CHAIN_ID),
); );
logDecoder = new LogDecoder(env.web3Wrapper, artifacts); logDecoder = new LogDecoder(env.web3Wrapper, artifacts);

1
contracts/exchange/test/lib_exchange_rich_error_decoder.ts
View File

@ -16,6 +16,7 @@ blockchainTests.resets('LibExchangeRichErrorDecoder', ({ provider, txDefaults })
artifacts.TestLibExchangeRichErrorDecoder, artifacts.TestLibExchangeRichErrorDecoder,
provider, provider,
txDefaults, txDefaults,
{},
); );
}); });

4
contracts/exchange/test/match_orders.ts
View File

@ -117,7 +117,7 @@ describe('matchOrders', () => {
await erc721Wrapper.setBalancesAndAllowancesAsync(); await erc721Wrapper.setBalancesAndAllowancesAsync();
// Deploy ERC1155 token and proxy // Deploy ERC1155 token and proxy
[erc1155Wrapper] = await erc1155ProxyWrapper.deployDummyContractsAsync(); [erc1155Wrapper] = await erc1155ProxyWrapper.deployDummyContractsAsync();
erc1155Token = erc1155Wrapper.getContract(); erc1155Token = (erc1155Wrapper.getContract() as any) as ERC1155TokenContract;
erc1155Proxy = await erc1155ProxyWrapper.deployProxyAsync(); erc1155Proxy = await erc1155ProxyWrapper.deployProxyAsync();
await erc1155ProxyWrapper.setBalancesAndAllowancesAsync(); await erc1155ProxyWrapper.setBalancesAndAllowancesAsync();
// Deploy MultiAssetProxy. // Deploy MultiAssetProxy.
@ -125,12 +125,14 @@ describe('matchOrders', () => {
assetProxyArtifacts.MultiAssetProxy, assetProxyArtifacts.MultiAssetProxy,
provider, provider,
txDefaults, txDefaults,
{},
); );
// Depoy exchange // Depoy exchange
exchange = await ExchangeContract.deployFrom0xArtifactAsync( exchange = await ExchangeContract.deployFrom0xArtifactAsync(
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
exchangeWrapper = new ExchangeWrapper(exchange, provider); exchangeWrapper = new ExchangeWrapper(exchange, provider);

1
contracts/exchange/test/reentrancy_tests.ts
View File

@ -93,6 +93,7 @@ blockchainTests.resets('Reentrancy Tests', env => {
artifacts.ReentrancyTester, artifacts.ReentrancyTester,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
); );
}); });

2
contracts/exchange/test/signature_validator.ts
View File

@ -50,12 +50,14 @@ blockchainTests.resets('MixinSignatureValidator', env => {
artifacts.TestSignatureValidator, artifacts.TestSignatureValidator,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
validatorWallet = await TestValidatorWalletContract.deployFrom0xArtifactAsync( validatorWallet = await TestValidatorWalletContract.deployFrom0xArtifactAsync(
artifacts.TestValidatorWallet, artifacts.TestValidatorWallet,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
signatureValidator.address, signatureValidator.address,
); );
validatorWalletRevertReason = await validatorWallet.REVERT_REASON.callAsync(); validatorWalletRevertReason = await validatorWallet.REVERT_REASON.callAsync();

3
contracts/exchange/test/transactions.ts
View File

@ -103,6 +103,7 @@ blockchainTests.resets('Exchange transactions', env => {
artifacts.Exchange, artifacts.Exchange,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
exchangeWrapper = new ExchangeWrapper(exchangeInstance, env.provider); exchangeWrapper = new ExchangeWrapper(exchangeInstance, env.provider);
@ -976,6 +977,7 @@ blockchainTests.resets('Exchange transactions', env => {
artifacts.ExchangeWrapper, artifacts.ExchangeWrapper,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
exchangeInstance.address, exchangeInstance.address,
); );
}); });
@ -1078,6 +1080,7 @@ blockchainTests.resets('Exchange transactions', env => {
artifacts.Whitelist, artifacts.Whitelist,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
exchangeInstance.address, exchangeInstance.address,
); );
const isApproved = true; const isApproved = true;

9
contracts/exchange/test/utils/dependency_artifacts.ts Normal file
View File

@ -0,0 +1,9 @@
import { artifacts as erc1155Artifacts } from '@0x/contracts-erc1155';
import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
export const dependencyArtifacts = {
...erc20Artifacts,
...erc721Artifacts,
...erc1155Artifacts,
};

36
contracts/exchange/test/utils/exchange_wrapper.ts
View File

@ -21,6 +21,7 @@ import { AbiDecodedFillOrderData } from './types';
export class ExchangeWrapper { export class ExchangeWrapper {
private readonly _exchange: ExchangeContract; private readonly _exchange: ExchangeContract;
// tslint:disable no-unused-variable
private readonly _web3Wrapper: Web3Wrapper; private readonly _web3Wrapper: Web3Wrapper;
private readonly _logDecoder: LogDecoder; private readonly _logDecoder: LogDecoder;
constructor(exchangeContract: ExchangeContract, provider: Web3ProviderEngine | ZeroExProvider) { constructor(exchangeContract: ExchangeContract, provider: Web3ProviderEngine | ZeroExProvider) {
@ -39,20 +40,18 @@ export class ExchangeWrapper {
opts: { takerAssetFillAmount?: BigNumber } = {}, opts: { takerAssetFillAmount?: BigNumber } = {},
): Promise<TransactionReceiptWithDecodedLogs> { ): Promise<TransactionReceiptWithDecodedLogs> {
const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount); const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
const txHash = await this._exchange.fillOrder.sendTransactionAsync( const txReceipt = await this._exchange.fillOrder.awaitTransactionSuccessAsync(
params.order, params.order,
params.takerAssetFillAmount, params.takerAssetFillAmount,
params.signature, params.signature,
{ from }, { from },
); );
const txReceipt = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return txReceipt; return txReceipt;
} }
public async cancelOrderAsync(signedOrder: SignedOrder, from: string): Promise<TransactionReceiptWithDecodedLogs> { public async cancelOrderAsync(signedOrder: SignedOrder, from: string): Promise<TransactionReceiptWithDecodedLogs> {
const params = orderUtils.createCancel(signedOrder); const params = orderUtils.createCancel(signedOrder);
const txHash = await this._exchange.cancelOrder.sendTransactionAsync(params.order, { from }); const txReceipt = await this._exchange.cancelOrder.awaitTransactionSuccessAsync(params.order, { from });
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return txReceipt;
return tx;
} }
public async fillOrKillOrderAsync( public async fillOrKillOrderAsync(
signedOrder: SignedOrder, signedOrder: SignedOrder,
@ -60,14 +59,13 @@ export class ExchangeWrapper {
opts: { takerAssetFillAmount?: BigNumber } = {}, opts: { takerAssetFillAmount?: BigNumber } = {},
): Promise<TransactionReceiptWithDecodedLogs> { ): Promise<TransactionReceiptWithDecodedLogs> {
const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount); const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
const txHash = await this._exchange.fillOrKillOrder.sendTransactionAsync( const txReceipt = await this._exchange.fillOrKillOrder.awaitTransactionSuccessAsync(
params.order, params.order,
params.takerAssetFillAmount, params.takerAssetFillAmount,
params.signature, params.signature,
{ from }, { from },
); );
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return txReceipt;
return tx;
} }
public async fillOrderNoThrowAsync( public async fillOrderNoThrowAsync(
signedOrder: SignedOrder, signedOrder: SignedOrder,
@ -75,14 +73,13 @@ export class ExchangeWrapper {
opts: { takerAssetFillAmount?: BigNumber; gas?: number } = {}, opts: { takerAssetFillAmount?: BigNumber; gas?: number } = {},
): Promise<TransactionReceiptWithDecodedLogs> { ): Promise<TransactionReceiptWithDecodedLogs> {
const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount); const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
const txHash = await this._exchange.fillOrderNoThrow.sendTransactionAsync( const txReceipt = await this._exchange.fillOrderNoThrow.awaitTransactionSuccessAsync(
params.order, params.order,
params.takerAssetFillAmount, params.takerAssetFillAmount,
params.signature, params.signature,
{ from, gas: opts.gas }, { from, gas: opts.gas },
); );
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return txReceipt;
return tx;
} }
public async batchFillOrdersAsync( public async batchFillOrdersAsync(
orders: SignedOrder[], orders: SignedOrder[],
@ -169,17 +166,17 @@ export class ExchangeWrapper {
return tx; return tx;
} }
public async cancelOrdersUpToAsync(salt: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> { public async cancelOrdersUpToAsync(salt: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
const txHash = await this._exchange.cancelOrdersUpTo.sendTransactionAsync(salt, { from }); const txReceipt = await this._exchange.cancelOrdersUpTo.awaitTransactionSuccessAsync(salt, { from });
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return txReceipt;
return tx;
} }
public async registerAssetProxyAsync( public async registerAssetProxyAsync(
assetProxyAddress: string, assetProxyAddress: string,
from: string, from: string,
): Promise<TransactionReceiptWithDecodedLogs> { ): Promise<TransactionReceiptWithDecodedLogs> {
const txHash = await this._exchange.registerAssetProxy.sendTransactionAsync(assetProxyAddress, { from }); const txReceipt = await this._exchange.registerAssetProxy.awaitTransactionSuccessAsync(assetProxyAddress, {
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); from,
return tx; });
return txReceipt;
} }
public async executeTransactionAsync( public async executeTransactionAsync(
signedTransaction: SignedZeroExTransaction, signedTransaction: SignedZeroExTransaction,
@ -324,15 +321,14 @@ export class ExchangeWrapper {
from: string, from: string,
): Promise<TransactionReceiptWithDecodedLogs> { ): Promise<TransactionReceiptWithDecodedLogs> {
const params = orderUtils.createMatchOrders(signedOrderLeft, signedOrderRight); const params = orderUtils.createMatchOrders(signedOrderLeft, signedOrderRight);
const txHash = await this._exchange.matchOrders.sendTransactionAsync( const txReceipt = await this._exchange.matchOrders.awaitTransactionSuccessAsync(
params.left, params.left,
params.right, params.right,
params.leftSignature, params.leftSignature,
params.rightSignature, params.rightSignature,
{ from }, { from },
); );
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return txReceipt;
return tx;
} }
public async getMatchOrdersResultsAsync( public async getMatchOrdersResultsAsync(
signedOrderLeft: SignedOrder, signedOrderLeft: SignedOrder,

2
contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
View File

@ -102,6 +102,7 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
assetProxyArtifacts.MultiAssetProxy, assetProxyArtifacts.MultiAssetProxy,
provider, provider,
txDefaults, txDefaults,
{},
); );
const assetWrapper = new AssetWrapper([erc20Wrapper, erc721Wrapper, erc1155Wrapper], burnerAddress); const assetWrapper = new AssetWrapper([erc20Wrapper, erc721Wrapper, erc1155Wrapper], burnerAddress);
@ -110,6 +111,7 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
const exchangeWrapper = new ExchangeWrapper(exchangeContract, provider); const exchangeWrapper = new ExchangeWrapper(exchangeContract, provider);

1
contracts/exchange/test/utils/isolated_exchange_wrapper.ts
View File

@ -53,6 +53,7 @@ export class IsolatedExchangeWrapper {
artifacts.IsolatedExchange, artifacts.IsolatedExchange,
provider, provider,
txDefaults, txDefaults,
{},
); );
return new IsolatedExchangeWrapper(web3Wrapper, instance); return new IsolatedExchangeWrapper(web3Wrapper, instance);
} }

1
contracts/exchange/test/wrapper.ts
View File

@ -82,6 +82,7 @@ blockchainTests.resets('Exchange wrappers', env => {
artifacts.Exchange, artifacts.Exchange,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
new BigNumber(chainId), new BigNumber(chainId),
); );
exchangeWrapper = new ExchangeWrapper(exchange, env.provider); exchangeWrapper = new ExchangeWrapper(exchange, env.provider);

1
contracts/exchange/test/wrapper_unit_tests.ts
View File

@ -43,6 +43,7 @@ blockchainTests('Exchange wrapper functions unit tests.', env => {
artifacts.TestWrapperFunctions, artifacts.TestWrapperFunctions,
env.provider, env.provider,
env.txDefaults, env.txDefaults,
{},
); );
}); });

28
contracts/extensions/CHANGELOG.json
View File

@ -1,4 +1,32 @@
[ [
{
"timestamp": 1565296576,
"version": "4.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "4.0.4",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564607468
},
{
"timestamp": 1563957393,
"version": "4.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "4.0.2", "version": "4.0.2",

12
contracts/extensions/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v4.0.5 - _August 8, 2019_
* Dependencies updated
## v4.0.4 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v4.0.3 - _July 24, 2019_
* Dependencies updated
## v4.0.2 - _July 15, 2019_ ## v4.0.2 - _July 15, 2019_
* Dependencies updated * Dependencies updated

42
contracts/extensions/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-extensions", "name": "@0x/contracts-extensions",
"version": "4.0.2", "version": "4.0.5",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,21 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contract-wrappers": "^9.1.7", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/dev-utils": "^2.3.0",
"@0x/dev-utils": "^2.2.4", "@0x/sol-compiler": "^3.1.12",
"@0x/sol-compiler": "^3.1.9",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -69,19 +69,19 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-asset-proxy": "^2.2.2", "@0x/contracts-asset-proxy": "^2.2.5",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-erc721": "^2.1.9", "@0x/contracts-erc721": "^2.1.12",
"@0x/contracts-exchange": "^2.1.8", "@0x/contracts-exchange": "^2.1.11",
"@0x/contracts-exchange-libs": "^3.0.2", "@0x/contracts-exchange-libs": "^3.0.5",
"@0x/contracts-utils": "^3.1.9", "@0x/contracts-utils": "^3.2.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

3
contracts/extensions/test/balance_threshold_filter.ts
View File

@ -132,6 +132,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
artifacts,
zrxAssetData, zrxAssetData,
new BigNumber(chainId), new BigNumber(chainId),
); );
@ -151,6 +152,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
artifacts.BalanceThresholdFilter, artifacts.BalanceThresholdFilter,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchangeInstance.address, exchangeInstance.address,
erc721BalanceThresholdAsset.address, erc721BalanceThresholdAsset.address,
erc721alanceThreshold, erc721alanceThreshold,
@ -160,6 +162,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
artifacts.BalanceThresholdFilter, artifacts.BalanceThresholdFilter,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchangeInstance.address, exchangeInstance.address,
erc20BalanceThresholdAsset.address, erc20BalanceThresholdAsset.address,
erc20BalanceThreshold, erc20BalanceThreshold,

17
contracts/extensions/test/dutch_auction.ts
View File

@ -1,4 +1,3 @@
import { DutchAuctionWrapper } from '@0x/contract-wrappers';
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20'; import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721'; import { DummyERC721TokenContract } from '@0x/contracts-erc721';
@ -84,7 +83,7 @@ describe(ContractName.DutchAuction, () => {
const erc721Balances = await erc721Wrapper.getBalancesAsync(); const erc721Balances = await erc721Wrapper.getBalancesAsync();
erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address]; erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address];
wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults); wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults, artifacts);
erc20Wrapper.addDummyTokenContract(wethContract as any); erc20Wrapper.addDummyTokenContract(wethContract as any);
const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
@ -92,6 +91,7 @@ describe(ContractName.DutchAuction, () => {
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
artifacts,
zrxAssetData, zrxAssetData,
new BigNumber(chainId), new BigNumber(chainId),
); );
@ -110,6 +110,7 @@ describe(ContractName.DutchAuction, () => {
artifacts.DutchAuction, artifacts.DutchAuction,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchangeInstance.address, exchangeInstance.address,
); );
dutchAuctionContract = new DutchAuctionContract(dutchAuctionInstance.address, provider); dutchAuctionContract = new DutchAuctionContract(dutchAuctionInstance.address, provider);
@ -151,7 +152,7 @@ describe(ContractName.DutchAuction, () => {
feeRecipientAddress, feeRecipientAddress,
// taker address or sender address should be set to the ducth auction contract // taker address or sender address should be set to the ducth auction contract
takerAddress: dutchAuctionContract.address, takerAddress: dutchAuctionContract.address,
makerAssetData: DutchAuctionWrapper.encodeDutchAuctionAssetData( makerAssetData: assetDataUtils.encodeDutchAuctionAssetData(
assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress), assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
@ -197,7 +198,7 @@ describe(ContractName.DutchAuction, () => {
describe('matchOrders', () => { describe('matchOrders', () => {
it('should be worth the begin price at the begining of the auction', async () => { it('should be worth the begin price at the begining of the auction', async () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp + 2); auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp + 2);
const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultERC20MakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
@ -211,7 +212,7 @@ describe(ContractName.DutchAuction, () => {
it('should be be worth the end price at the end of the auction', async () => { it('should be be worth the end price at the end of the auction', async () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2); auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds); auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultERC20MakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
@ -277,7 +278,7 @@ describe(ContractName.DutchAuction, () => {
it('should revert when auction expires', async () => { it('should revert when auction expires', async () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2); auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds); auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultERC20MakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
@ -305,7 +306,7 @@ describe(ContractName.DutchAuction, () => {
}); });
it('begin time is less than end time', async () => { it('begin time is less than end time', async () => {
auctionBeginTimeSeconds = new BigNumber(auctionEndTimeSeconds).plus(tenMinutesInSeconds); auctionBeginTimeSeconds = new BigNumber(auctionEndTimeSeconds).plus(tenMinutesInSeconds);
const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultERC20MakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
@ -329,7 +330,7 @@ describe(ContractName.DutchAuction, () => {
it('should match orders when ERC721', async () => { it('should match orders when ERC721', async () => {
const makerAssetId = erc721MakerAssetIds[0]; const makerAssetId = erc721MakerAssetIds[0];
const erc721MakerAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, makerAssetId); const erc721MakerAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, makerAssetId);
const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
erc721MakerAssetData, erc721MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,

8
contracts/extensions/test/order_matcher.ts
View File

@ -104,12 +104,14 @@ describe('OrderMatcher', () => {
proxyArtifacts.ERC721Proxy, proxyArtifacts.ERC721Proxy,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
// Depoy exchange // Depoy exchange
exchange = await ExchangeContract.deployFrom0xArtifactAsync( exchange = await ExchangeContract.deployFrom0xArtifactAsync(
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
artifacts,
assetDataUtils.encodeERC20AssetData(zrxToken.address), assetDataUtils.encodeERC20AssetData(zrxToken.address),
new BigNumber(chainId), new BigNumber(chainId),
); );
@ -128,6 +130,7 @@ describe('OrderMatcher', () => {
artifacts.OrderMatcher, artifacts.OrderMatcher,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchange.address, exchange.address,
); );
// Set default addresses // Set default addresses
@ -206,6 +209,7 @@ describe('OrderMatcher', () => {
artifacts.Exchange, artifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.NULL_BYTES, constants.NULL_BYTES,
new BigNumber(chainId), new BigNumber(chainId),
); );
@ -214,6 +218,7 @@ describe('OrderMatcher', () => {
artifacts.OrderMatcher, artifacts.OrderMatcher,
provider, provider,
txDefaults, txDefaults,
artifacts,
exchangeInstance.address, exchangeInstance.address,
) as any) as sendTransactionResult, ) as any) as sendTransactionResult,
RevertReason.UnregisteredAssetProxy, RevertReason.UnregisteredAssetProxy,
@ -732,6 +737,7 @@ describe('OrderMatcher', () => {
erc721Artifacts.DummyERC721Token, erc721Artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
); );
@ -775,6 +781,7 @@ describe('OrderMatcher', () => {
erc721Artifacts.DummyERC721Token, erc721Artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
); );
@ -792,6 +799,7 @@ describe('OrderMatcher', () => {
erc721Artifacts.DummyERC721Token, erc721Artifacts.DummyERC721Token,
provider, provider,
txDefaults, txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME, constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL, constants.DUMMY_TOKEN_SYMBOL,
); );

28
contracts/multisig/CHANGELOG.json
View File

@ -1,4 +1,32 @@
[ [
{
"timestamp": 1565296576,
"version": "3.1.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.1.10",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
}
],
"timestamp": 1564607468
},
{
"timestamp": 1563957393,
"version": "3.1.9",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "3.1.8", "version": "3.1.8",

12
contracts/multisig/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.1.11 - _August 8, 2019_
* Dependencies updated
## v3.1.10 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
## v3.1.9 - _July 24, 2019_
* Dependencies updated
## v3.1.8 - _July 15, 2019_ ## v3.1.8 - _July 15, 2019_
* Dependencies updated * Dependencies updated

31
contracts/multisig/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-multisig", "name": "@0x/contracts-multisig",
"version": "3.1.8", "version": "3.1.11",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -47,20 +47,21 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -68,15 +69,15 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/contracts-asset-proxy": "^2.2.2", "@0x/contracts-asset-proxy": "^2.2.5",
"@0x/contracts-erc20": "^2.2.8", "@0x/contracts-erc20": "^2.2.11",
"@0x/contracts-utils": "2.0.1", "@0x/contracts-utils": "2.0.1",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },
"publishConfig": { "publishConfig": {

5
contracts/multisig/test/asset_proxy_owner.ts
View File

@ -61,17 +61,20 @@ describe('AssetProxyOwner', () => {
proxyArtifacts.MixinAuthorizable, proxyArtifacts.MixinAuthorizable,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
erc721Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync( erc721Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync(
proxyArtifacts.MixinAuthorizable, proxyArtifacts.MixinAuthorizable,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
const defaultAssetProxyContractAddresses: string[] = []; const defaultAssetProxyContractAddresses: string[] = [];
testAssetProxyOwner = await TestAssetProxyOwnerContract.deployFrom0xArtifactAsync( testAssetProxyOwner = await TestAssetProxyOwnerContract.deployFrom0xArtifactAsync(
artifacts.TestAssetProxyOwner, artifacts.TestAssetProxyOwner,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
defaultAssetProxyContractAddresses, defaultAssetProxyContractAddresses,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
@ -105,6 +108,7 @@ describe('AssetProxyOwner', () => {
artifacts.AssetProxyOwner, artifacts.AssetProxyOwner,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
assetProxyContractAddresses, assetProxyContractAddresses,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
@ -122,6 +126,7 @@ describe('AssetProxyOwner', () => {
artifacts.AssetProxyOwner, artifacts.AssetProxyOwner,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
assetProxyContractAddresses, assetProxyContractAddresses,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,

6
contracts/multisig/test/multi_sig_with_time_lock.ts
View File

@ -66,6 +66,7 @@ describe('MultiSigWalletWithTimeLock', () => {
artifacts.MultiSigWalletWithTimeLock, artifacts.MultiSigWalletWithTimeLock,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
secondsTimeLocked, secondsTimeLocked,
@ -81,6 +82,7 @@ describe('MultiSigWalletWithTimeLock', () => {
artifacts.MultiSigWalletWithTimeLock, artifacts.MultiSigWalletWithTimeLock,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
secondsTimeLocked, secondsTimeLocked,
@ -135,6 +137,7 @@ describe('MultiSigWalletWithTimeLock', () => {
artifacts.MultiSigWalletWithTimeLock, artifacts.MultiSigWalletWithTimeLock,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
secondsTimeLocked, secondsTimeLocked,
@ -198,6 +201,7 @@ describe('MultiSigWalletWithTimeLock', () => {
artifacts.TestRejectEther, artifacts.TestRejectEther,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
const data = constants.NULL_BYTES; const data = constants.NULL_BYTES;
const value = new BigNumber(10); const value = new BigNumber(10);
@ -234,6 +238,7 @@ describe('MultiSigWalletWithTimeLock', () => {
artifacts.MultiSigWalletWithTimeLock, artifacts.MultiSigWalletWithTimeLock,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
secondsTimeLocked, secondsTimeLocked,
@ -308,6 +313,7 @@ describe('MultiSigWalletWithTimeLock', () => {
artifacts.MultiSigWalletWithTimeLock, artifacts.MultiSigWalletWithTimeLock,
provider, provider,
txDefaults, txDefaults,
artifacts,
owners, owners,
REQUIRED_APPROVALS, REQUIRED_APPROVALS,
SECONDS_TIME_LOCKED, SECONDS_TIME_LOCKED,

11
contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts
View File

@ -4,14 +4,17 @@ import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper'; import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import { AssetProxyOwnerContract } from '../../generated-wrappers/asset_proxy_owner'; import { AssetProxyOwnerContract, TestAssetProxyOwnerContract } from '../../src';
import { artifacts } from '../../src/artifacts'; import { artifacts } from '../../src/artifacts';
export class AssetProxyOwnerWrapper { export class AssetProxyOwnerWrapper {
private readonly _assetProxyOwner: AssetProxyOwnerContract; private readonly _assetProxyOwner: AssetProxyOwnerContract | TestAssetProxyOwnerContract;
private readonly _web3Wrapper: Web3Wrapper; private readonly _web3Wrapper: Web3Wrapper;
private readonly _logDecoder: LogDecoder; private readonly _logDecoder: LogDecoder;
constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Web3ProviderEngine) { constructor(
assetproxyOwnerContract: AssetProxyOwnerContract | TestAssetProxyOwnerContract,
provider: Web3ProviderEngine,
) {
this._assetProxyOwner = assetproxyOwnerContract; this._assetProxyOwner = assetproxyOwnerContract;
this._web3Wrapper = new Web3Wrapper(provider); this._web3Wrapper = new Web3Wrapper(provider);
this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...proxyArtifacts }); this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...proxyArtifacts });
@ -57,7 +60,7 @@ export class AssetProxyOwnerWrapper {
): Promise<TransactionReceiptWithDecodedLogs> { ): Promise<TransactionReceiptWithDecodedLogs> {
// tslint:disable-next-line:no-unnecessary-type-assertion // tslint:disable-next-line:no-unnecessary-type-assertion
const txHash = await (this const txHash = await (this
._assetProxyOwner as AssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync( ._assetProxyOwner as TestAssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(
txId, txId,
{ {
from, from,

9
contracts/multisig/test/utils/multi_sig_wrapper.ts
View File

@ -3,14 +3,17 @@ import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper'; import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import { MultiSigWalletContract } from '../../generated-wrappers/multi_sig_wallet'; import { MultiSigWalletContract, MultiSigWalletWithTimeLockContract } from '../../src';
import { artifacts } from '../../src/artifacts'; import { artifacts } from '../../src/artifacts';
export class MultiSigWrapper { export class MultiSigWrapper {
private readonly _multiSig: MultiSigWalletContract; private readonly _multiSig: MultiSigWalletContract | MultiSigWalletWithTimeLockContract;
private readonly _web3Wrapper: Web3Wrapper; private readonly _web3Wrapper: Web3Wrapper;
private readonly _logDecoder: LogDecoder; private readonly _logDecoder: LogDecoder;
constructor(multiSigContract: MultiSigWalletContract, provider: Web3ProviderEngine) { constructor(
multiSigContract: MultiSigWalletContract | MultiSigWalletWithTimeLockContract,
provider: Web3ProviderEngine,
) {
this._multiSig = multiSigContract; this._multiSig = multiSigContract;
this._web3Wrapper = new Web3Wrapper(provider); this._web3Wrapper = new Web3Wrapper(provider);
this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);

27
contracts/test-utils/CHANGELOG.json
View File

@ -64,6 +64,33 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "3.1.13",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1564604963,
"version": "3.1.12",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1563957393,
"version": "3.1.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "3.1.10", "version": "3.1.10",

12
contracts/test-utils/CHANGELOG.md
View File

@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.1.13 - _August 8, 2019_
* Dependencies updated
## v3.1.12 - _July 31, 2019_
* Dependencies updated
## v3.1.11 - _July 24, 2019_
* Dependencies updated
## v3.1.10 - _July 15, 2019_ ## v3.1.10 - _July 15, 2019_
* Dependencies updated * Dependencies updated

28
contracts/test-utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-test-utils", "name": "@0x/contracts-test-utils",
"version": "3.1.10", "version": "3.1.13",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -34,24 +34,26 @@
}, },
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/test-utils/README.md", "homepage": "https://github.com/0xProject/0x-monorepo/contracts/test-utils/README.md",
"devDependencies": { "devDependencies": {
"@types/mocha": "^5.2.7",
"mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/sol-coverage": "^3.0.6", "@0x/sol-coverage": "^3.0.9",
"@0x/sol-profiler": "^3.1.8", "@0x/sol-profiler": "^3.1.11",
"@0x/sol-trace": "^2.0.14", "@0x/sol-trace": "^2.0.17",
"@0x/subproviders": "^4.1.1", "@0x/subproviders": "^5.0.1",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/js-combinatorics": "^0.5.29", "@types/js-combinatorics": "^0.5.29",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
@ -61,7 +63,7 @@
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"ethers": "~4.0.4", "ethers": "~4.0.4",
"js-combinatorics": "^0.5.3", "js-combinatorics": "^0.5.3",

34
contracts/utils/CHANGELOG.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"version": "3.2.0", "version": "3.2.2",
"changes": [ "changes": [
{ {
"note": "Change ReentrancyGuard implementation to cheaper one", "note": "Change ReentrancyGuard implementation to cheaper one",
@ -56,6 +56,38 @@
} }
] ]
}, },
{
"timestamp": 1565296576,
"version": "3.2.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.2.0",
"changes": [
{
"note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
"pr": 1995
},
{
"note": "Added tests for decoding log arguments when artifact dependencies are included/excluded.",
"pr": 1995
}
],
"timestamp": 1564604963
},
{
"timestamp": 1563957393,
"version": "3.1.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1563193019, "timestamp": 1563193019,
"version": "3.1.9", "version": "3.1.9",

13
contracts/utils/CHANGELOG.md
View File

@ -5,6 +5,19 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.2.1 - _August 8, 2019_
* Dependencies updated
## v3.2.0 - _July 31, 2019_
* Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
* Added tests for decoding log arguments when artifact dependencies are included/excluded. (#1995)
## v3.1.10 - _July 24, 2019_
* Dependencies updated
## v3.1.9 - _July 15, 2019_ ## v3.1.9 - _July 15, 2019_
* Dependencies updated * Dependencies updated

55
contracts/utils/contracts/test/TestLogDecoding.sol Normal file
View File

@ -0,0 +1,55 @@
/*
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.5.5;
import "./TestLogDecodingDownstream.sol";
contract TestLogDecoding {
/// @dev arbitrary event; fields to not matter.
event TestEvent(
uint256 foo,
bytes bar,
string car
);
/// @dev Emits a local event
function emitEvent()
public
{
emit TestEvent(256, hex'1234', "4321");
}
/// @dev Emits an event in a downstream contract
function emitEventDownstream()
public
{
TestLogDecodingDownstream testLogDecodingDownstream = new TestLogDecodingDownstream();
ITestLogDecodingDownstream(testLogDecodingDownstream).emitEvent();
}
/// @dev Emits a local event and a downstream event
function emitEventsLocalAndDownstream()
public
{
emitEvent();
emitEventDownstream();
}
}

48
contracts/utils/contracts/test/TestLogDecodingDownstream.sol Normal file
View File

@ -0,0 +1,48 @@
/*
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.5.5;
contract ITestLogDecodingDownstream {
/// @dev Emits a local event
function emitEvent() external;
}
contract TestLogDecodingDownstream is
ITestLogDecodingDownstream
{
/// @dev event with fields different than those in `TestLogDecoding.TestEvent`
/// Note: do not include this in the interface
/// For testing, we want to emit an event that is
/// not known by the calling contract.
event TestEvent2(
uint256 lorem,
string ipsum
);
/// @dev Emits a local event
function emitEvent()
external
{
emit TestEvent2(256, "4321");
}
}

31
contracts/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-utils", "name": "@0x/contracts-utils",
"version": "3.1.9", "version": "3.2.1",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@ -34,7 +34,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "config": {
"abis": "./generated-artifacts/@(Authorizable|IAuthorizable|IOwnable|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibBytes|LibBytesRichErrors|LibEIP1271|LibEIP712|LibOwnableRichErrors|LibReentrancyGuardRichErrors|LibRichErrors|LibSafeMath|LibSafeMathRichErrors|Ownable|ReentrancyGuard|SafeMath|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibRichErrors|TestOwnable|TestReentrancyGuard|TestSafeMath).json", "abis": "./generated-artifacts/@(Authorizable|IAuthorizable|IOwnable|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibBytes|LibBytesRichErrors|LibEIP1271|LibEIP712|LibOwnableRichErrors|LibReentrancyGuardRichErrors|LibRichErrors|LibSafeMath|LibSafeMathRichErrors|Ownable|ReentrancyGuard|SafeMath|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibRichErrors|TestLogDecoding|TestLogDecodingDownstream|TestOwnable|TestReentrancyGuard|TestSafeMath).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {
@ -47,21 +47,22 @@
}, },
"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": "^2.1.1", "@0x/abi-gen": "^4.1.0",
"@0x/contracts-gen": "^1.0.10", "@0x/contracts-gen": "^1.0.13",
"@0x/contracts-test-utils": "^3.1.10", "@0x/contracts-test-utils": "^3.1.13",
"@0x/dev-utils": "^2.2.4", "@0x/dev-utils": "^2.3.0",
"@0x/sol-compiler": "^3.1.9", "@0x/sol-compiler": "^3.1.12",
"@0x/tslint-config": "^3.0.1", "@0x/tslint-config": "^3.0.1",
"@types/bn.js": "^4.11.0", "@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104", "@types/lodash": "4.14.104",
"@types/mocha": "^5.2.7",
"@types/node": "*", "@types/node": "*",
"chai": "^4.0.1", "chai": "^4.0.1",
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^4.1.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"solhint": "^1.4.1", "solhint": "^1.4.1",
@ -69,14 +70,14 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^5.1.1", "@0x/base-contract": "^5.3.1",
"@0x/order-utils": "^8.2.2", "@0x/order-utils": "^8.2.5",
"@0x/types": "^2.4.0", "@0x/types": "^2.4.1",
"@0x/typescript-typings": "^4.2.3", "@0x/typescript-typings": "^4.2.4",
"@0x/utils": "^4.4.0", "@0x/utils": "^4.5.0",
"@0x/web3-wrapper": "^6.0.7", "@0x/web3-wrapper": "^6.0.10",
"bn.js": "^4.11.8", "bn.js": "^4.11.8",
"ethereum-types": "^2.1.3", "ethereum-types": "^2.1.4",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11" "lodash": "^4.17.11"
}, },

4
contracts/utils/src/artifacts.ts
View File

@ -29,6 +29,8 @@ import * as TestLibAddressArray from '../generated-artifacts/TestLibAddressArray
import * as TestLibBytes from '../generated-artifacts/TestLibBytes.json'; import * as TestLibBytes from '../generated-artifacts/TestLibBytes.json';
import * as TestLibEIP712 from '../generated-artifacts/TestLibEIP712.json'; import * as TestLibEIP712 from '../generated-artifacts/TestLibEIP712.json';
import * as TestLibRichErrors from '../generated-artifacts/TestLibRichErrors.json'; import * as TestLibRichErrors from '../generated-artifacts/TestLibRichErrors.json';
import * as TestLogDecoding from '../generated-artifacts/TestLogDecoding.json';
import * as TestLogDecodingDownstream from '../generated-artifacts/TestLogDecodingDownstream.json';
import * as TestOwnable from '../generated-artifacts/TestOwnable.json'; import * as TestOwnable from '../generated-artifacts/TestOwnable.json';
import * as TestReentrancyGuard from '../generated-artifacts/TestReentrancyGuard.json'; import * as TestReentrancyGuard from '../generated-artifacts/TestReentrancyGuard.json';
import * as TestSafeMath from '../generated-artifacts/TestSafeMath.json'; import * as TestSafeMath from '../generated-artifacts/TestSafeMath.json';
@ -57,6 +59,8 @@ export const artifacts = {
TestLibBytes: TestLibBytes as ContractArtifact, TestLibBytes: TestLibBytes as ContractArtifact,
TestLibEIP712: TestLibEIP712 as ContractArtifact, TestLibEIP712: TestLibEIP712 as ContractArtifact,
TestLibRichErrors: TestLibRichErrors as ContractArtifact, TestLibRichErrors: TestLibRichErrors as ContractArtifact,
TestLogDecoding: TestLogDecoding as ContractArtifact,
TestLogDecodingDownstream: TestLogDecodingDownstream as ContractArtifact,
TestOwnable: TestOwnable as ContractArtifact, TestOwnable: TestOwnable as ContractArtifact,
TestReentrancyGuard: TestReentrancyGuard as ContractArtifact, TestReentrancyGuard: TestReentrancyGuard as ContractArtifact,
TestSafeMath: TestSafeMath as ContractArtifact, TestSafeMath: TestSafeMath as ContractArtifact,

2
contracts/utils/src/wrappers.ts
View File

@ -27,6 +27,8 @@ export * from '../generated-wrappers/test_lib_address_array';
export * from '../generated-wrappers/test_lib_bytes'; export * from '../generated-wrappers/test_lib_bytes';
export * from '../generated-wrappers/test_lib_e_i_p712'; export * from '../generated-wrappers/test_lib_e_i_p712';
export * from '../generated-wrappers/test_lib_rich_errors'; export * from '../generated-wrappers/test_lib_rich_errors';
export * from '../generated-wrappers/test_log_decoding';
export * from '../generated-wrappers/test_log_decoding_downstream';
export * from '../generated-wrappers/test_ownable'; export * from '../generated-wrappers/test_ownable';
export * from '../generated-wrappers/test_reentrancy_guard'; export * from '../generated-wrappers/test_reentrancy_guard';
export * from '../generated-wrappers/test_safe_math'; export * from '../generated-wrappers/test_safe_math';

1
contracts/utils/test/authorizable.ts
View File

@ -31,6 +31,7 @@ describe('Authorizable', () => {
artifacts.Authorizable, artifacts.Authorizable,
provider, provider,
txDefaults, txDefaults,
{},
); );
}); });

7
contracts/utils/test/lib_address.ts
View File

@ -16,7 +16,12 @@ describe('LibAddress', () => {
await blockchainLifecycle.startAsync(); await blockchainLifecycle.startAsync();
nonContract = (await web3Wrapper.getAvailableAddressesAsync())[0]; nonContract = (await web3Wrapper.getAvailableAddressesAsync())[0];
// Deploy LibAddress // Deploy LibAddress
lib = await TestLibAddressContract.deployFrom0xArtifactAsync(artifacts.TestLibAddress, provider, txDefaults); lib = await TestLibAddressContract.deployFrom0xArtifactAsync(
artifacts.TestLibAddress,
provider,
txDefaults,
{},
);
}); });
after(async () => { after(async () => {

1
contracts/utils/test/lib_address_array.ts
View File

@ -20,6 +20,7 @@ describe('LibAddressArray', () => {
artifacts.TestLibAddressArray, artifacts.TestLibAddressArray,
provider, provider,
txDefaults, txDefaults,
artifacts,
); );
}); });
after(async () => { after(async () => {

7
contracts/utils/test/lib_bytes.ts
View File

@ -59,7 +59,12 @@ describe('LibBytes', () => {
testAddress = accounts[1]; testAddress = accounts[1];
testAddressB = accounts[2]; testAddressB = accounts[2];
// Deploy LibBytes // Deploy LibBytes
libBytes = await TestLibBytesContract.deployFrom0xArtifactAsync(artifacts.TestLibBytes, provider, txDefaults); libBytes = await TestLibBytesContract.deployFrom0xArtifactAsync(
artifacts.TestLibBytes,
provider,
txDefaults,
artifacts,
);
// Verify lengths of test data // Verify lengths of test data
const byteArrayShorterThan32BytesLength = ethUtil.toBuffer(byteArrayShorterThan32Bytes).byteLength; const byteArrayShorterThan32BytesLength = ethUtil.toBuffer(byteArrayShorterThan32Bytes).byteLength;
expect(byteArrayShorterThan32BytesLength).to.be.lessThan(32); expect(byteArrayShorterThan32BytesLength).to.be.lessThan(32);

2
contracts/utils/test/lib_eip712.ts
View File

@ -17,7 +17,7 @@ describe('LibEIP712', () => {
before(async () => { before(async () => {
await blockchainLifecycle.startAsync(); await blockchainLifecycle.startAsync();
// Deploy LibEIP712 // Deploy LibEIP712
lib = await TestLibEIP712Contract.deployFrom0xArtifactAsync(artifacts.TestLibEIP712, provider, txDefaults); lib = await TestLibEIP712Contract.deployFrom0xArtifactAsync(artifacts.TestLibEIP712, provider, txDefaults, {});
}); });
after(async () => { after(async () => {

1
contracts/utils/test/lib_rich_errors.ts
View File

@ -20,6 +20,7 @@ describe('LibRichErrors', () => {
artifacts.TestLibRichErrors, artifacts.TestLibRichErrors,
provider, provider,
txDefaults, txDefaults,
{},
); );
}); });

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