aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-05-24 01:36:26 +0800
committerGitHub <noreply@github.com>2017-05-24 01:36:26 +0800
commit1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d (patch)
treed5b6148278a0aaa7a916047b3d5e6289f571c27b
parent650365f9f21ab0a8d670656edd9c03d422c42f8f (diff)
parentbe5af7cb4bb44731504357e010bf78b3eda9d543 (diff)
downloadtangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.tar
tangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.tar.gz
tangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.tar.bz2
tangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.tar.lz
tangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.tar.xz
tangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.tar.zst
tangerine-wallet-browser-1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d.zip
Merge pull request #1475 from MetaMask/i1427-ThrowIfResolverNotSet
Throw if ENS Resolver isn't set up
-rw-r--r--CHANGELOG.md1
-rw-r--r--package.json2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 265c239b2..dab16c89a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
- Add Transaction Number (nonce) to transaction list.
- Label the pending tx icon with a tooltip.
- Fix bug where website filters would pile up and not deallocate when leaving a site.
+- 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",