From 94641d1443e8e680fe13e69044629ccd9ebebad6 Mon Sep 17 00:00:00 2001 From: Chen Wei Date: Thu, 18 Jul 2019 16:57:03 +0800 Subject: do not load inpage.js by "fs". They can be accessed with extension URL --- app/scripts/inpage.js | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'app/scripts/inpage.js') diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 705741cf1..365d4c53e 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -115,14 +115,6 @@ window.tangerine = createStandardProvider(proxiedInpageProvider) // setup web3 // -// if (typeof window.web3 !== 'undefined') { -// throw new Error(`MetaMask detected another web3. -// MetaMask will not work reliably with another web3 extension. -// This usually happens if you have two MetaMasks installed, -// or MetaMask and another web3 extension. Please remove one -// and try again.`) -// } - const web3 = new Web3(proxiedInpageProvider) web3.setProvider = function () { log.debug('MetaMask - overrode web3.setProvider') @@ -131,27 +123,6 @@ log.debug('MetaMask - injected web3') setupDappAutoReload(web3, inpageProvider.publicConfigStore) -// export global web3, with usage-detection and deprecation warning - -/* TODO: Uncomment this area once auto-reload.js has been deprecated: -let hasBeenWarned = false -global.web3 = new Proxy(web3, { - get: (_web3, key) => { - // show warning once on web3 access - if (!hasBeenWarned && key !== 'currentProvider') { - console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/MetaMask/faq/blob/master/detecting_metamask.md#web3-deprecation') - hasBeenWarned = true - } - // return value normally - return _web3[key] - }, - set: (_web3, key, value) => { - // set value normally - _web3[key] = value - }, -}) -*/ - // set web3 defaultAccount inpageProvider.publicConfigStore.subscribe(function (state) { web3.eth.defaultAccount = state.selectedAddress -- cgit