Only resolve ENS on mainnet (#7944)

The ENS resolver will now bail on any network other than mainnet.
MetaMask · Jan 30, 2020 · ee41505 · ee41505
1 parent 472d8c3
commit ee41505
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -254,6 +254,7 @@ function setupController (initState, initLangCode) {
   })
 
   setupEnsIpfsResolver({
+    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,7 @@ const supportedTopLevelDomains = ['eth']
 
 export default setupEnsIpfsResolver
 
-function setupEnsIpfsResolver ({ provider, getIpfsGateway }) {
+function setupEnsIpfsResolver ({ provider, getCurrentNetwork, getIpfsGateway }) {
 
   // install listener
   const urlPatterns = supportedTopLevelDomains.map(tld => `*://*.${tld}/*`)
@@ -23,7 +23,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
@@ -675,6 +675,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