aboutsummaryrefslogtreecommitdiffstats
path: root/packages/subproviders
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-16 21:52:20 +0800
committerFabio Berger <me@fabioberger.com>2018-11-16 21:52:20 +0800
commit25d0b1e6e58987d0f00a5034158c2c514cf476d6 (patch)
tree412ef07e713fd928b856aca2fc603e182adcd1d3 /packages/subproviders
parente36fc4e6aef414c5d3507c59d82e03e92fbc93fb (diff)
parentcabb7432b9a6d4a5bb8da6fc7fe4522d24e4ece5 (diff)
downloaddexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.tar
dexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.tar.gz
dexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.tar.bz2
dexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.tar.lz
dexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.tar.xz
dexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.tar.zst
dexon-sol-tools-25d0b1e6e58987d0f00a5034158c2c514cf476d6.zip
Merge branch 'development' into launchKitLanding
* development: (110 commits) fix: fix exceeds block gas limit error chore(instant): fix lint error fix: remove unused vars Send in affiliate info as option Have heartbeat update not trigger errors fix: remove redundant handler feat: make onUnlockWalletClick different based on ON chore: remove wallet panel content for mobile feat: use blue for wallet prompt on mobile feat: use stable version of bowser fix: add http to external url string feat: make onUnlockWalletClick different based on ON chore: remove wallet panel content for mobile feat: use blue for wallet prompt on mobile feat: use stable version of bowser feat: expose webpack-dev-server content to local network fix(website): remove node env definition from webpack fix(website): currentProvider called on undefined chore: update yarn lock feat: use capital values for enums ...
Diffstat (limited to 'packages/subproviders')
-rw-r--r--packages/subproviders/CHANGELOG.json27
-rw-r--r--packages/subproviders/CHANGELOG.md12
-rw-r--r--packages/subproviders/package.json8
-rw-r--r--packages/subproviders/src/subproviders/ledger.ts1
-rw-r--r--packages/subproviders/src/utils/wallet_utils.ts3
5 files changed, 45 insertions, 6 deletions
diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index 816c776a5..cdc150c3a 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,5 +1,32 @@
[
{
+ "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": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "2.1.1",
"changes": [
{
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index 72ac9d1f7..eda76bd2f 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,6 +5,18 @@ 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
+
## v2.1.1 - _November 9, 2018_
* Dependencies updated
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 1a25b5e32..d249e4d6d 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/subproviders",
- "version": "2.1.1",
+ "version": "2.1.4",
"engines": {
"node": ">=6.12"
},
@@ -29,11 +29,11 @@
}
},
"dependencies": {
- "@0x/assert": "^1.0.15",
+ "@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.1",
+ "@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;
}