m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

update inpage-provider; minor fixes (#7997)

Browse Source
This commit is contained in:
Erik Marks 2020-02-06 07:57:54 -08:00 committed by GitHub
parent 08c7322203
commit 8e307f8d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/inpage.js
View File

@ -36,7 +36,7 @@ import log from 'loglevel'
import LocalMessageDuplexStream from 'post-message-stream' import LocalMessageDuplexStream from 'post-message-stream'
import MetamaskInpageProvider from 'metamask-inpage-provider' import MetamaskInpageProvider from 'metamask-inpage-provider'
// TODO:deprecate:2020-01-13 // TODO:deprecate:Q1-2020
import 'web3/dist/web3.min.js' import 'web3/dist/web3.min.js'
import setupDappAutoReload from './lib/auto-reload.js' import setupDappAutoReload from './lib/auto-reload.js'
@ -70,7 +70,7 @@ const proxiedInpageProvider = new Proxy(inpageProvider, {
}) })
// //
// TODO:deprecate:2020-01-13 // TODO:deprecate:Q1-2020
// //
// setup web3 // setup web3
@ -95,7 +95,7 @@ proxiedInpageProvider._web3Ref = web3.eth
setupDappAutoReload(web3, inpageProvider._publicConfigStore) setupDappAutoReload(web3, inpageProvider._publicConfigStore)
// //
// end deprecate:2020-01-13 // end deprecate:Q1-2020
// //
window.ethereum = proxiedInpageProvider window.ethereum = proxiedInpageProvider

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

@ -1,5 +1,5 @@
// TODO:deprecate:2020-01-13 // TODO:deprecate:Q1-2020
export default setupDappAutoReload export default setupDappAutoReload
@ -16,7 +16,7 @@ function setupDappAutoReload (web3, observable) {
lastTimeUsed = Date.now() lastTimeUsed = Date.now()
// show warning once on web3 access // show warning once on web3 access
if (!hasBeenWarned && key !== 'currentProvider') { if (!hasBeenWarned && key !== 'currentProvider') {
console.warn(`MetaMask: On 2020-01-13, MetaMask will no longer inject web3. For more information, see: https://medium.com/metamask/no-longer-injecting-web3-js-4a899ad6e59e`) console.warn(`MetaMask: In Q1 2020, MetaMask will no longer inject web3. For more information, see: https://medium.com/metamask/no-longer-injecting-web3-js-4a899ad6e59e`)
hasBeenWarned = true hasBeenWarned = true
} }
// return value normally // return value normally

2
package.json
View File

@ -123,7 +123,7 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"loglevel": "^1.4.1", "loglevel": "^1.4.1",
"luxon": "^1.8.2", "luxon": "^1.8.2",
"metamask-inpage-provider": "^4.0.3", "metamask-inpage-provider": "^4.0.4",
"metamask-logo": "^2.1.4", "metamask-logo": "^2.1.4",
"multihashes": "^0.4.12", "multihashes": "^0.4.12",
"nanoid": "^2.1.6", "nanoid": "^2.1.6",

8
yarn.lock
View File

@ -18868,10 +18868,10 @@ mersenne-twister@^1.0.1, mersenne-twister@^1.1.0:
resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a" resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o= integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o=
metamask-inpage-provider@^4.0.3: metamask-inpage-provider@^4.0.4:
version "4.0.3" version "4.0.4"
resolved "https://registry.yarnpkg.com/metamask-inpage-provider/-/metamask-inpage-provider-4.0.3.tgz#856698255c2153b82203402c6b5337ca6363d9b0" resolved "https://registry.yarnpkg.com/metamask-inpage-provider/-/metamask-inpage-provider-4.0.4.tgz#697121873bf686a1fddc671832d9adbceda4c9ae"
integrity sha512-JKbGkkR7qg+Z5Dayg6rpfXXzSVcXcp3BENbk2zgWwp/Aa70Sf9MHC7m364FeyIIio9A2r9OuJKV0Bcwmz0h+xg== integrity sha512-DCuqQ1NpAScesjvJac+8k4SbKzgcbmP78sAvo96i04qIszzH0LMg0dZLEViTz6/uqM7nU6JO3NIAcNF3iA2Lpw==
dependencies: dependencies:
eth-json-rpc-errors "^2.0.0" eth-json-rpc-errors "^2.0.0"
fast-deep-equal "^2.0.1" fast-deep-equal "^2.0.1"