Merge development

4 files changed, 32 insertions, 24 deletions

diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index cc0e0414a..19a43b6a7 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "2.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "2.1.9",
         "changes": [
@@ -165,8 +174,7 @@
         "version": "2.0.0",
         "changes": [
             {
-                "note":
-                    "Export types: `PartialTxParams`, `JSONRPCRequestPayloadWithMethod`, `ECSignatureString`, `AccountFetchingConfigs`, `LedgerEthereumClientFactoryAsync`, `OnNextCompleted`, `MnemonicWalletSubproviderConfigs`, LedgerGetAddressResult, `JSONRPCRequestPayload`, `Provider`, `JSONRPCResponsePayload` and `JSONRPCErrorCallback`",
+                "note": "Export types: `PartialTxParams`, `JSONRPCRequestPayloadWithMethod`, `ECSignatureString`, `AccountFetchingConfigs`, `LedgerEthereumClientFactoryAsync`, `OnNextCompleted`, `MnemonicWalletSubproviderConfigs`, LedgerGetAddressResult, `JSONRPCRequestPayload`, `Provider`, `JSONRPCResponsePayload` and `JSONRPCErrorCallback`",
                 "pr": 924
             }
         ],
@@ -295,8 +303,7 @@
         "version": "0.9.0",
         "changes": [
             {
-                "note":
-                    "Refactor RedundantRPCSubprovider into RedundantSubprovider where it now accepts an array of subproviders rather then an array of RPC endpoints",
+                "note": "Refactor RedundantRPCSubprovider into RedundantSubprovider where it now accepts an array of subproviders rather then an array of RPC endpoints",
                 "pr": 500
             },
             {
@@ -312,8 +319,7 @@
                 "pr": 507
             },
             {
-                "note":
-                    "Refactors LedgerSubprovider such that explicitly setting the `pathIndex` is no longer required. Simply set the request `from` address as desired",
+                "note": "Refactors LedgerSubprovider such that explicitly setting the `pathIndex` is no longer required. Simply set the request `from` address as desired",
                 "pr": 507
             },
             {
@@ -371,8 +377,7 @@
         "version": "0.7.0",
         "changes": [
             {
-                "note":
-                    "Updated legerco packages. Removed node-hid package as a dependency and make it an optional dependency. It is still used in integration tests but is causing problems for users on Linux distros.",
+                "note": "Updated legerco packages. Removed node-hid package as a dependency and make it an optional dependency. It is still used in integration tests but is causing problems for users on Linux distros.",
                 "pr": 437
             }
         ],
@@ -420,8 +425,7 @@
                 "pr": 355
             },
             {
-                "note":
-                    "InjectedWeb3Subprovider accepts a Provider in the constructor, previously it was a Web3 object",
+                "note": "InjectedWeb3Subprovider accepts a Provider in the constructor, previously it was a Web3 object",
                 "pr": 363
             }
         ],
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index 076cce935..ec33a35eb 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.10 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v2.1.9 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 6f97d760e..b0d77284b 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -78,12 +78,12 @@ yarn run test:unit
 
 In order to run the integration tests, make sure you have a Ledger Nano S available.
 
-*   Setup your Ledger with the development mnemonic seed: `concert load couple harbor equip island argue ramp clarify fence smart topic`
-*   Plug it into your computer
-*   Unlock the device
-*   Open the on-device Ethereum app
-*   Make sure "browser support" and "contract data" are disabled
-*   Start [TestRPC](https://github.com/trufflesuite/ganache-cli) locally at port `8545`
+-   Setup your Ledger with the development mnemonic seed: `concert load couple harbor equip island argue ramp clarify fence smart topic`
+-   Plug it into your computer
+-   Unlock the device
+-   Open the on-device Ethereum app
+-   Make sure "browser support" and "contract data" are disabled
+-   Start [TestRPC](https://github.com/trufflesuite/ganache-cli) locally at port `8545`
 
 Then run:
 
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 178e7a99c..88c850b44 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/subproviders",
-    "version": "2.1.9",
+    "version": "2.1.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,11 +29,11 @@
         }
     },
     "dependencies": {
-        "@0x/assert": "^1.0.21",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/assert": "^1.0.22",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "4.24.0",
         "@types/eth-lightwallet": "^3.0.0",
@@ -43,7 +43,7 @@
         "bip39": "^2.5.0",
         "bn.js": "^4.11.8",
         "eth-lightwallet": "^3.0.1",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "ganache-core": "^2.2.1",
@@ -54,7 +54,7 @@
         "web3-provider-engine": "14.0.6"
     },
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bip39": "^2.4.0",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-tx": "^1.0.0",