m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Add web3 deprecation warning (#7334)

Browse Source 
* Add web3 deprecation warning

* Update web3 deprecation article URL
This commit is contained in:
Whymarrh Whitby 2019-10-31 21:56:02 -02:30 committed by Mark Stacey
parent 5d843db533
commit 5455b8e3fd
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/scripts/inpage.js
View File

@ -174,27 +174,6 @@ log.debug('MetaMask - injected web3')
setupDappAutoReload(web3, inpageProvider.publicConfigStore) 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 // set web3 defaultAccount
inpageProvider.publicConfigStore.subscribe(function (state) { inpageProvider.publicConfigStore.subscribe(function (state) {
web3.eth.defaultAccount = state.selectedAddress web3.eth.defaultAccount = state.selectedAddress

6
app/scripts/lib/auto-reload.js
View File

@ -5,11 +5,17 @@ function setupDappAutoReload (web3, observable) {
let reloadInProgress = false let reloadInProgress = false
let lastTimeUsed let lastTimeUsed
let lastSeenNetwork let lastSeenNetwork
let hasBeenWarned = false
global.web3 = new Proxy(web3, { global.web3 = new Proxy(web3, {
get: (_web3, key) => { get: (_web3, key) => {
// get the time of use // get the time of use
lastTimeUsed = Date.now() lastTimeUsed = Date.now()
// 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://medium.com/metamask/4a899ad6e59e')
hasBeenWarned = true
}
// return value normally // return value normally
return _web3[key] return _web3[key]
}, },