Merge pull request #1965 from MetaMask/inpage-provider-fixes

Various Inpage fixes

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Current Master
 
+- Make eth_sign deprecation warning less noisy
+- Fix bug with network version serialization over synchronous RPC
+
 ## 3.9.11 2017-8-24
 
 - Fix nonce calculation bug that would sometimes generate very wrong nonces.

app/scripts/lib/auto-reload.js

@@ -2,33 +2,55 @@ module.exports = setupDappAutoReload
 
 function setupDappAutoReload (web3, observable) {
   // export web3 as a global, checking for usage
+  let hasBeenWarned = false
+  let reloadInProgress = false
+  let lastTimeUsed
+  let lastSeenNetwork
+
   global.web3 = new Proxy(web3, {
-    get: (_web3, name) => {
+    get: (_web3, key) => {
-      // get the time of use
+      // show warning once on web3 access
-      if (name !== '_used') {
+      if (!hasBeenWarned && key !== 'currentProvider') {
         console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/ethereum/mist/releases/tag/v0.9.0')
-        _web3._used = Date.now()
+        hasBeenWarned = true
       }
-      return _web3[name]
+      // get the time of use
+      lastTimeUsed = Date.now()
+      // return value normally
+      return _web3[key]
     },
-    set: (_web3, name, value) => {
+    set: (_web3, key, value) => {
-      _web3[name] = value
+      // set value normally
+      _web3[key] = value
     },
   })
-  var networkVersion
 
   observable.subscribe(function (state) {
-    // get the initial network
+    // if reload in progress, no need to check reload logic
-    const curentNetVersion = state.networkVersion
+    if (reloadInProgress) return
-    if (!networkVersion) networkVersion = curentNetVersion
 
-    if (curentNetVersion !== networkVersion && web3._used) {
+    const currentNetwork = state.networkVersion
-      const timeSinceUse = Date.now() - web3._used
+
-      // if web3 was recently used then delay the reloading of the page
+    // set the initial network
-      timeSinceUse > 500 ? triggerReset() : setTimeout(triggerReset, 500)
+    if (!lastSeenNetwork) {
-      // prevent reentry into if statement if state updates again before
+      lastSeenNetwork = currentNetwork
-      // reload
+      return
-      networkVersion = curentNetVersion
+    }
+
+    // skip reload logic if web3 not used
+    if (!lastTimeUsed) return
+
+    // if network did not change, exit
+    if (currentNetwork === lastSeenNetwork) return
+
+    // initiate page reload
+    reloadInProgress = true
+    const timeSinceUse = Date.now() - lastTimeUsed
+    // if web3 was recently used then delay the reloading of the page
+    if (timeSinceUse > 500) {
+      triggerReset()
+    } else {
+      setTimeout(triggerReset, 500)
     }
   })
 }

app/scripts/lib/inpage-provider.js

@@ -27,7 +27,7 @@ function MetamaskInpageProvider (connectionStream) {
   )
 
   // ignore phishing warning message (handled elsewhere)
-  multiStream.ignoreStream('phishing') 
+  multiStream.ignoreStream('phishing')
 
   // connect to async provider
   const asyncProvider = self.asyncProvider = new StreamProvider()
@@ -80,7 +80,7 @@ MetamaskInpageProvider.prototype.send = function (payload) {
     case 'eth_coinbase':
       // read from localStorage
       selectedAddress = self.publicConfigStore.getState().selectedAddress
-      result = selectedAddress
+      result = selectedAddress || null
       break
 
     case 'eth_uninstallFilter':
@@ -90,7 +90,7 @@ MetamaskInpageProvider.prototype.send = function (payload) {
 
     case 'net_version':
       const networkVersion = self.publicConfigStore.getState().networkVersion
-      result = networkVersion
+      result = networkVersion || null
       break
 
     // throw not-supported Error