Updated CHANGELOGS

- 0x.js@1.0.1-rc.1
 - @0xproject/abi-gen@1.0.2
 - @0xproject/assert@1.0.2
 - @0xproject/base-contract@1.0.2
 - @0xproject/connect@1.0.2
 - @0xproject/contract-wrappers@1.0.1-rc.1
 - contracts@2.1.37
 - @0xproject/dev-utils@1.0.2
 - ethereum-types@1.0.2
 - @0xproject/fill-scenarios@1.0.1-rc.1
 - @0xproject/json-schemas@1.0.1-rc.1
 - @0xproject/metacoin@0.0.12
 - @0xproject/migrations@1.0.2
 - @0xproject/monorepo-scripts@1.0.3
 - @0xproject/order-utils@1.0.1-rc.1
 - @0xproject/order-watcher@1.0.1-rc.1
 - @0xproject/react-docs@1.0.2
 - @0xproject/react-docs-example@0.0.17
 - @0xproject/react-shared@1.0.3
 - @0xproject/sol-compiler@1.0.2
 - @0xproject/sol-cov@1.0.2
 - @0xproject/sol-resolver@1.0.2
 - @0xproject/sra-report@1.0.2
 - @0xproject/subproviders@1.0.2
 - @0xproject/testnet-faucets@1.0.38
 - @0xproject/tslint-config@1.0.3
 - @0xproject/types@1.0.1-rc.1
 - @0xproject/typescript-typings@1.0.2
 - @0xproject/utils@1.0.2
 - @0xproject/web3-wrapper@1.1.0
 - @0xproject/website@0.0.41

.gitignore

@@ -41,6 +41,7 @@ typings/
 
 # Optional npm cache directory
 .npm
+.npmrc
 
 # Optional eslint cache
 .eslintcache
@@ -81,8 +82,10 @@ packages/sol-cov/test/fixtures/artifacts/
 packages/metacoin/artifacts/
 packages/order-watcher/test/artifacts/
 packages/contract-wrappers/test/artifacts/
+packages/contract-wrappers/src/artifacts/
+packages/order-watcher/src/artifacts/
 
-# generated contract wrappers
+# generated contract watcher
 packages/0x.js/src/generated_contract_wrappers/
 packages/contracts/generated_contract_wrappers/
 packages/contract-wrappers/src/contract_wrappers/generated/

.prettierignore

@@ -12,6 +12,8 @@ lib
 /packages/migrations/src/2.0.0-beta-testnet/contract_wrappers
 /packages/0x.js/src/artifacts
 /packages/contracts/src/artifacts
+/packages/contract-wrappers/src/artifacts
+/packages/order-watcher/src/artifacts
 /packages/metacoin/artifacts
 /packages/contract-wrappers/test/artifacts
 /packages/order-watcher/test/artifacts

PULL_REQUEST_TEMPLATE.md

@@ -18,12 +18,10 @@
 
 ## Checklist:
 
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- The following points should be used to indicate the progress of your PR.  Put an `x` in all the boxes that apply right now, and come back over time and check them off as you make progress.  If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-
-*   [ ] Change requires a change to the documentation.
-*   [ ] Added tests to cover my changes.
+*   [ ] Prefixed the title of this PR with `[WIP]` if it is a work in progress.
+*   [ ] Prefixed the title of this PR with bracketed package name(s) corresponding to the changed package(s). For example: `[sol-cov] Fixed bug`.
+*   [ ] Added tests to cover my changes, or decided that tests would be too impractical.
+*   [ ] Updated documentation, or decided that no doc change is needed.
 *   [ ] Added new entries to the relevant CHANGELOG.jsons.
-*   [ ] Labeled this PR with the 'WIP' label if it is a work in progress.
-*   [ ] Labeled this PR with the labels corresponding to the changed package.

lerna.json

@@ -1,15 +1,10 @@
 {
-    "lerna": "3.0.0-beta.14",
+    "lerna": "3.0.0-beta.23",
     "packages": ["packages/*"],
-    "commands": {
-        "publish": {
-            "allowBranch": "development"
-        }
-    },
     "version": "independent",
-    "commands": {
+    "command": {
         "publish": {
-            "ignore": ["test/**/*", "*.md", "scripts", "lib", "tslint.json", "tsconfig.json"]
+            "ignoreChanges": ["test/**/*", "*.md", "scripts", "lib", "tslint.json", "tsconfig.json"]
         }
     },
     "npmClient": "yarn",

package.json

@@ -13,25 +13,26 @@
         "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",
         "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls",
         "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js",
-        "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild script:publish",
-        "run:publish:dry": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild script:publish:dry",
+        "test:installation:local": "IS_LOCAL_PUBLISH=true node ./packages/monorepo-scripts/lib/test_installation.js",
+        "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish",
+        "run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish",
         "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js",
         "script:publish": "node ./packages/monorepo-scripts/lib/publish.js",
-        "script:publish:dry": "IS_DRY_RUN=true yarn script:publish",
         "install:all": "yarn install",
         "wsrun": "wsrun",
-        "lerna:run": "lerna run",
+        "lerna": "lerna",
         "watch": "wsrun watch_without_deps $PKG --fast-exit -r --stages --done-criteria='complete|successfully'",
         "build": "wsrun build $PKG --fast-exit -r --stages",
+        "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0xproject/website",
         "build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build",
         "clean": "wsrun clean $PKG --fast-exit -r --parallel",
         "remove_node_modules": "lerna clean --yes; rm -rf node_modules",
         "rebuild": "run-s clean build",
+        "rebuild:no_website": "run-s clean build:no_website",
         "test": "wsrun test $PKG --fast-exit --serial --exclude-missing",
         "stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing",
         "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing",
-        "comment:postinstall": "HACK: For some reason `yarn` is not setting up symlinks properly for order-utils. We temporarily set them manually. Remove this after V2 refactor is complete.",
-        "postinstall": "rm -rf `pwd`/packages/0x.js/node_modules/@0xproject; mkdir `pwd`/packages/0x.js/node_modules/@0xproject; ln -s `pwd`/packages/contract-wrappers `pwd`/packages/0x.js/node_modules/@0xproject/contract-wrappers; ln -s `pwd`/packages/order-utils `pwd`/packages/0x.js/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/types `pwd`/packages/0x.js/node_modules/@0xproject/types; rm -rf `pwd`/packages/order-utils/node_modules/@0xproject; mkdir `pwd`/packages/order-utils/node_modules/@0xproject; ln -s `pwd`/packages/json-schemas `pwd`/packages/order-utils/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/assert `pwd`/packages/order-utils/node_modules/@0xproject/assert; ln -s `pwd`/packages/types `pwd`/packages/order-utils/node_modules/@0xproject/types; rm -rf `pwd`/packages/fill-scenarios/node_modules/@0xproject; mkdir -p `pwd`/packages/fill-scenarios/node_modules/@0xproject; ln -s `pwd`/packages/types `pwd`/packages/fill-scenarios/node_modules/@0xproject/types; ln -s `pwd`/packages/json-schemas `pwd`/packages/fill-scenarios/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/order-utils `pwd`/packages/fill-scenarios/node_modules/@0xproject/order-utils; rm -rf `pwd`/packages/contract-wrappers/node_modules/@0xproject; mkdir -p `pwd`/packages/contract-wrappers/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/contract-wrappers/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/assert `pwd`/packages/contract-wrappers/node_modules/@0xproject/assert; ln -s `pwd`/packages/json-schemas `pwd`/packages/contract-wrappers/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/types `pwd`/packages/contract-wrappers/node_modules/@0xproject/types; ln -s `pwd`/packages/fill-scenarios `pwd`/packages/contract-wrappers/node_modules/@0xproject/fill-scenarios; rm -rf `pwd`/packages/assert/node_modules/@0xproject; mkdir -p `pwd`/packages/assert/node_modules/@0xproject; ln -s `pwd`/packages/json-schemas `pwd`/packages/assert/node_modules/@0xproject/json-schemas; rm -rf `pwd`/packages/order-watcher/node_modules/@0xproject; mkdir `pwd`/packages/order-watcher/node_modules/@0xproject; ln -s `pwd`/packages/assert `pwd`/packages/order-watcher/node_modules/@0xproject/assert; ln -s `pwd`/packages/json-schemas `pwd`/packages/order-watcher/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/order-utils `pwd`/packages/order-watcher/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/types `pwd`/packages/order-watcher/node_modules/@0xproject/types; ln -s `pwd`/packages/contract-wrappers `pwd`/packages/order-watcher/node_modules/@0xproject/contract-wrappers; rm -rf `pwd`/packages/contracts/node_modules/@0xproject; mkdir `pwd`/packages/contracts/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/contracts/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/types `pwd`/packages/contracts/node_modules/@0xproject/types; rm -rf `pwd`/packages/migrations/node_modules/@0xproject; mkdir `pwd`/packages/migrations/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/migrations/node_modules/@0xproject/order-utils"
+        "comment:postinstall": "HACK: For some reason `yarn` is not setting up symlinks properly for order-utils. We temporarily set them manually. Remove this after V2 refactor is complete."
     },
     "config": {
         "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
@@ -41,11 +42,11 @@
         "coveralls": "^3.0.0",
         "ganache-cli": "6.1.3",
         "lcov-result-merger": "^3.0.0",
-        "lerna": "3.0.0-beta.14",
+        "@0x-lerna-fork/lerna": "3.0.0-beta.23",
         "npm-run-all": "^4.1.2",
         "prettier": "^1.11.1",
-        "wsrun": "^2.2.0",
-        "source-map-support": "^0.5.6"
+        "source-map-support": "^0.5.6",
+        "wsrun": "^2.2.0"
     },
     "resolutions": {
         "ethers": "0xproject/ethers.js#eip-838-reasons"

packages/0x.js/CHANGELOG.json

@@ -1,32 +1,69 @@
 [
     {
+        "version": "1.0.1-rc.2",
+        "changes": [
+            {
+                "note": "Fixed bug caused by importing non-existent dep"
+            }
+        ],
+        "timestamp": 1532614997
+    },
+    {
+        "version": "1.0.1-rc.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1532605697
+    },
+    {
+        "timestamp": 1532357734,
         "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043100,
+        "version": "1.0.0-rc.2",
+        "changes": [
+            {
+                "note": "Remove `zeroEx.assetData`  and instead re-export it's static functions directly off `ZeroEx`"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
+        "version": "1.0.0-rc.1",
         "changes": [
             {
                 "note": "Remove tokenRegistry wrapper",
                 "pr": 863
             },
             {
-                "note": "Rename zeroEx.token to zeroEx.erc20Token, and add zeroEx.erc721Token",
+                "note": "Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token`",
                 "pr": 863
             },
             {
-                "note": "Rename zeroEx.proxy to zeroEx.erc20Proxy and add zeroEx.erc721Proxy",
+                "note": "Rename `zeroEx.proxy` to `zeroEx.erc20Proxy` and add `zeroEx.erc721Proxy`",
                 "pr": 863
             },
             {
                 "note":
-                    "Refactored ZeroEx.isValidSignature to zeroEx.isValidSignatureAsync. It is now async so that it can verify contract-dependent signature types",
+                    "Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types",
                 "pr": 863
             },
             {
                 "note":
-                    "Refactored signOrderHashAsync to ecSignOrderHashAsync. There are now many non-ECSignature ways to sign orders too.",
+                    "Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too.",
                 "pr": 863
             },
             {
                 "note":
-                    "Removed createOrderWatcherAsync method. Will be added back once OrderWatcher is refactored for V2",
+                    "Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2",
                 "pr": 863
             },
             {
@@ -34,11 +71,7 @@
                 "pr": 863
             },
             {
-                "note": "Remove stateLayer config from OrderWatcher. It now always operates on the latest block",
-                "pr": 875
-            },
-            {
-                "note": "Export ZeroEx.assetData with methods to decode/encode assetData fields found in 0x orders",
+                "note": "Export `ZeroEx.assetData` with methods to decode/encode assetData fields found in 0x orders",
                 "pr": 884
             }
         ]

packages/0x.js/CHANGELOG.md

@@ -1,10 +1,37 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.1-rc.2 - _July 26, 2018_
+
+    * Fixed bug caused by importing non-existent dep
+
+## v1.0.1-rc.1 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0-rc.2 - _July 20, 2018_
+
+    * Remove `zeroEx.assetData`  and instead re-export it's static functions directly off `ZeroEx`
+
+## v1.0.0-rc.1 - _July 20, 2018_
+
+    * Remove tokenRegistry wrapper (#863)
+    * Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
+    * Rename `zeroEx.proxy` to `zeroEx.erc20Proxy` and add `zeroEx.erc721Proxy` (#863)
+    * Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types (#863)
+    * Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too. (#863)
+    * Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2 (#863)
+    * 0x.js exports renamed contract events and event arg types (#863)
+    * Export `ZeroEx.assetData` with methods to decode/encode assetData fields found in 0x orders (#884)
+
 ## v0.38.6 - _July 18, 2018_
 
     * Dependencies updated

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "0.38.6",
+    "version": "1.0.1-rc.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,13 +51,11 @@
                     "../contract-wrappers/src/types.ts",
                     "../contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts",
                     "../contract-wrappers/src/contract_wrappers/exchange_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/token_registry_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper.ts",
-                    "../contract-wrappers/src/contract_wrappers/token_wrapper.ts",
-                    "../order-watcher/src/order_watcher/order_watcher.ts",
-                    "./src/generated_contract_wrappers/ether_token.ts",
-                    "./src/generated_contract_wrappers/token.ts",
-                    "./src/generated_contract_wrappers/exchange.ts"
+                    "../contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts",
+                    "../contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts",
+                    "../contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts",
+                    "../contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts",
+                    "../order-watcher/src/order_watcher/order_watcher.ts"
                 ],
                 "s3BucketPath": "s3://doc-jsons/0x.js/",
                 "s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/"
@@ -70,11 +68,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.0",
-        "@0xproject/dev-utils": "^1.0.0",
-        "@0xproject/migrations": "^0.0.10",
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/abi-gen": "^1.0.2",
+        "@0xproject/dev-utils": "^1.0.2",
+        "@0xproject/migrations": "^1.0.2",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -100,17 +98,17 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.0",
-        "@0xproject/base-contract": "^1.0.0",
-        "@0xproject/contract-wrappers": "^0.1.1",
-        "@0xproject/order-utils": "^1.0.0",
-        "@0xproject/sol-compiler": "^0.5.4",
-        "@0xproject/subproviders": "^1.0.0",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
-        "ethereum-types": "^1.0.0",
+        "@0xproject/assert": "^1.0.2",
+        "@0xproject/base-contract": "^1.0.2",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.1",
+        "@0xproject/order-utils": "^1.0.1-rc.1",
+        "@0xproject/sol-compiler": "^1.0.2",
+        "@0xproject/subproviders": "^1.0.2",
+        "@0xproject/types": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
+        "ethereum-types": "^1.0.2",
         "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },

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

@@ -38,10 +38,6 @@ export class ZeroEx {
      * this constant for your convenience.
      */
     public static NULL_ADDRESS = constants.NULL_ADDRESS;
-    /**
-     * A set of methods to easily decode/encode assetData fields found in 0x orders.
-     */
-    public static assetData = assetDataUtils;
     /**
      * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
      */
@@ -125,6 +121,57 @@ export class ZeroEx {
         const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amount, decimals);
         return baseUnitAmount;
     }
+    /**
+     * Encodes an ERC20 token address into a hex encoded assetData string, usable in the makerAssetData or
+     * takerAssetData fields in a 0x order.
+     * @param tokenAddress  The ERC20 token address to encode
+     * @return The hex encoded assetData string
+     */
+    public static encodeERC20AssetData(tokenAddress: string): string {
+        return assetDataUtils.encodeERC20AssetData(tokenAddress);
+    }
+    /**
+     * Decodes an ERC20 assetData hex string into it's corresponding ERC20 tokenAddress & assetProxyId
+     * @param assetData Hex encoded assetData string to decode
+     * @return An object containing the decoded tokenAddress & assetProxyId
+     */
+    public static decodeERC20AssetData(assetData: string): ERC20AssetData {
+        return assetDataUtils.decodeERC20AssetData(assetData);
+    }
+    /**
+     * Encodes an ERC721 token address into a hex encoded assetData string, usable in the makerAssetData or
+     * takerAssetData fields in a 0x order.
+     * @param tokenAddress  The ERC721 token address to encode
+     * @param tokenId  The ERC721 tokenId to encode
+     * @return The hex encoded assetData string
+     */
+    public static encodeERC721AssetData(tokenAddress: string, tokenId: BigNumber): string {
+        return assetDataUtils.encodeERC721AssetData(tokenAddress, tokenId);
+    }
+    /**
+     * Decodes an ERC721 assetData hex string into it's corresponding ERC721 tokenAddress, tokenId & assetProxyId
+     * @param assetData Hex encoded assetData string to decode
+     * @return An object containing the decoded tokenAddress, tokenId & assetProxyId
+     */
+    public static decodeERC721AssetData(assetData: string): ERC721AssetData {
+        return assetDataUtils.decodeERC721AssetData(assetData);
+    }
+    /**
+     * Decode and return the assetProxyId from the assetData
+     * @param assetData Hex encoded assetData string to decode
+     * @return The assetProxyId
+     */
+    public static decodeAssetProxyId(assetData: string): AssetProxyId {
+        return assetDataUtils.decodeAssetProxyId(assetData);
+    }
+    /**
+     * Decode any assetData into it's corresponding assetData object
+     * @param assetData Hex encoded assetData string to decode
+     * @return Either a ERC20 or ERC721 assetData object
+     */
+    public static decodeAssetDataOrThrow(assetData: string): ERC20AssetData | ERC721AssetData {
+        return assetDataUtils.decodeAssetDataOrThrow(assetData);
+    }
     /**
      * Instantiates a new ZeroEx instance that provides the public interface to the 0x.js library.
      * @param   provider    The Provider instance you would like the 0x.js library to use for interacting with

packages/abi-gen/CHANGELOG.json

@@ -1,5 +1,34 @@
 [
     {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Fix the abi-gen entry point in package.json",
+                "pr": 901
+            }
+        ],
+        "timestamp": 1532357734
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {

packages/abi-gen/CHANGELOG.md

@@ -1,10 +1,28 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.3 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1 - _July 23, 2018_
+
+    * Fix the abi-gen entry point in package.json (#901)
+
+## v1.0.0 - _July 20, 2018_
+
+    * Convert e_r_c to erc in generated file names (#822)
+    * Remove the output directory before writing to it (#822)
+    * skip generation of wrappers that are already up to date (#788)
+
 ## v0.3.4 - _July 18, 2018_
 
     * Dependencies updated

packages/abi-gen/bin/abi-gen.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../lib/src/index.js')
+require('../lib/src/index.js');

packages/abi-gen/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
     "description": "Generate contract wrappers from ABI and handlebars templates",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
+    "main": "lib/src/index.js",
+    "types": "lib/src/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
         "lint": "tslint --project .",
@@ -32,10 +32,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.0",
+        "ethereum-types": "^1.0.2",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.4",
@@ -46,8 +46,8 @@
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/glob": "5.0.35",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",

packages/abi-gen/src/index.ts

@@ -109,7 +109,7 @@ for (const abiFileName of abiFileNames) {
     const outFilePath = `${args.output}/${outFileName}.ts`;
 
     if (utils.isOutputFileUpToDate(abiFileName, outFilePath)) {
-        logUtils.log(`Aready up to date: ${chalk.bold(outFilePath)}`);
+        logUtils.log(`Already up to date: ${chalk.bold(outFilePath)}`);
         continue;
     }
 

packages/assert/CHANGELOG.json

@@ -1,5 +1,33 @@
 [
     {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {

packages/assert/CHANGELOG.md

@@ -1,10 +1,26 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.3 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 20, 2018_
+
+    * Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values (#821)
+
 ## v0.2.14 - _July 18, 2018_
 
     * Dependencies updated

packages/assert/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/assert",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -13,7 +13,6 @@
         "clean": "shx rm -rf lib test_temp scripts",
         "lint": "tslint --project .",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
-        "prepublishOnly": "run-p build",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s clean build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@@ -31,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/valid-url": "^1.0.2",
@@ -48,9 +47,9 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/json-schemas": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
         "lodash": "^4.17.4",
         "valid-url": "^1.0.9"
     },

packages/base-contract/CHANGELOG.json

@@ -1,5 +1,33 @@
 [
     {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {

packages/base-contract/CHANGELOG.md

@@ -1,10 +1,26 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.3 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 20, 2018_
+
+    * Dependencies updated
+
 ## v0.3.6 - _July 18, 2018_
 
     * Dependencies updated

packages/base-contract/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "copyfiles": "^1.2.0",
@@ -43,10 +43,10 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "ethereum-types": "^1.0.0",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
+        "ethereum-types": "^1.0.2",
         "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },

packages/connect/CHANGELOG.json

@@ -1,10 +1,38 @@
 [
     {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {
                 "note":
-                    "Remove WebSocketOrderbookChannel from the public interface and replace with orderbookChannelFactory"
+                    "Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`"
             }
         ]
     },

packages/connect/CHANGELOG.md

@@ -1,10 +1,26 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.3 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 20, 2018_
+
+    * Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`
+
 ## v0.6.17 - _July 18, 2018_
 
     * Dependencies updated

packages/connect/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/connect",
-    "version": "0.6.17",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,19 +51,19 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0xproject/assert": "^1.0.0",
-        "@0xproject/json-schemas": "^1.0.0-rc.1",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/assert": "^0.2.14",
+        "@0xproject/json-schemas": "^0.8.3",
+        "@0xproject/types": "^0.8.2",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
         "lodash": "^4.17.4",
         "query-string": "^5.0.1",
         "sinon": "^4.0.0",
         "websocket": "^1.0.25"
     },
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/fetch-mock": "^5.12.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",

packages/contract-wrappers/CHANGELOG.json

@@ -1,16 +1,44 @@
 [
     {
+        "version": "1.0.1-rc.2",
+        "changes": [
+            {
+                "note": "Fixed bug caused by importing non-existent dep"
+            }
+        ],
+        "timestamp": 1532614997
+    },
+    {
+        "version": "1.0.1-rc.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1532605697
+    },
+    {
+        "timestamp": 1532357734,
         "version": "1.0.0",
         "changes": [
             {
-                "note": "Update blockstream to v5.0 and propogate up caught errors to active subscriptions"
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
+        "version": "1.0.0-rc.1",
+        "changes": [
+            {
+                "note": "Update blockstream to v5.0 and propogate up caught errors to active subscriptions",
+                "pr": 815
             },
             {
                 "note": "Update to v2 of 0x rpotocol",
                 "pr": 822
             }
-        ],
-        "timestamp": 1531149657
+        ]
     },
     {
         "timestamp": 1531919263,

packages/contract-wrappers/CHANGELOG.md

@@ -1,17 +1,30 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
-## v0.1.1 - _July 18, 2018_
+## v1.0.1-rc.2 - _July 26, 2018_
+
+    * Fixed bug caused by importing non-existent dep
+
+## v1.0.1-rc.1 - _July 26, 2018_
 
     * Dependencies updated
 
-## v0.1.0 - _July 9, 2018_
+## v1.0.0 - _July 23, 2018_
 
-    * Update Blockstream dep. to V5.0 and no longer force unsubscribe on blockstream error (which are not recoverable)
+    * Dependencies updated
+
+## v1.0.0-rc.1 - _July 20, 2018_
+
+    * Update blockstream to v5.0 and propogate up caught errors to active subscriptions (#815)
+    * Update to v2 of 0x rpotocol (#822)
+
+## v0.1.1 - _July 18, 2018_
+
+    * Dependencies updated
 
 ## v0.0.5 - _June 19, 2018_
 
@@ -19,11 +32,7 @@ CHANGELOG
 
 ## v0.0.4 - _May 29, 2018_
 
-    * Dependencies updated
-
-## v0.0.3 - _May 29, 2018_
-
-    * Dependencies updated
+    * Expose 'abi' ContractAbi property on all contract wrappers
 
 ## v0.0.2 - _May 22, 2018_
 

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/contract-wrappers",
-    "version": "0.1.1",
+    "version": "1.0.1-rc.1",
     "description": "Smart TS wrappers for 0x smart contracts",
     "keywords": [
         "0xproject",
@@ -13,7 +13,7 @@
     "scripts": {
         "watch_without_deps": "yarn pre_build && tsc -w",
         "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "pre_build": "run-s generate_contract_wrappers update_artifacts",
+        "pre_build": "run-s update_artifacts_v2_beta update_artifacts_v2 generate_contract_wrappers copy_artifacts",
         "generate_contract_wrappers": "abi-gen --abis 'src/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token|ZRXToken|ERC20Token|ERC721Token|WETH9|ERC20Proxy|ERC721Proxy).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers",
         "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*",
         "test:circleci": "run-s test:coverage",
@@ -21,18 +21,16 @@
         "rebuild_and_test": "run-s build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "update_artifacts": "copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts",
-        "clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/contract_wrappers/generated",
+        "update_artifacts_v2_beta": "for i in ${npm_package_config_contracts_v2_beta}; do copyfiles -u 4 ../migrations/artifacts/2.0.0-beta-testnet/$i.json src/artifacts; done;",
+        "update_artifacts_v2": "for i in ${npm_package_config_contracts_v2}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json src/artifacts; done;",
+        "copy_artifacts": "copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts",
+        "clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/contract_wrappers/generated src/artifacts",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "config": {
-        "postpublish": {
-            "assets": [
-                "packages/contract-wrappers/_bundles/index.js",
-                "packages/contract-wrappers/_bundles/index.min.js"
-            ]
-        }
+        "contracts_v2_beta": "Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken",
+        "contracts_v2": "DummyERC20Token DummyERC721Token"
     },
     "repository": {
         "type": "git",
@@ -43,13 +41,13 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.0",
-        "@0xproject/dev-utils": "^1.0.0",
-        "@0xproject/migrations": "^0.0.10",
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/sol-compiler": "^0.5.4",
-        "@0xproject/subproviders": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/abi-gen": "^1.0.2",
+        "@0xproject/dev-utils": "^1.0.2",
+        "@0xproject/migrations": "^1.0.2",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/sol-compiler": "^1.0.2",
+        "@0xproject/subproviders": "^1.0.2",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -69,21 +67,21 @@
         "shx": "^0.2.2",
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
-        "web3-provider-engine": "14.0.6",
         "tslint": "5.11.0",
-        "typescript": "2.7.1"
+        "typescript": "2.7.1",
+        "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.0",
-        "@0xproject/base-contract": "^1.0.0",
-        "@0xproject/order-utils": "^1.0.0",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
-        "@0xproject/fill-scenarios": "^1.0.0",
-        "@0xproject/json-schemas": "^1.0.0-rc.1",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "ethereum-types": "^1.0.0",
+        "@0xproject/assert": "^1.0.2",
+        "@0xproject/base-contract": "^1.0.2",
+        "@0xproject/fill-scenarios": "^1.0.1-rc.1",
+        "@0xproject/json-schemas": "^1.0.1-rc.1",
+        "@0xproject/order-utils": "^1.0.1-rc.1",
+        "@0xproject/types": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
+        "ethereum-types": "^1.0.2",
         "ethereumjs-blockstream": "5.0.0",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",

packages/contract-wrappers/src/artifacts/DummyERC20Token.json

@@ -1,306 +0,0 @@
-{
-    "schemaVersion": "2.0.0",
-    "contractName": "DummyERC20Token",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "name",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_spender",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "approve",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "totalSupply",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "decimals",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    }
-                ],
-                "name": "balanceOf",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "owner",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "symbol",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "mint",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transfer",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_spender",
-                        "type": "address"
-                    }
-                ],
-                "name": "allowance",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_target",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "setBalance",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "newOwner",
-                        "type": "address"
-                    }
-                ],
-                "name": "transferOwnership",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "inputs": [
-                    {
-                        "name": "_name",
-                        "type": "string"
-                    },
-                    {
-                        "name": "_symbol",
-                        "type": "string"
-                    },
-                    {
-                        "name": "_decimals",
-                        "type": "uint8"
-                    },
-                    {
-                        "name": "_totalSupply",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "constructor"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Transfer",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_spender",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Approval",
-                "type": "event"
-            }
-        ]
-    }
-}

packages/contract-wrappers/src/artifacts/DummyERC721Token.json

@@ -1,368 +0,0 @@
-{
-    "schemaVersion": "2.0.0",
-    "contractName": "DummyERC721Token",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "name",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "getApproved",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "approve",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "mint",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "safeTransferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "exists",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "ownerOf",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    }
-                ],
-                "name": "balanceOf",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "owner",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "symbol",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_approved",
-                        "type": "bool"
-                    }
-                ],
-                "name": "setApprovalForAll",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "_data",
-                        "type": "bytes"
-                    }
-                ],
-                "name": "safeTransferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_operator",
-                        "type": "address"
-                    }
-                ],
-                "name": "isApprovedForAll",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "newOwner",
-                        "type": "address"
-                    }
-                ],
-                "name": "transferOwnership",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "inputs": [
-                    {
-                        "name": "name",
-                        "type": "string"
-                    },
-                    {
-                        "name": "symbol",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "constructor"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Transfer",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_approved",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Approval",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_operator",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_approved",
-                        "type": "bool"
-                    }
-                ],
-                "name": "ApprovalForAll",
-                "type": "event"
-            }
-        ]
-    }
-}

packages/contract-wrappers/src/artifacts/ERC20Proxy.json

@@ -1,210 +0,0 @@
-{
-    "contractName": "ERC20Proxy",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "target",
-                        "type": "address"
-                    }
-                ],
-                "name": "addAuthorizedAddress",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "authorities",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "target",
-                        "type": "address"
-                    }
-                ],
-                "name": "removeAuthorizedAddress",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "owner",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "target",
-                        "type": "address"
-                    },
-                    {
-                        "name": "index",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "removeAuthorizedAddressAtIndex",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "assetData",
-                        "type": "bytes"
-                    },
-                    {
-                        "name": "from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "getProxyId",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bytes4"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "name": "authorized",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "getAuthorizedAddresses",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address[]"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "newOwner",
-                        "type": "address"
-                    }
-                ],
-                "name": "transferOwnership",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "target",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "caller",
-                        "type": "address"
-                    }
-                ],
-                "name": "AuthorizedAddressAdded",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "target",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "caller",
-                        "type": "address"
-                    }
-                ],
-                "name": "AuthorizedAddressRemoved",
-                "type": "event"
-            }
-        ]
-    },
-    "networks": {
-        "50": { "address": "0x1dc4c1cefef38a777b15aa20260a54e584b16c48" }
-    }
-}

packages/contract-wrappers/src/artifacts/ERC20Token.json

@@ -1,174 +0,0 @@
-{
-    "contractName": "ERC20Token",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_spender",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "approve",
-                "outputs": [
-                    {
-                        "name": "success",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "totalSupply",
-                "outputs": [
-                    {
-                        "name": "supply",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [
-                    {
-                        "name": "success",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    }
-                ],
-                "name": "balanceOf",
-                "outputs": [
-                    {
-                        "name": "balance",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transfer",
-                "outputs": [
-                    {
-                        "name": "success",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_spender",
-                        "type": "address"
-                    }
-                ],
-                "name": "allowance",
-                "outputs": [
-                    {
-                        "name": "remaining",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "type": "function"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Transfer",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_spender",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Approval",
-                "type": "event"
-            }
-        ]
-    }
-}

packages/contract-wrappers/src/artifacts/ERC721Proxy.json

@@ -1,210 +0,0 @@
-{
-    "contractName": "ERC20Proxy",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "target",
-                        "type": "address"
-                    }
-                ],
-                "name": "addAuthorizedAddress",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "authorities",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "target",
-                        "type": "address"
-                    }
-                ],
-                "name": "removeAuthorizedAddress",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "owner",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "target",
-                        "type": "address"
-                    },
-                    {
-                        "name": "index",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "removeAuthorizedAddressAtIndex",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "assetData",
-                        "type": "bytes"
-                    },
-                    {
-                        "name": "from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "getProxyId",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bytes4"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "name": "authorized",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "getAuthorizedAddresses",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address[]"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "newOwner",
-                        "type": "address"
-                    }
-                ],
-                "name": "transferOwnership",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "target",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "caller",
-                        "type": "address"
-                    }
-                ],
-                "name": "AuthorizedAddressAdded",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "target",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "caller",
-                        "type": "address"
-                    }
-                ],
-                "name": "AuthorizedAddressRemoved",
-                "type": "event"
-            }
-        ]
-    },
-    "networks": {
-        "50": { "address": "0x1d7022f5b17d2f8b695918fb48fa1089c9f85401" }
-    }
-}

packages/contract-wrappers/src/artifacts/ERC721Token.json

@@ -1,322 +0,0 @@
-{
-    "schemaVersion": "2.0.0",
-    "contractName": "ERC721Token",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "name",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "getApproved",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "approve",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "safeTransferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "exists",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "ownerOf",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    }
-                ],
-                "name": "balanceOf",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "symbol",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_approved",
-                        "type": "bool"
-                    }
-                ],
-                "name": "setApprovalForAll",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "_data",
-                        "type": "bytes"
-                    }
-                ],
-                "name": "safeTransferFrom",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "name": "_operator",
-                        "type": "address"
-                    }
-                ],
-                "name": "isApprovedForAll",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "inputs": [
-                    {
-                        "name": "_name",
-                        "type": "string"
-                    },
-                    {
-                        "name": "_symbol",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "constructor"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Transfer",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_approved",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_tokenId",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Approval",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_operator",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_approved",
-                        "type": "bool"
-                    }
-                ],
-                "name": "ApprovalForAll",
-                "type": "event"
-            }
-        ]
-    }
-}

packages/contract-wrappers/src/artifacts/WETH9.json

@@ -1,301 +0,0 @@
-{
-    "contractName": "WETH9",
-    "compilerOutput": {
-        "abi": [
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "name",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "guy",
-                        "type": "address"
-                    },
-                    {
-                        "name": "wad",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "approve",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "totalSupply",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "src",
-                        "type": "address"
-                    },
-                    {
-                        "name": "dst",
-                        "type": "address"
-                    },
-                    {
-                        "name": "wad",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transferFrom",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "wad",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "withdraw",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "decimals",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint8"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "name": "balanceOf",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [],
-                "name": "symbol",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "string"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "dst",
-                        "type": "address"
-                    },
-                    {
-                        "name": "wad",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "transfer",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "bool"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
-                "constant": false,
-                "inputs": [],
-                "name": "deposit",
-                "outputs": [],
-                "payable": true,
-                "stateMutability": "payable",
-                "type": "function"
-            },
-            {
-                "constant": true,
-                "inputs": [
-                    {
-                        "name": "",
-                        "type": "address"
-                    },
-                    {
-                        "name": "",
-                        "type": "address"
-                    }
-                ],
-                "name": "allowance",
-                "outputs": [
-                    {
-                        "name": "",
-                        "type": "uint256"
-                    }
-                ],
-                "payable": false,
-                "stateMutability": "view",
-                "type": "function"
-            },
-            {
-                "payable": true,
-                "stateMutability": "payable",
-                "type": "fallback"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_spender",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Approval",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_from",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": true,
-                        "name": "_to",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Transfer",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Deposit",
-                "type": "event"
-            },
-            {
-                "anonymous": false,
-                "inputs": [
-                    {
-                        "indexed": true,
-                        "name": "_owner",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "_value",
-                        "type": "uint256"
-                    }
-                ],
-                "name": "Withdrawal",
-                "type": "event"
-            }
-        ]
-    },
-    "networks": {
-        "1": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-        },
-        "3": {
-            "address": "0xc00fd9820cd2898cc4c054b7bf142de637ad129a"
-        },
-        "4": {
-            "address": "0xc778417e063141139fce010982780140aa0cd5ab"
-        },
-        "42": {
-            "address": "0x653e49e301e508a13237c0ddc98ae7d4cd2667a1"
-        },
-        "50": {
-            "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"
-        }
-    }
-}

packages/contract-wrappers/src/artifacts/ZRXToken.json

@@ -1,23 +0,0 @@
-{
-    "contractName": "ZRXToken",
-    "compilerOutput": {
-        "abi": []
-    },
-    "networks": {
-        "1": {
-            "address": "0xe41d2489571d322189246dafa5ebde1f4699f498"
-        },
-        "3": {
-            "address": "0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d"
-        },
-        "4": {
-            "address": "0x00f58d6d585f84b2d7267940cede30ce2fe6eae8"
-        },
-        "42": {
-            "address": "0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570"
-        },
-        "50": {
-            "address": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c"
-        }
-    }
-}

packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts

@@ -4,7 +4,6 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { constants } from '../../test/utils/constants';
 import { artifacts } from '../artifacts';
 import { methodOptsSchema } from '../schemas/method_opts_schema';
 import { txOptsSchema } from '../schemas/tx_opts_schema';
@@ -17,6 +16,7 @@ import {
     TransactionOpts,
 } from '../types';
 import { assert } from '../utils/assert';
+import { constants } from '../utils/constants';
 
 import { ContractWrapper } from './contract_wrapper';
 import { ERC721ProxyWrapper } from './erc721_proxy_wrapper';

packages/contracts/compiler.json

@@ -39,12 +39,13 @@
         "MultiSigWalletWithTimeLock",
         "TestAssetProxyOwner",
         "TestAssetProxyDispatcher",
+        "TestConstants",
         "TestLibBytes",
         "TestLibs",
         "TestSignatureValidator",
-        "TestValidator",
-        "TestWallet",
         "TokenRegistry",
+        "Validator",
+        "Wallet",
         "Whitelist",
         "WETH9",
         "ZRXToken"

packages/contracts/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "contracts",
-    "version": "2.1.35",
+    "version": "2.1.37",
     "engines": {
         "node": ">=6.12"
     },
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint src/2.0.0/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestAssetProxyDispatcher|TestLibBytes|TestLibs|TestSignatureValidator|TestValidator|TestWallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"
+        "abis": "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestLibBytes|TestLibs|TestSignatureValidator|Validator|Wallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"
     },
     "repository": {
         "type": "git",
@@ -46,15 +46,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.0",
-        "@0xproject/dev-utils": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
-        "@0xproject/subproviders": "^1.0.0",
-        "@0xproject/sol-cov": "^0.1.3",
-        "@types/lodash": "4.14.104",
+        "@0xproject/abi-gen": "^1.0.2",
+        "@0xproject/dev-utils": "^1.0.2",
+        "@0xproject/sol-cov": "^1.0.2",
+        "@0xproject/subproviders": "^1.0.2",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/bn.js": "^4.11.0",
-        "@types/node": "^8.0.53",
         "@types/ethereumjs-abi": "^0.6.0",
+        "@types/lodash": "4.14.104",
+        "@types/node": "^8.0.53",
         "@types/yargs": "^10.0.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
@@ -72,18 +72,18 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^1.0.0",
-        "@0xproject/order-utils": "^1.0.0",
-        "@0xproject/sol-compiler": "^0.5.4",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
-        "ethereum-types": "^1.0.0",
+        "@0xproject/base-contract": "^1.0.2",
+        "@0xproject/order-utils": "^1.0.1-rc.1",
+        "@0xproject/sol-compiler": "^1.0.2",
+        "@0xproject/types": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
         "bn.js": "^4.11.8",
-        "ethereumjs-abi": "^0.6.4",
+        "ethereum-types": "^1.0.2",
+        "ethereumjs-abi": "0.6.5",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
         "lodash": "^4.17.4"
     }
-}
+}

packages/contracts/src/2.0.0/examples/Validator/Validator.sol

@@ -21,7 +21,7 @@ pragma solidity 0.4.24;
 import "../../protocol/Exchange/interfaces/IValidator.sol";
 
 
-contract TestValidator is 
+contract Validator is 
     IValidator
 {
 
@@ -29,7 +29,7 @@ contract TestValidator is
     // solhint-disable-next-line var-name-mixedcase
     address internal VALID_SIGNER;
 
-    /// @dev constructs a new `TestValidator` with a single valid signer.
+    /// @dev constructs a new `Validator` with a single valid signer.
     /// @param validSigner The sole, valid signer.
     constructor (address validSigner) public {
         VALID_SIGNER = validSigner;

packages/contracts/src/2.0.0/examples/Wallet/Wallet.sol

@@ -22,7 +22,7 @@ import "../../protocol/Exchange/interfaces/IWallet.sol";
 import "../../utils/LibBytes/LibBytes.sol";
 
 
-contract TestWallet is 
+contract Wallet is 
     IWallet
 {
     using LibBytes for bytes;
@@ -31,7 +31,7 @@ contract TestWallet is
     // solhint-disable-next-line var-name-mixedcase
     address internal WALLET_OWNER;
 
-    /// @dev constructs a new `TestWallet` with a single owner.
+    /// @dev constructs a new `Wallet` with a single owner.
     /// @param walletOwner The owner of this wallet.
     constructor (address walletOwner) public {
         WALLET_OWNER = walletOwner;

packages/contracts/src/2.0.0/forwarder/Forwarder.sol

@@ -19,20 +19,19 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "./MixinFees.sol";
+import "./MixinWeth.sol";
 import "./MixinForwarderCore.sol";
-import "./MixinConstants.sol";
-import "./MixinMarketBuyZrx.sol";
-import "./MixinExpectedResults.sol";
-import "./MixinTransfer.sol";
+import "./libs/LibConstants.sol";
+import "./MixinAssets.sol";
+import "./MixinExchangeWrapper.sol";
 
 
+// solhint-disable no-empty-blocks
 contract Forwarder is
-    MixinConstants,
-    MixinExpectedResults,
-    MixinFees,
-    MixinMarketBuyZrx,
-    MixinTransfer,
+    LibConstants,
+    MixinWeth,
+    MixinAssets,
+    MixinExchangeWrapper,
     MixinForwarderCore
 {
 
@@ -44,7 +43,7 @@ contract Forwarder is
         bytes memory _wethAssetData
     )
         public
-        MixinConstants(
+        LibConstants(
             _exchange,
             _etherToken,
             _zrxToken,

packages/contracts/src/2.0.0/forwarder/MixinAssets.sol

@@ -19,58 +19,78 @@
 pragma solidity 0.4.24;
 
 import "../utils/LibBytes/LibBytes.sol";
+import "../utils/Ownable/Ownable.sol";
+import "../tokens/ERC20Token/IERC20Token.sol";
 import "../tokens/ERC721Token/IERC721Token.sol";
-import "./mixins/MTransfer.sol";
+import "./libs/LibConstants.sol";
+import "./mixins/MAssets.sol";
 
 
-contract MixinTransfer is
-    MTransfer
+contract MixinAssets is
+    Ownable,
+    LibConstants,
+    MAssets
 {
 
     using LibBytes for bytes;
 
     bytes4 constant internal ERC20_TRANSFER_SELECTOR = bytes4(keccak256("transfer(address,uint256)"));
-    bytes4 constant internal ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,uint256,bytes)"));
-    bytes4 constant internal ERC721_RECEIVED_OPERATOR = bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"));
 
-    function onERC721Received(
-        address,
-        uint256,
-        bytes memory
-    )
-        public
-        pure
-        returns(bytes4)
-    {
-        return ERC721_RECEIVED;
-    }
-
-    function onERC721Received(
-        address,
-        address,
-        uint256,
-        bytes memory
-    )
-        public
-        pure
-        returns(bytes4)
-    {
-        return ERC721_RECEIVED_OPERATOR;
-    }
-
-    function transferERC20Token(
+    /// @dev Withdraws ERC20 tokens from this contract. The contract requires a ZRX balance in order to 
+    ///      function optimally, and this function allows the ZRX to be withdrawn by owner. It may also be
+    ///      used to withdraw tokens that were accidentally sent to this contract.
+    /// @param token Address of ERC20 token to withdraw.
+    /// @param amount Amount of ERC20 token to withdraw.
+    function withdrawERC20(
         address token,
-        address to,
+        uint256 amount
+    )
+        external
+        onlyOwner
+    {
+        require(
+            IERC20Token(token).transfer(msg.sender, amount),
+            "WITHDRAWAL_FAILED"
+        );
+    }
+
+    /// @dev Transfers given amount of asset to sender.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param amount Amount of asset to transfer to sender.
+    function transferPurchasedAssetToSender(
+        bytes memory assetData,
         uint256 amount
     )
         internal
     {
+        bytes4 proxyId = assetData.readBytes4(0);
+
+        if (proxyId == ERC20_DATA_ID) {
+            transferERC20Token(assetData, amount);
+        } else if (proxyId == ERC721_DATA_ID) {
+            transferERC721Token(assetData, amount);
+        } else {
+            revert("UNSUPPORTED_TOKEN_PROXY");
+        }
+    }
+
+    /// @dev Decodes ERC20 assetData and transfers given amount to sender.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param amount Amount of asset to transfer to sender.
+    function transferERC20Token(
+        bytes memory assetData,
+        uint256 amount
+    )
+        internal
+    {
+        address token = assetData.readAddress(16);
+
         // Transfer tokens.
         // We do a raw call so we can check the success separate
         // from the return data.
         bool success = token.call(abi.encodeWithSelector(
             ERC20_TRANSFER_SELECTOR,
-            to,
+            msg.sender,
             amount
         ));
         require(
@@ -100,21 +120,28 @@ contract MixinTransfer is
         );
     }
 
+    /// @dev Decodes ERC721 assetData and transfers given amount to sender.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param amount Amount of asset to transfer to sender.
     function transferERC721Token(
         bytes memory assetData,
-        address to
+        uint256 amount
     )
         internal
     {
+        require(
+            amount == 1,
+            "INVALID_AMOUNT"
+        );
         // Decode asset data.
         address token = assetData.readAddress(16);
         uint256 tokenId = assetData.readUint256(36);
-        bytes memory receiverData = assetData.readBytesWithLength(100);
-        IERC721Token(token).safeTransferFrom(
+
+        // Perform transfer.
+        IERC721Token(token).transferFrom(
             address(this),
-            to,
-            tokenId,
-            receiverData
+            msg.sender,
+            tokenId
         );
     }
 }

packages/contracts/src/2.0.0/forwarder/MixinErrorMessages.sol

@@ -1,35 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-// solhint-disable
-pragma solidity 0.4.24;
-
-
-/// This contract is intended to serve as a reference, but is not actually used for efficiency reasons.
-contract MixinErrorMessages {
-    string constant VALUE_GREATER_THAN_ZERO = "VALUE_GREATER_THAN_ZERO";
-    string constant FEE_PROPORTION_TOO_LARGE = "FEE_PROPORTION_TOO_LARGE";
-    string constant TAKER_ASSET_ZRX_REQUIRED = "TAKER_ASSET_ZRX_REQUIRED";
-    string constant TAKER_ASSET_WETH_REQUIRED = "TAKER_ASSET_WETH_REQUIRED";
-    string constant SAME_ASSET_TYPE_REQUIRED = "SAME_ASSET_TYPE_REQUIRED";
-    string constant UNACCEPTABLE_THRESHOLD = "UNACCEPTABLE_THRESHOLD";
-    string constant UNSUPPORTED_TOKEN_PROXY = "UNSUPPORTED_TOKEN_PROXY";
-    string constant ASSET_AMOUNT_MATCH_ORDER_SIZE = "ASSET_AMOUNT_MUST_MATCH_ORDER_SIZE";
-    string constant DEFAULT_FUNCTION_WETH_CONTRACT_ONLY = "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY";
-    string constant INVALID_MSG_VALUE = "INVALID_MSG_VALUE";
-}

packages/contracts/src/2.0.0/forwarder/MixinExchangeWrapper.sol

@@ -0,0 +1,253 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+pragma experimental ABIEncoderV2;
+
+import "./libs/LibConstants.sol";
+import "./mixins/MExchangeWrapper.sol";
+import "../protocol/Exchange/libs/LibAbiEncoder.sol";
+import "../protocol/Exchange/libs/LibOrder.sol";
+import "../protocol/Exchange/libs/LibFillResults.sol";
+import "../protocol/Exchange/libs/LibMath.sol";
+
+
+contract MixinExchangeWrapper is
+    LibAbiEncoder,
+    LibFillResults,
+    LibMath,
+    LibConstants,
+    MExchangeWrapper
+{
+
+    /// @dev Fills the input order.
+    ///      Returns false if the transaction would otherwise revert.
+    /// @param order Order struct containing order specifications.
+    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
+    /// @param signature Proof that order has been created by maker.
+    /// @return Amounts filled and fees paid by maker and taker.
+    function fillOrderNoThrow(
+        LibOrder.Order memory order,
+        uint256 takerAssetFillAmount,
+        bytes memory signature
+    )
+        internal
+        returns (FillResults memory fillResults)
+    {
+        // ABI encode calldata for `fillOrder`
+        bytes memory fillOrderCalldata = abiEncodeFillOrder(
+            order,
+            takerAssetFillAmount,
+            signature
+        );
+
+        address exchange = address(EXCHANGE);
+
+        // Call `fillOrder` and handle any exceptions gracefully
+        assembly {
+            let success := call(
+                gas,                                // forward all gas, TODO: look into gas consumption of assert/throw
+                exchange,                           // call address of Exchange contract
+                0,                                  // transfer 0 wei
+                add(fillOrderCalldata, 32),         // pointer to start of input (skip array length in first 32 bytes)
+                mload(fillOrderCalldata),           // length of input
+                fillOrderCalldata,                  // write output over input
+                128                                 // output size is 128 bytes
+            )
+            switch success
+            case 0 {
+                mstore(fillResults, 0)
+                mstore(add(fillResults, 32), 0)
+                mstore(add(fillResults, 64), 0)
+                mstore(add(fillResults, 96), 0)
+            }
+            case 1 {
+                mstore(fillResults, mload(fillOrderCalldata))
+                mstore(add(fillResults, 32), mload(add(fillOrderCalldata, 32)))
+                mstore(add(fillResults, 64), mload(add(fillOrderCalldata, 64)))
+                mstore(add(fillResults, 96), mload(add(fillOrderCalldata, 96)))
+            }
+        }
+        return fillResults;
+    }
+
+    /// @dev Synchronously executes multiple calls of fillOrder until total amount of WETH has been sold by taker.
+    ///      Returns false if the transaction would otherwise revert.
+    /// @param orders Array of order specifications.
+    /// @param wethSellAmount Desired amount of WETH to sell.
+    /// @param signatures Proofs that orders have been signed by makers.
+    /// @return Amounts filled and fees paid by makers and taker.
+    function marketSellWeth(
+        LibOrder.Order[] memory orders,
+        uint256 wethSellAmount,
+        bytes[] memory signatures
+    )
+        internal
+        returns (FillResults memory totalFillResults)
+    {
+        bytes memory makerAssetData = orders[0].makerAssetData;
+        bytes memory wethAssetData = WETH_ASSET_DATA;
+
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
+
+            // We assume that asset being bought by taker is the same for each order.
+            // We assume that asset being sold by taker is WETH for each order.
+            orders[i].makerAssetData = makerAssetData;
+            orders[i].takerAssetData = wethAssetData;
+
+            // Calculate the remaining amount of WETH to sell
+            uint256 remainingTakerAssetFillAmount = safeSub(wethSellAmount, totalFillResults.takerAssetFilledAmount);
+
+            // Attempt to sell the remaining amount of WETH
+            FillResults memory singleFillResults = fillOrderNoThrow(
+                orders[i],
+                remainingTakerAssetFillAmount,
+                signatures[i]
+            );
+
+            // Update amounts filled and fees paid by maker and taker
+            addFillResults(totalFillResults, singleFillResults);
+
+            // Stop execution if the entire amount of takerAsset has been sold
+            if (totalFillResults.takerAssetFilledAmount >= wethSellAmount) {
+                break;
+            }
+        }
+        return totalFillResults;
+    }
+
+    /// @dev Synchronously executes multiple fill orders in a single transaction until total amount is bought by taker.
+    ///      Returns false if the transaction would otherwise revert.
+    ///      The asset being sold by taker must always be WETH.
+    /// @param orders Array of order specifications.
+    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
+    /// @param signatures Proofs that orders have been signed by makers.
+    /// @return Amounts filled and fees paid by makers and taker.
+    function marketBuyWithWeth(
+        LibOrder.Order[] memory orders,
+        uint256 makerAssetFillAmount,
+        bytes[] memory signatures
+    )
+        internal
+        returns (FillResults memory totalFillResults)
+    {
+        bytes memory makerAssetData = orders[0].makerAssetData;
+        bytes memory wethAssetData = WETH_ASSET_DATA;
+
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
+
+            // We assume that asset being bought by taker is the same for each order.
+            // We assume that asset being sold by taker is WETH for each order.
+            orders[i].makerAssetData = makerAssetData;
+            orders[i].takerAssetData = wethAssetData;
+
+            // Calculate the remaining amount of makerAsset to buy
+            uint256 remainingMakerAssetFillAmount = safeSub(makerAssetFillAmount, totalFillResults.makerAssetFilledAmount);
+
+            // Convert the remaining amount of makerAsset to buy into remaining amount
+            // of takerAsset to sell, assuming entire amount can be sold in the current order
+            uint256 remainingTakerAssetFillAmount = getPartialAmount(
+                orders[i].takerAssetAmount,
+                orders[i].makerAssetAmount,
+                remainingMakerAssetFillAmount
+            );
+
+            // Attempt to sell the remaining amount of takerAsset
+            FillResults memory singleFillResults = fillOrderNoThrow(
+                orders[i],
+                remainingTakerAssetFillAmount,
+                signatures[i]
+            );
+
+            // Update amounts filled and fees paid by maker and taker
+            addFillResults(totalFillResults, singleFillResults);
+
+            // Stop execution if the entire amount of makerAsset has been bought
+            if (totalFillResults.makerAssetFilledAmount >= makerAssetFillAmount) {
+                break;
+            }
+        }
+        return totalFillResults;
+    }
+
+    /// @dev Buys zrxBuyAmount of ZRX fee tokens, taking into account ZRX fees for each order. This will guarantee
+    ///      that at least zrxBuyAmount of ZRX is purchased (sometimes slightly over due to rounding issues).
+    ///      It is possible that a request to buy 200 ZRX will require purchasing 202 ZRX
+    ///      as 2 ZRX is required to purchase the 200 ZRX fee tokens. This guarantees at least 200 ZRX for future purchases.
+    ///      The asset being sold by taker must always be WETH. 
+    /// @param orders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset.
+    /// @param zrxBuyAmount Desired amount of ZRX to buy.
+    /// @param signatures Proofs that orders have been created by makers.
+    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
+    function marketBuyZrxWithWeth(
+        LibOrder.Order[] memory orders,
+        uint256 zrxBuyAmount,
+        bytes[] memory signatures
+    )
+        internal
+        returns (FillResults memory totalFillResults)
+    {
+        // Do nothing if zrxBuyAmount == 0
+        if (zrxBuyAmount == 0) {
+            return totalFillResults;
+        }
+
+        bytes memory zrxAssetData = ZRX_ASSET_DATA;
+        bytes memory wethAssetData = WETH_ASSET_DATA;
+        uint256 zrxPurchased = 0;
+
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
+
+            // All of these are ZRX/WETH, so we can drop the respective assetData from calldata.
+            orders[i].makerAssetData = zrxAssetData;
+            orders[i].takerAssetData = wethAssetData;
+
+            // Calculate the remaining amount of ZRX to buy.
+            uint256 remainingZrxBuyAmount = safeSub(zrxBuyAmount, zrxPurchased);
+
+            // Convert the remaining amount of ZRX to buy into remaining amount
+            // of WETH to sell, assuming entire amount can be sold in the current order.
+            uint256 remainingWethSellAmount = getPartialAmount(
+                orders[i].takerAssetAmount,
+                safeSub(orders[i].makerAssetAmount, orders[i].takerFee),  // our exchange rate after fees 
+                remainingZrxBuyAmount
+            );
+
+            // Attempt to sell the remaining amount of WETH.
+            FillResults memory singleFillResult = fillOrderNoThrow(
+                orders[i],
+                safeAdd(remainingWethSellAmount, 1),  // we add 1 wei to the fill amount to make up for rounding errors
+                signatures[i]
+            );
+
+            // Update amounts filled and fees paid by maker and taker.
+            addFillResults(totalFillResults, singleFillResult);
+            zrxPurchased = safeSub(totalFillResults.makerAssetFilledAmount, totalFillResults.takerFeePaid);
+
+            // Stop execution if the entire amount of ZRX has been bought.
+            if (zrxPurchased >= zrxBuyAmount) {
+                break;
+            }
+        }
+
+        return totalFillResults;
+    }
+}

packages/contracts/src/2.0.0/forwarder/MixinExpectedResults.sol

@@ -1,161 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../utils/LibBytes/LibBytes.sol";
-import "../protocol/Exchange/libs/LibFillResults.sol";
-import "../protocol/Exchange/libs/LibMath.sol";
-import "../protocol/Exchange/libs/LibOrder.sol";
-import "./mixins/MConstants.sol";
-import "./mixins/MExpectedResults.sol";
-
-
-contract MixinExpectedResults is
-    LibMath,
-    LibFillResults,
-    MConstants,
-    MExpectedResults
-{
-
-    /// @dev Calculates a total FillResults for buying makerAssetFillAmount over all orders.
-    ///      Including the fees required to be paid. 
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param makerAssetFillAmount A number representing the amount of this order to fill.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
-    function calculateMarketBuyResults(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount
-    )
-        public
-        view
-        returns (FillResults memory totalFillResults)
-    {
-        for (uint256 i = 0; i < orders.length; i++) {
-            uint256 remainingMakerAssetFillAmount = safeSub(makerAssetFillAmount, totalFillResults.makerAssetFilledAmount);
-            uint256 remainingTakerAssetFillAmount = getPartialAmount(
-                orders[i].takerAssetAmount,
-                orders[i].makerAssetAmount,
-                remainingMakerAssetFillAmount
-            );
-            FillResults memory singleFillResult = calculateFillResults(orders[i], remainingTakerAssetFillAmount);
-            addFillResults(totalFillResults, singleFillResult);
-            if (totalFillResults.makerAssetFilledAmount == makerAssetFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Calculates a FillResults total for selling takerAssetFillAmount over all orders. 
-    ///      Including the fees required to be paid. 
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param takerAssetFillAmount A number representing the amount of this order to fill.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
-    function calculateMarketSellResults(
-        LibOrder.Order[] memory orders,
-        uint256 takerAssetFillAmount
-    )
-        public
-        view
-        returns (FillResults memory totalFillResults)
-    {
-        for (uint256 i = 0; i < orders.length; i++) {
-            uint256 remainingTakerAssetFillAmount = safeSub(takerAssetFillAmount, totalFillResults.takerAssetFilledAmount);
-            FillResults memory singleFillResult = calculateFillResults(orders[i], remainingTakerAssetFillAmount);
-            addFillResults(totalFillResults, singleFillResult);
-            if (totalFillResults.takerAssetFilledAmount == takerAssetFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Calculates fill results for buyFeeTokens. This handles fees on buying ZRX
-    ///      so the end result is the expected amount of ZRX (not less after fees).
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param zrxFillAmount A number representing the amount zrx to buy
-    /// @return totalFillResults Expected fill result amounts from buying fees
-    function calculateMarketBuyZrxResults(
-        LibOrder.Order[] memory orders,
-        uint256 zrxFillAmount
-    )
-        public
-        view
-        returns (FillResults memory totalFillResults)
-    {
-        for (uint256 i = 0; i < orders.length; i++) {
-            uint256 remainingZrxFillAmount = safeSub(zrxFillAmount, totalFillResults.makerAssetFilledAmount);
-            // Convert the remaining amount of makerToken to buy into remaining amount
-            // of takerToken to sell, assuming entire amount can be sold in the current order
-            uint256 remainingWethSellAmount = getPartialAmount(
-                orders[i].takerAssetAmount,
-                safeSub(orders[i].makerAssetAmount, orders[i].takerFee), // our exchange rate after fees 
-                remainingZrxFillAmount
-            );
-            FillResults memory singleFillResult = calculateFillResults(orders[i], safeAdd(remainingWethSellAmount, 1));
-
-            singleFillResult.makerAssetFilledAmount = safeSub(singleFillResult.makerAssetFilledAmount, singleFillResult.takerFeePaid);
-            addFillResults(totalFillResults, singleFillResult);
-            // As we compensate for the rounding issue above have slightly more ZRX than the requested zrxFillAmount
-            if (totalFillResults.makerAssetFilledAmount >= zrxFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Simulates the 0x Exchange fillOrder validation and calculations, without performing any state changes.
-    /// @param order An Order struct containing order specifications.
-    /// @param takerAssetFillAmount A number representing the amount of this order to fill.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function calculateFillResults(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount
-    )
-        internal
-        view
-        returns (FillResults memory fillResults)
-    {
-        LibOrder.OrderInfo memory orderInfo = EXCHANGE.getOrderInfo(order);
-        if (orderInfo.orderStatus != uint8(LibOrder.OrderStatus.FILLABLE)) {
-            return fillResults;
-        }
-        uint256 remainingTakerAssetAmount = safeSub(order.takerAssetAmount, orderInfo.orderTakerAssetFilledAmount);
-        uint256 takerAssetFilledAmount = min256(takerAssetFillAmount, remainingTakerAssetAmount);
-
-        fillResults.takerAssetFilledAmount = takerAssetFilledAmount;
-        fillResults.makerAssetFilledAmount = getPartialAmount(
-            takerAssetFilledAmount,
-            order.takerAssetAmount,
-            order.makerAssetAmount
-        );
-        fillResults.makerFeePaid = getPartialAmount(
-            takerAssetFilledAmount,
-            order.takerAssetAmount,
-            order.makerFee
-        );
-        fillResults.takerFeePaid = getPartialAmount(
-            takerAssetFilledAmount,
-            order.takerAssetAmount,
-            order.takerFee
-        );
-        return fillResults;
-    }
-}

packages/contracts/src/2.0.0/forwarder/MixinFees.sol

@@ -1,126 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../protocol/Exchange/libs/LibMath.sol";
-import "./mixins/MConstants.sol";
-import "./mixins/MFees.sol";
-
-
-contract MixinFees is
-    LibMath,
-    MConstants,
-    MFees
-{
-
-    uint16 constant public PERCENTAGE_DENOMINATOR = 10000; // 9800 == 98%, 10000 == 100%
-    uint16 constant public MAX_FEE = 1000; // 10%
-    uint16 constant public ALLOWABLE_EXCHANGE_PERCENTAGE = 9500; // 95%
-
-    /// @dev Default payabale function, this allows us to withdraw WETH
-    function ()
-        public
-        payable
-    {
-        require(
-            msg.sender == address(ETHER_TOKEN),
-            "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY"
-        );
-    }
-
-    /// @dev Pays the feeRecipient feeProportion of the total takerEthAmount, denominated in ETH
-    /// @param takerEthAmount The total amount that was transacted in WETH, fees are calculated from this value.
-    /// @param feeProportion The proportion of fees
-    /// @param feeRecipient The recipient of the fees
-    /// @return ethFeeAmount Amount of ETH paid to feeRecipient as fee.
-    function payEthFee(
-        uint256 takerEthAmount,
-        uint16 feeProportion,
-        address feeRecipient
-    )
-        internal
-        returns (uint256 ethFeeAmount)
-    {
-        if (feeProportion > 0 && feeRecipient != address(0)) {
-            require(
-                feeProportion <= MAX_FEE,
-                "FEE_PROPORTION_TOO_LARGE"
-            );
-            // 1.5% is 150, allowing for 2 decimal precision, i.e 0.05% is 5
-            ethFeeAmount = getPartialAmount(
-                feeProportion,
-                PERCENTAGE_DENOMINATOR,
-                takerEthAmount
-            );
-            feeRecipient.transfer(ethFeeAmount);
-        }
-        return ethFeeAmount;
-    }
-
-    /// @dev Withdraws the remaining WETH, deduct and pay fees from this amount based on the takerTokenAmount to the feeRecipient.
-    ///      If a user overpaid ETH initially, the fees are calculated from the amount traded and deducted from withdrawAmount.
-    ///      Any remaining ETH is sent back to the user.
-    /// @param ethWithdrawAmount The amount to withdraw from the WETH contract.
-    /// @param wethAmountSold The total amount that was transacted in WETH, fees are calculated from this value.
-    /// @param feeProportion The proportion of fees
-    /// @param feeRecipient The recipient of the fees
-    function withdrawPayAndDeductEthFee(
-        uint256 ethWithdrawAmount,
-        uint256 wethAmountSold,
-        uint16 feeProportion,
-        address feeRecipient
-    )
-        internal
-    {
-        // Return all of the excess WETH if any after deducting fees on the amount
-        if (ethWithdrawAmount > 0) {
-            ETHER_TOKEN.withdraw(ethWithdrawAmount);
-            // Fees proportional to the amount traded
-            uint256 ethFeeAmount = payEthFee(
-                wethAmountSold,
-                feeProportion,
-                feeRecipient
-            );
-            uint256 unspentEthAmount = safeSub(ethWithdrawAmount, ethFeeAmount);
-            if (unspentEthAmount > 0) {
-                msg.sender.transfer(unspentEthAmount);
-            }
-        }
-    }
-
-    /// @dev Checks whether the amount of tokens sold against the amount of tokens requested
-    ///      is within a certain threshold. This ensures the caller gets a fair deal when
-    ///      performing any token fee abstraction. Threshold is 95%. If fee abstraction costs more than
-    ///      5% of the total transaction, we return false.
-    /// @param requestedSellAmount The amount the user requested, or sent in to a payable function
-    /// @param tokenAmountSold The amount of the token that was sold after fee abstraction
-    /// @return bool of whether this is within an acceptable threshold
-    function isAcceptableThreshold(uint256 requestedSellAmount, uint256 tokenAmountSold)
-        internal
-        pure
-        returns (bool)
-    {
-        uint256 acceptableSellAmount = getPartialAmount(
-            ALLOWABLE_EXCHANGE_PERCENTAGE,
-            PERCENTAGE_DENOMINATOR,
-            requestedSellAmount
-        );
-        return tokenAmountSold >= acceptableSellAmount;
-    }
-}

packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol

@@ -19,30 +19,30 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "../utils/LibBytes/LibBytes.sol";
-import "./mixins/MFees.sol";
-import "./mixins/MMarketBuyZrx.sol";
-import "./mixins/MExpectedResults.sol";
-import "./mixins/MTransfer.sol";
-import "./mixins/MConstants.sol";
+import "./libs/LibConstants.sol";
+import "./mixins/MWeth.sol";
+import "./mixins/MAssets.sol";
+import "./mixins/MExchangeWrapper.sol";
 import "./mixins/MForwarderCore.sol";
+import "../utils/LibBytes/LibBytes.sol";
 import "../protocol/Exchange/libs/LibOrder.sol";
 import "../protocol/Exchange/libs/LibFillResults.sol";
+import "../protocol/Exchange/libs/LibMath.sol";
 
 
 contract MixinForwarderCore is
     LibFillResults,
-    MConstants,
-    MExpectedResults,
-    MFees,
-    MMarketBuyZrx,
-    MTransfer,
+    LibMath,
+    LibConstants,
+    MWeth,
+    MAssets,
+    MExchangeWrapper,
     MForwarderCore
 {
-    bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
-    bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)"));
-    uint256 constant internal MAX_UINT = 2**256 - 1;
 
+    using LibBytes for bytes;
+
+    /// @dev Constructor approves ERC20 proxy to transfer ZRX and WETH on this contract's behalf.
     constructor ()
         public
     {
@@ -53,379 +53,202 @@ contract MixinForwarderCore is
         }
     }
 
-    /// @dev Market sells ETH for ERC20 tokens, performing fee abstraction if required. This does not support ERC721 tokens. This function is payable
-    ///      and will convert all incoming ETH into WETH and perform the trade on behalf of the caller.
-    ///      This function allows for a deduction of a proportion of incoming ETH sent to the feeRecipient.
-    ///      The caller is sent all tokens from the operation.
-    ///      If the purchased token amount does not meet an acceptable threshold then this function reverts.
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param feeOrders An array of Order struct containing order specifications for fees.
-    /// @param feeSignatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param feeProportion A proportion deducted off the incoming ETH and sent to feeRecipient. The maximum value for this
-    ///        is 1000, aka 10%. Supports up to 2 decimal places. I.e 0.59% is 59.
-    /// @param feeRecipient An address of the fee recipient whom receives feeProportion of ETH.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketSellEthForERC20(
+    /// @dev Purchases as much of orders' makerAssets as possible by selling up to 95% of transaction's ETH value.
+    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
+    ///      5% of ETH value is reserved for paying fees to order feeRecipients (in ZRX) and forwarding contract feeRecipient (in ETH).
+    ///      Any ETH not spent will be refunded to sender.
+    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
+    /// @param signatures Proofs that orders have been created by makers.
+    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
+    /// @param feeSignatures Proofs that feeOrders have been created by makers.
+    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
+    /// @param feeRecipient Address that will receive ETH when orders are filled.
+    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
+    function marketSellOrdersWithEth(
         LibOrder.Order[] memory orders,
         bytes[] memory signatures,
         LibOrder.Order[] memory feeOrders,
         bytes[] memory feeSignatures,
-        uint16  feeProportion,
+        uint256  feePercentage,
         address feeRecipient
     )
         public
         payable
-        returns (FillResults memory totalFillResults)
+        returns (
+            FillResults memory orderFillResults,
+            FillResults memory feeOrderFillResults
+        )
     {
-        uint256 takerEthAmount = msg.value;
-        require(
-            takerEthAmount > 0,
-            "VALUE_GREATER_THAN_ZERO"
-        );
-        // Deduct the fee from the total amount of ETH sent in
-        uint256 ethFeeAmount = payEthFee(
-            takerEthAmount,
-            feeProportion,
-            feeRecipient
-        );
-        uint256 wethSellAmount = safeSub(takerEthAmount, ethFeeAmount);
+        // Convert ETH to WETH.
+        convertEthToWeth();
 
-        // Deposit the remaining to be used for trading
-        ETHER_TOKEN.deposit.value(wethSellAmount)();
-        // Populate the known assetData, as it is always WETH the caller can provide null bytes to save gas
-        // marketSellOrders fills the remaining
-        address makerTokenAddress = LibBytes.readAddress(orders[0].makerAssetData, 16);
-        orders[0].takerAssetData = WETH_ASSET_DATA;
-        if (makerTokenAddress == address(ZRX_TOKEN)) {
-            // If this is ZRX then we market sell from the orders, rather than a 2 step of buying ZRX fees from feeOrders
-            // then buying ZRX from orders
-            totalFillResults = marketSellEthForZRXInternal(
+        uint256 wethSellAmount;
+        uint256 zrxBuyAmount;
+        uint256 makerAssetAmountPurchased;
+        if (orders[0].makerAssetData.equals(ZRX_ASSET_DATA)) {
+            // Calculate amount of WETH that won't be spent on ETH fees.
+            wethSellAmount = getPartialAmount(
+                PERCENTAGE_DENOMINATOR,
+                safeAdd(PERCENTAGE_DENOMINATOR, feePercentage),
+                msg.value
+            );
+            // Market sell available WETH.
+            // ZRX fees are paid with this contract's balance.
+            orderFillResults = marketSellWeth(
                 orders,
-                signatures,
-                wethSellAmount
-            );
-        } else {
-            totalFillResults = marketSellEthForERC20Internal(
-                orders,
-                signatures,
-                feeOrders,
-                feeSignatures,
-                wethSellAmount
-            );
-        }
-        // Prevent accidental WETH owned by this contract and it being spent
-        require(
-            takerEthAmount >= totalFillResults.takerAssetFilledAmount,
-            "INVALID_MSG_VALUE"
-        );
-        // Ensure no WETH is left in this contract
-        require(
-            wethSellAmount == totalFillResults.takerAssetFilledAmount,
-            "UNACCEPTABLE_THRESHOLD"
-        );
-        // Transfer all tokens to msg.sender
-        transferERC20Token(
-            makerTokenAddress,
-            msg.sender,
-            totalFillResults.makerAssetFilledAmount
-        );
-        return totalFillResults;
-    }
-
-    /// @dev Buys the exact amount of assets (ERC20 and ERC721), performing fee abstraction if required.
-    ///      All order assets must be of the same type. Deducts a proportional fee to fee recipient.
-    ///      This function is payable and will convert all incoming ETH into WETH and perform the trade on behalf of the caller.
-    ///      The caller is sent all assets from the fill of orders. This function will revert unless the requested amount of assets are purchased.
-    ///      Any excess ETH sent will be returned to the caller
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param feeOrders An array of Order struct containing order specifications for fees.
-    /// @param makerTokenFillAmount The amount of maker asset to buy.
-    /// @param feeSignatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param feeProportion A proportion deducted off the ETH spent and sent to feeRecipient. The maximum value for this
-    ///        is 1000, aka 10%. Supports up to 2 decimal places. I.e 0.59% is 59.
-    /// @param feeRecipient An address of the fee recipient whom receives feeProportion of ETH.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketBuyTokensWithEth(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256 makerTokenFillAmount,
-        uint16  feeProportion,
-        address feeRecipient
-    )
-        public
-        payable
-        returns (FillResults memory totalFillResults)
-    {
-        uint256 takerEthAmount = msg.value;
-        require(
-            takerEthAmount > 0,
-            "VALUE_GREATER_THAN_ZERO"
-        );
-        require(
-            makerTokenFillAmount > 0,
-            "VALUE_GREATER_THAN_ZERO"
-        );
-        bytes4 assetDataId = LibBytes.readBytes4(orders[0].makerAssetData, 0);
-        require(
-            assetDataId == ERC20_DATA_ID || assetDataId == ERC721_DATA_ID,
-            "UNSUPPORTED_TOKEN_PROXY"
-        );
-
-        ETHER_TOKEN.deposit.value(takerEthAmount)();
-        if (assetDataId == ERC20_DATA_ID) {
-            totalFillResults = marketBuyERC20TokensInternal(
-                orders,
-                signatures,
-                feeOrders,
-                feeSignatures,
-                makerTokenFillAmount
-            );
-        } else if (assetDataId == ERC721_DATA_ID) {
-            totalFillResults = batchBuyERC721TokensInternal(
-                orders,
-                signatures,
-                feeOrders,
-                feeSignatures
-            );
-        }
-        // Prevent accidental WETH owned by this contract and it being spent
-        require(
-            takerEthAmount >= totalFillResults.takerAssetFilledAmount,
-            "INVALID_MSG_VALUE"
-        );
-        withdrawPayAndDeductEthFee(
-            safeSub(takerEthAmount, totalFillResults.takerAssetFilledAmount),
-            totalFillResults.takerAssetFilledAmount,
-            feeProportion,
-            feeRecipient
-        );
-        return totalFillResults;
-    }
-
-    /// @dev Market sells WETH for ERC20 tokens.
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param feeOrders An array of Order struct containing order specifications for fees.
-    /// @param feeSignatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param wethSellAmount The amount of WETH to sell.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketSellEthForERC20Internal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256 wethSellAmount
-    )
-        internal
-        returns (FillResults memory totalFillResults)
-    {
-        uint256 remainingWethSellAmount = wethSellAmount;
-        FillResults memory calculatedMarketSellResults = calculateMarketSellResults(orders, wethSellAmount);
-        if (calculatedMarketSellResults.takerFeePaid > 0) {
-            // Fees are required for these orders. Buy enough ZRX to cover the future market buy
-            FillResults memory feeTokensResults = marketBuyZrxInternal(
-                feeOrders,
-                feeSignatures,
-                calculatedMarketSellResults.takerFeePaid
-            );
-            // Ensure the token abstraction was fair if fees were proportionally too high, we fail
-            require(
-                isAcceptableThreshold(
-                    wethSellAmount,
-                    safeSub(wethSellAmount, feeTokensResults.takerAssetFilledAmount)
-                ),
-                "UNACCEPTABLE_THRESHOLD"
-            );
-            remainingWethSellAmount = safeSub(remainingWethSellAmount, feeTokensResults.takerAssetFilledAmount);
-            totalFillResults.takerFeePaid = feeTokensResults.takerFeePaid;
-            totalFillResults.takerAssetFilledAmount = feeTokensResults.takerAssetFilledAmount;
-        }
-        // Make our market sell to buy the requested tokens with the remaining balance
-        FillResults memory requestedTokensResults = EXCHANGE.marketSellOrders(
-            orders,
-            remainingWethSellAmount,
-            signatures
-        );
-        // Update our return FillResult with the market sell
-        addFillResults(totalFillResults, requestedTokensResults);
-        return totalFillResults;
-    }
-
-    /// @dev Market sells WETH for ZRX tokens.
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param wethSellAmount The amount of WETH to sell.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketSellEthForZRXInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        uint256 wethSellAmount
-    )
-        internal
-        returns (FillResults memory totalFillResults)
-    {
-        // Make our market sell to buy the requested tokens with the remaining balance
-        totalFillResults = EXCHANGE.marketSellOrders(
-            orders,
-            wethSellAmount,
-            signatures
-        );
-        // Exchange does not special case ZRX in the makerAssetFilledAmount, if fees were deducted then using this amount
-        // for future transfers is invalid.
-        uint256 zrxAmountBought = safeSub(totalFillResults.makerAssetFilledAmount, totalFillResults.takerFeePaid);
-        require(
-            isAcceptableThreshold(totalFillResults.makerAssetFilledAmount, zrxAmountBought),
-            "UNACCEPTABLE_THRESHOLD"
-        );
-        totalFillResults.makerAssetFilledAmount = zrxAmountBought;
-        return totalFillResults;
-    }
-
-    /// @dev Buys an exact amount of an ERC20 token using WETH.
-    /// @param orders Orders to fill. The maker asset is the ERC20 token to buy. The taker asset is WETH.
-    /// @param signatures Proof that the orders were created by their respective makers.
-    /// @param feeOrders to fill. The maker asset is ZRX and the taker asset is WETH.
-    /// @param feeSignatures Proof that the feeOrders were created by their respective makers.
-    /// @param makerTokenFillAmount Amount of the ERC20 token to buy.
-    /// @return totalFillResults Aggregated fill results of buying the ERC20 and ZRX tokens.
-    function marketBuyERC20TokensInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256 makerTokenFillAmount
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults)
-    {
-        // We read the maker token address to check if it is ZRX and later use it for transfer
-        address makerTokenAddress = LibBytes.readAddress(orders[0].makerAssetData, 16);
-        // We assume that asset being bought by taker is the same for each order.
-        // Rather than passing this in as calldata, we copy the makerAssetData from the first order onto all later orders.
-        orders[0].takerAssetData = WETH_ASSET_DATA;
-        // We can short cut here for effeciency and use buyFeeTokensInternal if maker asset token is ZRX
-        // this buys us exactly that amount taking into account the fees. This saves gas and calculates the rate correctly
-        FillResults memory marketBuyResults;
-        if (makerTokenAddress == address(ZRX_TOKEN)) {
-            marketBuyResults = marketBuyZrxInternal(
-                orders,
-                signatures,
-                makerTokenFillAmount
-            );
-            // When buying ZRX we round up which can result in a small margin excess
-            require(
-                marketBuyResults.makerAssetFilledAmount >= makerTokenFillAmount,
-                "UNACCEPTABLE_THRESHOLD"
-            );
-            addFillResults(totalFillResults, marketBuyResults);
-            require(
-                isAcceptableThreshold(
-                    safeAdd(totalFillResults.makerAssetFilledAmount, totalFillResults.takerFeePaid), // Total ZRX
-                    totalFillResults.makerAssetFilledAmount // amount going to msg.sender
-                ),
-                "UNACCEPTABLE_THRESHOLD"
-            );
-        } else {
-            FillResults memory calculatedMarketBuyResults = calculateMarketBuyResults(orders, makerTokenFillAmount);
-            if (calculatedMarketBuyResults.takerFeePaid > 0) {
-                // Fees are required for these orders. Buy enough ZRX to cover the future market buy
-                FillResults memory zrxMarketBuyResults = marketBuyZrxInternal(
-                    feeOrders,
-                    feeSignatures,
-                    calculatedMarketBuyResults.takerFeePaid
-                );
-                totalFillResults.takerAssetFilledAmount = zrxMarketBuyResults.takerAssetFilledAmount;
-                totalFillResults.takerFeePaid = zrxMarketBuyResults.takerFeePaid;
-            }
-            // Make our market buy of the requested tokens with the remaining balance
-            marketBuyResults = EXCHANGE.marketBuyOrders(
-                orders,
-                makerTokenFillAmount,
+                wethSellAmount,
                 signatures
             );
-            require(
-                marketBuyResults.makerAssetFilledAmount == makerTokenFillAmount,
-                "UNACCEPTABLE_THRESHOLD"
+            // The fee amount must be deducted from the amount transfered back to sender.
+            makerAssetAmountPurchased = safeSub(orderFillResults.makerAssetFilledAmount, orderFillResults.takerFeePaid);
+        } else {
+            // 5% of WETH is reserved for filling feeOrders and paying feeRecipient.
+            wethSellAmount = getPartialAmount(
+                MAX_WETH_FILL_PERCENTAGE,
+                PERCENTAGE_DENOMINATOR,
+                msg.value
             );
-            addFillResults(totalFillResults, marketBuyResults);
-            require(
-                isAcceptableThreshold(
-                    totalFillResults.takerAssetFilledAmount,
-                    marketBuyResults.takerAssetFilledAmount
-                ),
-                "UNACCEPTABLE_THRESHOLD"
+            // Market sell 95% of WETH.
+            // ZRX fees are payed with this contract's balance.
+            orderFillResults = marketSellWeth(
+                orders,
+                wethSellAmount,
+                signatures
             );
+            // Buy back all ZRX spent on fees.
+            zrxBuyAmount = orderFillResults.takerFeePaid;
+            feeOrderFillResults = marketBuyZrxWithWeth(
+                feeOrders,
+                zrxBuyAmount,
+                feeSignatures
+            );
+            makerAssetAmountPurchased = orderFillResults.makerAssetFilledAmount;
         }
-        // Transfer all purchased tokens to msg.sender
-        transferERC20Token(
-            makerTokenAddress,
-            msg.sender,
-            marketBuyResults.makerAssetFilledAmount
+
+        // Ensure that all ZRX fees have been repurchased and no extra WETH owned by this contract has been sold.
+        assertValidFillResults(
+            orderFillResults,
+            feeOrderFillResults,
+            zrxBuyAmount
         );
-        return totalFillResults;
+
+        // Transfer feePercentage of total ETH spent on primary orders to feeRecipient.
+        // Refund remaining ETH to msg.sender.
+        transferEthFeeAndRefund(
+            orderFillResults.takerAssetFilledAmount,
+            feeOrderFillResults.takerAssetFilledAmount,
+            feePercentage,
+            feeRecipient
+        );
+
+        // Transfer purchased assets to msg.sender.
+        transferPurchasedAssetToSender(orders[0].makerAssetData, makerAssetAmountPurchased);
     }
 
-    /// @dev Buys an all of the ERC721 tokens in the orders.
-    /// @param orders Orders to fill. The maker asset is the ERC721 token to buy. The taker asset is WETH.
-    /// @param signatures Proof that the orders were created by their respective makers.
-    /// @param feeOrders to fill. The maker asset is ZRX and the taker asset is WETH.
-    /// @param feeSignatures Proof that the feeOrders were created by their respective makers.
-    /// @return totalFillResults Aggregated fill results of buying the ERC721 tokens and ZRX tokens.
-    function batchBuyERC721TokensInternal(
+    /// @dev Attempt to purchase makerAssetFillAmount of makerAsset by selling ETH provided with transaction.
+    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
+    ///      Any ETH not spent will be refunded to sender.
+    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
+    /// @param makerAssetFillAmount Desired amount of makerAsset to purchase.
+    /// @param signatures Proofs that orders have been created by makers.
+    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
+    /// @param feeSignatures Proofs that feeOrders have been created by makers.
+    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
+    /// @param feeRecipient Address that will receive ETH when orders are filled.
+    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
+    function marketBuyOrdersWithEth(
         LibOrder.Order[] memory orders,
+        uint256 makerAssetFillAmount,
         bytes[] memory signatures,
         LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures
+        bytes[] memory feeSignatures,
+        uint256  feePercentage,
+        address feeRecipient
+    )
+        public
+        payable
+        returns (
+            FillResults memory orderFillResults,
+            FillResults memory feeOrderFillResults
+        )
+    {
+        // Convert ETH to WETH.
+        convertEthToWeth();
+
+        uint256 zrxBuyAmount;
+        uint256 makerAssetAmountPurchased;
+        if (orders[0].makerAssetData.equals(ZRX_ASSET_DATA)) {
+            // If the makerAsset is ZRX, it is not necessary to pay fees out of this
+            // contracts's ZRX balance because fees are factored into the price of the order.
+            orderFillResults = marketBuyZrxWithWeth(
+                orders,
+                makerAssetFillAmount,
+                signatures
+            );
+            // The fee amount must be deducted from the amount transfered back to sender.
+            makerAssetAmountPurchased = safeSub(orderFillResults.makerAssetFilledAmount, orderFillResults.takerFeePaid);
+        } else {
+            // Attemp to purchase desired amount of makerAsset.
+            // ZRX fees are payed with this contract's balance.
+            orderFillResults = marketBuyWithWeth(
+                orders,
+                makerAssetFillAmount,
+                signatures
+            );
+            // Buy back all ZRX spent on fees.
+            zrxBuyAmount = orderFillResults.takerFeePaid;
+            feeOrderFillResults = marketBuyZrxWithWeth(
+                feeOrders,
+                zrxBuyAmount,
+                feeSignatures
+            );
+            makerAssetAmountPurchased = orderFillResults.makerAssetFilledAmount;
+        }
+
+        // Ensure that all ZRX fees have been repurchased and no extra WETH owned by this contract has been sold.
+        assertValidFillResults(
+            orderFillResults,
+            feeOrderFillResults,
+            zrxBuyAmount
+        );
+
+        // Transfer feePercentage of total ETH spent on primary orders to feeRecipient.
+        // Refund remaining ETH to msg.sender.
+        transferEthFeeAndRefund(
+            orderFillResults.takerAssetFilledAmount,
+            feeOrderFillResults.takerAssetFilledAmount,
+            feePercentage,
+            feeRecipient
+        );
+
+        // Transfer purchased assets to msg.sender.
+        transferPurchasedAssetToSender(orders[0].makerAssetData, makerAssetAmountPurchased);
+    }
+
+    /// @dev Ensures that all ZRX fees have been repurchased and no extra WETH owned by this contract has been sold.
+    /// @param orderFillResults Amounts filled and fees paid for primary orders.
+    /// @param feeOrderFillResults Amounts filled and fees paid for fee orders.
+    /// @param zrxBuyAmount The amount of ZRX that needed to be repurchased after filling primary orders.
+    function assertValidFillResults(
+        FillResults memory orderFillResults,
+        FillResults memory feeOrderFillResults,
+        uint256 zrxBuyAmount
     )
         internal
-        returns (LibFillResults.FillResults memory totalFillResults)
+        view
     {
-        uint256 totalZrxFeeAmount;
-        uint256 ordersLength = orders.length;
-        uint256[] memory takerAssetFillAmounts = new uint256[](ordersLength);
-        for (uint256 i = 0; i < ordersLength; i++) {
-            // Total up the fees
-            totalZrxFeeAmount = safeAdd(totalZrxFeeAmount, orders[i].takerFee);
-            // We assume that asset being bought by taker is the same for each order.
-            // Rather than passing this in as calldata, we set the takerAssetData as WETH asset data
-            orders[i].takerAssetData = WETH_ASSET_DATA;
-            // Populate takerAssetFillAmounts for later batchFill
-            takerAssetFillAmounts[i] = orders[i].takerAssetAmount;
-        }
-        if (totalZrxFeeAmount > 0) {
-            // Fees are required for these orders. Buy enough ZRX to cover the future fill
-            FillResults memory zrxMarketBuyResults = marketBuyZrxInternal(
-                feeOrders,
-                feeSignatures,
-                totalZrxFeeAmount
-            );
-            totalFillResults.takerFeePaid = zrxMarketBuyResults.takerFeePaid;
-            totalFillResults.takerAssetFilledAmount = zrxMarketBuyResults.takerAssetFilledAmount;
-        }
-        FillResults memory batchFillResults = EXCHANGE.batchFillOrKillOrders(
-            orders,
-            takerAssetFillAmounts,
-            signatures
-        );
-        addFillResults(totalFillResults, batchFillResults);
+        // Ensure that all ZRX spent while filling primary orders has been repurchased.
+        uint256 zrxPurchased = safeSub(feeOrderFillResults.makerAssetFilledAmount, feeOrderFillResults.takerFeePaid);
         require(
-            isAcceptableThreshold(
-                totalFillResults.takerAssetFilledAmount,
-                batchFillResults.takerAssetFilledAmount
-            ),
-            "UNACCEPTABLE_THRESHOLD"
+            zrxPurchased >= zrxBuyAmount,
+            "COMPLETE_FILL_FAILED"
+        );
+
+        // Ensure that no extra WETH owned by this contract has been sold.
+        uint256 wethSold = safeAdd(orderFillResults.takerAssetFilledAmount, feeOrderFillResults.takerAssetFilledAmount);
+        require(
+            wethSold <= msg.value,
+            "OVERSOLD_WETH"
         );
-        // Transfer all of the tokens filled from the batchFill
-        for (i = 0; i < ordersLength; i++) {
-            transferERC721Token(
-                orders[i].makerAssetData,
-                msg.sender
-            );
-        }
-        return totalFillResults;
     }
 }

packages/contracts/src/2.0.0/forwarder/MixinMarketBuyZrx.sol

@@ -1,83 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../protocol/Exchange/libs/LibFillResults.sol";
-import "../protocol/Exchange/libs/LibOrder.sol";
-import "../protocol/Exchange/libs/LibMath.sol";
-import "./mixins/MConstants.sol";
-import "./mixins/MMarketBuyZrx.sol";
-
-
-contract MixinMarketBuyZrx is
-    LibMath,
-    LibFillResults,
-    MConstants,
-    MMarketBuyZrx
-{
-
-    /// @dev Buys zrxBuyAmount of ZRX fee tokens, taking into account the fees on buying fee tokens. This will guarantee
-    ///      At least zrxBuyAmount of ZRX fee tokens are purchased (sometimes slightly over due to rounding issues).
-    ///      It is possible that a request to buy 200 ZRX fee tokens will require purchasing 202 ZRX tokens
-    ///      As 2 ZRX is required to purchase the 200 ZRX fee tokens. This guarantees at least 200 ZRX for future purchases.
-    /// @param orders An array of Order struct containing order specifications for fees.
-    /// @param signatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param zrxBuyAmount The number of requested ZRX fee tokens.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker. makerTokenAmount is the zrx amount deducted of fees
-    function marketBuyZrxInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        uint256 zrxBuyAmount
-    )
-        internal
-        returns (FillResults memory totalFillResults)
-    {
-        for (uint256 i = 0; i < orders.length; i++) {
-            // All of these are ZRX/WETH, we can drop the respective assetData from callData
-            orders[i].makerAssetData = ZRX_ASSET_DATA;
-            orders[i].takerAssetData = WETH_ASSET_DATA;
-            // Calculate the remaining amount of makerToken to buy
-            uint256 remainingZrxBuyAmount = safeSub(zrxBuyAmount, totalFillResults.makerAssetFilledAmount);
-            // Convert the remaining amount of makerToken to buy into remaining amount
-            // of takerToken to sell, assuming entire amount can be sold in the current order
-            uint256 remainingWethSellAmount = getPartialAmount(
-                orders[i].takerAssetAmount,
-                safeSub(orders[i].makerAssetAmount, orders[i].takerFee), // our exchange rate after fees 
-                remainingZrxBuyAmount
-            );
-            // Attempt to sell the remaining amount of takerToken
-            // Round up the amount to ensure we don't under buy by a fractional amount
-            FillResults memory singleFillResult = EXCHANGE.fillOrder(
-                orders[i],
-                safeAdd(remainingWethSellAmount, 1),
-                signatures[i]
-            );
-            // We didn't buy the full amount when buying ZRX as some were taken for fees
-            singleFillResult.makerAssetFilledAmount = safeSub(singleFillResult.makerAssetFilledAmount, singleFillResult.takerFeePaid);
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResult);
-            // Stop execution if the entire amount of makerToken has been bought
-            if (totalFillResults.makerAssetFilledAmount >= zrxBuyAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-}

packages/contracts/src/2.0.0/forwarder/MixinWeth.sol

@@ -0,0 +1,110 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+
+import "../protocol/Exchange/libs/LibMath.sol";
+import "./libs/LibConstants.sol";
+import "./mixins/MWeth.sol";
+
+
+contract MixinWeth is
+    LibMath,
+    LibConstants,
+    MWeth
+{
+
+    /// @dev Default payabale function, this allows us to withdraw WETH
+    function ()
+        public
+        payable
+    {
+        require(
+            msg.sender == address(ETHER_TOKEN),
+            "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY"
+        );
+    }
+
+    /// @dev Converts message call's ETH value into WETH.
+    function convertEthToWeth()
+        internal
+    {
+        require(
+            msg.value > 0,
+            "INVALID_MSG_VALUE"
+        );
+        ETHER_TOKEN.deposit.value(msg.value)();
+    }
+
+    /// @dev Transfers feePercentage of WETH spent on primary orders to feeRecipient.
+    ///      Refunds any excess ETH to msg.sender.
+    /// @param wethSoldExcludingFeeOrders Amount of WETH sold when filling primary orders.
+    /// @param wethSoldForZrx Amount of WETH sold when purchasing ZRX required for primary order fees.
+    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
+    /// @param feeRecipient Address that will receive ETH when orders are filled.
+    function transferEthFeeAndRefund(
+        uint256 wethSoldExcludingFeeOrders,
+        uint256 wethSoldForZrx,
+        uint256 feePercentage,
+        address feeRecipient
+    )
+        internal
+    {
+        // Ensure feePercentage is less than 5%.
+        require(
+            feePercentage <= MAX_FEE_PERCENTAGE,
+            "FEE_PERCENTAGE_TOO_LARGE"
+        );
+
+        // Calculate amount of WETH that hasn't been sold.
+        uint256 wethRemaining = safeSub(
+            msg.value,
+            safeAdd(wethSoldExcludingFeeOrders, wethSoldForZrx)
+        );
+
+        // Calculate ETH fee to pay to feeRecipient.
+        uint256 ethFee = getPartialAmount(
+            feePercentage,
+            PERCENTAGE_DENOMINATOR,
+            wethSoldExcludingFeeOrders
+        );
+
+        // Ensure fee is less than amount of WETH remaining.
+        require(
+            ethFee <= wethRemaining,
+            "INSUFFICIENT_ETH_REMAINING"
+        );
+    
+        // Do nothing if no WETH remaining
+        if (wethRemaining > 0) {
+            // Convert remaining WETH to ETH
+            ETHER_TOKEN.withdraw(wethRemaining);
+
+            // Pay ETH to feeRecipient
+            if (ethFee > 0) {
+                feeRecipient.transfer(ethFee);
+            }
+
+            // Refund remaining ETH to msg.sender.
+            uint256 ethRefund = safeSub(wethRemaining, ethFee);
+            if (ethRefund > 0) {
+                msg.sender.transfer(ethRefund);
+            }
+        }
+    }
+}

packages/contracts/src/2.0.0/forwarder/interfaces/IAssets.sol

@@ -19,28 +19,16 @@
 pragma solidity 0.4.24;
 
 
-contract MTransfer {
+contract IAssets {
 
-    function onERC721Received(address, uint256, bytes memory)
-        public
-        pure
-        returns(bytes4);
-
-    function onERC721Received(address, address, uint256, bytes memory)
-        public
-        pure
-        returns(bytes4);
-    
-    function transferERC20Token(
+    /// @dev Withdraws ERC20 tokens from this contract. The contract requires a ZRX balance in order to 
+    ///      function optimally, and this function allows the ZRX to be withdrawn by owner. It may also be
+    ///      used to withdraw tokens that were accidentally sent to this contract.
+    /// @param token Address of ERC20 token to withdraw.
+    /// @param amount Amount of ERC20 token to withdraw.
+    function withdrawERC20(
         address token,
-        address to,
         uint256 amount
     )
-        internal;
-
-    function transferERC721Token(
-        bytes memory assetData,
-        address to
-    )
-        internal;
+        external;
 }

packages/contracts/src/2.0.0/forwarder/interfaces/IExpectedResults.sol

@@ -1,66 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/libs/LibFillResults.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-
-
-contract IExpectedResults {
-
-    /// @dev Calculates a total FillResults for buying makerAssetFillAmount over all orders.
-    ///      Including the fees required to be paid. 
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param makerAssetFillAmount A number representing the amount of this order to fill.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
-    function calculateMarketBuyResults(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount
-    )
-        public
-        view
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Calculates a FillResults total for selling takerAssetFillAmount over all orders. 
-    ///      Including the fees required to be paid. 
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param takerAssetFillAmount A number representing the amount of this order to fill.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
-    function calculateMarketSellResults(
-        LibOrder.Order[] memory orders,
-        uint256 takerAssetFillAmount
-    )
-        public
-        view
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Calculates fill results for buyFeeTokens. This handles fees on buying ZRX
-    ///      so the end result is the expected amount of ZRX (not less after fees).
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param zrxFillAmount A number representing the amount zrx to buy
-    /// @return totalFillResults Expected fill result amounts from buying fees
-    function calculateMarketBuyZrxResults(
-        LibOrder.Order[] memory orders,
-        uint256 zrxFillAmount
-    )
-        public
-        view
-        returns (LibFillResults.FillResults memory totalFillResults);
-}

packages/contracts/src/2.0.0/forwarder/interfaces/IForwarder.sol

@@ -20,11 +20,11 @@ pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;
 
 import "./IForwarderCore.sol";
-import "./IExpectedResults.sol";
+import "./IAssets.sol";
 
 
 // solhint-disable no-empty-blocks
 contract IForwarder is
     IForwarderCore,
-    IExpectedResults
+    IAssets
 {}

packages/contracts/src/2.0.0/forwarder/interfaces/IForwarderCore.sol

@@ -25,55 +25,56 @@ import "../../protocol/Exchange/libs/LibFillResults.sol";
 
 contract IForwarderCore {
 
-    /// @dev Market sells ETH for ERC20 tokens, performing fee abstraction if required. This does not support ERC721 tokens. This function is payable
-    ///      and will convert all incoming ETH into WETH and perform the trade on behalf of the caller.
-    ///      This function allows for a deduction of a proportion of incoming ETH sent to the feeRecipient.
-    ///      The caller is sent all tokens from the operation.
-    ///      If the purchased token amount does not meet an acceptable threshold then this function reverts.
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param feeOrders An array of Order struct containing order specifications for fees.
-    /// @param feeSignatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param feeProportion A proportion deducted off the incoming ETH and sent to feeRecipient. The maximum value for this
-    ///        is 1000, aka 10%. Supports up to 2 decimal places. I.e 0.59% is 59.
-    /// @param feeRecipient An address of the fee recipient whom receives feeProportion of ETH.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketSellEthForERC20(
+    /// @dev Purchases as much of orders' makerAssets as possible by selling up to 95% of transaction's ETH value.
+    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
+    ///      5% of ETH value is reserved for paying fees to order feeRecipients (in ZRX) and forwarding contract feeRecipient (in ETH).
+    ///      Any ETH not spent will be refunded to sender.
+    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
+    /// @param signatures Proofs that orders have been created by makers.
+    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
+    /// @param feeSignatures Proofs that feeOrders have been created by makers.
+    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
+    /// @param feeRecipient Address that will receive ETH when orders are filled.
+    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
+    function marketSellOrdersWithEth(
         LibOrder.Order[] memory orders,
         bytes[] memory signatures,
         LibOrder.Order[] memory feeOrders,
         bytes[] memory feeSignatures,
-        uint16  feeProportion,
+        uint256  feePercentage,
         address feeRecipient
     )
         public
         payable
-        returns (LibFillResults.FillResults memory totalFillResults);
+        returns (
+            LibFillResults.FillResults memory orderFillResults,
+            LibFillResults.FillResults memory feeOrderFillResults
+        );
 
-    /// @dev Buys the exact amount of assets (ERC20 and ERC721), performing fee abstraction if required.
-    ///      All order assets must be of the same type. Deducts a proportional fee to fee recipient.
-    ///      This function is payable and will convert all incoming ETH into WETH and perform the trade on behalf of the caller.
-    ///      The caller is sent all assets from the fill of orders. This function will revert unless the requested amount of assets are purchased.
-    ///      Any excess ETH sent will be returned to the caller
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param feeOrders An array of Order struct containing order specifications for fees.
-    /// @param makerTokenFillAmount The amount of maker asset to buy.
-    /// @param feeSignatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param feeProportion A proportion deducted off the ETH spent and sent to feeRecipient. The maximum value for this
-    ///        is 1000, aka 10%. Supports up to 2 decimal places. I.e 0.59% is 59.
-    /// @param feeRecipient An address of the fee recipient whom receives feeProportion of ETH.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketBuyTokensWithEth(
+    /// @dev Attempt to purchase makerAssetFillAmount of makerAsset by selling ETH provided with transaction.
+    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
+    ///      Any ETH not spent will be refunded to sender.
+    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
+    /// @param makerAssetFillAmount Desired amount of makerAsset to purchase.
+    /// @param signatures Proofs that orders have been created by makers.
+    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
+    /// @param feeSignatures Proofs that feeOrders have been created by makers.
+    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
+    /// @param feeRecipient Address that will receive ETH when orders are filled.
+    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
+    function marketBuyOrdersWithEth(
         LibOrder.Order[] memory orders,
+        uint256 makerAssetFillAmount,
         bytes[] memory signatures,
         LibOrder.Order[] memory feeOrders,
         bytes[] memory feeSignatures,
-        uint256 makerTokenFillAmount,
-        uint16  feeProportion,
+        uint256  feePercentage,
         address feeRecipient
     )
         public
         payable
-        returns (LibFillResults.FillResults memory totalFillResults);
+        returns (
+            LibFillResults.FillResults memory orderFillResults,
+            LibFillResults.FillResults memory feeOrderFillResults
+        );
 }

packages/contracts/src/2.0.0/forwarder/libs/LibConstants.sol

@@ -18,12 +18,27 @@
 
 pragma solidity 0.4.24;
 
-import "./mixins/MConstants.sol";
+import "../../protocol/Exchange/interfaces/IExchange.sol";
+import "../../tokens/EtherToken/IEtherToken.sol";
+import "../../tokens/ERC20Token/IERC20Token.sol";
 
 
-contract MixinConstants is
-    MConstants
-{
+contract LibConstants {
+
+    bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
+    bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
+    uint256 constant internal MAX_UINT = 2**256 - 1;
+    uint256 constant internal PERCENTAGE_DENOMINATOR = 10**18; 
+    uint256 constant internal MAX_FEE_PERCENTAGE = 5 * PERCENTAGE_DENOMINATOR / 100;         // 5%
+    uint256 constant internal MAX_WETH_FILL_PERCENTAGE = 95 * PERCENTAGE_DENOMINATOR / 100;  // 95%
+ 
+     // solhint-disable var-name-mixedcase
+    IExchange internal EXCHANGE;
+    IEtherToken internal ETHER_TOKEN;
+    IERC20Token internal ZRX_TOKEN;
+    bytes internal ZRX_ASSET_DATA;
+    bytes internal WETH_ASSET_DATA;
+    // solhint-enable var-name-mixedcase
 
     constructor (
         address _exchange,

packages/contracts/src/2.0.0/forwarder/libs/LibForwarderErrors.sol

@@ -0,0 +1,34 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+// solhint-disable
+pragma solidity 0.4.24;
+
+
+/// This contract is intended to serve as a reference, but is not actually used for efficiency reasons.
+contract LibForwarderErrors {
+    string constant FEE_PERCENTAGE_TOO_LARGE = "FEE_PROPORTION_TOO_LARGE";                        // Provided fee percentage greater than 5%.
+    string constant INSUFFICIENT_ETH_REMAINING = "INSUFFICIENT_ETH_REMAINING";                    // Not enough ETH remaining to pay feeRecipient.
+    string constant OVERSOLD_WETH = "OVERSOLD_WETH";                                              // More WETH sold than provided with current message call.
+    string constant COMPLETE_FILL_FAILED = "COMPLETE_FILL_FAILED";                                // Desired purchase amount not completely filled (required for ZRX fees only).
+    string constant TRANSFER_FAILED = "TRANSFER_FAILED";                                          // Asset transfer failed.
+    string constant UNSUPPORTED_TOKEN_PROXY = "UNSUPPORTED_TOKEN_PROXY";                          // Proxy in assetData not supported.
+    string constant DEFAULT_FUNCTION_WETH_CONTRACT_ONLY = "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY";  // Fallback function may only be used for WETH withdrawals.
+    string constant INVALID_MSG_VALUE = "INVALID_MSG_VALUE";                                      // msg.value must be greater than 0.
+    string constant INVALID_AMOUNT = "INVALID_AMOUNT";                                            // Amount must equal 1.
+}

packages/contracts/src/2.0.0/forwarder/mixins/MAssets.sol

@@ -0,0 +1,54 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+
+import "../interfaces/IAssets.sol";
+
+
+contract MAssets is
+    IAssets
+{
+
+    /// @dev Transfers given amount of asset to sender.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param amount Amount of asset to transfer to sender.
+    function transferPurchasedAssetToSender(
+        bytes memory assetData,
+        uint256 amount
+    )
+        internal;
+
+    /// @dev Decodes ERC20 assetData and transfers given amount to sender.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param amount Amount of asset to transfer to sender.
+    function transferERC20Token(
+        bytes memory assetData,
+        uint256 amount
+    )
+        internal;
+
+    /// @dev Decodes ERC721 assetData and transfers given amount to sender.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param amount Amount of asset to transfer to sender.
+    function transferERC721Token(
+        bytes memory assetData,
+        uint256 amount
+    )
+        internal;
+}

packages/contracts/src/2.0.0/forwarder/mixins/MConstants.sol

@@ -1,35 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/interfaces/IExchange.sol";
-import "../../tokens/EtherToken/IEtherToken.sol";
-import "../../tokens/ERC20Token/IERC20Token.sol";
-
-
-contract MConstants {
-
-    // solhint-disable var-name-mixedcase
-    IExchange internal EXCHANGE;
-    IEtherToken internal ETHER_TOKEN;
-    IERC20Token internal ZRX_TOKEN;
-    bytes internal ZRX_ASSET_DATA;
-    bytes internal WETH_ASSET_DATA;
-    // solhint-enable var-name-mixedcase
-}

packages/contracts/src/2.0.0/forwarder/mixins/MExchangeWrapper.sol

@@ -0,0 +1,87 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+pragma experimental ABIEncoderV2;
+
+import "../../protocol/Exchange/libs/LibOrder.sol";
+import "../../protocol/Exchange/libs/LibFillResults.sol";
+
+
+contract MExchangeWrapper {
+
+    /// @dev Fills the input order.
+    ///      Returns false if the transaction would otherwise revert.
+    /// @param order Order struct containing order specifications.
+    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
+    /// @param signature Proof that order has been created by maker.
+    /// @return Amounts filled and fees paid by maker and taker.
+    function fillOrderNoThrow(
+        LibOrder.Order memory order,
+        uint256 takerAssetFillAmount,
+        bytes memory signature
+    )
+        internal
+        returns (LibFillResults.FillResults memory fillResults);
+
+    /// @dev Synchronously executes multiple calls of fillOrder until total amount of WETH has been sold by taker.
+    ///      Returns false if the transaction would otherwise revert.
+    /// @param orders Array of order specifications.
+    /// @param wethSellAmount Desired amount of WETH to sell.
+    /// @param signatures Proofs that orders have been signed by makers.
+    /// @return Amounts filled and fees paid by makers and taker.
+    function marketSellWeth(
+        LibOrder.Order[] memory orders,
+        uint256 wethSellAmount,
+        bytes[] memory signatures
+    )
+        internal
+        returns (LibFillResults.FillResults memory totalFillResults);
+
+    /// @dev Synchronously executes multiple fill orders in a single transaction until total amount is bought by taker.
+    ///      Returns false if the transaction would otherwise revert.
+    ///      The asset being sold by taker must always be WETH.
+    /// @param orders Array of order specifications.
+    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
+    /// @param signatures Proofs that orders have been signed by makers.
+    /// @return Amounts filled and fees paid by makers and taker.
+    function marketBuyWithWeth(
+        LibOrder.Order[] memory orders,
+        uint256 makerAssetFillAmount,
+        bytes[] memory signatures
+    )
+        internal
+        returns (LibFillResults.FillResults memory totalFillResults);
+
+    /// @dev Buys zrxBuyAmount of ZRX fee tokens, taking into account ZRX fees for each order. This will guarantee
+    ///      that at least zrxBuyAmount of ZRX is purchased (sometimes slightly over due to rounding issues).
+    ///      It is possible that a request to buy 200 ZRX will require purchasing 202 ZRX
+    ///      as 2 ZRX is required to purchase the 200 ZRX fee tokens. This guarantees at least 200 ZRX for future purchases.
+    ///      The asset being sold by taker must always be WETH. 
+    /// @param orders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset.
+    /// @param zrxBuyAmount Desired amount of ZRX to buy.
+    /// @param signatures Proofs that orders have been created by makers.
+    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
+    function marketBuyZrxWithWeth(
+        LibOrder.Order[] memory orders,
+        uint256 zrxBuyAmount,
+        bytes[] memory signatures
+    )
+        internal
+        returns (LibFillResults.FillResults memory totalFillResults);
+}

packages/contracts/src/2.0.0/forwarder/mixins/MExpectedResults.sol

@@ -1,42 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/libs/LibFillResults.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-import "../interfaces/IExpectedResults.sol";
-
-
-contract MExpectedResults is
-    IExpectedResults
-{
-
-    /// @dev Simulates the 0x Exchange fillOrder validation and calculations, without performing any state changes.
-    /// @param order An Order struct containing order specifications.
-    /// @param takerAssetFillAmount A number representing the amount of this order to fill.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function calculateFillResults(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount
-    )
-        internal
-        view
-        returns (LibFillResults.FillResults memory fillResults);
-}

packages/contracts/src/2.0.0/forwarder/mixins/MFees.sol

@@ -1,63 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract MFees {
-
-    /// @dev Pays the feeRecipient feeProportion of the total takerEthAmount, denominated in ETH
-    /// @param takerEthAmount The total amount that was transacted in WETH, fees are calculated from this value.
-    /// @param feeProportion The proportion of fees
-    /// @param feeRecipient The recipient of the fees
-    /// @return ethFeeAmount Amount of ETH paid to feeRecipient as fee.
-    function payEthFee(
-        uint256 takerEthAmount,
-        uint16 feeProportion,
-        address feeRecipient
-    )
-        internal
-        returns (uint256 ethFeeAmount);
-
-    /// @dev Withdraws the remaining WETH, deduct and pay fees from this amount based on the takerTokenAmount to the feeRecipient.
-    ///      If a user overpaid ETH initially, the fees are calculated from the amount traded and deducted from withdrawAmount.
-    ///      Any remaining ETH is sent back to the user.
-    /// @param ethWithdrawAmount The amount to withdraw from the WETH contract.
-    /// @param wethAmountSold The total amount that was transacted in WETH, fees are calculated from this value.
-    /// @param feeProportion The proportion of fees
-    /// @param feeRecipient The recipient of the fees
-    function withdrawPayAndDeductEthFee(
-        uint256 ethWithdrawAmount,
-        uint256 wethAmountSold,
-        uint16 feeProportion,
-        address feeRecipient
-    )
-        internal;
-
-    /// @dev Checks whether the amount of tokens sold against the amount of tokens requested
-    ///      is within a certain threshold. This ensures the caller gets a fair deal when
-    ///      performing any token fee abstraction. Threshold is 95%. If fee abstraction costs more than
-    ///      5% of the total transaction, we return false.
-    /// @param requestedSellAmount The amount the user requested, or sent in to a payable function
-    /// @param tokenAmountSold The amount of the token that was sold after fee abstraction
-    /// @return bool of whether this is within an acceptable threshold
-    function isAcceptableThreshold(uint256 requestedSellAmount, uint256 tokenAmountSold)
-        internal
-        pure
-        returns (bool);
-}

packages/contracts/src/2.0.0/forwarder/mixins/MForwarderCore.sol

@@ -28,65 +28,15 @@ contract MForwarderCore is
     IForwarderCore
 {
 
-    /// @dev Market sells WETH for ERC20 tokens.
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param feeOrders An array of Order struct containing order specifications for fees.
-    /// @param feeSignatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param wethSellAmount The amount of WETH to sell.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketSellEthForERC20Internal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256 wethSellAmount
+    /// @dev Ensures that all ZRX fees have been repurchased and no extra WETH owned by this contract has been sold.
+    /// @param orderFillResults Amounts filled and fees paid for primary orders.
+    /// @param feeOrderFillResults Amounts filled and fees paid for fee orders.
+    /// @param zrxBuyAmount The amount of ZRX that needed to be repurchased after filling primary orders.
+    function assertValidFillResults(
+        LibFillResults.FillResults memory orderFillResults,
+        LibFillResults.FillResults memory feeOrderFillResults,
+        uint256 zrxBuyAmount
     )
         internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Market sells WETH for ZRX tokens.
-    /// @param orders An array of Order struct containing order specifications.
-    /// @param signatures An array of Proof that order has been created by maker.
-    /// @param wethSellAmount The amount of WETH to sell.
-    /// @return FillResults amounts filled and fees paid by maker and taker.
-    function marketSellEthForZRXInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        uint256 wethSellAmount
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Buys an exact amount of an ERC20 token using WETH.
-    /// @param orders Orders to fill. The maker asset is the ERC20 token to buy. The taker asset is WETH.
-    /// @param signatures Proof that the orders were created by their respective makers.
-    /// @param feeOrders to fill. The maker asset is ZRX and the taker asset is WETH.
-    /// @param feeSignatures Proof that the feeOrders were created by their respective makers.
-    /// @param makerTokenFillAmount Amount of the ERC20 token to buy.
-    /// @return totalFillResults Aggregated fill results of buying the ERC20 and ZRX tokens.
-    function marketBuyERC20TokensInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256 makerTokenFillAmount
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Buys an all of the ERC721 tokens in the orders.
-    /// @param orders Orders to fill. The maker asset is the ERC721 token to buy. The taker asset is WETH.
-    /// @param signatures Proof that the orders were created by their respective makers.
-    /// @param feeOrders to fill. The maker asset is ZRX and the taker asset is WETH.
-    /// @param feeSignatures Proof that the feeOrders were created by their respective makers.
-    /// @return totalFillResults Aggregated fill results of buying the ERC721 tokens and ZRX tokens.
-    function batchBuyERC721TokensInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
+        view;
 }

packages/contracts/src/2.0.0/forwarder/mixins/MMarketBuyZrx.sol

@@ -1,42 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/libs/LibFillResults.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-
-
-contract MMarketBuyZrx {
-
-    /// @dev Buys zrxBuyAmount of ZRX fee tokens, taking into account the fees on buying fee tokens. This will guarantee
-    ///      At least zrxBuyAmount of ZRX fee tokens are purchased (sometimes slightly over due to rounding issues).
-    ///      It is possible that a request to buy 200 ZRX fee tokens will require purchasing 202 ZRX tokens
-    ///      As 2 ZRX is required to purchase the 200 ZRX fee tokens. This guarantees at least 200 ZRX for future purchases.
-    /// @param orders An array of Order struct containing order specifications for fees.
-    /// @param signatures An array of Proof that order has been created by maker for the fee orders.
-    /// @param zrxBuyAmount The number of requested ZRX fee tokens.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker. makerTokenAmount is the zrx amount deducted of fees
-    function marketBuyZrxInternal(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        uint256 zrxBuyAmount
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-}

packages/contracts/src/2.0.0/forwarder/mixins/MWeth.sol

@@ -0,0 +1,41 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+
+
+contract MWeth {
+
+    /// @dev Converts message call's ETH value into WETH.
+    function convertEthToWeth()
+        internal;
+
+    /// @dev Transfers feePercentage of WETH spent on primary orders to feeRecipient.
+    ///      Refunds any excess ETH to msg.sender.
+    /// @param wethSoldExcludingFeeOrders Amount of WETH sold when filling primary orders.
+    /// @param wethSoldForZrx Amount of WETH sold when purchasing ZRX required for primary order fees.
+    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
+    /// @param feeRecipient Address that will receive ETH when orders are filled.
+    function transferEthFeeAndRefund(
+        uint256 wethSoldExcludingFeeOrders,
+        uint256 wethSoldForZrx,
+        uint256 feePercentage,
+        address feeRecipient
+    )
+        internal;
+}

packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol

@@ -26,7 +26,7 @@ contract ERC721Proxy is
     MixinAuthorizable
 {
     // Id of this proxy.
-    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)"));
+    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
 
     // solhint-disable-next-line payable-fallback
     function () 
@@ -83,34 +83,26 @@ contract ERC721Proxy is
                 // WARNING: The ABIv2 specification allows additional padding between
                 //          the Params and Data section. This will result in a larger
                 //          offset to assetData.
-                
+
                 // Asset data itself is encoded as follows:
                 //
                 // | Area     | Offset | Length  | Contents                            |
                 // |----------|--------|---------|-------------------------------------|
                 // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 3 * 32  | function parameters:                |
+                // | Params   |        | 2 * 32  | function parameters:                |
                 // |          | 4      | 12 + 20 |   1. token address                  |
                 // |          | 36     |         |   2. tokenId                        |
-                // |          | 68     |         |   3. offset to receiverData (*)     |
-                // | Data     |        |         | receiverData:                       |
-                // |          | 100    | 32      | receiverData Length                 |
-                // |          | 132    | **      | receiverData Contents               |
                 
-                // We construct calldata for the `token.safeTransferFrom` ABI.
+                // We construct calldata for the `token.transferFrom` ABI.
                 // The layout of this calldata is in the table below.
                 // 
                 // | Area     | Offset | Length  | Contents                            |
                 // |----------|--------|---------|-------------------------------------|
                 // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 4 * 32  | function parameters:                |
+                // | Params   |        | 3 * 32  | function parameters:                |
                 // |          | 4      |         |   1. from                           |
                 // |          | 36     |         |   2. to                             |
                 // |          | 68     |         |   3. tokenId                        |
-                // |          | 100    |         |   4. offset to receiverData (*)     |
-                // | Data     |        |         | receiverData:                       |
-                // |          | 132    | 32      | receiverData Length                 |
-                // |          | 164    | **      | receiverData Contents               |
 
                 // There exists only 1 of each token.
                 // require(amount == 1, "INVALID_AMOUNT")
@@ -122,76 +114,32 @@ contract ERC721Proxy is
                     mstore(96, 0)
                     revert(0, 100)
                 }
-                
-                // Require assetData to be at least 132 bytes
-                let offset := calldataload(4)
-                if lt(calldataload(add(offset, 4)), 132) {
-                    // Revert with `Error("LENGTH_GREATER_THAN_131_REQUIRED")`
-                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                    mstore(64, 0x000000204c454e4754485f475245415445525f5448414e5f3133315f52455155)
-                    mstore(96, 0x4952454400000000000000000000000000000000000000000000000000000000)
-                    revert(0, 100)
-                }
-                
-                /////// Setup State ///////
-                // `cdStart` is the start of the calldata for
-                // `token.safeTransferFrom` (equal to free memory ptr).
-                let cdStart := mload(64)
-                // `dataAreaLength` is the total number of words
-                // needed to store `receiverData`
-                // As-per the ABI spec, this value is padded up to
-                // the nearest multiple of 32,
-                // and includes 32-bytes for length.
-                // It's calculated as folows:
-                //      - Unpadded length in bytes = `mload(receiverData) + 32`
-                //      - Add 31 to convert rounding down to rounding up.
-                //        Combined with the previous and this is `63`.
-                //      - Round down to nearest multiple of 32 by clearing
-                //        bits 0x1F. This is done with `and` and a mask.
 
                 /////// Setup Header Area ///////
-                // This area holds the 4-byte `transferFromSelector`.
+                // This area holds the 4-byte `transferFrom` selector.
                 // Any trailing data in transferFromSelector will be
                 // overwritten in the next `mstore` call.
-                mstore(cdStart, 0xb88d4fde00000000000000000000000000000000000000000000000000000000)
+                mstore(0, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
                 
                 /////// Setup Params Area ///////
-                // Each parameter is padded to 32-bytes.
-                // The entire Params Area is 128 bytes.
-                // Notes:
-                //   1. A 20-byte mask is applied to addresses
-                //      to zero-out the unused bytes.
-                //   2. The offset to `receiverData` is the length
-                //      of the Params Area (128 bytes).
-                
-                let length := calldataload(add(offset, 136))
-                let token := calldataload(add(offset, 40))
-                
-                // Round length up to multiple of 32
-                length := and(add(length, 31), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0)
-                
-                // Copy `from` and `to`
-                calldatacopy(add(cdStart, 4), 36, 64)
-                
-                // TokenId
-                mstore(add(cdStart, 68), calldataload(add(offset, 72)))
-                
-                // Offset to receiverData
-                mstore(add(cdStart, 100), 128)
-                
-                // receiverData (including length)
-                calldatacopy(add(cdStart, 132), add(offset, 136), add(length, 32))
-                
-                /////// Call `token.safeTransferFrom` using the calldata ///////
+                // We copy the fields `from` and `to` in bulk
+                // from our own calldata to the new calldata.
+                calldatacopy(4, 36, 64)
+
+                // Copy `tokenId` field from our own calldata to the new calldata.
+                let assetDataOffset := calldataload(4)
+                calldatacopy(68, add(assetDataOffset, 72), 32)
+
+                /////// Call `token.transferFrom` using the calldata ///////
+                let token := calldataload(add(assetDataOffset, 40))
                 let success := call(
-                    gas,                    // forward all gas
-                    token,                  // call address of token contract
-                    0,                      // don't send any ETH
-                    cdStart,                // pointer to start of input
-                    add(length, 164),       // length of input
-                    0,                      // write output to null
-                    0                       // output size is 0 bytes
+                    gas,            // forward all gas
+                    token,          // call address of token contract
+                    0,              // don't send any ETH
+                    0,              // pointer to start of input
+                    100,            // length of input
+                    0,              // write output to null
+                    0               // output size is 0 bytes
                 )
                 if success {
                     return(0, 0)

packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol

@@ -46,7 +46,7 @@ contract MixinExchangeCore is
     mapping (bytes32 => bool) public cancelled;
 
     // Mapping of makerAddress => senderAddress => lowest salt an order can have in order to be fillable
-    // Orders with specified senderAddress and with a salt less than their epoch to are considered cancelled
+    // Orders with specified senderAddress and with a salt less than their epoch are considered cancelled
     mapping (address => mapping (address => uint256)) public orderEpoch;
 
     /// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch

packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol

@@ -22,14 +22,17 @@ pragma experimental ABIEncoderV2;
 import "./libs/LibMath.sol";
 import "./libs/LibOrder.sol";
 import "./libs/LibFillResults.sol";
+import "./libs/LibAbiEncoder.sol";
 import "./mixins/MExchangeCore.sol";
 
 
 contract MixinWrapperFunctions is
     LibMath,
     LibFillResults,
+    LibAbiEncoder,
     MExchangeCore
 {
+
     /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
     /// @param order Order struct containing order specifications.
     /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
@@ -54,7 +57,7 @@ contract MixinWrapperFunctions is
         return fillResults;
     }
 
-    /// @dev Fills an order with specified parameters and ECDSA signature.
+    /// @dev Fills the input order.
     ///      Returns false if the transaction would otherwise revert.
     /// @param order Order struct containing order specifications.
     /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
@@ -68,177 +71,21 @@ contract MixinWrapperFunctions is
         public
         returns (FillResults memory fillResults)
     {
-        // We need to call MExchangeCore.fillOrder using a delegatecall in
-        // assembly so that we can intercept a call that throws. For this, we
-        // need the input encoded in memory in the Ethereum ABIv2 format [1].
-
-        // | Area     | Offset | Length  | Contents                                    |
-        // | -------- |--------|---------|-------------------------------------------- |
-        // | Header   | 0x00   | 4       | function selector                           |
-        // | Params   |        | 3 * 32  | function parameters:                        |
-        // |          | 0x00   |         |   1. offset to order (*)                    |
-        // |          | 0x20   |         |   2. takerAssetFillAmount                   |
-        // |          | 0x40   |         |   3. offset to signature (*)                |
-        // | Data     |        | 12 * 32 | order:                                      |
-        // |          | 0x000  |         |   1.  senderAddress                         |
-        // |          | 0x020  |         |   2.  makerAddress                          |
-        // |          | 0x040  |         |   3.  takerAddress                          |
-        // |          | 0x060  |         |   4.  feeRecipientAddress                   |
-        // |          | 0x080  |         |   5.  makerAssetAmount                      |
-        // |          | 0x0A0  |         |   6.  takerAssetAmount                      |
-        // |          | 0x0C0  |         |   7.  makerFeeAmount                        |
-        // |          | 0x0E0  |         |   8.  takerFeeAmount                        |
-        // |          | 0x100  |         |   9.  expirationTimeSeconds                 |
-        // |          | 0x120  |         |   10. salt                                  |
-        // |          | 0x140  |         |   11. Offset to makerAssetData (*)          |
-        // |          | 0x160  |         |   12. Offset to takerAssetData (*)          |
-        // |          | 0x180  | 32      | makerAssetData Length                       |
-        // |          | 0x1A0  | **      | makerAssetData Contents                     |
-        // |          | 0x1C0  | 32      | takerAssetData Length                       |
-        // |          | 0x1E0  | **      | takerAssetData Contents                     |
-        // |          | 0x200  | 32      | signature Length                            |
-        // |          | 0x220  | **      | signature Contents                          |
-
-        // * Offsets are calculated from the beginning of the current area: Header, Params, Data:
-        //     An offset stored in the Params area is calculated from the beginning of the Params section.
-        //     An offset stored in the Data area is calculated from the beginning of the Data section.
-
-        // ** The length of dynamic array contents are stored in the field immediately preceeding the contents.
-
-        // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html
-
-        bytes4 fillOrderSelector = this.fillOrder.selector;
+        // ABI encode calldata for `fillOrder`
+        bytes memory fillOrderCalldata = abiEncodeFillOrder(
+            order,
+            takerAssetFillAmount,
+            signature
+        );
 
+        // Delegate to `fillOrder` and handle any exceptions gracefully
         assembly {
-
-            // Areas below may use the following variables:
-            //   1. <area>Start   -- Start of this area in memory
-            //   2. <area>End     -- End of this area in memory. This value may
-            //                       be precomputed (before writing contents),
-            //                       or it may be computed as contents are written.
-            //   3. <area>Offset  -- Current offset into area. If an area's End
-            //                       is precomputed, this variable tracks the
-            //                       offsets of contents as they are written.
-
-            /////// Setup Header Area ///////
-            // Load free memory pointer
-            let headerAreaStart := mload(0x40)
-            mstore(headerAreaStart, fillOrderSelector)
-            let headerAreaEnd := add(headerAreaStart, 0x4)
-
-            /////// Setup Params Area ///////
-            // This area is preallocated and written to later.
-            // This is because we need to fill in offsets that have not yet been calculated.
-            let paramsAreaStart := headerAreaEnd
-            let paramsAreaEnd := add(paramsAreaStart, 0x60)
-            let paramsAreaOffset := paramsAreaStart
-
-            /////// Setup Data Area ///////
-            let dataAreaStart := paramsAreaEnd
-            let dataAreaEnd := dataAreaStart
-
-            // Offset from the source data we're reading from
-            let sourceOffset := order
-            // arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array.
-            let arrayLenBytes := 0
-            let arrayLenWords := 0
-
-            /////// Write order Struct ///////
-            // Write memory location of Order, relative to the start of the
-            // parameter list, then increment the paramsAreaOffset respectively.
-            mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
-            paramsAreaOffset := add(paramsAreaOffset, 0x20)
-
-            // Write values for each field in the order
-            // It would be nice to use a loop, but we save on gas by writing
-            // the stores sequentially.
-            mstore(dataAreaEnd, mload(sourceOffset))                            // makerAddress
-            mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20)))      // takerAddress
-            mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40)))      // feeRecipientAddress
-            mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60)))      // senderAddress
-            mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80)))      // makerAssetAmount
-            mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0)))      // takerAssetAmount
-            mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0)))      // makerFeeAmount
-            mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0)))      // takerFeeAmount
-            mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100)))    // expirationTimeSeconds
-            mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120)))    // salt
-            mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140)))    // Offset to makerAssetData
-            mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160)))    // Offset to takerAssetData
-            dataAreaEnd := add(dataAreaEnd, 0x180)
-            sourceOffset := add(sourceOffset, 0x180)
-
-            // Write offset to <order.makerAssetData>
-            mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart))
-
-            // Calculate length of <order.makerAssetData>
-            sourceOffset := mload(add(order, 0x140)) // makerAssetData
-            arrayLenBytes := mload(sourceOffset)
-            sourceOffset := add(sourceOffset, 0x20)
-            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
-
-            // Write length of <order.makerAssetData>
-            mstore(dataAreaEnd, arrayLenBytes)
-            dataAreaEnd := add(dataAreaEnd, 0x20)
-
-            // Write contents of <order.makerAssetData>
-            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
-                mstore(dataAreaEnd, mload(sourceOffset))
-                dataAreaEnd := add(dataAreaEnd, 0x20)
-                sourceOffset := add(sourceOffset, 0x20)
-            }
-
-            // Write offset to <order.takerAssetData>
-            mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart))
-
-            // Calculate length of <order.takerAssetData>
-            sourceOffset := mload(add(order, 0x160)) // takerAssetData
-            arrayLenBytes := mload(sourceOffset)
-            sourceOffset := add(sourceOffset, 0x20)
-            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
-
-            // Write length of <order.takerAssetData>
-            mstore(dataAreaEnd, arrayLenBytes)
-            dataAreaEnd := add(dataAreaEnd, 0x20)
-
-            // Write contents of  <order.takerAssetData>
-            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
-                mstore(dataAreaEnd, mload(sourceOffset))
-                dataAreaEnd := add(dataAreaEnd, 0x20)
-                sourceOffset := add(sourceOffset, 0x20)
-            }
-
-            /////// Write takerAssetFillAmount ///////
-            mstore(paramsAreaOffset, takerAssetFillAmount)
-            paramsAreaOffset := add(paramsAreaOffset, 0x20)
-
-            /////// Write signature ///////
-            // Write offset to paramsArea
-            mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
-
-            // Calculate length of signature
-            sourceOffset := signature
-            arrayLenBytes := mload(sourceOffset)
-            sourceOffset := add(sourceOffset, 0x20)
-            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
-
-            // Write length of signature
-            mstore(dataAreaEnd, arrayLenBytes)
-            dataAreaEnd := add(dataAreaEnd, 0x20)
-
-            // Write contents of signature
-            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
-                mstore(dataAreaEnd, mload(sourceOffset))
-                dataAreaEnd := add(dataAreaEnd, 0x20)
-                sourceOffset := add(sourceOffset, 0x20)
-            }
-
-            // Execute delegatecall
             let success := delegatecall(
                 gas,                                // forward all gas, TODO: look into gas consumption of assert/throw
                 address,                            // call address of this contract
-                headerAreaStart,                    // pointer to start of input
-                sub(dataAreaEnd, headerAreaStart),  // length of input
-                headerAreaStart,                    // write output over input
+                add(fillOrderCalldata, 32),         // pointer to start of input (skip array length in first 32 bytes)
+                mload(fillOrderCalldata),           // length of input
+                fillOrderCalldata,                  // write output over input
                 128                                 // output size is 128 bytes
             )
             switch success
@@ -249,10 +96,10 @@ contract MixinWrapperFunctions is
                 mstore(add(fillResults, 96), 0)
             }
             case 1 {
-                mstore(fillResults, mload(headerAreaStart))
-                mstore(add(fillResults, 32), mload(add(headerAreaStart, 32)))
-                mstore(add(fillResults, 64), mload(add(headerAreaStart, 64)))
-                mstore(add(fillResults, 96), mload(add(headerAreaStart, 96)))
+                mstore(fillResults, mload(fillOrderCalldata))
+                mstore(add(fillResults, 32), mload(add(fillOrderCalldata, 32)))
+                mstore(add(fillResults, 64), mload(add(fillOrderCalldata, 64)))
+                mstore(add(fillResults, 96), mload(add(fillOrderCalldata, 96)))
             }
         }
         return fillResults;
@@ -272,7 +119,8 @@ contract MixinWrapperFunctions is
         public
         returns (FillResults memory totalFillResults)
     {
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
             FillResults memory singleFillResults = fillOrder(
                 orders[i],
                 takerAssetFillAmounts[i],
@@ -297,7 +145,8 @@ contract MixinWrapperFunctions is
         public
         returns (FillResults memory totalFillResults)
     {
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
             FillResults memory singleFillResults = fillOrKillOrder(
                 orders[i],
                 takerAssetFillAmounts[i],
@@ -323,7 +172,8 @@ contract MixinWrapperFunctions is
         public
         returns (FillResults memory totalFillResults)
     {
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
             FillResults memory singleFillResults = fillOrderNoThrow(
                 orders[i],
                 takerAssetFillAmounts[i],
@@ -349,7 +199,8 @@ contract MixinWrapperFunctions is
     {
         bytes memory takerAssetData = orders[0].takerAssetData;
     
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
 
             // We assume that asset being sold by taker is the same for each order.
             // Rather than passing this in as calldata, we use the takerAssetData from the first order in all later orders.
@@ -369,7 +220,7 @@ contract MixinWrapperFunctions is
             addFillResults(totalFillResults, singleFillResults);
 
             // Stop execution if the entire amount of takerAsset has been sold
-            if (totalFillResults.takerAssetFilledAmount == takerAssetFillAmount) {
+            if (totalFillResults.takerAssetFilledAmount >= takerAssetFillAmount) {
                 break;
             }
         }
@@ -392,7 +243,8 @@ contract MixinWrapperFunctions is
     {
         bytes memory takerAssetData = orders[0].takerAssetData;
 
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
 
             // We assume that asset being sold by taker is the same for each order.
             // Rather than passing this in as calldata, we use the takerAssetData from the first order in all later orders.
@@ -412,7 +264,7 @@ contract MixinWrapperFunctions is
             addFillResults(totalFillResults, singleFillResults);
 
             // Stop execution if the entire amount of takerAsset has been sold
-            if (totalFillResults.takerAssetFilledAmount == takerAssetFillAmount) {
+            if (totalFillResults.takerAssetFilledAmount >= takerAssetFillAmount) {
                 break;
             }
         }
@@ -434,7 +286,8 @@ contract MixinWrapperFunctions is
     {
         bytes memory makerAssetData = orders[0].makerAssetData;
 
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
 
             // We assume that asset being bought by taker is the same for each order.
             // Rather than passing this in as calldata, we copy the makerAssetData from the first order onto all later orders.
@@ -462,7 +315,7 @@ contract MixinWrapperFunctions is
             addFillResults(totalFillResults, singleFillResults);
 
             // Stop execution if the entire amount of makerAsset has been bought
-            if (totalFillResults.makerAssetFilledAmount == makerAssetFillAmount) {
+            if (totalFillResults.makerAssetFilledAmount >= makerAssetFillAmount) {
                 break;
             }
         }
@@ -485,7 +338,8 @@ contract MixinWrapperFunctions is
     {
         bytes memory makerAssetData = orders[0].makerAssetData;
 
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
 
             // We assume that asset being bought by taker is the same for each order.
             // Rather than passing this in as calldata, we copy the makerAssetData from the first order onto all later orders.
@@ -513,7 +367,7 @@ contract MixinWrapperFunctions is
             addFillResults(totalFillResults, singleFillResults);
 
             // Stop execution if the entire amount of makerAsset has been bought
-            if (totalFillResults.makerAssetFilledAmount == makerAssetFillAmount) {
+            if (totalFillResults.makerAssetFilledAmount >= makerAssetFillAmount) {
                 break;
             }
         }
@@ -525,7 +379,8 @@ contract MixinWrapperFunctions is
     function batchCancelOrders(LibOrder.Order[] memory orders)
         public
     {
-        for (uint256 i = 0; i < orders.length; i++) {
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
             cancelOrder(orders[i]);
         }
     }
@@ -538,9 +393,9 @@ contract MixinWrapperFunctions is
         view
         returns (LibOrder.OrderInfo[] memory)
     {
-        uint256 length = orders.length;
-        LibOrder.OrderInfo[] memory ordersInfo = new LibOrder.OrderInfo[](length);
-        for (uint256 i = 0; i < length; i++) {
+        uint256 ordersLength = orders.length;
+        LibOrder.OrderInfo[] memory ordersInfo = new LibOrder.OrderInfo[](ordersLength);
+        for (uint256 i = 0; i != ordersLength; i++) {
             ordersInfo[i] = getOrderInfo(orders[i]);
         }
         return ordersInfo;

packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol

@@ -0,0 +1,218 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+pragma experimental ABIEncoderV2;
+
+import "./LibOrder.sol";
+
+
+contract LibAbiEncoder {
+
+    /// @dev ABI encodes calldata for `fillOrder` in memory and returns the address range.
+    ///      This range can be passed into `call` or `delegatecall` to invoke an external
+    ///      call to `fillOrder`.
+    /// @param order Order struct containing order specifications.
+    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
+    /// @param signature Proof that order has been created by maker.
+    /// @return calldataBegin Memory address of ABI encoded calldata.
+    /// @return calldataLength Lenfgth of ABI encoded calldata.
+    function abiEncodeFillOrder(
+        LibOrder.Order memory order,
+        uint256 takerAssetFillAmount,
+        bytes memory signature
+    )
+        public
+        pure
+        returns (bytes memory fillOrderCalldata)
+    {
+        // We need to call MExchangeCore.fillOrder using a delegatecall in
+        // assembly so that we can intercept a call that throws. For this, we
+        // need the input encoded in memory in the Ethereum ABIv2 format [1].
+
+        // | Area     | Offset | Length  | Contents                                    |
+        // | -------- |--------|---------|-------------------------------------------- |
+        // | Header   | 0x00   | 4       | function selector                           |
+        // | Params   |        | 3 * 32  | function parameters:                        |
+        // |          | 0x00   |         |   1. offset to order (*)                    |
+        // |          | 0x20   |         |   2. takerAssetFillAmount                   |
+        // |          | 0x40   |         |   3. offset to signature (*)                |
+        // | Data     |        | 12 * 32 | order:                                      |
+        // |          | 0x000  |         |   1.  senderAddress                         |
+        // |          | 0x020  |         |   2.  makerAddress                          |
+        // |          | 0x040  |         |   3.  takerAddress                          |
+        // |          | 0x060  |         |   4.  feeRecipientAddress                   |
+        // |          | 0x080  |         |   5.  makerAssetAmount                      |
+        // |          | 0x0A0  |         |   6.  takerAssetAmount                      |
+        // |          | 0x0C0  |         |   7.  makerFeeAmount                        |
+        // |          | 0x0E0  |         |   8.  takerFeeAmount                        |
+        // |          | 0x100  |         |   9.  expirationTimeSeconds                 |
+        // |          | 0x120  |         |   10. salt                                  |
+        // |          | 0x140  |         |   11. Offset to makerAssetData (*)          |
+        // |          | 0x160  |         |   12. Offset to takerAssetData (*)          |
+        // |          | 0x180  | 32      | makerAssetData Length                       |
+        // |          | 0x1A0  | **      | makerAssetData Contents                     |
+        // |          | 0x1C0  | 32      | takerAssetData Length                       |
+        // |          | 0x1E0  | **      | takerAssetData Contents                     |
+        // |          | 0x200  | 32      | signature Length                            |
+        // |          | 0x220  | **      | signature Contents                          |
+
+        // * Offsets are calculated from the beginning of the current area: Header, Params, Data:
+        //     An offset stored in the Params area is calculated from the beginning of the Params section.
+        //     An offset stored in the Data area is calculated from the beginning of the Data section.
+
+        // ** The length of dynamic array contents are stored in the field immediately preceeding the contents.
+
+        // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html
+
+        assembly {
+
+            // Areas below may use the following variables:
+            //   1. <area>Start   -- Start of this area in memory
+            //   2. <area>End     -- End of this area in memory. This value may
+            //                       be precomputed (before writing contents),
+            //                       or it may be computed as contents are written.
+            //   3. <area>Offset  -- Current offset into area. If an area's End
+            //                       is precomputed, this variable tracks the
+            //                       offsets of contents as they are written.
+
+            /////// Setup Header Area ///////
+            // Load free memory pointer
+            fillOrderCalldata := mload(0x40)
+            // bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)"))
+            // = 0xb4be83d5
+            // Leave 0x20 bytes to store the length
+            mstore(add(fillOrderCalldata, 0x20), 0xb4be83d500000000000000000000000000000000000000000000000000000000)
+            let headerAreaEnd := add(fillOrderCalldata, 0x24)
+
+            /////// Setup Params Area ///////
+            // This area is preallocated and written to later.
+            // This is because we need to fill in offsets that have not yet been calculated.
+            let paramsAreaStart := headerAreaEnd
+            let paramsAreaEnd := add(paramsAreaStart, 0x60)
+            let paramsAreaOffset := paramsAreaStart
+
+            /////// Setup Data Area ///////
+            let dataAreaStart := paramsAreaEnd
+            let dataAreaEnd := dataAreaStart
+
+            // Offset from the source data we're reading from
+            let sourceOffset := order
+            // arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array.
+            let arrayLenBytes := 0
+            let arrayLenWords := 0
+
+            /////// Write order Struct ///////
+            // Write memory location of Order, relative to the start of the
+            // parameter list, then increment the paramsAreaOffset respectively.
+            mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
+            paramsAreaOffset := add(paramsAreaOffset, 0x20)
+
+            // Write values for each field in the order
+            // It would be nice to use a loop, but we save on gas by writing
+            // the stores sequentially.
+            mstore(dataAreaEnd, mload(sourceOffset))                            // makerAddress
+            mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20)))      // takerAddress
+            mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40)))      // feeRecipientAddress
+            mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60)))      // senderAddress
+            mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80)))      // makerAssetAmount
+            mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0)))      // takerAssetAmount
+            mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0)))      // makerFeeAmount
+            mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0)))      // takerFeeAmount
+            mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100)))    // expirationTimeSeconds
+            mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120)))    // salt
+            mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140)))    // Offset to makerAssetData
+            mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160)))    // Offset to takerAssetData
+            dataAreaEnd := add(dataAreaEnd, 0x180)
+            sourceOffset := add(sourceOffset, 0x180)
+
+            // Write offset to <order.makerAssetData>
+            mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart))
+
+            // Calculate length of <order.makerAssetData>
+            sourceOffset := mload(add(order, 0x140)) // makerAssetData
+            arrayLenBytes := mload(sourceOffset)
+            sourceOffset := add(sourceOffset, 0x20)
+            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
+
+            // Write length of <order.makerAssetData>
+            mstore(dataAreaEnd, arrayLenBytes)
+            dataAreaEnd := add(dataAreaEnd, 0x20)
+
+            // Write contents of <order.makerAssetData>
+            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
+                mstore(dataAreaEnd, mload(sourceOffset))
+                dataAreaEnd := add(dataAreaEnd, 0x20)
+                sourceOffset := add(sourceOffset, 0x20)
+            }
+
+            // Write offset to <order.takerAssetData>
+            mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart))
+
+            // Calculate length of <order.takerAssetData>
+            sourceOffset := mload(add(order, 0x160)) // takerAssetData
+            arrayLenBytes := mload(sourceOffset)
+            sourceOffset := add(sourceOffset, 0x20)
+            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
+
+            // Write length of <order.takerAssetData>
+            mstore(dataAreaEnd, arrayLenBytes)
+            dataAreaEnd := add(dataAreaEnd, 0x20)
+
+            // Write contents of  <order.takerAssetData>
+            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
+                mstore(dataAreaEnd, mload(sourceOffset))
+                dataAreaEnd := add(dataAreaEnd, 0x20)
+                sourceOffset := add(sourceOffset, 0x20)
+            }
+
+            /////// Write takerAssetFillAmount ///////
+            mstore(paramsAreaOffset, takerAssetFillAmount)
+            paramsAreaOffset := add(paramsAreaOffset, 0x20)
+
+            /////// Write signature ///////
+            // Write offset to paramsArea
+            mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
+
+            // Calculate length of signature
+            sourceOffset := signature
+            arrayLenBytes := mload(sourceOffset)
+            sourceOffset := add(sourceOffset, 0x20)
+            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
+
+            // Write length of signature
+            mstore(dataAreaEnd, arrayLenBytes)
+            dataAreaEnd := add(dataAreaEnd, 0x20)
+
+            // Write contents of signature
+            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
+                mstore(dataAreaEnd, mload(sourceOffset))
+                dataAreaEnd := add(dataAreaEnd, 0x20)
+                sourceOffset := add(sourceOffset, 0x20)
+            }
+
+            // Set length of calldata
+            mstore(
+                fillOrderCalldata,
+                sub(dataAreaEnd, add(fillOrderCalldata, 0x20))
+            )
+        }
+
+        return fillOrderCalldata;
+    }
+}

packages/contracts/src/2.0.0/protocol/Exchange/libs/LibConstants.sol

@@ -19,11 +19,23 @@
 pragma solidity 0.4.24;
 
 
+// solhint-disable max-line-length
 contract LibConstants {
    
     // Asset data for ZRX token. Used for fee transfers.
     // @TODO: Hardcode constant when we deploy. Currently 
     //        not constant to make testing easier.
+
+    // The proxyId for ZRX_ASSET_DATA is bytes4(keccak256("ERC20Token(address)")) = 0xf47261b0
+    
+    // Kovan ZRX address is 0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570.
+    // The ABI encoded proxyId and address is 0xf47261b00000000000000000000000006ff6c0ff1d68b964901f986d4c9fa3ac68346570
+    // bytes constant public ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6f\xf6\xc0\xff\x1d\x68\xb9\x64\x90\x1f\x98\x6d\x4c\x9f\xa3\xac\x68\x34\x65\x70";
+    
+    // Mainnet ZRX address is 0xe41d2489571d322189246dafa5ebde1f4699f498.
+    // The ABI encoded proxyId and address is 0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498
+    // bytes constant public ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe4\x1d\x24\x89\x57\x1d\x32\x21\x89\x24\x6d\xaf\xa5\xeb\xde\x1f\x46\x99\xf4\x98";
+    
     // solhint-disable-next-line var-name-mixedcase
     bytes public ZRX_ASSET_DATA;
 
@@ -34,3 +46,4 @@ contract LibConstants {
         ZRX_ASSET_DATA = zrxAssetData;
     }
 }
+// solhint-enable max-line-length

packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol

@@ -33,7 +33,8 @@ contract LibMath is
     function getPartialAmount(
         uint256 numerator,
         uint256 denominator,
-        uint256 target)
+        uint256 target
+    )
         internal
         pure
         returns (uint256 partialAmount)
@@ -53,7 +54,8 @@ contract LibMath is
     function isRoundingError(
         uint256 numerator,
         uint256 denominator,
-        uint256 target)
+        uint256 target
+    )
         internal
         pure
         returns (bool isError)

packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol

@@ -103,20 +103,20 @@ contract LibOrder is
         bytes32 takerAssetDataHash = keccak256(order.takerAssetData);
 
         // Assembly for more efficiently computing:
-        //    keccak256(abi.encode(
-        //        order.makerAddress,
-        //        order.takerAddress,
-        //        order.feeRecipientAddress,
-        //        order.senderAddress,
-        //        order.makerAssetAmount,
-        //        order.takerAssetAmount,
-        //        order.makerFee,
-        //        order.takerFee,
-        //        order.expirationTimeSeconds,
-        //        order.salt,
-        //        keccak256(order.makerAssetData),
-        //        keccak256(order.takerAssetData)
-        //    ));
+        // keccak256(abi.encode(
+        //     order.makerAddress,
+        //     order.takerAddress,
+        //     order.feeRecipientAddress,
+        //     order.senderAddress,
+        //     order.makerAssetAmount,
+        //     order.takerAssetAmount,
+        //     order.makerFee,
+        //     order.takerFee,
+        //     order.expirationTimeSeconds,
+        //     order.salt,
+        //     keccak256(order.makerAssetData),
+        //     keccak256(order.takerAssetData)
+        // ));
 
         assembly {
             // Backup

packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol

@@ -56,7 +56,7 @@ contract MExchangeCore is
     event CancelUpTo(
         address indexed makerAddress,         // Orders cancelled must have been created by this address.
         address indexed senderAddress,        // Orders cancelled must have a `senderAddress` equal to this address.
-        uint256 orderEpoch                    // Orders specified makerAddress and senderAddress with a salt <= this value are considered cancelled.
+        uint256 orderEpoch                    // Orders with specified makerAddress and senderAddress with a salt less than this value are considered cancelled.
     );
 
     /// @dev Updates state with results of a fill order.

packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol

@@ -22,7 +22,10 @@ import "../Mintable/Mintable.sol";
 import "../../utils/Ownable/Ownable.sol";
 
 
-contract DummyERC20Token is Mintable, Ownable {
+contract DummyERC20Token is 
+    Mintable,
+    Ownable
+{
     string public name;
     string public symbol;
     uint256 public decimals;

packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol

@@ -21,7 +21,9 @@ pragma solidity 0.4.24;
 import "../../protocol/Exchange/MixinAssetProxyDispatcher.sol";
 
 
-contract TestAssetProxyDispatcher is MixinAssetProxyDispatcher {
+contract TestAssetProxyDispatcher is 
+    MixinAssetProxyDispatcher
+{
     function publicDispatchTransferFrom(
         bytes memory assetData,
         address from,

packages/contracts/src/2.0.0/test/TestConstants/TestConstants.sol

@@ -0,0 +1,57 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.24;
+
+import "../../utils/LibBytes/LibBytes.sol";
+
+
+// solhint-disable max-line-length
+contract TestConstants {
+   
+    using LibBytes for bytes;
+
+    bytes4 constant internal ERC20_PROXY_ID = bytes4(keccak256("ERC20Token(address)"));
+    
+    address constant internal KOVAN_ZRX_ADDRESS = 0x6Ff6C0Ff1d68b964901F986d4C9FA3ac68346570;
+    bytes constant internal KOVAN_ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6f\xf6\xc0\xff\x1d\x68\xb9\x64\x90\x1f\x98\x6d\x4c\x9f\xa3\xac\x68\x34\x65\x70";
+    
+    address constant internal MAINNET_ZRX_ADDRESS = 0xE41d2489571d322189246DaFA5ebDe1F4699F498;
+    bytes constant public MAINNET_ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe4\x1d\x24\x89\x57\x1d\x32\x21\x89\x24\x6d\xaf\xa5\xeb\xde\x1f\x46\x99\xf4\x98";
+    
+    function assertValidZrxAssetData()
+        public
+        pure
+        returns (bool)
+    {
+        bytes memory kovanZrxAssetData = abi.encodeWithSelector(ERC20_PROXY_ID, KOVAN_ZRX_ADDRESS);
+        require(
+            kovanZrxAssetData.equals(KOVAN_ZRX_ASSET_DATA),
+            "INVALID_KOVAN_ZRX_ASSET_DATA"
+        );
+
+        bytes memory mainetZrxAssetData = abi.encodeWithSelector(ERC20_PROXY_ID, MAINNET_ZRX_ADDRESS);
+        require(
+            mainetZrxAssetData.equals(MAINNET_ZRX_ASSET_DATA),
+            "INVALID_MAINNET_ZRX_ASSET_DATA"
+        );
+
+        return true;
+    }
+}
+// solhint-enable max-line-length

packages/contracts/src/2.0.0/tokens/EtherToken/WETH9.sol

@@ -22,10 +22,10 @@ contract WETH9 {
     string public symbol   = "WETH";
     uint8  public decimals = 18;
 
-    event  Approval(address indexed src, address indexed guy, uint wad);
-    event  Transfer(address indexed src, address indexed dst, uint wad);
-    event  Deposit(address indexed dst, uint wad);
-    event  Withdrawal(address indexed src, uint wad);
+    event  Approval(address indexed _owner, address indexed _spender, uint _value);
+    event  Transfer(address indexed _from, address indexed _to, uint _value);
+    event  Deposit(address indexed _owner, uint _value);
+    event  Withdrawal(address indexed _owner, uint _value);
 
     mapping (address => uint)                       public  balanceOf;
     mapping (address => mapping (address => uint))  public  allowance;

packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol

@@ -34,7 +34,7 @@ contract SafeMath {
     {
         require(
             b <= a,
-            "UINT256_OVERFLOW"
+            "UINT256_UNDERFLOW"
         );
         return a - b;
     }

packages/contracts/test/asset_proxy/proxies.ts

@@ -1,17 +1,12 @@
 import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { assetDataUtils, generatePseudoRandomSalt } from '@0xproject/order-utils';
+import { assetDataUtils } from '@0xproject/order-utils';
 import { RevertReason } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
-import { LogWithDecodedArgs } from 'ethereum-types';
-import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
 import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
-import {
-    DummyERC721ReceiverContract,
-    DummyERC721ReceiverTokenReceivedEventArgs,
-} from '../../generated_contract_wrappers/dummy_erc721_receiver';
+import { DummyERC721ReceiverContract } from '../../generated_contract_wrappers/dummy_erc721_receiver';
 import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
 import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
 import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
@@ -23,7 +18,6 @@ import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { LogDecoder } from '../utils/log_decoder';
-import { typeEncodingUtils } from '../utils/type_encoding_utils';
 import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
@@ -253,7 +247,7 @@ describe('Asset Transfer Proxies', () => {
                 expect(newOwnerMakerAsset).to.be.bignumber.equal(takerAddress);
             });
 
-            it('should call onERC721Received when transferring to a smart contract without receiver data', async () => {
+            it('should not call onERC721Received when transferring to a smart contract', async () => {
                 // Construct ERC721 asset data
                 const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, erc721MakerTokenId);
                 // Verify pre-condition
@@ -277,85 +271,12 @@ describe('Asset Transfer Proxies', () => {
                     }),
                 );
                 // Verify that no log was emitted by erc721 receiver
-                expect(tx.logs.length).to.be.equal(1);
-                const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
-                expect(tokenReceivedLog.args.from).to.be.equal(makerAddress);
-                expect(tokenReceivedLog.args.tokenId).to.be.bignumber.equal(erc721MakerTokenId);
-                expect(tokenReceivedLog.args.data).to.be.equal(constants.NULL_BYTES);
+                expect(tx.logs.length).to.be.equal(0);
                 // Verify transfer was successful
                 const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
                 expect(newOwnerMakerAsset).to.be.bignumber.equal(erc721Receiver.address);
             });
 
-            it('should call onERC721Received when transferring to a smart contract with receiver data', async () => {
-                // Construct ERC721 asset data
-                const receiverData = ethUtil.bufferToHex(typeEncodingUtils.encodeUint256(generatePseudoRandomSalt()));
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(
-                    erc721Token.address,
-                    erc721MakerTokenId,
-                    receiverData,
-                );
-                // Verify pre-condition
-                const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-                expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
-                // Perform a transfer from makerAddress to takerAddress
-                const amount = new BigNumber(1);
-                const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
-                    encodedAssetData,
-                    makerAddress,
-                    erc721Receiver.address,
-                    amount,
-                );
-                const logDecoder = new LogDecoder(web3Wrapper, erc721Receiver.address);
-                const tx = await logDecoder.getTxWithDecodedLogsAsync(
-                    await web3Wrapper.sendTransactionAsync({
-                        to: erc721Proxy.address,
-                        data,
-                        from: exchangeAddress,
-                        gas: constants.MAX_TRANSFER_FROM_GAS,
-                    }),
-                );
-                // Validate log emitted by erc721 receiver
-                expect(tx.logs.length).to.be.equal(1);
-                const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
-                expect(tokenReceivedLog.args.from).to.be.equal(makerAddress);
-                expect(tokenReceivedLog.args.tokenId).to.be.bignumber.equal(erc721MakerTokenId);
-                expect(tokenReceivedLog.args.data).to.be.equal(receiverData);
-                // Verify transfer was successful
-                const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-                expect(newOwnerMakerAsset).to.be.bignumber.equal(erc721Receiver.address);
-            });
-
-            it('should throw if there is receiver data but contract does not have onERC721Received', async () => {
-                // Construct ERC721 asset data
-                const receiverData = ethUtil.bufferToHex(typeEncodingUtils.encodeUint256(generatePseudoRandomSalt()));
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(
-                    erc721Token.address,
-                    erc721MakerTokenId,
-                    receiverData,
-                );
-                // Verify pre-condition
-                const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-                expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
-                // Perform a transfer from makerAddress to takerAddress
-                const amount = new BigNumber(1);
-                const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
-                    encodedAssetData,
-                    makerAddress,
-                    erc20Proxy.address, // the ERC20 proxy does not have an ERC721 receiver
-                    amount,
-                );
-                return expectTransactionFailedAsync(
-                    web3Wrapper.sendTransactionAsync({
-                        to: erc721Proxy.address,
-                        data,
-                        from: exchangeAddress,
-                        gas: constants.MAX_TRANSFER_FROM_GAS,
-                    }),
-                    RevertReason.TransferFailed,
-                );
-            });
-
             it('should throw if transferring 0 amount of a token', async () => {
                 // Construct ERC721 asset data
                 const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, erc721MakerTokenId);
@@ -454,9 +375,9 @@ describe('Asset Transfer Proxies', () => {
             });
         });
 
-        it('should have an id of 0x08e937fa', async () => {
+        it('should have an id of 0x02571792', async () => {
             const proxyId = await erc721Proxy.getProxyId.callAsync();
-            const expectedProxyId = '0x08e937fa';
+            const expectedProxyId = '0x02571792';
             expect(proxyId).to.equal(expectedProxyId);
         });
     });

packages/contracts/test/exchange/core.ts

@@ -456,30 +456,6 @@ describe('Exchange core', () => {
                 RevertReason.RoundingError,
             );
         });
-
-        it('should throw if assetData has a length < 132', async () => {
-            // Construct Exchange parameters
-            const makerAssetId = erc721MakerAssetIds[0];
-            const takerAssetId = erc721TakerAssetIds[0];
-            const makerAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, makerAssetId).slice(0, -2);
-            signedOrder = await orderFactory.newSignedOrderAsync({
-                makerAssetAmount: new BigNumber(1),
-                takerAssetAmount: new BigNumber(1),
-                makerAssetData,
-                takerAssetData: assetDataUtils.encodeERC721AssetData(erc721Token.address, takerAssetId),
-            });
-            // Verify pre-conditions
-            const initialOwnerMakerAsset = await erc721Token.ownerOf.callAsync(makerAssetId);
-            expect(initialOwnerMakerAsset).to.be.bignumber.equal(makerAddress);
-            const initialOwnerTakerAsset = await erc721Token.ownerOf.callAsync(takerAssetId);
-            expect(initialOwnerTakerAsset).to.be.bignumber.equal(takerAddress);
-            // Call Exchange
-            const takerAssetFillAmount = signedOrder.takerAssetAmount;
-            return expectTransactionFailedAsync(
-                exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, { takerAssetFillAmount }),
-                RevertReason.LengthGreaterThan131Required,
-            );
-        });
     });
 
     describe('getOrderInfo', () => {

packages/contracts/test/exchange/libs.ts

@@ -4,6 +4,7 @@ import { SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 
+import { TestConstantsContract } from '../../generated_contract_wrappers/test_constants';
 import { TestLibsContract } from '../../generated_contract_wrappers/test_libs';
 import { addressUtils } from '../utils/address_utils';
 import { artifacts } from '../utils/artifacts';
@@ -21,6 +22,7 @@ describe('Exchange libs', () => {
     let signedOrder: SignedOrder;
     let orderFactory: OrderFactory;
     let libs: TestLibsContract;
+    let testConstants: TestConstantsContract;
 
     before(async () => {
         await blockchainLifecycle.startAsync();
@@ -32,6 +34,11 @@ describe('Exchange libs', () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         const makerAddress = accounts[0];
         libs = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults);
+        testConstants = await TestConstantsContract.deployFrom0xArtifactAsync(
+            artifacts.TestConstants,
+            provider,
+            txDefaults,
+        );
 
         const defaultOrderParams = {
             ...constants.STATIC_ORDER_PARAMS,
@@ -52,6 +59,15 @@ describe('Exchange libs', () => {
         await blockchainLifecycle.revertAsync();
     });
 
+    describe('LibConstants', () => {
+        describe('ZRX_ASSET_DATA', () => {
+            it('should have the correct ZRX_ASSET_DATA', async () => {
+                const isValid = await testConstants.assertValidZrxAssetData.callAsync();
+                expect(isValid).to.be.equal(true);
+            });
+        });
+    });
+
     describe('LibOrder', () => {
         describe('getOrderSchema', () => {
             it('should output the correct order schema hash', async () => {

packages/contracts/test/exchange/signature_validator.ts

@@ -9,8 +9,8 @@ import {
     TestSignatureValidatorContract,
     TestSignatureValidatorSignatureValidatorApprovalEventArgs,
 } from '../../generated_contract_wrappers/test_signature_validator';
-import { TestValidatorContract } from '../../generated_contract_wrappers/test_validator';
-import { TestWalletContract } from '../../generated_contract_wrappers/test_wallet';
+import { ValidatorContract } from '../../generated_contract_wrappers/validator';
+import { WalletContract } from '../../generated_contract_wrappers/wallet';
 import { addressUtils } from '../utils/address_utils';
 import { artifacts } from '../utils/artifacts';
 import { expectContractCallFailed } from '../utils/assertions';
@@ -29,8 +29,8 @@ describe('MixinSignatureValidator', () => {
     let signedOrder: SignedOrder;
     let orderFactory: OrderFactory;
     let signatureValidator: TestSignatureValidatorContract;
-    let testWallet: TestWalletContract;
-    let testValidator: TestValidatorContract;
+    let testWallet: WalletContract;
+    let testValidator: ValidatorContract;
     let signerAddress: string;
     let signerPrivateKey: Buffer;
     let notSignerAddress: string;
@@ -53,14 +53,14 @@ describe('MixinSignatureValidator', () => {
             provider,
             txDefaults,
         );
-        testWallet = await TestWalletContract.deployFrom0xArtifactAsync(
-            artifacts.TestWallet,
+        testWallet = await WalletContract.deployFrom0xArtifactAsync(
+            artifacts.Wallet,
             provider,
             txDefaults,
             signerAddress,
         );
-        testValidator = await TestValidatorContract.deployFrom0xArtifactAsync(
-            artifacts.TestValidator,
+        testValidator = await ValidatorContract.deployFrom0xArtifactAsync(
+            artifacts.Validator,
             provider,
             txDefaults,
             signerAddress,

packages/contracts/test/utils/artifacts.ts

@@ -15,12 +15,13 @@ import * as MultiSigWallet from '../../artifacts/MultiSigWallet.json';
 import * as MultiSigWalletWithTimeLock from '../../artifacts/MultiSigWalletWithTimeLock.json';
 import * as TestAssetProxyDispatcher from '../../artifacts/TestAssetProxyDispatcher.json';
 import * as TestAssetProxyOwner from '../../artifacts/TestAssetProxyOwner.json';
+import * as TestConstants from '../../artifacts/TestConstants.json';
 import * as TestLibBytes from '../../artifacts/TestLibBytes.json';
 import * as TestLibs from '../../artifacts/TestLibs.json';
 import * as TestSignatureValidator from '../../artifacts/TestSignatureValidator.json';
-import * as TestValidator from '../../artifacts/TestValidator.json';
-import * as TestWallet from '../../artifacts/TestWallet.json';
 import * as TokenRegistry from '../../artifacts/TokenRegistry.json';
+import * as Validator from '../../artifacts/Validator.json';
+import * as Wallet from '../../artifacts/Wallet.json';
 import * as EtherToken from '../../artifacts/WETH9.json';
 import * as Whitelist from '../../artifacts/Whitelist.json';
 import * as ZRX from '../../artifacts/ZRXToken.json';
@@ -42,11 +43,12 @@ export const artifacts = {
     MultiSigWalletWithTimeLock: (MultiSigWalletWithTimeLock as any) as ContractArtifact,
     TestAssetProxyOwner: (TestAssetProxyOwner as any) as ContractArtifact,
     TestAssetProxyDispatcher: (TestAssetProxyDispatcher as any) as ContractArtifact,
+    TestConstants: (TestConstants as any) as ContractArtifact,
     TestLibBytes: (TestLibBytes as any) as ContractArtifact,
     TestLibs: (TestLibs as any) as ContractArtifact,
     TestSignatureValidator: (TestSignatureValidator as any) as ContractArtifact,
-    TestValidator: (TestValidator as any) as ContractArtifact,
-    TestWallet: (TestWallet as any) as ContractArtifact,
+    Validator: (Validator as any) as ContractArtifact,
+    Wallet: (Wallet as any) as ContractArtifact,
     TokenRegistry: (TokenRegistry as any) as ContractArtifact,
     Whitelist: (Whitelist as any) as ContractArtifact,
     ZRX: (ZRX as any) as ContractArtifact,

packages/contracts/test/utils/constants.ts

@@ -49,4 +49,6 @@ export const constants = {
         takerFee: Web3Wrapper.toBaseUnitAmount(new BigNumber(1), 18),
     },
     WORD_LENGTH: 32,
+    ZERO_AMOUNT: new BigNumber(0),
+    PERCENTAGE_DENOMINATOR: new BigNumber(10).pow(18),
 };

packages/contracts/test/utils/forwarder_wrapper.ts

@@ -1,5 +1,4 @@
-import { assetDataUtils } from '@0xproject/order-utils';
-import { AssetProxyId, SignedOrder } from '@0xproject/types';
+import { SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs, TxDataPayable } from 'ethereum-types';
@@ -12,209 +11,108 @@ import { formatters } from './formatters';
 import { LogDecoder } from './log_decoder';
 import { MarketSellOrders } from './types';
 
-const DEFAULT_FEE_PROPORTION = 0;
-const PERCENTAGE_DENOMINATOR = 10000;
-const ZERO_AMOUNT = new BigNumber(0);
-const INSUFFICENT_ORDERS_FOR_MAKER_AMOUNT = 'Unable to satisfy makerAssetFillAmount with provided orders';
-
 export class ForwarderWrapper {
     private readonly _web3Wrapper: Web3Wrapper;
     private readonly _forwarderContract: ForwarderContract;
     private readonly _logDecoder: LogDecoder;
-    private readonly _zrxAddress: string;
-    private static _createOptimizedSellOrders(signedOrders: SignedOrder[]): MarketSellOrders {
-        const marketSellOrders = formatters.createMarketSellOrders(signedOrders, ZERO_AMOUNT);
-        const assetDataId = assetDataUtils.decodeAssetProxyId(signedOrders[0].makerAssetData);
-        // Contract will fill this in for us as all of the assetData is assumed to be the same
-        for (let i = 0; i < signedOrders.length; i++) {
-            if (i !== 0 && assetDataId === AssetProxyId.ERC20) {
-                // Forwarding contract will fill this in from the first order
-                marketSellOrders.orders[i].makerAssetData = constants.NULL_BYTES;
+    public static getPercentageOfValue(value: BigNumber, percentage: number): BigNumber {
+        const numerator = constants.PERCENTAGE_DENOMINATOR.times(percentage).dividedToIntegerBy(100);
+        const newValue = value.times(numerator).dividedToIntegerBy(constants.PERCENTAGE_DENOMINATOR);
+        return newValue;
+    }
+    public static getWethForFeeOrders(feeAmount: BigNumber, feeOrders: SignedOrder[]): BigNumber {
+        let wethAmount = new BigNumber(0);
+        let remainingFeeAmount = feeAmount;
+        _.forEach(feeOrders, feeOrder => {
+            const feeAvailable = feeOrder.makerAssetAmount.minus(feeOrder.takerFee);
+            if (!remainingFeeAmount.isZero() && feeAvailable.gt(remainingFeeAmount)) {
+                wethAmount = wethAmount
+                    .plus(feeOrder.takerAssetAmount.times(remainingFeeAmount).dividedToIntegerBy(feeAvailable))
+                    .plus(1);
+                remainingFeeAmount = new BigNumber(0);
+            } else if (!remainingFeeAmount.isZero()) {
+                wethAmount = wethAmount.plus(feeOrder.takerAssetAmount);
+                remainingFeeAmount = remainingFeeAmount.minus(feeAvailable);
             }
-            marketSellOrders.orders[i].takerAssetData = constants.NULL_BYTES;
-        }
-        return marketSellOrders;
+        });
+        return wethAmount;
     }
-    private static _createOptimizedZRXSellOrders(signedOrders: SignedOrder[]): MarketSellOrders {
-        const marketSellOrders = formatters.createMarketSellOrders(signedOrders, ZERO_AMOUNT);
-        // Contract will fill this in for us as all of the assetData is assumed to be the same
-        for (let i = 0; i < signedOrders.length; i++) {
-            marketSellOrders.orders[i].makerAssetData = constants.NULL_BYTES;
-            marketSellOrders.orders[i].takerAssetData = constants.NULL_BYTES;
-        }
-        return marketSellOrders;
+    private static _createOptimizedOrders(signedOrders: SignedOrder[]): MarketSellOrders {
+        _.forEach(signedOrders, (signedOrder, index) => {
+            signedOrder.takerAssetData = constants.NULL_BYTES;
+            if (index > 0) {
+                signedOrder.makerAssetData = constants.NULL_BYTES;
+            }
+        });
+        const params = formatters.createMarketSellOrders(signedOrders, constants.ZERO_AMOUNT);
+        return params;
     }
-    private static _calculateAdditionalFeeProportionAmount(feeProportion: number, fillAmountWei: BigNumber): BigNumber {
-        if (feeProportion > 0) {
-            // Add to the total ETH transaction to ensure all NFTs can be filled after fees
-            // 150 = 1.5% = 0.015
-            const denominator = new BigNumber(1).minus(new BigNumber(feeProportion).dividedBy(PERCENTAGE_DENOMINATOR));
-            return fillAmountWei.dividedBy(denominator).round(0, BigNumber.ROUND_FLOOR);
-        }
-        return fillAmountWei;
+    private static _createOptimizedZrxOrders(signedOrders: SignedOrder[]): MarketSellOrders {
+        _.forEach(signedOrders, signedOrder => {
+            signedOrder.makerAssetData = constants.NULL_BYTES;
+            signedOrder.takerAssetData = constants.NULL_BYTES;
+        });
+        const params = formatters.createMarketSellOrders(signedOrders, constants.ZERO_AMOUNT);
+        return params;
     }
-    constructor(contractInstance: ForwarderContract, provider: Provider, zrxAddress: string) {
+    constructor(contractInstance: ForwarderContract, provider: Provider) {
         this._forwarderContract = contractInstance;
         this._web3Wrapper = new Web3Wrapper(provider);
         this._logDecoder = new LogDecoder(this._web3Wrapper, this._forwarderContract.address);
-        // this._web3Wrapper.abiDecoder.addABI(contractInstance.abi);
-        this._zrxAddress = zrxAddress;
     }
-    public async marketBuyTokensWithEthAsync(
+    public async marketSellOrdersWithEthAsync(
         orders: SignedOrder[],
         feeOrders: SignedOrder[],
-        makerTokenBuyAmount: BigNumber,
         txData: TxDataPayable,
-        opts: { feeProportion?: number; feeRecipient?: string } = {},
+        opts: { feePercentage?: BigNumber; feeRecipient?: string } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const params = ForwarderWrapper._createOptimizedSellOrders(orders);
-        const feeParams = ForwarderWrapper._createOptimizedZRXSellOrders(feeOrders);
-        const feeProportion = _.isUndefined(opts.feeProportion) ? DEFAULT_FEE_PROPORTION : opts.feeProportion;
+        const params = ForwarderWrapper._createOptimizedOrders(orders);
+        const feeParams = ForwarderWrapper._createOptimizedZrxOrders(feeOrders);
+        const feePercentage = _.isUndefined(opts.feePercentage) ? constants.ZERO_AMOUNT : opts.feePercentage;
         const feeRecipient = _.isUndefined(opts.feeRecipient) ? constants.NULL_ADDRESS : opts.feeRecipient;
-        const txHash: string = await this._forwarderContract.marketBuyTokensWithEth.sendTransactionAsync(
+        const txHash = await this._forwarderContract.marketSellOrdersWithEth.sendTransactionAsync(
             params.orders,
             params.signatures,
             feeParams.orders,
             feeParams.signatures,
-            makerTokenBuyAmount,
-            feeProportion,
+            feePercentage,
             feeRecipient,
             txData,
         );
         const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return tx;
     }
-    public async marketSellEthForERC20Async(
+    public async marketBuyOrdersWithEthAsync(
         orders: SignedOrder[],
         feeOrders: SignedOrder[],
+        makerAssetFillAmount: BigNumber,
         txData: TxDataPayable,
-        opts: { feeProportion?: number; feeRecipient?: string } = {},
+        opts: { feePercentage?: BigNumber; feeRecipient?: string } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const assetDataId = assetDataUtils.decodeAssetProxyId(orders[0].makerAssetData);
-        if (assetDataId !== AssetProxyId.ERC20) {
-            throw new Error('Asset type not supported by marketSellEthForERC20');
-        }
-        const params = ForwarderWrapper._createOptimizedSellOrders(orders);
-        const feeParams = ForwarderWrapper._createOptimizedZRXSellOrders(feeOrders);
-        const feeProportion = _.isUndefined(opts.feeProportion) ? DEFAULT_FEE_PROPORTION : opts.feeProportion;
+        const params = ForwarderWrapper._createOptimizedOrders(orders);
+        const feeParams = ForwarderWrapper._createOptimizedZrxOrders(feeOrders);
+        const feePercentage = _.isUndefined(opts.feePercentage) ? constants.ZERO_AMOUNT : opts.feePercentage;
         const feeRecipient = _.isUndefined(opts.feeRecipient) ? constants.NULL_ADDRESS : opts.feeRecipient;
-        const txHash: string = await this._forwarderContract.marketSellEthForERC20.sendTransactionAsync(
+        const txHash = await this._forwarderContract.marketBuyOrdersWithEth.sendTransactionAsync(
             params.orders,
+            makerAssetFillAmount,
             params.signatures,
             feeParams.orders,
             feeParams.signatures,
-            feeProportion,
+            feePercentage,
             feeRecipient,
             txData,
         );
         const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
         return tx;
     }
-    public async calculateMarketBuyFillAmountWeiAsync(
-        orders: SignedOrder[],
-        feeOrders: SignedOrder[],
-        feeProportion: number,
-        makerAssetFillAmount: BigNumber,
-    ): Promise<BigNumber> {
-        const assetProxyId = assetDataUtils.decodeAssetProxyId(orders[0].makerAssetData);
-        switch (assetProxyId) {
-            case AssetProxyId.ERC20: {
-                const fillAmountWei = this._calculateMarketBuyERC20FillAmountAsync(
-                    orders,
-                    feeOrders,
-                    feeProportion,
-                    makerAssetFillAmount,
-                );
-                return fillAmountWei;
-            }
-            case AssetProxyId.ERC721: {
-                const fillAmountWei = await this._calculateMarketBuyERC721FillAmountAsync(
-                    orders,
-                    feeOrders,
-                    feeProportion,
-                );
-                return fillAmountWei;
-            }
-            default:
-                throw new Error(`Invalid Asset Proxy Id: ${assetProxyId}`);
-        }
-    }
-    private async _calculateMarketBuyERC20FillAmountAsync(
-        orders: SignedOrder[],
-        feeOrders: SignedOrder[],
-        feeProportion: number,
-        makerAssetFillAmount: BigNumber,
-    ): Promise<BigNumber> {
-        const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(orders[0].makerAssetData);
-        const makerAssetToken = makerAssetData.tokenAddress;
-        const params = formatters.createMarketBuyOrders(orders, makerAssetFillAmount);
-
-        let fillAmountWei;
-        if (makerAssetToken === this._zrxAddress) {
-            // If buying ZRX we buy the tokens and fees from the ZRX order in one step
-            const expectedBuyFeeTokensFillResults = await this._forwarderContract.calculateMarketBuyZrxResults.callAsync(
-                params.orders,
-                makerAssetFillAmount,
-            );
-            if (expectedBuyFeeTokensFillResults.makerAssetFilledAmount.lessThan(makerAssetFillAmount)) {
-                throw new Error(INSUFFICENT_ORDERS_FOR_MAKER_AMOUNT);
-            }
-            fillAmountWei = expectedBuyFeeTokensFillResults.takerAssetFilledAmount;
-        } else {
-            const expectedMarketBuyFillResults = await this._forwarderContract.calculateMarketBuyResults.callAsync(
-                params.orders,
-                makerAssetFillAmount,
-            );
-            if (expectedMarketBuyFillResults.makerAssetFilledAmount.lessThan(makerAssetFillAmount)) {
-                throw new Error(INSUFFICENT_ORDERS_FOR_MAKER_AMOUNT);
-            }
-            fillAmountWei = expectedMarketBuyFillResults.takerAssetFilledAmount;
-            const expectedFeeAmount = expectedMarketBuyFillResults.takerFeePaid;
-            if (expectedFeeAmount.greaterThan(ZERO_AMOUNT)) {
-                const expectedFeeFillFillAmountWei = await this._calculateMarketBuyERC20FillAmountAsync(
-                    feeOrders,
-                    [],
-                    DEFAULT_FEE_PROPORTION,
-                    expectedFeeAmount,
-                );
-                fillAmountWei = fillAmountWei.plus(expectedFeeFillFillAmountWei);
-            }
-        }
-        fillAmountWei = ForwarderWrapper._calculateAdditionalFeeProportionAmount(feeProportion, fillAmountWei);
-        return fillAmountWei;
-    }
-    private async _calculateMarketBuyERC721FillAmountAsync(
-        orders: SignedOrder[],
-        feeOrders: SignedOrder[],
-        feeProportion: number,
-    ): Promise<BigNumber> {
-        // Total cost when buying ERC721 is the total cost of all ERC721 orders + any fee abstraction
-        let fillAmountWei = _.reduce(
-            orders,
-            (totalAmount: BigNumber, order: SignedOrder) => {
-                return totalAmount.plus(order.takerAssetAmount);
-            },
-            ZERO_AMOUNT,
-        );
-        const totalFees = _.reduce(
-            orders,
-            (totalAmount: BigNumber, order: SignedOrder) => {
-                return totalAmount.plus(order.takerFee);
-            },
-            ZERO_AMOUNT,
-        );
-        if (totalFees.greaterThan(ZERO_AMOUNT)) {
-            // Calculate the ZRX fee abstraction cost
-            const emptyFeeOrders: SignedOrder[] = [];
-            const expectedFeeAmountWei = await this._calculateMarketBuyERC20FillAmountAsync(
-                feeOrders,
-                emptyFeeOrders,
-                DEFAULT_FEE_PROPORTION,
-                totalFees,
-            );
-            fillAmountWei = fillAmountWei.plus(expectedFeeAmountWei);
-        }
-        fillAmountWei = ForwarderWrapper._calculateAdditionalFeeProportionAmount(feeProportion, fillAmountWei);
-        return fillAmountWei;
+    public async withdrawERC20Async(
+        tokenAddress: string,
+        amount: BigNumber,
+        txData: TxDataPayable,
+    ): Promise<TransactionReceiptWithDecodedLogs> {
+        const txHash = await this._forwarderContract.withdrawERC20.sendTransactionAsync(tokenAddress, amount, txData);
+        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
+        return tx;
     }
 }

packages/dev-utils/CHANGELOG.json

@@ -1,5 +1,33 @@
 [
     {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {
@@ -45,7 +73,8 @@
                 "note": "Add SolidityProfiler to EnvVars",
                 "pr": 675
             }
-        ]
+        ],
+        "timestamp": 1527008544
     },
     {
         "version": "0.4.2",

packages/dev-utils/CHANGELOG.md

@@ -1,10 +1,26 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.3 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 20, 2018_
+
+    * Dependencies updated
+
 ## v0.4.6 - _July 18, 2018_
 
     * Dependencies updated
@@ -17,12 +33,14 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.4.3 - _June 1, 2018_
+## v0.4.3 - _May 22, 2018_
 
-    * Incorrect publish that was unpublished
+    * Add optional parameter shouldUseFakeGasEstimate to Web3Config (#622)
+    * Add SolidityProfiler to EnvVars (#675)
 
 ## v0.4.2 - _May 22, 2018_
 
+    * Pass SolCompilerArtifactAdapter to CoverageSubprovider (#589)
     * Move callbackErrorReporter over from 0x.js (#579)
 
 ## v0.4.1 - _May 5, 2018_

packages/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/dev-utils",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "chai": "^4.0.1",
@@ -45,12 +45,12 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/subproviders": "^1.0.0",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/utils": "^1.0.0",
-        "ethereum-types": "^1.0.0",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
+        "@0xproject/subproviders": "^1.0.2",
+        "@0xproject/types": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
+        "ethereum-types": "^1.0.2",
         "lodash": "^4.17.4"
     },
     "publishConfig": {

packages/ethereum-types/CHANGELOG.json

@@ -1,5 +1,33 @@
 [
     {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {

packages/ethereum-types/CHANGELOG.md

@@ -0,0 +1,27 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v1.0.3 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 20, 2018_
+
+    * Add `TraceParams` interface for `debug_traceTransaction` parameters (#675)
+    * Add `TransactionReceiptStatus` type (#812)
+
+## v0.0.2 - _June 1, 2018_
+
+    * Initial publish (#642)

packages/ethereum-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ethereum-types",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -35,8 +35,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",

packages/fill-scenarios/CHANGELOG.json

@@ -1,6 +1,34 @@
 [
     {
+        "version": "1.0.1-rc.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1532614997
+    },
+    {
+        "version": "1.0.1-rc.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1532605697
+    },
+    {
+        "timestamp": 1532357734,
         "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
+        "version": "1.0.0-rc.1",
         "changes": [
             {
                 "note": "Make fill-scenarios compatible with V2 of 0x protocol",

packages/fill-scenarios/CHANGELOG.md

@@ -1,10 +1,26 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.1-rc.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1-rc.1 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0-rc.1 - _July 20, 2018_
+
+    * Make fill-scenarios compatible with V2 of 0x protocol (#656)
+
 ## v0.0.6 - _July 18, 2018_
 
     * Dependencies updated

packages/fill-scenarios/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@0xproject/fill-scenarios",
-    "version": "1.0.0",
+    "version": "1.0.1-rc.1",
     "description": "0x order fill scenario generator",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
         "watch_without_deps": "yarn pre_build && tsc -w",
-        "build": "yarn pre_build && tsc",
+        "build": "yarn pre_build && tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "pre_build": "run-s update_artifacts generate_contract_wrappers",
         "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json lib/artifacts; done;",
         "generate_contract_wrappers": "abi-gen --abis 'lib/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
@@ -28,10 +28,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.0",
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/sol-compiler": "^0.5.4",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/abi-gen": "^1.0.2",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/sol-compiler": "^1.0.2",
+        "@0xproject/tslint-config": "^1.0.3",
         "@types/lodash": "4.14.104",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
@@ -41,13 +41,13 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^1.0.0",
-        "@0xproject/order-utils": "^1.0.0",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "ethereum-types": "^1.0.0",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
+        "@0xproject/base-contract": "^1.0.2",
+        "@0xproject/order-utils": "^1.0.1-rc.1",
+        "@0xproject/types": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
+        "ethereum-types": "^1.0.2",
         "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },

packages/json-schemas/CHANGELOG.json

@@ -1,5 +1,33 @@
 [
     {
+        "version": "1.0.1-rc.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1532614997
+    },
+    {
+        "version": "1.0.1-rc.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1532605697
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0-rc.1",
         "changes": [
             {
@@ -51,7 +79,8 @@
                     "Update Order & SignedOrder schemas, remove ECSignature schema and add Hex schema as part of V2 upgrades",
                 "pr": 615
             }
-        ]
+        ],
+        "timestamp": 1527008794
     },
     {
         "timestamp": 1527008794,

packages/json-schemas/CHANGELOG.md

@@ -1,10 +1,28 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.1-rc.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.1-rc.1 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0-rc.1 - _July 20, 2018_
+
+    * Update schemas for V2 or 0x Protocol (#615)
+    * Added CallData schema (#821)
+    * Update CallData schema id to CallData (#894)
+
 ## v0.8.3 - _July 18, 2018_
 
     * Dependencies updated
@@ -17,9 +35,9 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.8.0 - _June 1, 2018_
+## v0.8.0 - _May 22, 2018_
 
-    * Incorrect publish that was unpublished
+    * Update Order & SignedOrder schemas, remove ECSignature schema and add Hex schema as part of V2 upgrades (#615)
 
 ## v0.7.24 - _May 22, 2018_
 

packages/json-schemas/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/json-schemas",
-    "version": "1.0.0-rc.1",
+    "version": "1.0.1-rc.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,15 +47,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.0",
+        "@0xproject/typescript-typings": "^1.0.2",
         "@types/node": "^8.0.53",
         "jsonschema": "^1.2.0",
         "lodash.values": "^4.3.0"
     },
     "devDependencies": {
-        "@0xproject/monorepo-script": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.3",
+        "@0xproject/tslint-config": "^1.0.3",
+        "@0xproject/utils": "^1.0.2",
         "@types/lodash.foreach": "^4.5.3",
         "@types/lodash.values": "^4.3.3",
         "@types/mocha": "^2.2.42",

packages/metacoin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/metacoin",
-    "version": "0.0.10",
+    "version": "0.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,25 +29,25 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/abi-gen": "^1.0.0",
-        "@0xproject/base-contract": "^1.0.0",
-        "@0xproject/sol-compiler": "^0.5.4",
-        "@0xproject/sol-cov": "^0.1.3",
-        "@0xproject/subproviders": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
+        "@0xproject/abi-gen": "^1.0.2",
+        "@0xproject/base-contract": "^1.0.2",
+        "@0xproject/sol-compiler": "^1.0.2",
+        "@0xproject/sol-cov": "^1.0.2",
+        "@0xproject/subproviders": "^1.0.2",
+        "@0xproject/tslint-config": "^1.0.3",
+        "@0xproject/types": "^1.0.1-rc.1",
+        "@0xproject/typescript-typings": "^1.0.2",
+        "@0xproject/utils": "^1.0.2",
+        "@0xproject/web3-wrapper": "^1.1.0",
         "@types/mocha": "^5.2.2",
         "copyfiles": "^2.0.0",
-        "ethereum-types": "^1.0.0",
+        "ethereum-types": "^1.0.2",
         "ethers": "3.0.22",
         "lodash": "^4.17.4",
         "run-s": "^0.0.0"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.0",
+        "@0xproject/dev-utils": "^1.0.2",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",

packages/migrations/CHANGELOG.json

@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1532614997,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532605697,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Added migrations for 0x Protocol v2"
+            }
+        ]
+    },
     {
         "timestamp": 1531919263,
         "version": "0.0.10",
@@ -27,6 +63,7 @@
         ]
     },
     {
+        "timestamp": 1527008794,
         "version": "0.0.7",
         "changes": [
             {