Merge development

1 files changed, 22 insertions, 22 deletions

diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index cbb12534e..8316d4733 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/contract-wrappers",
-    "version": "1.0.1-rc.2",
+    "version": "1.0.1-rc.3",
     "description": "Smart TS wrappers for 0x smart contracts",
     "keywords": [
         "0xproject",
@@ -14,7 +14,7 @@
         "watch_without_deps": "yarn pre_build && tsc -w",
         "build": "yarn pre_build && tsc",
         "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",
+        "generate_contract_wrappers": "abi-gen --abis 'src/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token|ZRXToken|ERC20Token|ERC721Token|WETH9|ERC20Proxy|ERC721Proxy|Forwarder).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",
         "test": "yarn run_mocha",
@@ -29,7 +29,7 @@
         "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "config": {
-        "contracts_v2_beta": "Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken",
+        "contracts_v2_beta": "Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken Forwarder",
         "contracts_v2": "DummyERC20Token DummyERC721Token",
         "postpublish": {
             "assets": [],
@@ -45,12 +45,12 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.4",
-        "@0xproject/dev-utils": "^1.0.3",
-        "@0xproject/migrations": "^1.0.3",
-        "@0xproject/sol-compiler": "^1.0.4",
-        "@0xproject/subproviders": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/abi-gen": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.4",
+        "@0xproject/migrations": "^1.0.4",
+        "@0xproject/sol-compiler": "^1.0.5",
+        "@0xproject/subproviders": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -63,7 +63,7 @@
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.0.1",
+        "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "nyc": "^11.0.1",
         "opn-cli": "^3.1.0",
@@ -72,25 +72,25 @@
         "source-map-support": "^0.5.0",
         "tslint": "5.11.0",
         "typedoc": "0xProject/typedoc",
-        "typescript": "2.7.1",
+        "typescript": "2.9.2",
         "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.4",
-        "@0xproject/base-contract": "^1.0.4",
-        "@0xproject/fill-scenarios": "^1.0.1-rc.2",
-        "@0xproject/json-schemas": "^1.0.1-rc.3",
-        "@0xproject/order-utils": "^1.0.1-rc.2",
-        "@0xproject/types": "^1.0.1-rc.3",
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
-        "@0xproject/web3-wrapper": "^1.1.2",
-        "ethereum-types": "^1.0.3",
+        "@0xproject/assert": "^1.0.5",
+        "@0xproject/base-contract": "^2.0.0-rc.1",
+        "@0xproject/fill-scenarios": "^1.0.1-rc.3",
+        "@0xproject/json-schemas": "^1.0.1-rc.4",
+        "@0xproject/order-utils": "^1.0.1-rc.3",
+        "@0xproject/types": "^1.0.1-rc.4",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
+        "@0xproject/web3-wrapper": "^1.2.0",
+        "ethereum-types": "^1.0.4",
         "ethereumjs-blockstream": "5.0.0",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
         "js-sha3": "^0.7.0",
-        "lodash": "^4.17.4",
+        "lodash": "^4.17.5",
         "uuid": "^3.1.0"
     },
     "publishConfig": {