merge developmentx

packages/sol-cov/package.json

@@ -40,6 +40,7 @@
     "dependencies": {
         "@0xproject/subproviders": "^0.8.2",
         "@0xproject/utils": "^0.3.4",
+        "@0xproject/typescript-typings": "^0.0.1",
         "ethereumjs-util": "^5.1.1",
         "glob": "^7.1.2",
         "istanbul": "^0.4.5",
@@ -57,7 +58,6 @@
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
         "chai": "^4.0.1",
-        "chai-typescript-typings": "^0.0.6",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "mocha": "^4.0.1",

packages/sol-cov/tsconfig.json

@@ -7,8 +7,6 @@
         "./src/**/*",
         "./test/**/*",
         "../../node_modules/types-bn/index.d.ts",
-        "../../node_modules/web3-typescript-typings/index.d.ts",
-        "../../node_modules/chai-typescript-typings/index.d.ts",
         "../../node_modules/types-ethereumjs-util/index.d.ts"
     ]
 }