Merge branch 'development' into dev-tools-pages

5 files changed, 32 insertions, 6 deletions

diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index 49b1d99d0..cdc150c3a 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "timestamp": 1542208198,
+        "version": "2.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1542134075,
+        "version": "2.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1542028948,
         "version": "2.1.2",
         "changes": [
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index a8ef8deb6..eda76bd2f 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.4 - _November 14, 2018_
+
+    * Dependencies updated
+
+## v2.1.3 - _November 13, 2018_
+
+    * Dependencies updated
+
 ## v2.1.2 - _November 12, 2018_
 
     * Dependencies updated
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index c5a1dc3d1..d249e4d6d 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/subproviders",
-    "version": "2.1.2",
+    "version": "2.1.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,11 +29,11 @@
         }
     },
     "dependencies": {
-        "@0x/assert": "^1.0.16",
+        "@0x/assert": "^1.0.17",
         "@0x/types": "^1.2.1",
         "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.4",
-        "@0x/web3-wrapper": "^3.1.2",
+        "@0x/utils": "^2.0.5",
+        "@0x/web3-wrapper": "^3.1.4",
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "4.24.0",
         "@types/eth-lightwallet": "^3.0.0",
diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index 28e348f90..b5ca10ce1 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -32,7 +32,6 @@ const DEFAULT_ADDRESS_SEARCH_LIMIT = 1000;
  */
 export class LedgerSubprovider extends BaseWalletSubprovider {
     // tslint:disable-next-line:no-unused-variable
-    private readonly _nonceLock = new Lock();
     private readonly _connectionLock = new Lock();
     private readonly _networkId: number;
     private _baseDerivationPath: string;
diff --git a/packages/subproviders/src/utils/wallet_utils.ts b/packages/subproviders/src/utils/wallet_utils.ts
index 4c233645b..7027ca8a0 100644
--- a/packages/subproviders/src/utils/wallet_utils.ts
+++ b/packages/subproviders/src/utils/wallet_utils.ts
@@ -56,10 +56,11 @@ export const walletUtils = {
         parentDerivedKeyInfo: DerivedHDKeyInfo,
         searchLimit: number,
     ): DerivedHDKeyInfo | undefined {
+        const lowercaseAddress = address.toLowerCase();
         let matchedKey: DerivedHDKeyInfo | undefined;
         const derivedKeyIterator = new DerivedHDKeyInfoIterator(parentDerivedKeyInfo, searchLimit);
         for (const key of derivedKeyIterator) {
-            if (key.address === address) {
+            if (key.address === lowercaseAddress) {
                 matchedKey = key;
                 break;
             }