Merge branch 'v2-prototype' into v2-contract-wrappers-WIP

2018-07-05 15:04:01 +02:00
parent 1eba78e20a 5176d929fa
commit 1ee2d6ed54
278 changed files with 8510 additions and 2798 deletions
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -71,7 +71,7 @@
        "source-map-support": "^0.5.0",
        "tslint": "5.8.0",
        "typescript": "2.7.1",
-        "web3-provider-engine": "^14.0.4"
+        "web3-provider-engine": "14.0.6"
    },
    "dependencies": {
        "@0xproject/assert": "^0.3.0",
@@ -83,8 +83,8 @@
        "@0xproject/fill-scenarios": "^1.0.0",
        "@0xproject/json-schemas": "^1.0.0",
        "@0xproject/types": "^1.0.0",
-        "ethereum-types": "^0.0.1",
-        "ethereumjs-blockstream": "^2.0.6",
+        "ethereum-types": "^0.0.2",
+        "ethereumjs-blockstream": "5.0.0",
        "ethereumjs-util": "^5.1.1",
        "ethers": "3.0.22",
        "js-sha3": "^0.7.0",