Publish

- 0x.js@5.0.0
 - @0x/abi-gen@2.0.3
 - @0x/abi-gen-wrappers@3.0.3
 - @0x/assert@2.0.3
 - @0x/asset-buyer@5.0.4
 - @0x/base-contract@4.0.3
 - @0x/connect@4.0.4
 - @0x/contract-wrappers@7.1.0
 - @0x/contracts-gen@1.0.2
 - @0x/dev-tools-pages@0.0.19
 - @0x/dev-utils@2.1.0
 - @0x/fill-scenarios@2.0.4
 - @0x/instant@1.0.13
 - @0x/json-schemas@3.0.3
 - @0x/metacoin@0.0.40
 - @0x/migrations@3.0.4
 - @0x/monorepo-scripts@1.0.24
 - @0x/order-utils@6.1.0
 - @0x/order-watcher@3.0.4
 - @0x/pipeline@1.0.10
 - @0x/react-docs@2.0.4
 - @0x/react-shared@2.0.4
 - @0x/sol-compiler@3.0.3
 - @0x/sol-coverage@2.0.3
 - @0x/sol-doc@2.0.3
 - @0x/sol-profiler@2.0.4
 - @0x/sol-trace@2.0.4
 - @0x/sol-tracing-utils@6.0.3
 - @0x/sra-spec@2.0.3
 - @0x/subproviders@3.0.3
 - @0x/testnet-faucets@1.0.69
 - @0x/utils@4.1.0
 - @0x/web3-wrapper@5.0.0
 - @0x/website@0.0.72
 - @0x/contracts-asset-proxy@1.0.5
 - @0x/contracts-erc20@1.0.5
 - @0x/contracts-erc721@1.0.5
 - @0x/contracts-exchange@1.0.5
 - @0x/contracts-exchange-forwarder@1.0.5
 - @0x/contracts-exchange-libs@1.0.5
 - @0x/contracts-extensions@2.0.4
 - @0x/contracts-multisig@2.0.4
 - @0x/contracts-test-utils@3.0.4
 - @0x/contracts-utils@2.0.4

.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
                   command: sudo npm install --global yarn@1.9.4
             - run:
                   name: yarn
-                  command: yarn --frozen-lockfile --ignore-engines install
+                  command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
             - setup_remote_docker
             - run: yarn build:ci:no_website
             - run: yarn build:ts

.github/autolabeler.yml

@@ -2,6 +2,7 @@ python: ['python-packages']
 contracts: ['contracts']
 sol-doc: ['packages/sol-doc']
 sol-resolver: ['packages/sol-resolver']
+contracts-gen: ['packages/contracts-gen']
 sra-spec: ['packages/sra-spec']
 subproviders: ['packages/subproviders']
 contract-addresses: ['packages/contract-addresses']

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1549373905,
         "version": "1.0.1",

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated

contracts/asset-proxy/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -20,12 +17,17 @@
         }
     },
     "contracts": [
-        "IAssetData",
-        "IAssetProxy",
-        "IAuthorizable",
-        "ERC20Proxy",
-        "ERC721Proxy",
-        "MixinAuthorizable",
-        "MultiAssetProxy"
+        "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
+        "@0x/contracts-erc20/contracts/test/DummyMultipleReturnERC20Token.sol",
+        "@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Receiver.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
+        "src/ERC20Proxy.sol",
+        "src/ERC721Proxy.sol",
+        "src/MixinAuthorizable.sol",
+        "src/MultiAssetProxy.sol",
+        "src/interfaces/IAssetData.sol",
+        "src/interfaces/IAssetProxy.sol",
+        "src/interfaces/IAuthorizable.sol"
     ]
 }

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "1.0.1",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json"
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,9 +46,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -63,18 +66,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-erc20": "^1.0.1",
-        "@0x/contracts-erc721": "^1.0.1",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/order-utils": "^4.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/order-utils": "^6.1.0",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/asset-proxy/src/artifacts.ts

@@ -0,0 +1,33 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json';
+import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
+import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
+import * as IAssetData from '../generated-artifacts/IAssetData.json';
+import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json';
+import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
+import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
+import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
+export const artifacts = {
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
+    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
+    DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    ERC20Proxy: ERC20Proxy as ContractArtifact,
+    ERC721Proxy: ERC721Proxy as ContractArtifact,
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
+    IAssetData: IAssetData as ContractArtifact,
+    IAssetProxy: IAssetProxy as ContractArtifact,
+    IAuthorizable: IAuthorizable as ContractArtifact,
+};

contracts/asset-proxy/src/artifacts/index.ts

@@ -1,19 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json';
-import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json';
-import * as IAssetData from '../../generated-artifacts/IAssetData.json';
-import * as IAssetProxy from '../../generated-artifacts/IAssetProxy.json';
-import * as IAuthorizable from '../../generated-artifacts/IAuthorizable.json';
-import * as MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json';
-import * as MultiAssetProxy from '../../generated-artifacts/MultiAssetProxy.json';
-
-export const artifacts = {
-    IAuthorizable: IAuthorizable as ContractArtifact,
-    IAssetData: IAssetData as ContractArtifact,
-    IAssetProxy: IAssetProxy as ContractArtifact,
-    ERC20Proxy: ERC20Proxy as ContractArtifact,
-    ERC721Proxy: ERC721Proxy as ContractArtifact,
-    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
-    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
-};

contracts/asset-proxy/src/wrappers.ts

@@ -0,0 +1,17 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_erc721_receiver';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/dummy_multiple_return_erc20_token';
+export * from '../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../generated-wrappers/erc20_proxy';
+export * from '../generated-wrappers/erc721_proxy';
+export * from '../generated-wrappers/i_asset_data';
+export * from '../generated-wrappers/i_asset_proxy';
+export * from '../generated-wrappers/i_authorizable';
+export * from '../generated-wrappers/mixin_authorizable';
+export * from '../generated-wrappers/multi_asset_proxy';

contracts/asset-proxy/src/wrappers/index.ts

@@ -1,7 +0,0 @@
-export * from '../../generated-wrappers/i_asset_data';
-export * from '../../generated-wrappers/i_asset_proxy';
-export * from '../../generated-wrappers/erc20_proxy';
-export * from '../../generated-wrappers/erc721_proxy';
-export * from '../../generated-wrappers/mixin_authorizable';
-export * from '../../generated-wrappers/multi_asset_proxy';
-export * from '../../generated-wrappers/i_authorizable';

contracts/asset-proxy/test/proxies.ts

@@ -1,15 +1,3 @@
-import {
-    artifacts as erc20Artifacts,
-    DummyERC20TokenContract,
-    DummyERC20TokenTransferEventArgs,
-    DummyMultipleReturnERC20TokenContract,
-    DummyNoReturnERC20TokenContract,
-} from '@0x/contracts-erc20';
-import {
-    artifacts as erc721Artifacts,
-    DummyERC721ReceiverContract,
-    DummyERC721TokenContract,
-} from '@0x/contracts-erc721';
 import {
     chaiSetup,
     constants,
@@ -30,6 +18,12 @@ import * as _ from 'lodash';
 
 import {
     artifacts,
+    DummyERC20TokenContract,
+    DummyERC20TokenTransferEventArgs,
+    DummyERC721ReceiverContract,
+    DummyERC721TokenContract,
+    DummyMultipleReturnERC20TokenContract,
+    DummyNoReturnERC20TokenContract,
     ERC20ProxyContract,
     ERC20Wrapper,
     ERC721ProxyContract,
@@ -154,7 +148,7 @@ describe('Asset Transfer Proxies', () => {
             constants.DUMMY_TOKEN_DECIMALS,
         );
         noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync(
-            erc20Artifacts.DummyNoReturnERC20Token,
+            artifacts.DummyNoReturnERC20Token,
             provider,
             txDefaults,
             constants.DUMMY_TOKEN_NAME,
@@ -163,7 +157,7 @@ describe('Asset Transfer Proxies', () => {
             constants.DUMMY_TOKEN_TOTAL_SUPPLY,
         );
         multipleReturnErc20Token = await DummyMultipleReturnERC20TokenContract.deployFrom0xArtifactAsync(
-            erc20Artifacts.DummyMultipleReturnERC20Token,
+            artifacts.DummyMultipleReturnERC20Token,
             provider,
             txDefaults,
             constants.DUMMY_TOKEN_NAME,
@@ -204,7 +198,7 @@ describe('Asset Transfer Proxies', () => {
         // Deploy and configure ERC721 tokens and receiver
         [erc721TokenA, erc721TokenB] = await erc721Wrapper.deployDummyTokensAsync();
         erc721Receiver = await DummyERC721ReceiverContract.deployFrom0xArtifactAsync(
-            erc721Artifacts.DummyERC721Receiver,
+            artifacts.DummyERC721Receiver,
             provider,
             txDefaults,
         );
@@ -568,7 +562,7 @@ describe('Asset Transfer Proxies', () => {
                     erc721Receiver.address,
                     amount,
                 );
-                const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc721Artifacts });
+                const logDecoder = new LogDecoder(web3Wrapper, artifacts);
                 const tx = await logDecoder.getTxWithDecodedLogsAsync(
                     await web3Wrapper.sendTransactionAsync({
                         to: erc721Proxy.address,
@@ -760,7 +754,7 @@ describe('Asset Transfer Proxies', () => {
                     inputAmount,
                 );
                 const erc20Balances = await erc20Wrapper.getBalancesAsync();
-                const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts });
+                const logDecoder = new LogDecoder(web3Wrapper, artifacts);
                 const tx = await logDecoder.getTxWithDecodedLogsAsync(
                     await web3Wrapper.sendTransactionAsync({
                         to: multiAssetProxy.address,

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

@@ -1,4 +1,3 @@
-import { artifacts as tokensArtifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
 import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
@@ -6,8 +5,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, DummyERC20TokenContract, ERC20ProxyContract } from '../../src';
 
 export class ERC20Wrapper {
     private readonly _tokenOwnerAddresses: string[];
@@ -38,7 +36,7 @@ export class ERC20Wrapper {
         for (let i = 0; i < numberToDeploy; i++) {
             this._dummyTokenContracts.push(
                 await DummyERC20TokenContract.deployFrom0xArtifactAsync(
-                    tokensArtifacts.DummyERC20Token,
+                    artifacts.DummyERC20Token,
                     this._provider,
                     txDefaults,
                     constants.DUMMY_TOKEN_NAME,

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

@@ -1,4 +1,3 @@
-import { artifacts as tokensArtifacts, DummyERC721TokenContract } from '@0x/contracts-erc721';
 import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
 import { generatePseudoRandomSalt } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
@@ -6,8 +5,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, DummyERC721TokenContract, ERC721ProxyContract } from '../../src';
 
 export class ERC721Wrapper {
     private readonly _tokenOwnerAddresses: string[];
@@ -30,7 +28,7 @@ export class ERC721Wrapper {
         for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) {
             this._dummyTokenContracts.push(
                 await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-                    tokensArtifacts.DummyERC721Token,
+                    artifacts.DummyERC721Token,
                     this._provider,
                     txDefaults,
                     constants.DUMMY_TOKEN_NAME,

contracts/asset-proxy/tsconfig.json

@@ -1,19 +1,20 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/IAssetData.json",
-        "./generated-artifacts/IAssetProxy.json",
-        "./generated-artifacts/IAuthorizable.json",
-        "./generated-artifacts/ERC20Proxy.json",
-        "./generated-artifacts/ERC721Proxy.json",
-        "./generated-artifacts/MixinAuthorizable.json",
-        "./generated-artifacts/MultiAssetProxy.json"
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyERC721Receiver.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/DummyMultipleReturnERC20Token.json",
+        "generated-artifacts/DummyNoReturnERC20Token.json",
+        "generated-artifacts/ERC20Proxy.json",
+        "generated-artifacts/ERC721Proxy.json",
+        "generated-artifacts/IAssetData.json",
+        "generated-artifacts/IAssetProxy.json",
+        "generated-artifacts/IAuthorizable.json",
+        "generated-artifacts/MixinAuthorizable.json",
+        "generated-artifacts/MultiAssetProxy.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1549373905,
         "version": "1.0.1",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated

contracts/erc20/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -20,16 +17,16 @@
         }
     },
     "contracts": [
-        "DummyERC20Token",
-        "DummyMultipleReturnERC20Token",
-        "DummyNoReturnERC20Token",
-        "ReentrantERC20Token",
-        "ERC20Token",
-        "IERC20Token",
-        "MintableERC20Token",
-        "UnlimitedAllowanceERC20Token",
-        "IEtherToken",
-        "WETH9",
-        "ZRXToken"
+        "src/ERC20Token.sol",
+        "src/MintableERC20Token.sol",
+        "src/UnlimitedAllowanceERC20Token.sol",
+        "src/WETH9.sol",
+        "src/ZRXToken.sol",
+        "src/interfaces/IERC20Token.sol",
+        "src/interfaces/IEtherToken.sol",
+        "test/DummyERC20Token.sol",
+        "test/DummyMultipleReturnERC20Token.sol",
+        "test/DummyNoReturnERC20Token.sol",
+        "test/ReentrantERC20Token.sol"
     ]
 }

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "1.0.1",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ReentrantERC20Token|ERC20Token|IERC20Token|MintableERC20Token|UnlimitedAllowanceERC20Token|IEtherToken|WETH9|ZRXToken).json"
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IEtherToken|MintableERC20Token|ReentrantERC20Token|UnlimitedAllowanceERC20Token|WETH9|ZRXToken).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,10 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -64,15 +67,15 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-exchange-libs": "^1.0.1",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/erc20/src/artifacts.ts

@@ -0,0 +1,31 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json';
+import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC20Token from '../generated-artifacts/ERC20Token.json';
+import * as IERC20Token from '../generated-artifacts/IERC20Token.json';
+import * as IEtherToken from '../generated-artifacts/IEtherToken.json';
+import * as MintableERC20Token from '../generated-artifacts/MintableERC20Token.json';
+import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json';
+import * as UnlimitedAllowanceERC20Token from '../generated-artifacts/UnlimitedAllowanceERC20Token.json';
+import * as WETH9 from '../generated-artifacts/WETH9.json';
+import * as ZRXToken from '../generated-artifacts/ZRXToken.json';
+export const artifacts = {
+    ERC20Token: ERC20Token as ContractArtifact,
+    MintableERC20Token: MintableERC20Token as ContractArtifact,
+    UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact,
+    WETH9: WETH9 as ContractArtifact,
+    ZRXToken: (ZRXToken as any) as ContractArtifact,
+    IERC20Token: IERC20Token as ContractArtifact,
+    IEtherToken: IEtherToken as ContractArtifact,
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
+    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
+    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
+};

contracts/erc20/src/artifacts/index.ts

@@ -1,30 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as DummyERC20Token from '../../generated-artifacts/DummyERC20Token.json';
-import * as DummyMultipleReturnERC20Token from '../../generated-artifacts/DummyMultipleReturnERC20Token.json';
-import * as DummyNoReturnERC20Token from '../../generated-artifacts/DummyNoReturnERC20Token.json';
-import * as ERC20Token from '../../generated-artifacts/ERC20Token.json';
-import * as IERC20Token from '../../generated-artifacts/IERC20Token.json';
-import * as IEtherToken from '../../generated-artifacts/IEtherToken.json';
-import * as MintableERC20Token from '../../generated-artifacts/MintableERC20Token.json';
-import * as ReentrantERC20Token from '../../generated-artifacts/ReentrantERC20Token.json';
-import * as UnlimitedAllowanceERC20Token from '../../generated-artifacts/UnlimitedAllowanceERC20Token.json';
-import * as WETH9 from '../../generated-artifacts/WETH9.json';
-import * as ZRXToken from '../../generated-artifacts/ZRXToken.json';
-
-// tslint:disable:no-unnecessary-type-assertion
-export const artifacts = {
-    DummyERC20Token: DummyERC20Token as ContractArtifact,
-    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
-    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
-    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
-    ERC20Token: ERC20Token as ContractArtifact,
-    IERC20Token: IERC20Token as ContractArtifact,
-    MintableERC20Token: MintableERC20Token as ContractArtifact,
-    UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact,
-    IEtherToken: IEtherToken as ContractArtifact,
-    WETH9: WETH9 as ContractArtifact,
-    // Note(albrow): "as any" hack still required here because ZRXToken does not
-    // conform to the v2 artifact type.
-    ZRXToken: (ZRXToken as any) as ContractArtifact,
-};

contracts/erc20/src/wrappers.ts

@@ -0,0 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_multiple_return_erc20_token';
+export * from '../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../generated-wrappers/erc20_token';
+export * from '../generated-wrappers/i_erc20_token';
+export * from '../generated-wrappers/i_ether_token';
+export * from '../generated-wrappers/mintable_erc20_token';
+export * from '../generated-wrappers/reentrant_erc20_token';
+export * from '../generated-wrappers/unlimited_allowance_erc20_token';
+export * from '../generated-wrappers/weth9';
+export * from '../generated-wrappers/zrx_token';

contracts/erc20/src/wrappers/index.ts

@@ -1,11 +0,0 @@
-export * from '../../generated-wrappers/zrx_token';
-export * from '../../generated-wrappers/weth9';
-export * from '../../generated-wrappers/unlimited_allowance_erc20_token';
-export * from '../../generated-wrappers/reentrant_erc20_token';
-export * from '../../generated-wrappers/mintable_erc20_token';
-export * from '../../generated-wrappers/i_ether_token';
-export * from '../../generated-wrappers/i_erc20_token';
-export * from '../../generated-wrappers/erc20_token';
-export * from '../../generated-wrappers/dummy_no_return_erc20_token';
-export * from '../../generated-wrappers/dummy_multiple_return_erc20_token';
-export * from '../../generated-wrappers/dummy_erc20_token';

contracts/erc20/tsconfig.json

@@ -1,23 +1,19 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/DummyERC20Token.json",
-        "./generated-artifacts/DummyMultipleReturnERC20Token.json",
-        "./generated-artifacts/DummyNoReturnERC20Token.json",
-        "./generated-artifacts/ReentrantERC20Token.json",
-        "./generated-artifacts/ERC20Token.json",
-        "./generated-artifacts/IERC20Token.json",
-        "./generated-artifacts/MintableERC20Token.json",
-        "./generated-artifacts/UnlimitedAllowanceERC20Token.json",
-        "./generated-artifacts/IEtherToken.json",
-        "./generated-artifacts/WETH9.json",
-        "./generated-artifacts/ZRXToken.json"
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyMultipleReturnERC20Token.json",
+        "generated-artifacts/DummyNoReturnERC20Token.json",
+        "generated-artifacts/ERC20Token.json",
+        "generated-artifacts/IERC20Token.json",
+        "generated-artifacts/IEtherToken.json",
+        "generated-artifacts/MintableERC20Token.json",
+        "generated-artifacts/ReentrantERC20Token.json",
+        "generated-artifacts/UnlimitedAllowanceERC20Token.json",
+        "generated-artifacts/WETH9.json",
+        "generated-artifacts/ZRXToken.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/erc721/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1549373905,
         "version": "1.0.1",

contracts/erc721/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated

contracts/erc721/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -20,12 +17,12 @@
         }
     },
     "contracts": [
-        "DummyERC721Receiver",
-        "InvalidERC721Receiver",
-        "DummyERC721Token",
-        "ERC721Token",
-        "IERC721Receiver",
-        "IERC721Token",
-        "MintableERC721Token"
+        "src/ERC721Token.sol",
+        "src/MintableERC721Token.sol",
+        "src/interfaces/IERC721Receiver.sol",
+        "src/interfaces/IERC721Token.sol",
+        "test/DummyERC721Receiver.sol",
+        "test/DummyERC721Token.sol",
+        "test/InvalidERC721Receiver.sol"
     ]
 }

contracts/erc721/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc721",
-    "version": "1.0.1",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(DummyERC721Receiver|InvalidERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|MintableERC721Token).json"
+        "abis": "./generated-artifacts/@(DummyERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|InvalidERC721Receiver|MintableERC721Token).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,10 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -64,14 +67,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/erc721/src/artifacts.ts

@@ -0,0 +1,23 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as ERC721Token from '../generated-artifacts/ERC721Token.json';
+import * as IERC721Receiver from '../generated-artifacts/IERC721Receiver.json';
+import * as IERC721Token from '../generated-artifacts/IERC721Token.json';
+import * as InvalidERC721Receiver from '../generated-artifacts/InvalidERC721Receiver.json';
+import * as MintableERC721Token from '../generated-artifacts/MintableERC721Token.json';
+export const artifacts = {
+    ERC721Token: ERC721Token as ContractArtifact,
+    MintableERC721Token: MintableERC721Token as ContractArtifact,
+    IERC721Receiver: IERC721Receiver as ContractArtifact,
+    IERC721Token: IERC721Token as ContractArtifact,
+    DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact,
+};

contracts/erc721/src/artifacts/index.ts

@@ -1,20 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as DummyERC721Receiver from '../../generated-artifacts/DummyERC721Receiver.json';
-import * as DummyERC721Token from '../../generated-artifacts/DummyERC721Token.json';
-import * as ERC721Token from '../../generated-artifacts/ERC721Token.json';
-import * as IERC721Receiver from '../../generated-artifacts/IERC721Receiver.json';
-import * as IERC721Token from '../../generated-artifacts/IERC721Token.json';
-import * as InvalidERC721Receiver from '../../generated-artifacts/InvalidERC721Receiver.json';
-import * as MintableERC721Token from '../../generated-artifacts/MintableERC721Token.json';
-
-// tslint:disable:no-unnecessary-type-assertion
-export const artifacts = {
-    DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
-    InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact,
-    DummyERC721Token: DummyERC721Token as ContractArtifact,
-    ERC721Token: ERC721Token as ContractArtifact,
-    IERC721Receiver: IERC721Receiver as ContractArtifact,
-    IERC721Token: IERC721Token as ContractArtifact,
-    MintableERC721Token: MintableERC721Token as ContractArtifact,
-};

contracts/erc721/src/wrappers.ts

@@ -0,0 +1,12 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc721_receiver';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/erc721_token';
+export * from '../generated-wrappers/i_erc721_receiver';
+export * from '../generated-wrappers/i_erc721_token';
+export * from '../generated-wrappers/invalid_erc721_receiver';
+export * from '../generated-wrappers/mintable_erc721_token';

contracts/erc721/src/wrappers/index.ts

@@ -1,7 +0,0 @@
-export * from '../../generated-wrappers/mintable_erc721_token';
-export * from '../../generated-wrappers/invalid_erc721_receiver';
-export * from '../../generated-wrappers/i_erc721_token';
-export * from '../../generated-wrappers/i_erc721_receiver';
-export * from '../../generated-wrappers/erc721_token';
-export * from '../../generated-wrappers/dummy_erc721_token';
-export * from '../../generated-wrappers/dummy_erc721_receiver';

contracts/erc721/tsconfig.json

@@ -1,19 +1,15 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/DummyERC721Receiver.json",
-        "./generated-artifacts/InvalidERC721Receiver.json",
-        "./generated-artifacts/DummyERC721Token.json",
-        "./generated-artifacts/ERC721Token.json",
-        "./generated-artifacts/IERC721Receiver.json",
-        "./generated-artifacts/IERC721Token.json",
-        "./generated-artifacts/MintableERC721Token.json"
+        "generated-artifacts/DummyERC721Receiver.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/ERC721Token.json",
+        "generated-artifacts/IERC721Receiver.json",
+        "generated-artifacts/IERC721Token.json",
+        "generated-artifacts/InvalidERC721Receiver.json",
+        "generated-artifacts/MintableERC721Token.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/exchange-forwarder/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1549373905,
         "version": "1.0.1",

contracts/exchange-forwarder/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated

contracts/exchange-forwarder/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -19,5 +16,11 @@
             }
         }
     },
-    "contracts": ["Forwarder"]
+    "contracts": [
+        "@0x/contracts-erc20/contracts/src/WETH9.sol",
+        "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
+        "@0x/contracts-exchange/contracts/src/Exchange.sol",
+        "src/Forwarder.sol"
+    ]
 }

contracts/exchange-forwarder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-forwarder",
-    "version": "1.0.1",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(Forwarder).json"
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|Exchange|Forwarder|WETH9).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,11 +46,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/contract-wrappers": "^6.0.1",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contract-wrappers": "^7.1.0",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -65,20 +68,20 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-asset-proxy": "^1.0.1",
-        "@0x/contracts-erc20": "^1.0.1",
-        "@0x/contracts-erc721": "^1.0.1",
-        "@0x/contracts-exchange": "^1.0.1",
-        "@0x/contracts-exchange-libs": "^1.0.1",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/order-utils": "^4.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-exchange": "1.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/order-utils": "^6.1.0",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-forwarder/src/artifacts.ts

@@ -0,0 +1,19 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as Exchange from '../generated-artifacts/Exchange.json';
+import * as Forwarder from '../generated-artifacts/Forwarder.json';
+import * as WETH9 from '../generated-artifacts/WETH9.json';
+export const artifacts = {
+    WETH9: WETH9 as ContractArtifact,
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    Exchange: Exchange as ContractArtifact,
+    Forwarder: Forwarder as ContractArtifact,
+};

contracts/exchange-forwarder/src/artifacts/index.ts

@@ -1,7 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as Forwarder from '../../generated-artifacts/Forwarder.json';
-
-export const artifacts = {
-    Forwarder: Forwarder as ContractArtifact,
-};

contracts/exchange-forwarder/src/wrappers.ts

@@ -0,0 +1,10 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/exchange';
+export * from '../generated-wrappers/forwarder';
+export * from '../generated-wrappers/weth9';

contracts/exchange-forwarder/src/wrappers/index.ts

@@ -1 +0,0 @@
-export * from '../../generated-wrappers/forwarder';

contracts/exchange-forwarder/test/forwarder.ts

@@ -1,7 +1,5 @@
 import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
+import { ExchangeWrapper } from '@0x/contracts-exchange';
 import {
     chaiSetup,
     constants,
@@ -23,7 +21,15 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
-import { artifacts, ForwarderContract, ForwarderWrapper } from '../src';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC721TokenContract,
+    ExchangeContract,
+    ForwarderContract,
+    ForwarderWrapper,
+    WETH9Contract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -88,14 +94,14 @@ 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(artifacts.WETH9, provider, txDefaults);
         weth = new DummyERC20TokenContract(wethContract.abi, wethContract.address, provider);
         erc20Wrapper.addDummyTokenContract(weth);
 
         wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
         zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            exchangeArtifacts.Exchange,
+            artifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,
@@ -166,7 +172,7 @@ describe(ContractName.Forwarder, () => {
     describe('constructor', () => {
         it('should revert if assetProxy is unregistered', async () => {
             const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-                exchangeArtifacts.Exchange,
+                artifacts.Exchange,
                 provider,
                 txDefaults,
                 zrxAssetData,

contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts

@@ -1,6 +1,3 @@
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
 import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils';
 import { SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
@@ -61,12 +58,7 @@ export class ForwarderWrapper {
     constructor(contractInstance: ForwarderContract, provider: Provider) {
         this._forwarderContract = contractInstance;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, {
-            ...artifacts,
-            ...erc20Artifacts,
-            ...erc721Artifacts,
-            ...exchangeArtifacts,
-        });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async marketSellOrdersWithEthAsync(
         orders: SignedOrder[],

contracts/exchange-forwarder/tsconfig.json

@@ -1,11 +1,13 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": ["./generated-artifacts/Forwarder.json"],
+    "files": [
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/Exchange.json",
+        "generated-artifacts/Forwarder.json",
+        "generated-artifacts/WETH9.json"
+    ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/exchange-libs/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1549373905,
         "version": "1.0.1",

contracts/exchange-libs/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated

contracts/exchange-libs/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -20,13 +17,13 @@
         }
     },
     "contracts": [
-        "TestLibs",
-        "LibOrder",
-        "LibMath",
-        "LibFillResults",
-        "LibAbiEncoder",
-        "LibEIP712",
-        "LibAssetProxyErrors",
-        "LibConstants"
+        "src/LibAbiEncoder.sol",
+        "src/LibAssetProxyErrors.sol",
+        "src/LibConstants.sol",
+        "src/LibEIP712.sol",
+        "src/LibFillResults.sol",
+        "src/LibMath.sol",
+        "src/LibOrder.sol",
+        "test/TestLibs.sol"
     ]
 }

contracts/exchange-libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-libs",
-    "version": "1.0.1",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(LibMath|LibOrder|LibFillResults|LibAbiEncoder|TestLibs|LibEIP712).json"
+        "abis": "./generated-artifacts/@(LibAbiEncoder|LibAssetProxyErrors|LibConstants|LibEIP712|LibFillResults|LibMath|LibOrder|TestLibs).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,10 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -64,15 +67,15 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/order-utils": "^4.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/order-utils": "^6.1.0",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-libs/src/artifacts.ts

@@ -0,0 +1,25 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as LibAbiEncoder from '../generated-artifacts/LibAbiEncoder.json';
+import * as LibAssetProxyErrors from '../generated-artifacts/LibAssetProxyErrors.json';
+import * as LibConstants from '../generated-artifacts/LibConstants.json';
+import * as LibEIP712 from '../generated-artifacts/LibEIP712.json';
+import * as LibFillResults from '../generated-artifacts/LibFillResults.json';
+import * as LibMath from '../generated-artifacts/LibMath.json';
+import * as LibOrder from '../generated-artifacts/LibOrder.json';
+import * as TestLibs from '../generated-artifacts/TestLibs.json';
+export const artifacts = {
+    LibAbiEncoder: LibAbiEncoder as ContractArtifact,
+    LibAssetProxyErrors: LibAssetProxyErrors as ContractArtifact,
+    LibConstants: LibConstants as ContractArtifact,
+    LibEIP712: LibEIP712 as ContractArtifact,
+    LibFillResults: LibFillResults as ContractArtifact,
+    LibMath: LibMath as ContractArtifact,
+    LibOrder: LibOrder as ContractArtifact,
+    TestLibs: TestLibs as ContractArtifact,
+};

contracts/exchange-libs/src/artifacts/index.ts

@@ -1,17 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as LibAbiEncoder from '../../generated-artifacts/LibAbiEncoder.json';
-import * as LibEIP721 from '../../generated-artifacts/LibEIP712.json';
-import * as LibFillResults from '../../generated-artifacts/LibFillResults.json';
-import * as LibMath from '../../generated-artifacts/LibMath.json';
-import * as LibOrder from '../../generated-artifacts/LibOrder.json';
-import * as TestLibs from '../../generated-artifacts/TestLibs.json';
-
-export const artifacts = {
-    TestLibs: TestLibs as ContractArtifact,
-    LibAbiEncoder: LibAbiEncoder as ContractArtifact,
-    LibFillResults: LibFillResults as ContractArtifact,
-    LibMath: LibMath as ContractArtifact,
-    LibOrder: LibOrder as ContractArtifact,
-    LibEIP721: LibEIP721 as ContractArtifact,
-};

contracts/exchange-libs/src/wrappers.ts

@@ -0,0 +1,13 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/lib_abi_encoder';
+export * from '../generated-wrappers/lib_asset_proxy_errors';
+export * from '../generated-wrappers/lib_constants';
+export * from '../generated-wrappers/lib_e_i_p712';
+export * from '../generated-wrappers/lib_fill_results';
+export * from '../generated-wrappers/lib_math';
+export * from '../generated-wrappers/lib_order';
+export * from '../generated-wrappers/test_libs';

contracts/exchange-libs/src/wrappers/index.ts

@@ -1,6 +0,0 @@
-export * from '../../generated-wrappers/test_libs';
-export * from '../../generated-wrappers/lib_abi_encoder';
-export * from '../../generated-wrappers/lib_fill_results';
-export * from '../../generated-wrappers/lib_math';
-export * from '../../generated-wrappers/lib_order';
-export * from '../../generated-wrappers/lib_e_i_p712';

contracts/exchange-libs/tsconfig.json

@@ -1,18 +1,16 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/TestLibs.json",
-        "./generated-artifacts/LibOrder.json",
-        "./generated-artifacts/LibFillResults.json",
-        "./generated-artifacts/LibAbiEncoder.json",
-        "./generated-artifacts/LibEIP712.json",
-        "./generated-artifacts/LibMath.json"
+        "generated-artifacts/LibAbiEncoder.json",
+        "generated-artifacts/LibAssetProxyErrors.json",
+        "generated-artifacts/LibConstants.json",
+        "generated-artifacts/LibEIP712.json",
+        "generated-artifacts/LibFillResults.json",
+        "generated-artifacts/LibMath.json",
+        "generated-artifacts/LibOrder.json",
+        "generated-artifacts/TestLibs.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/exchange/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1549373905,
         "version": "1.0.1",

contracts/exchange/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated

contracts/exchange/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -20,23 +17,31 @@
         }
     },
     "contracts": [
-        "Exchange",
-        "IAssetProxyDispatcher",
-        "IExchange",
-        "IExchangeCore",
-        "IMatchOrders",
-        "ISignatureValidator",
-        "ITransactions",
-        "IValidator",
-        "IWallet",
-        "IWrapperFunctions",
-        "TestAssetProxyDispatcher",
-        "TestExchangeInternals",
-        "TestSignatureValidator",
-        "TestStaticCallReceiver",
-        "ExchangeWrapper",
-        "Validator",
-        "Wallet",
-        "Whitelist"
+        "@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol",
+        "@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol",
+        "@0x/contracts-asset-proxy/contracts/src/MultiAssetProxy.sol",
+        "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
+        "@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol",
+        "@0x/contracts-erc20/contracts/test/ReentrantERC20Token.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
+        "@0x/contracts-exchange-libs/contracts/test/TestLibs.sol",
+        "examples/ExchangeWrapper.sol",
+        "examples/Validator.sol",
+        "examples/Wallet.sol",
+        "examples/Whitelist.sol",
+        "src/Exchange.sol",
+        "src/interfaces/IAssetProxyDispatcher.sol",
+        "src/interfaces/IExchange.sol",
+        "src/interfaces/IExchangeCore.sol",
+        "src/interfaces/IMatchOrders.sol",
+        "src/interfaces/ISignatureValidator.sol",
+        "src/interfaces/ITransactions.sol",
+        "src/interfaces/IValidator.sol",
+        "src/interfaces/IWallet.sol",
+        "src/interfaces/IWrapperFunctions.sol",
+        "test/TestAssetProxyDispatcher.sol",
+        "test/TestExchangeInternals.sol",
+        "test/TestSignatureValidator.sol",
+        "test/TestStaticCallReceiver.sol"
     ]
 }

contracts/exchange/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "1.0.1",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|Exchange|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IWrapperFunctions|IValidator|IWallet|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver|ExchangeWrapper|Validator|Wallet|Whitelist).json"
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|MultiAssetProxy|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,9 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -63,21 +67,20 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-asset-proxy": "^1.0.1",
-        "@0x/contracts-erc20": "^1.0.1",
-        "@0x/contracts-erc721": "^1.0.1",
-        "@0x/contracts-exchange-libs": "^1.0.1",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/order-utils": "^4.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/order-utils": "^6.1.0",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
         "ethereumjs-util": "^5.1.1",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange/src/artifacts.ts

@@ -0,0 +1,61 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
+import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
+import * as Exchange from '../generated-artifacts/Exchange.json';
+import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json';
+import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json';
+import * as IExchange from '../generated-artifacts/IExchange.json';
+import * as IExchangeCore from '../generated-artifacts/IExchangeCore.json';
+import * as IMatchOrders from '../generated-artifacts/IMatchOrders.json';
+import * as ISignatureValidator from '../generated-artifacts/ISignatureValidator.json';
+import * as ITransactions from '../generated-artifacts/ITransactions.json';
+import * as IValidator from '../generated-artifacts/IValidator.json';
+import * as IWallet from '../generated-artifacts/IWallet.json';
+import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json';
+import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
+import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json';
+import * as TestAssetProxyDispatcher from '../generated-artifacts/TestAssetProxyDispatcher.json';
+import * as TestExchangeInternals from '../generated-artifacts/TestExchangeInternals.json';
+import * as TestLibs from '../generated-artifacts/TestLibs.json';
+import * as TestSignatureValidator from '../generated-artifacts/TestSignatureValidator.json';
+import * as TestStaticCallReceiver from '../generated-artifacts/TestStaticCallReceiver.json';
+import * as Validator from '../generated-artifacts/Validator.json';
+import * as Wallet from '../generated-artifacts/Wallet.json';
+import * as Whitelist from '../generated-artifacts/Whitelist.json';
+export const artifacts = {
+    ERC20Proxy: ERC20Proxy as ContractArtifact,
+    ERC721Proxy: ERC721Proxy as ContractArtifact,
+    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
+    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    TestLibs: TestLibs as ContractArtifact,
+    ExchangeWrapper: ExchangeWrapper as ContractArtifact,
+    Validator: Validator as ContractArtifact,
+    Wallet: Wallet as ContractArtifact,
+    Whitelist: Whitelist as ContractArtifact,
+    Exchange: Exchange as ContractArtifact,
+    IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
+    IExchange: IExchange as ContractArtifact,
+    IExchangeCore: IExchangeCore as ContractArtifact,
+    IMatchOrders: IMatchOrders as ContractArtifact,
+    ISignatureValidator: ISignatureValidator as ContractArtifact,
+    ITransactions: ITransactions as ContractArtifact,
+    IValidator: IValidator as ContractArtifact,
+    IWallet: IWallet as ContractArtifact,
+    IWrapperFunctions: IWrapperFunctions as ContractArtifact,
+    TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact,
+    TestExchangeInternals: TestExchangeInternals as ContractArtifact,
+    TestSignatureValidator: TestSignatureValidator as ContractArtifact,
+    TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
+};

contracts/exchange/src/artifacts/index.ts

@@ -1,41 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as Exchange from '../../generated-artifacts/Exchange.json';
-import * as ExchangeWrapper from '../../generated-artifacts/ExchangeWrapper.json';
-import * as IAssetProxyDispatcher from '../../generated-artifacts/IAssetProxyDispatcher.json';
-import * as IExchange from '../../generated-artifacts/IExchange.json';
-import * as IExchangeCore from '../../generated-artifacts/IExchangeCore.json';
-import * as IMatchOrders from '../../generated-artifacts/IMatchOrders.json';
-import * as ISignatureValidator from '../../generated-artifacts/ISignatureValidator.json';
-import * as ITransactions from '../../generated-artifacts/ITransactions.json';
-import * as IValidator from '../../generated-artifacts/IValidator.json';
-import * as IWallet from '../../generated-artifacts/IWallet.json';
-import * as IWrapperFunctions from '../../generated-artifacts/IWrapperFunctions.json';
-import * as TestAssetProxyDispatcher from '../../generated-artifacts/TestAssetProxyDispatcher.json';
-import * as TestExchangeInternals from '../../generated-artifacts/TestExchangeInternals.json';
-import * as TestSignatureValidator from '../../generated-artifacts/TestSignatureValidator.json';
-import * as TestStaticCallReceiver from '../../generated-artifacts/TestStaticCallReceiver.json';
-import * as Validator from '../../generated-artifacts/Validator.json';
-import * as Wallet from '../../generated-artifacts/Wallet.json';
-import * as Whitelist from '../../generated-artifacts/Whitelist.json';
-
-export const artifacts = {
-    Exchange: Exchange as ContractArtifact,
-    TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact,
-    TestExchangeInternals: TestExchangeInternals as ContractArtifact,
-    TestSignatureValidator: TestSignatureValidator as ContractArtifact,
-    TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
-    IExchange: IExchange as ContractArtifact,
-    IExchangeCore: IExchangeCore as ContractArtifact,
-    IMatchOrders: IMatchOrders as ContractArtifact,
-    ISignatureValidator: ISignatureValidator as ContractArtifact,
-    ITransactions: ITransactions as ContractArtifact,
-    IWrapperFunctions: IWrapperFunctions as ContractArtifact,
-    IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
-    IValidator: IValidator as ContractArtifact,
-    IWallet: IWallet as ContractArtifact,
-    ExchangeWrapper: ExchangeWrapper as ContractArtifact,
-    Validator: Validator as ContractArtifact,
-    Wallet: Wallet as ContractArtifact,
-    Whitelist: Whitelist as ContractArtifact,
-};

contracts/exchange/src/wrappers.ts

@@ -0,0 +1,31 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../generated-wrappers/erc20_proxy';
+export * from '../generated-wrappers/erc721_proxy';
+export * from '../generated-wrappers/exchange';
+export * from '../generated-wrappers/exchange_wrapper';
+export * from '../generated-wrappers/i_asset_proxy_dispatcher';
+export * from '../generated-wrappers/i_exchange';
+export * from '../generated-wrappers/i_exchange_core';
+export * from '../generated-wrappers/i_match_orders';
+export * from '../generated-wrappers/i_signature_validator';
+export * from '../generated-wrappers/i_transactions';
+export * from '../generated-wrappers/i_validator';
+export * from '../generated-wrappers/i_wallet';
+export * from '../generated-wrappers/i_wrapper_functions';
+export * from '../generated-wrappers/multi_asset_proxy';
+export * from '../generated-wrappers/reentrant_erc20_token';
+export * from '../generated-wrappers/test_asset_proxy_dispatcher';
+export * from '../generated-wrappers/test_exchange_internals';
+export * from '../generated-wrappers/test_libs';
+export * from '../generated-wrappers/test_signature_validator';
+export * from '../generated-wrappers/test_static_call_receiver';
+export * from '../generated-wrappers/validator';
+export * from '../generated-wrappers/wallet';
+export * from '../generated-wrappers/whitelist';

contracts/exchange/src/wrappers/index.ts

@@ -1,18 +0,0 @@
-export * from '../../generated-wrappers/exchange';
-export * from '../../generated-wrappers/test_asset_proxy_dispatcher';
-export * from '../../generated-wrappers/test_exchange_internals';
-export * from '../../generated-wrappers/test_signature_validator';
-export * from '../../generated-wrappers/test_static_call_receiver';
-export * from '../../generated-wrappers/i_asset_proxy_dispatcher';
-export * from '../../generated-wrappers/i_exchange';
-export * from '../../generated-wrappers/i_exchange_core';
-export * from '../../generated-wrappers/i_match_orders';
-export * from '../../generated-wrappers/i_signature_validator';
-export * from '../../generated-wrappers/i_transactions';
-export * from '../../generated-wrappers/i_wrapper_functions';
-export * from '../../generated-wrappers/i_validator';
-export * from '../../generated-wrappers/i_wallet';
-export * from '../../generated-wrappers/exchange_wrapper';
-export * from '../../generated-wrappers/validator';
-export * from '../../generated-wrappers/wallet';
-export * from '../../generated-wrappers/whitelist';

contracts/exchange/test/core.ts

@@ -1,19 +1,4 @@
-import {
-    artifacts as proxyArtifacts,
-    ERC20ProxyContract,
-    ERC20Wrapper,
-    ERC721ProxyContract,
-    ERC721Wrapper,
-    MultiAssetProxyContract,
-} from '@0x/contracts-asset-proxy';
-import {
-    artifacts as erc20Artifacts,
-    DummyERC20TokenContract,
-    DummyERC20TokenTransferEventArgs,
-    DummyNoReturnERC20TokenContract,
-    ReentrantERC20TokenContract,
-} from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import {
     chaiSetup,
     constants,
@@ -39,9 +24,17 @@ import * as _ from 'lodash';
 
 import {
     artifacts,
+    DummyERC20TokenContract,
+    DummyERC20TokenTransferEventArgs,
+    DummyERC721TokenContract,
+    DummyNoReturnERC20TokenContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
     ExchangeCancelEventArgs,
     ExchangeContract,
     ExchangeWrapper,
+    MultiAssetProxyContract,
+    ReentrantERC20TokenContract,
     TestStaticCallReceiverContract,
 } from '../src';
 
@@ -98,7 +91,7 @@ describe('Exchange core', () => {
         erc20Proxy = await erc20Wrapper.deployProxyAsync();
         erc721Proxy = await erc721Wrapper.deployProxyAsync();
         multiAssetProxy = await MultiAssetProxyContract.deployFrom0xArtifactAsync(
-            proxyArtifacts.MultiAssetProxy,
+            artifacts.MultiAssetProxy,
             provider,
             txDefaults,
         );
@@ -120,7 +113,7 @@ describe('Exchange core', () => {
             txDefaults,
         );
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
-            erc20Artifacts.ReentrantERC20Token,
+            artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
             exchange.address,
@@ -345,7 +338,7 @@ describe('Exchange core', () => {
     describe('Testing exchange of ERC20 tokens with no return values', () => {
         before(async () => {
             noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync(
-                erc20Artifacts.DummyNoReturnERC20Token,
+                artifacts.DummyNoReturnERC20Token,
                 provider,
                 txDefaults,
                 constants.DUMMY_TOKEN_NAME,

contracts/exchange/test/dispatcher.ts

@@ -1,11 +1,4 @@
-import {
-    artifacts as proxyArtifacts,
-    ERC20ProxyContract,
-    ERC20Wrapper,
-    ERC721ProxyContract,
-    ERC721Wrapper,
-} from '@0x/contracts-asset-proxy';
-import { DummyERC20TokenContract } from '@0x/contracts-erc20';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import {
     chaiSetup,
     constants,
@@ -25,6 +18,9 @@ import * as _ from 'lodash';
 
 import {
     artifacts,
+    DummyERC20TokenContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
     TestAssetProxyDispatcherAssetProxyRegisteredEventArgs,
     TestAssetProxyDispatcherContract,
 } from '../src';
@@ -131,7 +127,7 @@ describe('AssetProxyDispatcher', () => {
             expect(proxyAddress).to.be.equal(erc20Proxy.address);
             // Deploy a new version of the ERC20 Transfer Proxy contract
             const newErc20TransferProxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(
-                proxyArtifacts.ERC20Proxy,
+                artifacts.ERC20Proxy,
                 provider,
                 txDefaults,
             );

contracts/exchange/test/match_orders.ts

@@ -1,6 +1,4 @@
-import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import {
     chaiSetup,
     constants,
@@ -20,7 +18,18 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { artifacts, ExchangeContract, ExchangeWrapper, MatchOrderTester, TestExchangeInternalsContract } from '../src';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC721TokenContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
+    ExchangeContract,
+    ExchangeWrapper,
+    MatchOrderTester,
+    ReentrantERC20TokenContract,
+    TestExchangeInternalsContract,
+} from '../src';
 
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
@@ -131,7 +140,7 @@ describe('matchOrders', () => {
         );
 
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
-            erc20Artifacts.ReentrantERC20Token,
+            artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
             exchange.address,

contracts/exchange/test/signature_validator.ts

@@ -1,4 +1,3 @@
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
 import {
     addressUtils,
     chaiSetup,
@@ -78,7 +77,7 @@ describe('MixinSignatureValidator', () => {
             provider,
             txDefaults,
         );
-        signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts });
+        signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, artifacts);
         await web3Wrapper.awaitTransactionSuccessAsync(
             await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, {
                 from: signerAddress,

contracts/exchange/test/transactions.ts

@@ -8,14 +8,13 @@ import {
     OrderFactory,
     orderUtils,
     provider,
-    SignedTransaction,
     TransactionFactory,
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
-import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types';
+import { OrderWithoutExchangeAddress, RevertReason, SignedOrder, SignedZeroExTransaction } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -41,7 +40,7 @@ describe('Exchange transactions', () => {
 
     let erc20Balances: ERC20BalancesByOwner;
     let signedOrder: SignedOrder;
-    let signedTx: SignedTransaction;
+    let signedTx: SignedZeroExTransaction;
     let orderWithoutExchangeAddress: OrderWithoutExchangeAddress;
     let orderFactory: OrderFactory;
     let makerTransactionFactory: TransactionFactory;

contracts/exchange/test/utils/exchange_wrapper.ts

@@ -1,14 +1,5 @@
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
-import {
-    FillResults,
-    formatters,
-    LogDecoder,
-    OrderInfo,
-    orderUtils,
-    SignedTransaction,
-} from '@0x/contracts-test-utils';
-import { SignedOrder } from '@0x/types';
+import { FillResults, formatters, LogDecoder, OrderInfo, orderUtils } 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, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
@@ -25,7 +16,7 @@ export class ExchangeWrapper {
     constructor(exchangeContract: ExchangeContract, provider: Provider) {
         this._exchange = exchangeContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...erc721Artifacts });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async fillOrderAsync(
         signedOrder: SignedOrder,
@@ -206,7 +197,7 @@ export class ExchangeWrapper {
         return tx;
     }
     public async executeTransactionAsync(
-        signedTx: SignedTransaction,
+        signedTx: SignedZeroExTransaction,
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const txHash = await this._exchange.executeTransaction.sendTransactionAsync(

contracts/exchange/test/utils/fill_order_combinatorial_utils.ts

@@ -1,5 +1,4 @@
 import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { artifacts as libsArtifacts, TestLibsContract } from '@0x/contracts-exchange-libs';
 import {
     AllowanceAmountScenario,
     AssetDataScenario,
@@ -33,7 +32,7 @@ import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 
-import { artifacts, ExchangeContract, ExchangeFillEventArgs } from '../../src';
+import { artifacts, ExchangeContract, ExchangeFillEventArgs, TestLibsContract } from '../../src';
 
 import { AssetWrapper } from './asset_wrapper';
 import { ExchangeWrapper } from './exchange_wrapper';
@@ -129,11 +128,7 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
         exchangeContract.address,
     );
 
-    const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(
-        libsArtifacts.TestLibs,
-        provider,
-        txDefaults,
-    );
+    const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults);
 
     const fillOrderCombinatorialUtils = new FillOrderCombinatorialUtils(
         orderFactory,

contracts/exchange/test/wrapper.ts

@@ -1,6 +1,4 @@
-import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import {
     chaiSetup,
     constants,
@@ -22,7 +20,16 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { artifacts, ExchangeContract, ExchangeWrapper } from '../src';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC721TokenContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
+    ExchangeContract,
+    ExchangeWrapper,
+    ReentrantERC20TokenContract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -107,7 +114,7 @@ describe('Exchange wrappers', () => {
         );
 
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
-            erc20Artifacts.ReentrantERC20Token,
+            artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
             exchange.address,

contracts/exchange/tsconfig.json

@@ -1,30 +1,34 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/IAssetProxyDispatcher.json",
-        "./generated-artifacts/IExchange.json",
-        "./generated-artifacts/IExchangeCore.json",
-        "./generated-artifacts/IMatchOrders.json",
-        "./generated-artifacts/ISignatureValidator.json",
-        "./generated-artifacts/ITransactions.json",
-        "./generated-artifacts/IValidator.json",
-        "./generated-artifacts/IWallet.json",
-        "./generated-artifacts/IWrapperFunctions.json",
-        "./generated-artifacts/Exchange.json",
-        "./generated-artifacts/TestAssetProxyDispatcher.json",
-        "./generated-artifacts/TestExchangeInternals.json",
-        "./generated-artifacts/TestSignatureValidator.json",
-        "./generated-artifacts/TestStaticCallReceiver.json",
-        "./generated-artifacts/ExchangeWrapper.json",
-        "./generated-artifacts/Validator.json",
-        "./generated-artifacts/Wallet.json",
-        "./generated-artifacts/Whitelist.json"
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/DummyNoReturnERC20Token.json",
+        "generated-artifacts/ERC20Proxy.json",
+        "generated-artifacts/ERC721Proxy.json",
+        "generated-artifacts/Exchange.json",
+        "generated-artifacts/ExchangeWrapper.json",
+        "generated-artifacts/IAssetProxyDispatcher.json",
+        "generated-artifacts/IExchange.json",
+        "generated-artifacts/IExchangeCore.json",
+        "generated-artifacts/IMatchOrders.json",
+        "generated-artifacts/ISignatureValidator.json",
+        "generated-artifacts/ITransactions.json",
+        "generated-artifacts/IValidator.json",
+        "generated-artifacts/IWallet.json",
+        "generated-artifacts/IWrapperFunctions.json",
+        "generated-artifacts/MultiAssetProxy.json",
+        "generated-artifacts/ReentrantERC20Token.json",
+        "generated-artifacts/TestAssetProxyDispatcher.json",
+        "generated-artifacts/TestExchangeInternals.json",
+        "generated-artifacts/TestLibs.json",
+        "generated-artifacts/TestSignatureValidator.json",
+        "generated-artifacts/TestStaticCallReceiver.json",
+        "generated-artifacts/Validator.json",
+        "generated-artifacts/Wallet.json",
+        "generated-artifacts/Whitelist.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/extensions/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "2.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "2.0.2",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "2.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.0.0",
         "changes": [

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.4 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v2.0.3 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v2.0.2 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v2.0.1 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v2.0.0 - _February 5, 2019_
 
     * Upgrade the bignumber.js to v8.0.2 (#1517)

contracts/extensions/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -19,5 +16,17 @@
             }
         }
     },
-    "contracts": ["BalanceThresholdFilter", "DutchAuction", "OrderMatcher", "OrderValidator"]
+    "contracts": [
+        "@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol",
+        "@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol",
+        "@0x/contracts-erc20/contracts/src/WETH9.sol",
+        "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
+        "@0x/contracts-exchange/contracts/examples/ExchangeWrapper.sol",
+        "@0x/contracts-exchange/contracts/src/Exchange.sol",
+        "src/BalanceThresholdFilter/BalanceThresholdFilter.sol",
+        "src/DutchAuction/DutchAuction.sol",
+        "src/OrderMatcher/OrderMatcher.sol",
+        "src/OrderValidator/OrderValidator.sol"
+    ]
 }

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "2.0.0",
+    "version": "2.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(BalanceThresholdFilter|DutchAuction|OrderMatcher|OrderValidator).json"
+        "abis": "./generated-artifacts/@(BalanceThresholdFilter|DummyERC20Token|DummyERC721Token|DutchAuction|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|OrderMatcher|OrderValidator|WETH9).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,11 +46,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/contract-wrappers": "^6.0.1",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contract-wrappers": "^7.1.0",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -65,20 +68,20 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-asset-proxy": "^1.0.1",
-        "@0x/contracts-erc20": "^1.0.1",
-        "@0x/contracts-erc721": "^1.0.1",
-        "@0x/contracts-exchange": "^1.0.1",
-        "@0x/contracts-exchange-libs": "^1.0.1",
-        "@0x/contracts-utils": "^2.0.0",
-        "@0x/order-utils": "^4.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-exchange": "1.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/order-utils": "^6.1.0",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/extensions/src/artifacts.ts

@@ -0,0 +1,31 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as BalanceThresholdFilter from '../generated-artifacts/BalanceThresholdFilter.json';
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as DutchAuction from '../generated-artifacts/DutchAuction.json';
+import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
+import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
+import * as Exchange from '../generated-artifacts/Exchange.json';
+import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json';
+import * as OrderMatcher from '../generated-artifacts/OrderMatcher.json';
+import * as OrderValidator from '../generated-artifacts/OrderValidator.json';
+import * as WETH9 from '../generated-artifacts/WETH9.json';
+export const artifacts = {
+    ERC20Proxy: ERC20Proxy as ContractArtifact,
+    ERC721Proxy: ERC721Proxy as ContractArtifact,
+    WETH9: WETH9 as ContractArtifact,
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    ExchangeWrapper: ExchangeWrapper as ContractArtifact,
+    Exchange: Exchange as ContractArtifact,
+    BalanceThresholdFilter: BalanceThresholdFilter as ContractArtifact,
+    DutchAuction: DutchAuction as ContractArtifact,
+    OrderMatcher: OrderMatcher as ContractArtifact,
+    OrderValidator: OrderValidator as ContractArtifact,
+};

contracts/extensions/src/artifacts/index.ts

@@ -1,13 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as BalanceThresholdFilter from '../../generated-artifacts/BalanceThresholdFilter.json';
-import * as DutchAuction from '../../generated-artifacts/DutchAuction.json';
-import * as OrderMatcher from '../../generated-artifacts/OrderMatcher.json';
-import * as OrderValidator from '../../generated-artifacts/OrderValidator.json';
-
-export const artifacts = {
-    BalanceThresholdFilter: BalanceThresholdFilter as ContractArtifact,
-    DutchAuction: DutchAuction as ContractArtifact,
-    OrderMatcher: OrderMatcher as ContractArtifact,
-    OrderValidator: OrderValidator as ContractArtifact,
-};

contracts/extensions/src/wrappers.ts

@@ -0,0 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/balance_threshold_filter';
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/dutch_auction';
+export * from '../generated-wrappers/erc20_proxy';
+export * from '../generated-wrappers/erc721_proxy';
+export * from '../generated-wrappers/exchange';
+export * from '../generated-wrappers/exchange_wrapper';
+export * from '../generated-wrappers/order_matcher';
+export * from '../generated-wrappers/order_validator';
+export * from '../generated-wrappers/weth9';

contracts/extensions/src/wrappers/index.ts

@@ -1,4 +0,0 @@
-export * from '../../generated-wrappers/balance_threshold_filter';
-export * from '../../generated-wrappers/dutch_auction';
-export * from '../../generated-wrappers/order_matcher';
-export * from '../../generated-wrappers/order_validator';

contracts/extensions/test/balance_threshold_filter.ts

@@ -1,3 +1,4 @@
+import { ExchangeWrapper } from '@0x/contracts-exchange';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { Order, RevertReason, SignedOrder } from '@0x/types';
@@ -9,7 +10,6 @@ import * as _ from 'lodash';
 
 import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import { DummyERC20TokenContract } from '@0x/contracts-erc20';
-import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
 import {
     chaiSetup,
     constants,
@@ -24,7 +24,7 @@ import {
     web3Wrapper,
 } from '@0x/contracts-test-utils';
 
-import { artifacts, BalanceThresholdFilterContract, BalanceThresholdWrapper } from '../src';
+import { artifacts, BalanceThresholdFilterContract, BalanceThresholdWrapper, ExchangeContract } from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -127,7 +127,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
         await erc20Wrapper.setBalancesAndAllowancesAsync();
         // Deploy Exchange contract
         exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            exchangeArtifacts.Exchange,
+            artifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,

contracts/extensions/test/dutch_auction.ts

@@ -1,8 +1,6 @@
 import { DutchAuctionWrapper } from '@0x/contract-wrappers';
 import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
+import { ExchangeWrapper } from '@0x/contracts-exchange';
 import {
     chaiSetup,
     constants,
@@ -23,7 +21,15 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { artifacts, DutchAuctionContract, DutchAuctionTestWrapper } from '../src';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC721TokenContract,
+    DutchAuctionContract,
+    DutchAuctionTestWrapper,
+    ExchangeContract,
+    WETH9Contract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -82,12 +88,12 @@ describe(ContractName.DutchAuction, () => {
         const erc721Balances = await erc721Wrapper.getBalancesAsync();
         erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address];
 
-        wethContract = await WETH9Contract.deployFrom0xArtifactAsync(erc20Artifacts.WETH9, provider, txDefaults);
+        wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults);
         erc20Wrapper.addDummyTokenContract(wethContract as any);
 
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            exchangeArtifacts.Exchange,
+            artifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,

contracts/extensions/test/order_matcher.ts

@@ -1,17 +1,5 @@
-import {
-    artifacts as proxyArtifacts,
-    ERC20ProxyContract,
-    ERC20Wrapper,
-    ERC721ProxyContract,
-} from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts, DummyERC721TokenContract } from '@0x/contracts-erc721';
-import {
-    artifacts as exchangeArtifacts,
-    ExchangeContract,
-    ExchangeFillEventArgs,
-    ExchangeWrapper,
-} from '@0x/contracts-exchange';
+import { ERC20Wrapper } from '@0x/contracts-asset-proxy';
+import { ExchangeWrapper } from '@0x/contracts-exchange';
 import {
     chaiSetup,
     constants,
@@ -34,7 +22,16 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts, OrderMatcherContract } from '../src';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC721TokenContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
+    ExchangeContract,
+    ExchangeFillEventArgs,
+    OrderMatcherContract,
+} from '../src';
 
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
@@ -104,14 +101,10 @@ describe('OrderMatcher', () => {
         erc20Proxy = await erc20Wrapper.deployProxyAsync();
         await erc20Wrapper.setBalancesAndAllowancesAsync();
         // Deploy ERC721 proxy
-        erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
-            proxyArtifacts.ERC721Proxy,
-            provider,
-            txDefaults,
-        );
+        erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC721Proxy, provider, txDefaults);
         // Depoy exchange
         exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            exchangeArtifacts.Exchange,
+            artifacts.Exchange,
             provider,
             txDefaults,
             assetDataUtils.encodeERC20AssetData(zrxToken.address),
@@ -200,7 +193,7 @@ describe('OrderMatcher', () => {
     describe('constructor', () => {
         it('should revert if assetProxy is unregistered', async () => {
             const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-                exchangeArtifacts.Exchange,
+                artifacts.Exchange,
                 provider,
                 txDefaults,
                 constants.NULL_BYTES,
@@ -454,7 +447,7 @@ describe('OrderMatcher', () => {
                 signedOrderLeft.signature,
                 signedOrderRight.signature,
             );
-            const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts, ...exchangeArtifacts });
+            const logDecoder = new LogDecoder(web3Wrapper, artifacts);
             const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
                 await web3Wrapper.sendTransactionAsync({
                     data,
@@ -492,7 +485,7 @@ describe('OrderMatcher', () => {
                 signedOrderLeft.signature,
                 signedOrderRight.signature,
             );
-            const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts, ...exchangeArtifacts });
+            const logDecoder = new LogDecoder(web3Wrapper, artifacts);
             const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
                 await web3Wrapper.sendTransactionAsync({
                     data,
@@ -729,7 +722,7 @@ describe('OrderMatcher', () => {
         });
         it('should allow owner to withdraw ERC721 tokens', async () => {
             const erc721Token = await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-                erc721Artifacts.DummyERC721Token,
+                artifacts.DummyERC721Token,
                 provider,
                 txDefaults,
                 constants.DUMMY_TOKEN_NAME,
@@ -774,7 +767,7 @@ describe('OrderMatcher', () => {
         });
         it('should be able to approve an ERC721 token by passing in allowance = 1', async () => {
             const erc721Token = await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-                erc721Artifacts.DummyERC721Token,
+                artifacts.DummyERC721Token,
                 provider,
                 txDefaults,
                 constants.DUMMY_TOKEN_NAME,
@@ -791,7 +784,7 @@ describe('OrderMatcher', () => {
         });
         it('should be able to approve an ERC721 token by passing in allowance > 1', async () => {
             const erc721Token = await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-                erc721Artifacts.DummyERC721Token,
+                artifacts.DummyERC721Token,
                 provider,
                 txDefaults,
                 constants.DUMMY_TOKEN_NAME,

contracts/extensions/test/order_validator.ts

@@ -1,7 +1,5 @@
-import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { DummyERC20TokenContract } from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
+import { ExchangeWrapper } from '@0x/contracts-exchange';
 import {
     chaiSetup,
     constants,
@@ -18,7 +16,15 @@ import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { artifacts, OrderValidatorContract } from '../src';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC721TokenContract,
+    ERC20ProxyContract,
+    ERC721ProxyContract,
+    ExchangeContract,
+    OrderValidatorContract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -74,7 +80,7 @@ describe('OrderValidator', () => {
 
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            exchangeArtifacts.Exchange,
+            artifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,

contracts/extensions/test/utils/balance_threshold_wrapper.ts

@@ -1,6 +1,3 @@
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-exchange';
 import {
     FillResults,
     formatters,
@@ -15,8 +12,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { BalanceThresholdFilterContract } from '../../generated-wrappers/balance_threshold_filter';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, BalanceThresholdFilterContract, ExchangeContract } from '../../src';
 
 export class BalanceThresholdWrapper {
     private readonly _balanceThresholdFilter: BalanceThresholdFilterContract;
@@ -34,12 +30,7 @@ export class BalanceThresholdWrapper {
         this._exchange = exchangeContract;
         this._signerTransactionFactory = signerTransactionFactory;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, {
-            ...artifacts,
-            ...erc20Artifacts,
-            ...erc721Artifacts,
-            ...exchangeArtifacts,
-        });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async fillOrderAsync(
         signedOrder: SignedOrder,
@@ -227,7 +218,7 @@ export class BalanceThresholdWrapper {
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const params = orderUtils.createMatchOrders(signedOrderLeft, signedOrderRight);
-        const data = await this._exchange.matchOrders.getABIEncodedTransactionData(
+        const data = this._exchange.matchOrders.getABIEncodedTransactionData(
             params.left,
             params.right,
             params.leftSignature,

contracts/extensions/test/utils/dutch_auction_test_wrapper.ts

@@ -1,6 +1,3 @@
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
 import { LogDecoder } from '@0x/contracts-test-utils';
 import { DutchAuctionDetails, SignedOrder } from '@0x/types';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -18,12 +15,7 @@ export class DutchAuctionTestWrapper {
     constructor(contractInstance: DutchAuctionContract, provider: Provider) {
         this._dutchAuctionContract = contractInstance;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, {
-            ...artifacts,
-            ...erc20Artifacts,
-            ...erc721Artifacts,
-            ...exchangeArtifacts,
-        });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     /**
      * Matches the buy and sell orders at an amount given the following: the current block time, the auction

contracts/extensions/tsconfig.json

@@ -1,16 +1,19 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/BalanceThresholdFilter.json",
-        "./generated-artifacts/DutchAuction.json",
-        "./generated-artifacts/OrderMatcher.json",
-        "./generated-artifacts/OrderValidator.json"
+        "generated-artifacts/BalanceThresholdFilter.json",
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/DutchAuction.json",
+        "generated-artifacts/ERC20Proxy.json",
+        "generated-artifacts/ERC721Proxy.json",
+        "generated-artifacts/Exchange.json",
+        "generated-artifacts/ExchangeWrapper.json",
+        "generated-artifacts/OrderMatcher.json",
+        "generated-artifacts/OrderValidator.json",
+        "generated-artifacts/WETH9.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/multisig/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "2.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "2.0.2",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "2.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.0.0",
         "changes": [

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.4 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v2.0.3 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v2.0.2 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v2.0.1 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v2.0.0 - _February 5, 2019_
 
     * Upgrade the bignumber.js to v8.0.2 (#1517)

contracts/multisig/compiler.json

@@ -3,10 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {
                 "*": [
@@ -20,10 +17,11 @@
         }
     },
     "contracts": [
-        "AssetProxyOwner",
-        "MultiSigWallet",
-        "MultiSigWalletWithTimeLock",
-        "TestAssetProxyOwner",
-        "TestRejectEther"
+        "@0x/contracts-asset-proxy/contracts/src/MixinAuthorizable.sol",
+        "src/AssetProxyOwner.sol",
+        "src/MultiSigWallet.sol",
+        "src/MultiSigWalletWithTimeLock.sol",
+        "test/TestAssetProxyOwner.sol",
+        "test/TestRejectEther.sol"
     ]
 }

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "2.0.0",
+    "version": "2.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,10 +29,12 @@
         "profiler:report:html": "istanbul report html && open coverage/index.html",
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(AssetProxyOwner|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestRejectEther).json"
+        "abis": "./generated-artifacts/@(AssetProxyOwner|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestRejectEther).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
@@ -44,10 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/contracts-test-utils": "^3.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/sol-compiler": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/contracts-gen": "^1.0.2",
+        "@0x/contracts-test-utils": "^3.0.4",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/sol-compiler": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -64,15 +67,15 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^4.0.0",
-        "@0x/contracts-asset-proxy": "^1.0.1",
-        "@0x/contracts-erc20": "^1.0.1",
-        "@0x/types": "^2.0.0",
+        "@0x/base-contract": "^4.0.3",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "ethereum-types": "^2.0.0",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"

contracts/multisig/src/artifacts.ts

@@ -0,0 +1,21 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as AssetProxyOwner from '../generated-artifacts/AssetProxyOwner.json';
+import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
+import * as MultiSigWallet from '../generated-artifacts/MultiSigWallet.json';
+import * as MultiSigWalletWithTimeLock from '../generated-artifacts/MultiSigWalletWithTimeLock.json';
+import * as TestAssetProxyOwner from '../generated-artifacts/TestAssetProxyOwner.json';
+import * as TestRejectEther from '../generated-artifacts/TestRejectEther.json';
+export const artifacts = {
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    AssetProxyOwner: AssetProxyOwner as ContractArtifact,
+    MultiSigWallet: MultiSigWallet as ContractArtifact,
+    MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact,
+    TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact,
+    TestRejectEther: TestRejectEther as ContractArtifact,
+};

contracts/multisig/src/artifacts/index.ts

@@ -1,15 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as AssetProxyOwner from '../../generated-artifacts/AssetProxyOwner.json';
-import * as MultiSigWallet from '../../generated-artifacts/MultiSigWallet.json';
-import * as MultiSigWalletWithTimeLock from '../../generated-artifacts/MultiSigWalletWithTimeLock.json';
-import * as TestAssetProxyOwner from '../../generated-artifacts/TestAssetProxyOwner.json';
-import * as TestRejectEther from '../../generated-artifacts/TestRejectEther.json';
-
-export const artifacts = {
-    AssetProxyOwner: AssetProxyOwner as ContractArtifact,
-    MultiSigWallet: MultiSigWallet as ContractArtifact,
-    MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact,
-    TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact,
-    TestRejectEther: TestRejectEther as ContractArtifact,
-};

contracts/multisig/src/wrappers.ts

@@ -0,0 +1,11 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/asset_proxy_owner';
+export * from '../generated-wrappers/mixin_authorizable';
+export * from '../generated-wrappers/multi_sig_wallet';
+export * from '../generated-wrappers/multi_sig_wallet_with_time_lock';
+export * from '../generated-wrappers/test_asset_proxy_owner';
+export * from '../generated-wrappers/test_reject_ether';

contracts/multisig/src/wrappers/index.ts

@@ -1,5 +0,0 @@
-export * from '../../generated-wrappers/asset_proxy_owner';
-export * from '../../generated-wrappers/multi_sig_wallet';
-export * from '../../generated-wrappers/multi_sig_wallet_with_time_lock';
-export * from '../../generated-wrappers/test_asset_proxy_owner';
-export * from '../../generated-wrappers/test_reject_ether';

contracts/multisig/test/asset_proxy_owner.ts

@@ -1,4 +1,3 @@
-import { artifacts as proxyArtifacts, MixinAuthorizableContract } from '@0x/contracts-asset-proxy';
 import {
     chaiSetup,
     constants,
@@ -26,6 +25,7 @@ import {
     AssetProxyOwnerExecutionFailureEventArgs,
     AssetProxyOwnerSubmissionEventArgs,
     AssetProxyOwnerWrapper,
+    MixinAuthorizableContract,
     TestAssetProxyOwnerContract,
 } from '../src';
 
@@ -58,12 +58,12 @@ describe('AssetProxyOwner', () => {
         notOwner = accounts[3];
         const initialOwner = accounts[0];
         erc20Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync(
-            proxyArtifacts.MixinAuthorizable,
+            artifacts.MixinAuthorizable,
             provider,
             txDefaults,
         );
         erc721Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync(
-            proxyArtifacts.MixinAuthorizable,
+            artifacts.MixinAuthorizable,
             provider,
             txDefaults,
         );

contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts

@@ -1,5 +1,3 @@
-import { artifacts as proxyArtifacts } from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
 import { LogDecoder } from '@0x/contracts-test-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -16,7 +14,7 @@ export class AssetProxyOwnerWrapper {
     constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Provider) {
         this._assetProxyOwner = assetproxyOwnerContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...proxyArtifacts });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public async submitTransactionAsync(
         destination: string,

contracts/multisig/tsconfig.json

@@ -1,17 +1,14 @@
 {
     "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "./generated-artifacts/AssetProxyOwner.json",
-        "./generated-artifacts/MultiSigWallet.json",
-        "./generated-artifacts/MultiSigWalletWithTimeLock.json",
-        "./generated-artifacts/TestAssetProxyOwner.json",
-        "./generated-artifacts/TestRejectEther.json"
+        "generated-artifacts/AssetProxyOwner.json",
+        "generated-artifacts/MixinAuthorizable.json",
+        "generated-artifacts/MultiSigWallet.json",
+        "generated-artifacts/MultiSigWalletWithTimeLock.json",
+        "generated-artifacts/TestAssetProxyOwner.json",
+        "generated-artifacts/TestRejectEther.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/test-utils/CHANGELOG.json

@@ -1,10 +1,50 @@
 [
+    {
+        "timestamp": 1549733923,
+        "version": "3.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "3.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "3.0.2",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "3.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "3.0.0",
         "changes": [
             {
                 "note": "Upgrade the bignumber.js to v8.0.2",
                 "pr": 1517
+            },
+            {
+                "note": "Import `ZeroExTransaction` type instead of using type defined in this package",
+                "pr": 1576
             }
         ],
         "timestamp": 1549373905

contracts/test-utils/CHANGELOG.md

@@ -5,9 +5,26 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.4 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v3.0.3 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v3.0.2 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v3.0.1 - _February 6, 2019_
+
+    * Dependencies updated
+
 ## v3.0.0 - _February 5, 2019_
 
     * Upgrade the bignumber.js to v8.0.2 (#1517)
+    * Import `ZeroExTransaction` type instead of using type defined in this package (#1576)
 
 ## v2.0.1 - _January 17, 2019_
 

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "3.0.0",
+    "version": "3.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -40,19 +40,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/abi-gen": "^2.0.0",
-        "@0x/dev-utils": "^2.0.0",
-        "@0x/order-utils": "^4.0.0",
-        "@0x/sol-compiler": "^3.0.0",
-        "@0x/sol-coverage": "^2.0.0",
-        "@0x/sol-profiler": "^2.0.1",
-        "@0x/sol-trace": "^2.0.1",
-        "@0x/subproviders": "^3.0.0",
+        "@0x/abi-gen": "^2.0.3",
+        "@0x/dev-utils": "^2.1.0",
+        "@0x/order-utils": "^6.1.0",
+        "@0x/sol-compiler": "^3.0.3",
+        "@0x/sol-coverage": "^2.0.3",
+        "@0x/sol-profiler": "^2.0.4",
+        "@0x/sol-trace": "^2.0.4",
+        "@0x/subproviders": "^3.0.3",
         "@0x/tslint-config": "^3.0.0",
-        "@0x/types": "^2.0.0",
+        "@0x/types": "^2.0.2",
         "@0x/typescript-typings": "^4.0.0",
-        "@0x/utils": "^4.0.1",
-        "@0x/web3-wrapper": "^4.0.0",
+        "@0x/utils": "^4.1.0",
+        "@0x/web3-wrapper": "^5.0.0",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",
@@ -66,7 +66,7 @@
         "ethereumjs-util": "^5.1.1",
         "ethers": "~4.0.4",
         "js-combinatorics": "^0.5.3",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0"
     },
     "publishConfig": {

contracts/test-utils/src/index.ts

@@ -31,7 +31,6 @@ export {
     MarketBuyOrders,
     MarketSellOrders,
     ERC721TokenIdsByOwner,
-    SignedTransaction,
     OrderStatus,
     AllowanceAmountScenario,
     AssetDataScenario,

contracts/test-utils/src/transaction_factory.ts

@@ -1,10 +1,8 @@
-import { eip712Utils, generatePseudoRandomSalt } from '@0x/order-utils';
-import { SignatureType } from '@0x/types';
-import { signTypedDataUtils } from '@0x/utils';
+import { generatePseudoRandomSalt, transactionHashUtils } from '@0x/order-utils';
+import { SignatureType, SignedZeroExTransaction } from '@0x/types';
 import * as ethUtil from 'ethereumjs-util';
 
 import { signingUtils } from './signing_utils';
-import { SignedTransaction } from './types';
 
 export class TransactionFactory {
     private readonly _signerBuff: Buffer;
@@ -15,23 +13,25 @@ export class TransactionFactory {
         this._exchangeAddress = exchangeAddress;
         this._signerBuff = ethUtil.privateToAddress(this._privateKey);
     }
-    public newSignedTransaction(data: string, signatureType: SignatureType = SignatureType.EthSign): SignedTransaction {
+    public newSignedTransaction(
+        data: string,
+        signatureType: SignatureType = SignatureType.EthSign,
+    ): SignedZeroExTransaction {
         const salt = generatePseudoRandomSalt();
         const signerAddress = `0x${this._signerBuff.toString('hex')}`;
-        const executeTransactionData = {
+        const transaction = {
             salt,
             signerAddress,
             data,
+            verifyingContractAddress: this._exchangeAddress,
         };
 
-        const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData, this._exchangeAddress);
-        const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData);
-        const signature = signingUtils.signMessage(eip712MessageBuffer, this._privateKey, signatureType);
-        const signedTx = {
-            exchangeAddress: this._exchangeAddress,
+        const transactionHashBuffer = transactionHashUtils.getTransactionHashBuffer(transaction);
+        const signature = signingUtils.signMessage(transactionHashBuffer, this._privateKey, signatureType);
+        const signedTransaction = {
+            ...transaction,
             signature: `0x${signature.toString('hex')}`,
-            ...executeTransactionData,
         };
-        return signedTx;
+        return signedTransaction;
     }
 }