merge development

packages/typescript-typings/CHANGELOG.json

@@ -6,7 +6,8 @@
                 "note": "Add optional types to optimizer settings",
                 "pr": 1682
             }
-        ]
+        ],
+        "timestamp": 1553091633
     },
     {
         "version": "4.1.0",

packages/typescript-typings/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.2.0 - _March 20, 2019_
+
+    * Add optional types to optimizer settings (#1682)
+
 ## v4.1.0 - _February 25, 2019_
 
     * Add back custom web3-provider-engine type definitions (#1627)

packages/typescript-typings/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/typescript-typings",
-    "version": "4.1.0",
+    "version": "4.2.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -27,7 +27,7 @@
         "@types/bn.js": "^4.11.0",
         "@types/react": "*",
         "bignumber.js": "~8.0.2",
-        "ethereum-types": "^2.1.0",
+        "ethereum-types": "^2.1.1",
         "popper.js": "1.14.3"
     },
     "devDependencies": {