diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-05-24 03:24:45 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-05-24 03:24:45 +0800 |
| commit | 4dab68c48f63e51c50d1ea4cc551d006b4c3d9ea (patch) | |
| tree | 36d149b30911297369e4859f18657ab2b0329304 | |
| parent | cd2ad1733da16aa3d84158e5df9fbf33f51450aa (diff) | |
| parent | 1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d (diff) | |
| download | tangerine-wallet-browser-4dab68c48f63e51c50d1ea4cc551d006b4c3d9ea.tar.gz tangerine-wallet-browser-4dab68c48f63e51c50d1ea4cc551d006b4c3d9ea.tar.zst tangerine-wallet-browser-4dab68c48f63e51c50d1ea4cc551d006b4c3d9ea.zip | |
Merge branch 'master' into i1409-StalledTxs
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e84413bd0..88d7a81e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Label the pending tx icon with a tooltip. - Fix bug where website filters would pile up and not deallocate when leaving a site. - Continually resubmit pending txs for a period of time to ensure successful broadcast. +- ENS names will no longer resolve to their owner if no resolver is set. Resolvers must be explicitly set and configured. ## 3.6.5 2017-5-17 diff --git a/package.json b/package.json index 271e2a397..6b6996d9d 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", - "ethjs-ens": "^1.0.2", + "ethjs-ens": "^2.0.0", "express": "^4.14.0", "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", |