From 8e307f8d714bfd06051f68add4ef03af7eb8226b Mon Sep 17 00:00:00 2001 From: Erik Marks <25517051+rekmarks@users.noreply.github.com> Date: Thu, 6 Feb 2020 07:57:54 -0800 Subject: [PATCH] update inpage-provider; minor fixes (#7997) --- app/scripts/inpage.js | 6 +++--- app/scripts/lib/auto-reload.js | 4 ++-- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 3fcc3bbaf..af6450e9b 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -36,7 +36,7 @@ import log from 'loglevel' import LocalMessageDuplexStream from 'post-message-stream' import MetamaskInpageProvider from 'metamask-inpage-provider' -// TODO:deprecate:2020-01-13 +// TODO:deprecate:Q1-2020 import 'web3/dist/web3.min.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 @@ -95,7 +95,7 @@ proxiedInpageProvider._web3Ref = web3.eth setupDappAutoReload(web3, inpageProvider._publicConfigStore) // -// end deprecate:2020-01-13 +// end deprecate:Q1-2020 // window.ethereum = proxiedInpageProvider diff --git a/app/scripts/lib/auto-reload.js b/app/scripts/lib/auto-reload.js index e5b82bf4a..ba6f27765 100644 --- a/app/scripts/lib/auto-reload.js +++ b/app/scripts/lib/auto-reload.js @@ -1,5 +1,5 @@ -// TODO:deprecate:2020-01-13 +// TODO:deprecate:Q1-2020 export default setupDappAutoReload @@ -16,7 +16,7 @@ function setupDappAutoReload (web3, observable) { lastTimeUsed = Date.now() // show warning once on web3 access 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 } // return value normally diff --git a/package.json b/package.json index e4d096c58..e7e9e9211 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "lodash": "^4.17.15", "loglevel": "^1.4.1", "luxon": "^1.8.2", - "metamask-inpage-provider": "^4.0.3", + "metamask-inpage-provider": "^4.0.4", "metamask-logo": "^2.1.4", "multihashes": "^0.4.12", "nanoid": "^2.1.6", diff --git a/yarn.lock b/yarn.lock index f0fdc0582..88a2e1388 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o= -metamask-inpage-provider@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/metamask-inpage-provider/-/metamask-inpage-provider-4.0.3.tgz#856698255c2153b82203402c6b5337ca6363d9b0" - integrity sha512-JKbGkkR7qg+Z5Dayg6rpfXXzSVcXcp3BENbk2zgWwp/Aa70Sf9MHC7m364FeyIIio9A2r9OuJKV0Bcwmz0h+xg== +metamask-inpage-provider@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/metamask-inpage-provider/-/metamask-inpage-provider-4.0.4.tgz#697121873bf686a1fddc671832d9adbceda4c9ae" + integrity sha512-DCuqQ1NpAScesjvJac+8k4SbKzgcbmP78sAvo96i04qIszzH0LMg0dZLEViTz6/uqM7nU6JO3NIAcNF3iA2Lpw== dependencies: eth-json-rpc-errors "^2.0.0" fast-deep-equal "^2.0.1"