Only resolve ENS on mainnet (MetaMask#7944)

The ENS resolver will now bail on any network other than mainnet.
yqrashawn · Feb 3, 2020 · ecc91e4 · ecc91e4
1 parent 7d2dc79
commit ecc91e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -253,9 +253,8 @@ function setupController (initState, initLangCode) {
   })
 
   // setupEnsIpfsResolver({
-  //   getIpfsGateway: controller.preferencesController.getIpfsGateway.bind(
-  //     controller.preferencesController
-  //   ),
+  //   getCurrentNetwork: controller.getCurrentNetwork,
+  //   getIpfsGateway: controller.preferencesController.getIpfsGateway.bind(controller.preferencesController),
   //   provider: controller.provider,
   // })
 

diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
@@ -6,7 +6,8 @@ const supportedTopLevelDomains = ['eth']
 
 export default setupEnsIpfsResolver
 
-function setupEnsIpfsResolver ({ provider, getIpfsGateway }) {
+function setupEnsIpfsResolver ({ provider, getCurrentNetwork, getIpfsGateway }) {
+
   // install listener
   const urlPatterns = supportedTopLevelDomains.map(tld => `*://*.${tld}/*`)
   extension.webRequest.onErrorOccurred.addListener(webRequestDidFail, {
@@ -25,7 +26,8 @@ function setupEnsIpfsResolver ({ provider, getIpfsGateway }) {
   async function webRequestDidFail (details) {
     const { tabId, url } = details
     // ignore requests that are not associated with tabs
-    if (tabId === -1) {
+    // only attempt ENS resolution on mainnet
+    if (tabId === -1 || getCurrentNetwork() !== '1') {
       return
     }
     // parse ens name

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -775,6 +775,10 @@ export default class MetamaskController extends EventEmitter {
     })
   }
 
+  getCurrentNetwork = () => {
+    return this.networkController.store.getState().network
+  }
+
   /**
    * Collects all the information that we want to share
    * with the mobile client for syncing purposes