Publish

- @0x/contracts-asset-proxy@2.2.5
 - @0x/contracts-coordinator@2.0.10
 - @0x/contracts-dev-utils@0.0.7
 - @0x/contracts-erc1155@1.1.12
 - @0x/contracts-erc20@2.2.11
 - @0x/contracts-erc721@2.1.12
 - @0x/contracts-exchange-forwarder@3.0.9
 - @0x/contracts-exchange-libs@3.0.5
 - @0x/contracts-exchange@2.1.11
 - @0x/contracts-extensions@4.0.5
 - @0x/contracts-multisig@3.1.11
 - @0x/contracts-test-utils@3.1.13
 - @0x/contracts-utils@3.2.1
 - 0x.js@6.0.15
 - @0x/abi-gen-templates@2.4.1
 - @0x/abi-gen-wrappers@5.2.0
 - @0x/abi-gen@4.1.0
 - @0x/assert@2.1.3
 - @0x/asset-buyer@6.1.11
 - @0x/asset-swapper@1.0.1
 - @0x/base-contract@5.3.1
 - @0x/connect@5.0.16
 - @0x/contract-addresses@3.0.3
 - @0x/contract-artifacts@2.0.4
 - @0x/contract-wrappers@11.0.0
 - @0x/contracts-gen@1.0.13
 - @0x/dev-utils@2.3.0
 - @0x/fill-scenarios@3.0.16
 - @0x/instant@1.0.28
 - @0x/json-schemas@3.1.13
 - @0x/migrations@4.2.0
 - @0x/monorepo-scripts@1.0.34
 - @0x/order-utils@8.2.5
 - @0x/order-watcher@4.0.17
 - @0x/python-contract-wrappers@1.0.3
 - @0x/sol-compiler@3.1.12
 - @0x/sol-coverage@3.0.9
 - @0x/sol-doc@2.0.16
 - @0x/sol-profiler@3.1.11
 - @0x/sol-trace@2.0.17
 - @0x/sol-tracing-utils@6.0.16
 - @0x/sra-spec@2.0.14
 - @0x/subproviders@5.0.1
 - @0x/testnet-faucets@1.0.84
 - @0x/utils@4.5.0
 - @0x/web3-wrapper@6.0.10
 - @0x/website@0.0.87

.circleci/config.yml

@@ -37,6 +37,8 @@ jobs:
                   path: ~/repo/packages/python-contract-wrappers/generated
             - store_artifacts:
                   path: ~/repo/packages/abi-gen/test-cli/output
+            - store_artifacts:
+                  path: ~/repo/packages/abi-gen-wrappers/generated_docs
     build-website:
         resource_class: medium+
         docker:
@@ -180,12 +182,13 @@ jobs:
         docker:
             - image: circleci/python
             - image: 0xorg/ganache-cli:2.2.2
-            - image: 0xorg/launch-kit-ci
+            - image: 0xorg/launch-kit-backend:74bcc39
               environment:
                   RPC_URL: http://localhost:8545
                   NETWORK_ID: 50
                   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:
             - checkout
             - run: sudo chown -R circleci:circleci /usr/local/bin
@@ -208,7 +211,7 @@ jobs:
             - run:
                   command: |
                       cd python-packages
-                      ./parallel coverage run setup.py test
+                      ./parallel_without_sra_client coverage run setup.py test
                       ./build_docs
             - save_cache:
                   key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}

.gitattributes

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

.github/autolabeler.yml

@@ -22,9 +22,7 @@ contracts: ['contracts']
 @0x/tslint-config: ['packages/tslint-config']
 @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/react-shared: ['packages/react-shared']
 @0x/assert: ['packages/assert']
 @0x/base-contract: ['packages/base-contract']
 @0x/typescript-typings: ['packages/typescript-typings']

.gitignore

@@ -77,7 +77,6 @@ TODO.md
 
 packages/website/public/bundle*
 packages/dev-tools-pages/public/bundle*
-packages/react-docs/example/public/bundle*
 
 # server cli
 packages/testnet-faucets/server/
@@ -115,6 +114,24 @@ contracts/exchange-forwarder/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/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
 packages/abi-gen/test-cli/output

README.md

@@ -87,19 +87,17 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 
 #### Utilities
 
-| 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/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/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/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/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/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/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/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                                             |
+| 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/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/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/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/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/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
 

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "2.2.3",
+    "version": "2.2.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,16 +69,16 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-erc1155": "^1.1.10",
-        "@0x/contracts-erc20": "^2.2.9",
-        "@0x/contracts-erc721": "^2.1.10",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-erc1155": "^1.1.12",
+        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/contracts-erc721": "^2.1.12",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"

contracts/asset-proxy/test/authorizable.ts

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

contracts/asset-proxy/test/erc1155_proxy.ts

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

contracts/asset-proxy/test/proxies.ts

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

contracts/asset-proxy/test/static_call_proxy.ts

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

contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts

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

contracts/asset-proxy/test/utils/erc20_wrapper.ts

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

contracts/asset-proxy/test/utils/erc721_wrapper.ts

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

contracts/coordinator/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "2.0.8",
+    "version": "2.0.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,17 +69,17 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-erc20": "^2.2.9",
-        "@0x/contracts-exchange": "^2.1.9",
-        "@0x/contracts-exchange-libs": "^3.0.3",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-asset-proxy": "^2.2.5",
+        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/contracts-exchange": "^2.1.11",
+        "@0x/contracts-exchange-libs": "^3.0.5",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"

contracts/coordinator/test/coordinator.ts

@@ -74,6 +74,7 @@ describe('Coordinator tests', () => {
             exchangeArtifacts.Exchange,
             provider,
             txDefaults,
+            artifacts,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
         );
 
@@ -91,6 +92,7 @@ describe('Coordinator tests', () => {
             artifacts.Coordinator,
             provider,
             txDefaults,
+            artifacts,
             exchange.address,
         );
 

contracts/coordinator/test/libs.ts

@@ -25,6 +25,7 @@ describe('Libs tests', () => {
             artifacts.Coordinator,
             provider,
             txDefaults,
+            artifacts,
             exchangeAddress,
         );
     });

contracts/coordinator/test/mixins.ts

@@ -44,6 +44,7 @@ describe('Mixins tests', () => {
             artifacts.Coordinator,
             provider,
             txDefaults,
+            artifacts,
             exchangeAddress,
         );
         const accounts = await web3Wrapper.getAvailableAddressesAsync();

contracts/coordinator/test/utils/coordinator_registry_wrapper.ts

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

contracts/dev-utils/CHANGELOG.json

@@ -1,4 +1,32 @@
 [
+    {
+        "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",

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-dev-utils",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,21 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/dev-utils/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contract-wrappers": "^9.1.8",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -69,19 +69,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-erc1155": "^1.1.10",
-        "@0x/contracts-erc20": "^2.2.9",
-        "@0x/contracts-erc721": "^2.1.10",
-        "@0x/contracts-exchange": "^2.1.9",
-        "@0x/contracts-exchange-libs": "^3.0.3",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-asset-proxy": "^2.2.5",
+        "@0x/contracts-erc1155": "^1.1.12",
+        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/contracts-erc721": "^2.1.12",
+        "@0x/contracts-exchange": "^2.1.11",
+        "@0x/contracts-exchange-libs": "^3.0.5",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "ethereumjs-util": "^5.1.1"
     },

contracts/dev-utils/test/lib_asset_data.ts

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

contracts/dev-utils/test/lib_transaction_decoder.ts

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

contracts/dev-utils/test/order_validation_utils.ts

@@ -83,6 +83,7 @@ describe('OrderValidationUtils', () => {
             exchangeArtifacts.Exchange,
             provider,
             txDefaults,
+            artifacts,
             zrxAssetData,
         );
 
@@ -90,6 +91,7 @@ describe('OrderValidationUtils', () => {
             proxyArtifacts.MultiAssetProxy,
             provider,
             txDefaults,
+            artifacts,
         );
         const exchangeWrapper = new ExchangeWrapper(exchange, provider);
         await exchangeWrapper.registerAssetProxyAsync(erc20Proxy.address, owner);
@@ -102,6 +104,7 @@ describe('OrderValidationUtils', () => {
             artifacts.DevUtils,
             provider,
             txDefaults,
+            artifacts,
             exchange.address,
             zrxAssetData,
         );

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/erc1155/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/erc1155/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc1155",
-    "version": "1.1.10",
+    "version": "1.1.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,19 +47,20 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -67,13 +68,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/contracts-utils": "^3.1.10",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/contracts-utils": "^3.2.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/erc1155/test/erc1155_token.ts

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

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "2.2.9",
+    "version": "2.2.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,12 +69,12 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-utils": "^3.1.10",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-utils": "^3.2.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/erc20/test/unlimited_allowance_token.ts

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

contracts/erc20/test/weth9.ts

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

contracts/erc20/test/zrx_token.ts

@@ -26,7 +26,12 @@ describe('ZRXToken', () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         owner = accounts[0];
         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;
     });
     beforeEach(async () => {

contracts/erc721/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/erc721/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/erc721/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc721",
-    "version": "2.1.10",
+    "version": "2.1.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,12 +69,12 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-utils": "^3.1.10",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-utils": "^3.2.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/erc721/test/erc721_token.ts

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

contracts/exchange-forwarder/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/exchange-forwarder/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/exchange-forwarder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-forwarder",
-    "version": "3.0.7",
+    "version": "3.0.9",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,21 +46,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contract-wrappers": "^9.1.8",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,18 +68,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-erc20": "^2.2.9",
-        "@0x/contracts-erc721": "^2.1.10",
-        "@0x/contracts-exchange": "^2.1.9",
-        "@0x/contracts-exchange-libs": "^3.0.3",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-asset-proxy": "^2.2.5",
+        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/contracts-erc721": "^2.1.12",
+        "@0x/contracts-exchange": "^2.1.11",
+        "@0x/contracts-exchange-libs": "^3.0.5",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/exchange-forwarder/test/forwarder.ts

@@ -32,6 +32,7 @@ const DECIMALS_DEFAULT = 18;
 const MAX_WETH_FILL_PERCENTAGE = 95;
 
 describe(ContractName.Forwarder, () => {
+    const dependencyArtifacts = { ...artifacts, ...erc20Artifacts, ...exchangeArtifacts };
     let makerAddress: string;
     let owner: string;
     let takerAddress: string;
@@ -88,7 +89,12 @@ describe(ContractName.Forwarder, () => {
         const erc721Balances = await erc721Wrapper.getBalancesAsync();
         erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address];
 
-        wethContract = await WETH9Contract.deployFrom0xArtifactAsync(erc20Artifacts.WETH9, provider, txDefaults);
+        wethContract = await WETH9Contract.deployFrom0xArtifactAsync(
+            erc20Artifacts.WETH9,
+            provider,
+            txDefaults,
+            dependencyArtifacts,
+        );
         weth = new DummyERC20TokenContract(wethContract.address, provider);
         erc20Wrapper.addDummyTokenContract(weth);
 
@@ -98,6 +104,7 @@ describe(ContractName.Forwarder, () => {
             exchangeArtifacts.Exchange,
             provider,
             txDefaults,
+            dependencyArtifacts,
             zrxAssetData,
         );
         exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider);
@@ -131,6 +138,7 @@ describe(ContractName.Forwarder, () => {
             artifacts.Forwarder,
             provider,
             txDefaults,
+            dependencyArtifacts,
             exchangeInstance.address,
             zrxAssetData,
             wethAssetData,
@@ -169,6 +177,7 @@ describe(ContractName.Forwarder, () => {
                 exchangeArtifacts.Exchange,
                 provider,
                 txDefaults,
+                dependencyArtifacts,
                 zrxAssetData,
             );
             return expectContractCreationFailedAsync(
@@ -176,6 +185,7 @@ describe(ContractName.Forwarder, () => {
                     artifacts.Forwarder,
                     provider,
                     txDefaults,
+                    dependencyArtifacts,
                     exchangeInstance.address,
                     zrxAssetData,
                     wethAssetData,

contracts/exchange-libs/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/exchange-libs/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/exchange-libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-libs",
-    "version": "3.0.3",
+    "version": "3.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,13 +69,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/exchange-libs/test/exchange_libs.ts

@@ -35,7 +35,7 @@ describe('Exchange libs', () => {
     before(async () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         const makerAddress = accounts[0];
-        libs = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults);
+        libs = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults, artifacts);
 
         const defaultOrderParams = {
             ...constants.STATIC_ORDER_PARAMS,

contracts/exchange/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/exchange/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/exchange/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "2.1.9",
+    "version": "2.1.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,18 +69,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-erc1155": "^1.1.10",
-        "@0x/contracts-erc20": "^2.2.9",
-        "@0x/contracts-erc721": "^2.1.10",
-        "@0x/contracts-exchange-libs": "^3.0.3",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-asset-proxy": "^2.2.5",
+        "@0x/contracts-erc1155": "^1.1.12",
+        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/contracts-erc721": "^2.1.12",
+        "@0x/contracts-exchange-libs": "^3.0.5",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"

contracts/exchange/test/core.ts

@@ -1,5 +1,6 @@
 import {
     artifacts as proxyArtifacts,
+    ERC1155ProxyContract,
     ERC1155ProxyWrapper,
     ERC20ProxyContract,
     ERC20Wrapper,
@@ -50,6 +51,8 @@ import {
     TestStaticCallReceiverContract,
 } from '../src';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -69,7 +72,7 @@ describe('Exchange core', () => {
     let exchange: ExchangeContract;
     let erc20Proxy: ERC20ProxyContract;
     let erc721Proxy: ERC721ProxyContract;
-    let erc1155Proxy: ERC721ProxyContract;
+    let erc1155Proxy: ERC1155ProxyContract;
     let multiAssetProxy: MultiAssetProxyContract;
     let staticCallProxy: StaticCallProxyContract;
     let staticCallTarget: TestStaticCallTargetContract;
@@ -116,11 +119,13 @@ describe('Exchange core', () => {
             proxyArtifacts.MultiAssetProxy,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         staticCallProxy = await StaticCallProxyContract.deployFrom0xArtifactAsync(
             proxyArtifacts.StaticCallProxy,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         const numDummyErc20ToDeploy = 3;
         [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
@@ -135,17 +140,20 @@ describe('Exchange core', () => {
             artifacts.Exchange,
             provider,
             txDefaults,
+            dependencyArtifacts,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
         );
         maliciousWallet = maliciousValidator = await TestStaticCallReceiverContract.deployFrom0xArtifactAsync(
             artifacts.TestStaticCallReceiver,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
             artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
+            dependencyArtifacts,
             exchange.address,
         );
 
@@ -348,6 +356,7 @@ describe('Exchange core', () => {
                 erc20Artifacts.DummyNoReturnERC20Token,
                 provider,
                 txDefaults,
+                dependencyArtifacts,
                 constants.DUMMY_TOKEN_NAME,
                 constants.DUMMY_TOKEN_SYMBOL,
                 constants.DUMMY_TOKEN_DECIMALS,
@@ -1473,6 +1482,7 @@ describe('Exchange core', () => {
                 proxyArtifacts.TestStaticCallTarget,
                 provider,
                 txDefaults,
+                dependencyArtifacts,
             );
         });
         it('should revert if the staticcall is unsuccessful', async () => {

contracts/exchange/test/dispatcher.ts

@@ -29,6 +29,8 @@ import {
     TestAssetProxyDispatcherContract,
 } from '../src';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -72,6 +74,7 @@ describe('AssetProxyDispatcher', () => {
             artifacts.TestAssetProxyDispatcher,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         await web3Wrapper.awaitTransactionSuccessAsync(
             await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
@@ -134,6 +137,7 @@ describe('AssetProxyDispatcher', () => {
                 proxyArtifacts.ERC20Proxy,
                 provider,
                 txDefaults,
+                dependencyArtifacts,
             );
             // Register new ERC20 Transfer Proxy contract
             return expectTransactionFailedAsync(

contracts/exchange/test/internal.ts

@@ -18,6 +18,8 @@ import * as _ from 'lodash';
 
 import { artifacts, TestExchangeInternalsContract } from '../src';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 chaiSetup.configure();
 const expect = chai.expect;
 
@@ -65,6 +67,7 @@ describe('Exchange core internal functions', () => {
             artifacts.TestExchangeInternals,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         overflowErrorForSendTransaction = new Error(
             await getRevertReasonOrErrorMessageForSendTransactionAsync(RevertReason.Uint256Overflow),

contracts/exchange/test/match_orders.ts

@@ -29,6 +29,8 @@ import {
     TestExchangeInternalsContract,
 } from '../src';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
 const expect = chai.expect;
@@ -118,6 +120,7 @@ describe('matchOrders', () => {
             artifacts.Exchange,
             provider,
             txDefaults,
+            dependencyArtifacts,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
         );
         exchangeWrapper = new ExchangeWrapper(exchange, provider);
@@ -141,6 +144,7 @@ describe('matchOrders', () => {
             artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
+            dependencyArtifacts,
             exchange.address,
         );
 
@@ -175,6 +179,7 @@ describe('matchOrders', () => {
             artifacts.TestExchangeInternals,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
     });
     beforeEach(async () => {

contracts/exchange/test/signature_validator.ts

@@ -25,6 +25,8 @@ import {
     WalletContract,
 } from '../src';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 chaiSetup.configure();
 const expect = chai.expect;
 
@@ -59,23 +61,27 @@ describe('MixinSignatureValidator', () => {
             artifacts.TestSignatureValidator,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         testWallet = await WalletContract.deployFrom0xArtifactAsync(
             artifacts.Wallet,
             provider,
             txDefaults,
+            dependencyArtifacts,
             signerAddress,
         );
         testValidator = await ValidatorContract.deployFrom0xArtifactAsync(
             artifacts.Validator,
             provider,
             txDefaults,
+            dependencyArtifacts,
             signerAddress,
         );
         maliciousWallet = maliciousValidator = await TestStaticCallReceiverContract.deployFrom0xArtifactAsync(
             artifacts.TestStaticCallReceiver,
             provider,
             txDefaults,
+            dependencyArtifacts,
         );
         signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, artifacts);
         await web3Wrapper.awaitTransactionSuccessAsync(

contracts/exchange/test/transactions.ts

@@ -21,6 +21,8 @@ import * as _ from 'lodash';
 
 import { artifacts, ExchangeContract, ExchangeWrapper, ExchangeWrapperContract, WhitelistContract } from '../src/';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -87,6 +89,7 @@ describe('Exchange transactions', () => {
             artifacts.Exchange,
             provider,
             txDefaults,
+            dependencyArtifacts,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
         );
         exchangeWrapper = new ExchangeWrapper(exchange, provider);
@@ -219,6 +222,7 @@ describe('Exchange transactions', () => {
                     artifacts.ExchangeWrapper,
                     provider,
                     txDefaults,
+                    dependencyArtifacts,
                     exchange.address,
                 );
             });
@@ -333,6 +337,7 @@ describe('Exchange transactions', () => {
                 artifacts.Whitelist,
                 provider,
                 txDefaults,
+                dependencyArtifacts,
                 exchange.address,
             );
             const isApproved = true;

contracts/exchange/test/utils/dependency_artifacts.ts

@@ -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,
+};

contracts/exchange/test/utils/exchange_wrapper.ts

@@ -1,37 +1,21 @@
-import { artifacts as erc1155Artifacts } from '@0x/contracts-erc1155';
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
-import {
-    FillResults,
-    formatters,
-    LogDecoder,
-    OrderInfo,
-    orderUtils,
-    Web3ProviderEngine,
-} from '@0x/contracts-test-utils';
+import { FillResults, formatters, OrderInfo, orderUtils, Web3ProviderEngine } from '@0x/contracts-test-utils';
 import { SignedOrder, SignedZeroExTransaction } from '@0x/types';
 import { AbiEncoder, BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { MethodAbi, TransactionReceiptWithDecodedLogs, ZeroExProvider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts, ExchangeContract } from '../../src';
+import { ExchangeContract } from '../../src';
 
 import { AbiDecodedFillOrderData } from './types';
 
 export class ExchangeWrapper {
     private readonly _exchange: ExchangeContract;
+    // tslint:disable no-unused-variable
     private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _logDecoder: LogDecoder;
     constructor(exchangeContract: ExchangeContract, provider: Web3ProviderEngine | ZeroExProvider) {
         this._exchange = exchangeContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, {
-            ...artifacts,
-            ...erc20Artifacts,
-            ...erc721Artifacts,
-            ...erc1155Artifacts,
-        });
     }
     public async fillOrderAsync(
         signedOrder: SignedOrder,
@@ -39,20 +23,18 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmount?: BigNumber } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
-        const txHash = await this._exchange.fillOrder.sendTransactionAsync(
+        const txReceipt = await this._exchange.fillOrder.awaitTransactionSuccessAsync(
             params.order,
             params.takerAssetFillAmount,
             params.signature,
             { from },
         );
-        const txReceipt = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return txReceipt;
     }
     public async cancelOrderAsync(signedOrder: SignedOrder, from: string): Promise<TransactionReceiptWithDecodedLogs> {
         const params = orderUtils.createCancel(signedOrder);
-        const txHash = await this._exchange.cancelOrder.sendTransactionAsync(params.order, { from });
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        const txReceipt = await this._exchange.cancelOrder.awaitTransactionSuccessAsync(params.order, { from });
+        return txReceipt;
     }
     public async fillOrKillOrderAsync(
         signedOrder: SignedOrder,
@@ -60,14 +42,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmount?: BigNumber } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
-        const txHash = await this._exchange.fillOrKillOrder.sendTransactionAsync(
+        const txReceipt = await this._exchange.fillOrKillOrder.awaitTransactionSuccessAsync(
             params.order,
             params.takerAssetFillAmount,
             params.signature,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async fillOrderNoThrowAsync(
         signedOrder: SignedOrder,
@@ -75,14 +56,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmount?: BigNumber; gas?: number } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
-        const txHash = await this._exchange.fillOrderNoThrow.sendTransactionAsync(
+        const txReceipt = await this._exchange.fillOrderNoThrow.awaitTransactionSuccessAsync(
             params.order,
             params.takerAssetFillAmount,
             params.signature,
             { from, gas: opts.gas },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async batchFillOrdersAsync(
         orders: SignedOrder[],
@@ -90,14 +70,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmounts?: BigNumber[] } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createBatchFill(orders, opts.takerAssetFillAmounts);
-        const txHash = await this._exchange.batchFillOrders.sendTransactionAsync(
+        const txReceipt = await this._exchange.batchFillOrders.awaitTransactionSuccessAsync(
             params.orders,
             params.takerAssetFillAmounts,
             params.signatures,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async batchFillOrKillOrdersAsync(
         orders: SignedOrder[],
@@ -105,14 +84,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmounts?: BigNumber[] } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createBatchFill(orders, opts.takerAssetFillAmounts);
-        const txHash = await this._exchange.batchFillOrKillOrders.sendTransactionAsync(
+        const txReceipt = await this._exchange.batchFillOrKillOrders.awaitTransactionSuccessAsync(
             params.orders,
             params.takerAssetFillAmounts,
             params.signatures,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async batchFillOrdersNoThrowAsync(
         orders: SignedOrder[],
@@ -120,14 +98,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmounts?: BigNumber[]; gas?: number } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createBatchFill(orders, opts.takerAssetFillAmounts);
-        const txHash = await this._exchange.batchFillOrdersNoThrow.sendTransactionAsync(
+        const txReceipt = await this._exchange.batchFillOrdersNoThrow.awaitTransactionSuccessAsync(
             params.orders,
             params.takerAssetFillAmounts,
             params.signatures,
             { from, gas: opts.gas },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async marketSellOrdersAsync(
         orders: SignedOrder[],
@@ -135,14 +112,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmount: BigNumber },
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createMarketSellOrders(orders, opts.takerAssetFillAmount);
-        const txHash = await this._exchange.marketSellOrders.sendTransactionAsync(
+        const txReceipt = await this._exchange.marketSellOrders.awaitTransactionSuccessAsync(
             params.orders,
             params.takerAssetFillAmount,
             params.signatures,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async marketSellOrdersNoThrowAsync(
         orders: SignedOrder[],
@@ -150,14 +126,13 @@ export class ExchangeWrapper {
         opts: { takerAssetFillAmount: BigNumber; gas?: number },
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createMarketSellOrders(orders, opts.takerAssetFillAmount);
-        const txHash = await this._exchange.marketSellOrdersNoThrow.sendTransactionAsync(
+        const txReceipt = await this._exchange.marketSellOrdersNoThrow.awaitTransactionSuccessAsync(
             params.orders,
             params.takerAssetFillAmount,
             params.signatures,
             { from, gas: opts.gas },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async marketBuyOrdersAsync(
         orders: SignedOrder[],
@@ -165,14 +140,13 @@ export class ExchangeWrapper {
         opts: { makerAssetFillAmount: BigNumber },
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createMarketBuyOrders(orders, opts.makerAssetFillAmount);
-        const txHash = await this._exchange.marketBuyOrders.sendTransactionAsync(
+        const txReceipt = await this._exchange.marketBuyOrders.awaitTransactionSuccessAsync(
             params.orders,
             params.makerAssetFillAmount,
             params.signatures,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async marketBuyOrdersNoThrowAsync(
         orders: SignedOrder[],
@@ -180,50 +154,47 @@ export class ExchangeWrapper {
         opts: { makerAssetFillAmount: BigNumber; gas?: number },
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createMarketBuyOrders(orders, opts.makerAssetFillAmount);
-        const txHash = await this._exchange.marketBuyOrdersNoThrow.sendTransactionAsync(
+        const txReceipt = await this._exchange.marketBuyOrdersNoThrow.awaitTransactionSuccessAsync(
             params.orders,
             params.makerAssetFillAmount,
             params.signatures,
             { from, gas: opts.gas },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async batchCancelOrdersAsync(
         orders: SignedOrder[],
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = formatters.createBatchCancel(orders);
-        const txHash = await this._exchange.batchCancelOrders.sendTransactionAsync(params.orders, { from });
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        const txReceipt = await this._exchange.batchCancelOrders.awaitTransactionSuccessAsync(params.orders, { from });
+        return txReceipt;
     }
     public async cancelOrdersUpToAsync(salt: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
-        const txHash = await this._exchange.cancelOrdersUpTo.sendTransactionAsync(salt, { from });
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        const txReceipt = await this._exchange.cancelOrdersUpTo.awaitTransactionSuccessAsync(salt, { from });
+        return txReceipt;
     }
     public async registerAssetProxyAsync(
         assetProxyAddress: string,
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const txHash = await this._exchange.registerAssetProxy.sendTransactionAsync(assetProxyAddress, { from });
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        const txReceipt = await this._exchange.registerAssetProxy.awaitTransactionSuccessAsync(assetProxyAddress, {
+            from,
+        });
+        return txReceipt;
     }
     public async executeTransactionAsync(
         signedTx: SignedZeroExTransaction,
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const txHash = await this._exchange.executeTransaction.sendTransactionAsync(
+        const txReceipt = await this._exchange.executeTransaction.awaitTransactionSuccessAsync(
             signedTx.salt,
             signedTx.signerAddress,
             signedTx.data,
             signedTx.signature,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async getTakerAssetFilledAmountAsync(orderHashHex: string): Promise<BigNumber> {
         const filledAmount = await this._exchange.filled.callAsync(orderHashHex);
@@ -251,15 +222,14 @@ export class ExchangeWrapper {
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = orderUtils.createMatchOrders(signedOrderLeft, signedOrderRight);
-        const txHash = await this._exchange.matchOrders.sendTransactionAsync(
+        const txReceipt = await this._exchange.matchOrders.awaitTransactionSuccessAsync(
             params.left,
             params.right,
             params.leftSignature,
             params.rightSignature,
             { from },
         );
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
-        return tx;
+        return txReceipt;
     }
     public async getFillOrderResultsAsync(
         signedOrder: SignedOrder,

contracts/exchange/test/utils/fill_order_combinatorial_utils.ts

@@ -37,6 +37,7 @@ import 'make-promises-safe';
 import { artifacts, ExchangeContract, ExchangeFillEventArgs } from '../../src';
 
 import { AssetWrapper } from './asset_wrapper';
+import { dependencyArtifacts } from './dependency_artifacts';
 import { ExchangeWrapper } from './exchange_wrapper';
 import { OrderFactoryFromScenario } from './order_factory_from_scenario';
 import { SimpleAssetBalanceAndProxyAllowanceFetcher } from './simple_asset_balance_and_proxy_allowance_fetcher';
@@ -101,6 +102,7 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
         artifacts.Exchange,
         provider,
         txDefaults,
+        dependencyArtifacts,
         zrxAssetData,
     );
     const exchangeWrapper = new ExchangeWrapper(exchangeContract, provider);
@@ -135,6 +137,7 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
         libsArtifacts.TestLibs,
         provider,
         txDefaults,
+        dependencyArtifacts,
     );
 
     const fillOrderCombinatorialUtils = new FillOrderCombinatorialUtils(

contracts/exchange/test/wrapper.ts

@@ -24,6 +24,8 @@ import * as _ from 'lodash';
 
 import { artifacts, ExchangeContract, ExchangeWrapper, ReentrantERC20TokenContract } from '../src';
 
+import { dependencyArtifacts } from './utils/dependency_artifacts';
+
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -87,6 +89,7 @@ describe('Exchange wrappers', () => {
             artifacts.Exchange,
             provider,
             txDefaults,
+            dependencyArtifacts,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
         );
         exchangeWrapper = new ExchangeWrapper(exchange, provider);
@@ -110,6 +113,7 @@ describe('Exchange wrappers', () => {
             artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
+            dependencyArtifacts,
             exchange.address,
         );
 

contracts/extensions/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "4.0.3",
+    "version": "4.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,21 +47,22 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contract-wrappers": "^9.1.8",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contract-wrappers": "9.1.7",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -69,18 +70,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-erc20": "^2.2.9",
-        "@0x/contracts-erc721": "^2.1.10",
-        "@0x/contracts-exchange": "^2.1.9",
-        "@0x/contracts-exchange-libs": "^3.0.3",
-        "@0x/contracts-utils": "^3.1.10",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-asset-proxy": "^2.2.5",
+        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/contracts-erc721": "^2.1.12",
+        "@0x/contracts-exchange": "^2.1.11",
+        "@0x/contracts-exchange-libs": "^3.0.5",
+        "@0x/contracts-utils": "^3.2.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/extensions/test/balance_threshold_filter.ts

@@ -130,6 +130,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             artifacts.Exchange,
             provider,
             txDefaults,
+            artifacts,
             zrxAssetData,
         );
         exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider);
@@ -148,6 +149,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             artifacts.BalanceThresholdFilter,
             provider,
             txDefaults,
+            artifacts,
             exchangeInstance.address,
             erc721BalanceThresholdAsset.address,
             erc721alanceThreshold,
@@ -157,6 +159,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             artifacts.BalanceThresholdFilter,
             provider,
             txDefaults,
+            artifacts,
             exchangeInstance.address,
             erc20BalanceThresholdAsset.address,
             erc20BalanceThreshold,

contracts/extensions/test/dutch_auction.ts

@@ -82,7 +82,7 @@ describe(ContractName.DutchAuction, () => {
         const erc721Balances = await erc721Wrapper.getBalancesAsync();
         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);
 
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
@@ -90,6 +90,7 @@ describe(ContractName.DutchAuction, () => {
             artifacts.Exchange,
             provider,
             txDefaults,
+            artifacts,
             zrxAssetData,
         );
         const exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider);
@@ -107,6 +108,7 @@ describe(ContractName.DutchAuction, () => {
             artifacts.DutchAuction,
             provider,
             txDefaults,
+            artifacts,
             exchangeInstance.address,
         );
         dutchAuctionContract = new DutchAuctionContract(dutchAuctionInstance.address, provider);

contracts/extensions/test/order_matcher.ts

@@ -103,12 +103,14 @@ describe('OrderMatcher', () => {
             proxyArtifacts.ERC721Proxy,
             provider,
             txDefaults,
+            artifacts,
         );
         // Depoy exchange
         exchange = await ExchangeContract.deployFrom0xArtifactAsync(
             artifacts.Exchange,
             provider,
             txDefaults,
+            artifacts,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
         );
         exchangeWrapper = new ExchangeWrapper(exchange, provider);
@@ -126,6 +128,7 @@ describe('OrderMatcher', () => {
             artifacts.OrderMatcher,
             provider,
             txDefaults,
+            artifacts,
             exchange.address,
         );
         // Set default addresses
@@ -198,6 +201,7 @@ describe('OrderMatcher', () => {
                 artifacts.Exchange,
                 provider,
                 txDefaults,
+                artifacts,
                 constants.NULL_BYTES,
             );
             return expectContractCreationFailedAsync(
@@ -205,6 +209,7 @@ describe('OrderMatcher', () => {
                     artifacts.OrderMatcher,
                     provider,
                     txDefaults,
+                    artifacts,
                     exchangeInstance.address,
                 ) as any) as sendTransactionResult,
                 RevertReason.UnregisteredAssetProxy,
@@ -727,6 +732,7 @@ describe('OrderMatcher', () => {
                 erc721Artifacts.DummyERC721Token,
                 provider,
                 txDefaults,
+                artifacts,
                 constants.DUMMY_TOKEN_NAME,
                 constants.DUMMY_TOKEN_SYMBOL,
             );
@@ -772,6 +778,7 @@ describe('OrderMatcher', () => {
                 erc721Artifacts.DummyERC721Token,
                 provider,
                 txDefaults,
+                artifacts,
                 constants.DUMMY_TOKEN_NAME,
                 constants.DUMMY_TOKEN_SYMBOL,
             );
@@ -789,6 +796,7 @@ describe('OrderMatcher', () => {
                 erc721Artifacts.DummyERC721Token,
                 provider,
                 txDefaults,
+                artifacts,
                 constants.DUMMY_TOKEN_NAME,
                 constants.DUMMY_TOKEN_SYMBOL,
             );

contracts/multisig/CHANGELOG.json

@@ -1,4 +1,23 @@
 [
+    {
+        "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",

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "3.1.9",
+    "version": "3.1.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,20 +47,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -68,14 +69,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-erc20": "^2.2.9",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contracts-asset-proxy": "^2.2.5",
+        "@0x/contracts-erc20": "^2.2.11",
         "@0x/contracts-utils": "2.0.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },

contracts/multisig/test/asset_proxy_owner.ts

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

contracts/multisig/test/multi_sig_with_time_lock.ts

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

contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts

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

contracts/multisig/test/utils/multi_sig_wrapper.ts

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

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "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",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "3.1.11",
+    "version": "3.1.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,25 +34,26 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/test-utils/README.md",
     "devDependencies": {
-        "mocha": "^4.1.0",
+        "@types/mocha": "^5.2.7",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/order-utils": "^8.2.3",
-        "@0x/sol-compiler": "^3.1.10",
-        "@0x/sol-coverage": "^3.0.7",
-        "@0x/sol-profiler": "^3.1.9",
-        "@0x/sol-trace": "^2.0.15",
-        "@0x/subproviders": "^4.1.2",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/order-utils": "^8.2.5",
+        "@0x/sol-compiler": "^3.1.12",
+        "@0x/sol-coverage": "^3.0.9",
+        "@0x/sol-profiler": "^3.1.11",
+        "@0x/sol-trace": "^2.0.17",
+        "@0x/subproviders": "^5.0.1",
         "@0x/tslint-config": "^3.0.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",

contracts/utils/CHANGELOG.json

@@ -1,4 +1,27 @@
 [
+    {
+        "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",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,15 @@ Edit the package's CHANGELOG.json file only.
 
 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

contracts/utils/compiler.json

@@ -32,6 +32,8 @@
         "src/interfaces/IOwnable.sol",
         "test/TestConstants.sol",
         "test/TestLibAddressArray.sol",
-        "test/TestLibBytes.sol"
+        "test/TestLibBytes.sol",
+        "test/TestLogDecoding.sol",
+        "test/TestLogDecodingDownstream.sol"
     ]
 }

contracts/utils/contracts/test/TestLogDecoding.sol

@@ -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();
+    }
+}

contracts/utils/contracts/test/TestLogDecodingDownstream.sol

@@ -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");
+    }
+}

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "3.1.10",
+    "version": "3.2.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,7 +34,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(Address|IOwnable|LibBytes|Ownable|ReentrancyGuard|SafeMath|TestConstants|TestLibAddressArray|TestLibBytes).json",
+        "abis": "./generated-artifacts/@(Address|IOwnable|LibBytes|Ownable|ReentrancyGuard|SafeMath|TestConstants|TestLibAddressArray|TestLibBytes|TestLogDecoding|TestLogDecodingDownstream).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -47,21 +47,22 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^3.1.1",
-        "@0x/contracts-gen": "^1.0.11",
-        "@0x/contracts-test-utils": "^3.1.11",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/sol-compiler": "^3.1.10",
+        "@0x/abi-gen": "^4.1.0",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.13",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -69,12 +70,12 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.1.2",
-        "@0x/order-utils": "^8.2.3",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/order-utils": "^8.2.5",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "bn.js": "^4.11.8",
         "ethereum-types": "^2.1.4",
         "ethereumjs-util": "^5.1.1",

contracts/utils/src/artifacts.ts

@@ -14,6 +14,8 @@ import * as SafeMath from '../generated-artifacts/SafeMath.json';
 import * as TestConstants from '../generated-artifacts/TestConstants.json';
 import * as TestLibAddressArray from '../generated-artifacts/TestLibAddressArray.json';
 import * as TestLibBytes from '../generated-artifacts/TestLibBytes.json';
+import * as TestLogDecoding from '../generated-artifacts/TestLogDecoding.json';
+import * as TestLogDecodingDownstream from '../generated-artifacts/TestLogDecodingDownstream.json';
 export const artifacts = {
     Address: Address as ContractArtifact,
     LibBytes: LibBytes as ContractArtifact,
@@ -22,6 +24,8 @@ export const artifacts = {
     SafeMath: SafeMath as ContractArtifact,
     IOwnable: IOwnable as ContractArtifact,
     TestConstants: TestConstants as ContractArtifact,
-    TestLibBytes: TestLibBytes as ContractArtifact,
     TestLibAddressArray: TestLibAddressArray as ContractArtifact,
+    TestLibBytes: TestLibBytes as ContractArtifact,
+    TestLogDecoding: TestLogDecoding as ContractArtifact,
+    TestLogDecodingDownstream: TestLogDecodingDownstream as ContractArtifact,
 };

contracts/utils/src/wrappers.ts

@@ -12,3 +12,5 @@ export * from '../generated-wrappers/safe_math';
 export * from '../generated-wrappers/test_constants';
 export * from '../generated-wrappers/test_lib_address_array';
 export * from '../generated-wrappers/test_lib_bytes';
+export * from '../generated-wrappers/test_log_decoding';
+export * from '../generated-wrappers/test_log_decoding_downstream';

contracts/utils/test/lib_address_array.ts

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

contracts/utils/test/lib_bytes.ts

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

contracts/utils/test/libs.ts

@@ -24,6 +24,7 @@ describe('Libs', () => {
                     artifacts.TestConstants,
                     provider,
                     txDefaults,
+                    artifacts,
                 );
                 const isValid = await testConstants.assertValidZrxAssetData.callAsync();
                 expect(isValid).to.be.equal(true);

contracts/utils/test/log_decoding.ts

@@ -0,0 +1,95 @@
+import { chaiSetup, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { BigNumber } from '@0x/utils';
+import * as chai from 'chai';
+import { DecodedLogArgs, LogWithDecodedArgs } from 'ethereum-types';
+
+import { artifacts, TestLogDecodingContract } from '../src';
+
+chaiSetup.configure();
+const expect = chai.expect;
+
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+
+describe('TestLogDecoding', () => {
+    let testLogDecodingWithDependencies: TestLogDecodingContract;
+    let testLogDecodingDeployedWithoutDependencies: TestLogDecodingContract;
+    const expectedEvent = {
+        foo: new BigNumber(256),
+        bar: '0x1234',
+        car: '4321',
+    };
+    const expectedDownstreamEvent = {
+        lorem: new BigNumber(256),
+        ipsum: '4321',
+    };
+    const emptyDependencyList = {};
+
+    before(async () => {
+        testLogDecodingDeployedWithoutDependencies = await TestLogDecodingContract.deployFrom0xArtifactAsync(
+            artifacts.TestLogDecoding,
+            provider,
+            txDefaults,
+            emptyDependencyList,
+        );
+        testLogDecodingWithDependencies = await TestLogDecodingContract.deployFrom0xArtifactAsync(
+            artifacts.TestLogDecoding,
+            provider,
+            txDefaults,
+            artifacts,
+        );
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+
+    describe('Decoding Log Arguments', () => {
+        it('should decode locally emitted event args when no dependencies are passed into wrapper', async () => {
+            const txReceipt = await testLogDecodingDeployedWithoutDependencies.emitEvent.awaitTransactionSuccessAsync();
+            expect(txReceipt.logs.length).to.be.equal(1);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
+        });
+        it('should not decode event args when no dependencies are passed into wrapper', async () => {
+            const txReceipt = await testLogDecodingDeployedWithoutDependencies.emitEventDownstream.awaitTransactionSuccessAsync();
+            expect(txReceipt.logs.length).to.be.equal(1);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.undefined();
+        });
+        it('should decode args for local but not downstream event when no dependencies are passed into wrapper', async () => {
+            const txReceipt = await testLogDecodingDeployedWithoutDependencies.emitEventsLocalAndDownstream.awaitTransactionSuccessAsync();
+            expect(txReceipt.logs.length).to.be.equal(2);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[1] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.undefined();
+        });
+        it('should decode locally emitted event args when dependencies are passed into wrapper', async () => {
+            const txReceipt = await testLogDecodingWithDependencies.emitEvent.awaitTransactionSuccessAsync();
+            expect(txReceipt.logs.length).to.be.equal(1);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
+        });
+        it('should decode downstream event args when dependencies are passed into wrapper', async () => {
+            const txReceipt = await testLogDecodingWithDependencies.emitEventDownstream.awaitTransactionSuccessAsync();
+            expect(txReceipt.logs.length).to.be.equal(1);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(
+                expectedDownstreamEvent,
+            );
+        });
+        it('should decode args for both local and downstream events when dependencies are passed into wrapper', async () => {
+            const txReceipt = await testLogDecodingWithDependencies.emitEventsLocalAndDownstream.awaitTransactionSuccessAsync();
+            expect(txReceipt.logs.length).to.be.equal(2);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
+            // tslint:disable no-unnecessary-type-assertion
+            expect((txReceipt.logs[1] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(
+                expectedDownstreamEvent,
+            );
+        });
+    });
+});

contracts/utils/tsconfig.json

@@ -11,7 +11,9 @@
         "generated-artifacts/SafeMath.json",
         "generated-artifacts/TestConstants.json",
         "generated-artifacts/TestLibAddressArray.json",
-        "generated-artifacts/TestLibBytes.json"
+        "generated-artifacts/TestLibBytes.json",
+        "generated-artifacts/TestLogDecoding.json",
+        "generated-artifacts/TestLogDecodingDownstream.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

package.json

@@ -50,7 +50,7 @@
     "config": {
         "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-multisig @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-coordinator @0x/contracts-dev-utils",
         "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
-        "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer migrations",
+        "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper order-utils order-watcher sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer migrations",
         "ignoreDependencyVersions": "@types/styled-components @types/node",
         "ignoreDependencyVersionsForPackage": "website instant dev-tools-pages"
     },
@@ -77,7 +77,7 @@
         "graceful-fs": "4.1.15"
     },
     "devDependencies": {
-        "@0x-lerna-fork/lerna": "3.16.7",
+        "@0x-lerna-fork/lerna": "3.16.10",
         "@0xproject/npm-cli-login": "^0.0.11",
         "async-child-process": "^1.1.1",
         "bundlewatch": "^0.2.1",

packages/0x.js/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1565296576,
+        "version": "6.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1564604963,
+        "version": "6.0.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "6.0.13",
         "changes": [

packages/0x.js/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v6.0.15 - _August 8, 2019_
+
+    * Dependencies updated
+
+## v6.0.14 - _July 31, 2019_
+
+    * Dependencies updated
+
 ## v6.0.13 - _July 24, 2019_
 
     * re-export new ethereum-types type, TupleDataItem (#1919)

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "6.0.13",
+    "version": "6.0.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,13 +43,13 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0x/abi-gen-wrappers": "^5.0.3",
-        "@0x/contract-addresses": "^3.0.2",
-        "@0x/dev-utils": "^2.2.5",
-        "@0x/migrations": "^4.1.10",
+        "@0x/abi-gen-wrappers": "^5.2.0",
+        "@0x/contract-addresses": "^3.0.3",
+        "@0x/dev-utils": "^2.3.0",
+        "@0x/migrations": "^4.2.0",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
-        "@types/mocha": "^2.2.42",
+        "@types/mocha": "^5.2.7",
         "@types/node": "*",
         "@types/sinon": "^2.2.2",
         "awesome-typescript-loader": "^5.2.1",
@@ -59,7 +59,7 @@
         "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "nyc": "^11.0.1",
         "opn-cli": "^3.1.0",
@@ -73,16 +73,17 @@
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0x/assert": "^2.1.1",
-        "@0x/base-contract": "^5.1.2",
-        "@0x/contract-wrappers": "^9.1.8",
-        "@0x/order-utils": "^8.2.3",
-        "@0x/order-watcher": "^4.0.15",
-        "@0x/subproviders": "^4.1.2",
+        "@0x/assert": "^2.1.3",
+        "@0x/asset-swapper": "^1.0.1",
+        "@0x/base-contract": "^5.3.1",
+        "@0x/contract-wrappers": "9.1.7",
+        "@0x/order-utils": "^8.2.5",
+        "@0x/order-watcher": "^4.0.17",
+        "@0x/subproviders": "^5.0.1",
         "@0x/types": "^2.4.1",
         "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.4.1",
-        "@0x/web3-wrapper": "^6.0.8",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "@types/web3-provider-engine": "^14.0.0",
         "ethereum-types": "^2.1.4",
         "ethers": "~4.0.4",

packages/0x.js/src/index.ts

@@ -40,6 +40,13 @@ export {
 } from '@0x/contract-wrappers';
 
 export {
+    DutchAuctionContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
+    ExchangeContract,
+    ForwarderContract,
+    OrderValidatorContract,
+    WETH9Contract,
     WETH9Events,
     WETH9WithdrawalEventArgs,
     WETH9ApprovalEventArgs,
@@ -102,15 +109,12 @@ export {
     ObjectMap,
     OrderRelevantState,
     Stats,
-    DutchAuctionDetails,
     ZeroExTransaction,
     SignedZeroExTransaction,
 } from '@0x/types';
 
 export {
-    BlockParamLiteral,
     ContractAbi,
-    BlockParam,
     LogWithDecodedArgs,
     ContractEventArg,
     SupportedProvider,

packages/abi-gen-templates/CHANGELOG.json

@@ -1,4 +1,27 @@
 [
+    {
+        "timestamp": 1565296576,
+        "version": "2.4.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.4.0",
+        "changes": [
+            {
+                "note": "Updated interface to `deployFrom0xArtifactAsync` to include log decode dependencies.",
+                "pr": 1995
+            },
+            {
+                "note": "Updated interface to `deployAsync` to include log decode dependencies.",
+                "pr": 1995
+            }
+        ],
+        "timestamp": 1564604963
+    },
     {
         "version": "2.3.0",
         "changes": [

packages/abi-gen-templates/CHANGELOG.md

@@ -5,6 +5,15 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.4.1 - _August 8, 2019_
+
+    * Dependencies updated
+
+## v2.4.0 - _July 31, 2019_
+
+    * Updated interface to `deployFrom0xArtifactAsync` to include log decode dependencies. (#1995)
+    * Updated interface to `deployAsync` to include log decode dependencies. (#1995)
+
 ## v2.3.0 - _July 24, 2019_
 
     * Python: fix broken event handling (#1919)

packages/abi-gen-templates/Python/contract.handlebars

@@ -11,37 +11,18 @@ from typing import (  # pylint: disable=unused-import
     Union,
 )
 
+from eth_utils import to_checksum_address
 from mypy_extensions import TypedDict  # pylint: disable=unused-import
 from hexbytes import HexBytes
+from web3 import Web3
+from web3.contract import ContractFunction
 from web3.datastructures import AttributeDict
 from web3.providers.base import BaseProvider
 
-from zero_ex.contract_wrappers._base_contract_wrapper import BaseContractWrapper
+from zero_ex.contract_wrappers.bases import ContractMethod, Validator
 from zero_ex.contract_wrappers.tx_params import TxParams
 
 
-class {{contractName}}ValidatorBase:
-    """Base class for validating inputs to {{contractName}} methods."""
-    def __init__(
-        self,
-        provider: BaseProvider,
-        contract_address: str,
-        private_key: str = None,
-    ):
-        """Initialize the instance."""
-
-    def assert_valid(
-        self, method_name: str, parameter_name: str, argument_value: Any
-    ):
-        """Raise an exception if method input is not valid.
-
-        :param method_name: Name of the method whose input is to be validated.
-        :param parameter_name: Name of the parameter whose input is to be
-            validated.
-        :param argument_value: Value of argument to parameter to be validated.
-        """
-
-
 # Try to import a custom validator class definition; if there isn't one,
 # declare one that we can instantiate for the default argument to the
 # constructor for {{contractName}} below.
@@ -53,56 +34,58 @@ try:
     )
 except ImportError:
 
-    class {{contractName}}Validator({{contractName}}ValidatorBase):  # type: ignore
+    class {{contractName}}Validator(  # type: ignore
+        Validator
+    ):
         """No-op input validator."""
 
 
 {{tupleDefinitions ABIString}}
 
+{{#each methods}}
+{{> method_class contractName=../contractName}}
+{{/each}}
 
-# pylint: disable=too-many-public-methods
-class {{contractName}}(BaseContractWrapper):
+# pylint: disable=too-many-public-methods,too-many-instance-attributes
+class {{contractName}}:
     """Wrapper class for {{contractName}} Solidity contract.{{docBytesIfNecessary ABIString}}"""
+{{#each methods}}
+    {{toPythonIdentifier this.languageSpecificName}}: {{toPythonClassname this.languageSpecificName}}Method
+    """Constructor-initialized instance of
+    :class:`{{toPythonClassname this.languageSpecificName}}Method`.
+    """
+
+{{/each}}
 
     def __init__(
         self,
         provider: BaseProvider,
         contract_address: str,
         validator: {{contractName}}Validator = None,
-        private_key: str = None,
     ):
         """Get an instance of wrapper for smart contract.
 
         :param provider: instance of :class:`web3.providers.base.BaseProvider`
         :param contract_address: where the contract has been deployed
-        :param private_key: If specified, transactions will be signed locally,
-            via Web3.py's `eth.account.signTransaction()`:code:, before being
-            sent via `eth.sendRawTransaction()`:code:.
+        :param validator: for validation of method inputs.
         """
-        super().__init__(
-            provider=provider,
-            contract_address=contract_address,
-            private_key=private_key,
-        )
+        self.contract_address = contract_address
 
         if not validator:
-            validator = {{contractName}}Validator(provider, contract_address, private_key)
+            validator = {{contractName}}Validator(provider, contract_address)
 
-        self.validator = validator
+        self._web3_eth = Web3(  # type: ignore # pylint: disable=no-member
+            provider
+        ).eth
 
-    def _get_contract_instance(self, token_address):
-        """Get an instance of the smart contract at a specific address.
+        functions = self._web3_eth.contract(address=to_checksum_address(contract_address), abi={{contractName}}.abi()).functions
 
-        :returns: contract object
-        """
-        return self._contract_instance(
-            address=token_address, abi={{contractName}}.abi()
-        )
-{{#each methods}}
-{{> call contractName=../contractName}}
-{{/each}}
+        {{#each methods}}
+        self.{{toPythonIdentifier this.languageSpecificName}} = {{toPythonClassname this.languageSpecificName}}Method(provider, contract_address, functions.{{this.name}}, validator)
+
+        {{/each}}
 {{#each events}}
-{{> event}}
+{{> event contractName=../contractName}}
 {{/each}}
 
     @staticmethod