Merge pull request #713 from ethereum/fallbacknode

remix-debugger/src/ui/Ethdebugger.js

@@ -6,6 +6,8 @@ var TraceManager = remixCore.trace.TraceManager
 var VmDebugger = require('./VmDebugger')
 var remixLib = require('remix-lib')
 var global = remixLib.global
+var init = remixLib.init
+var executionContext = remixLib.execution.executionContext
 var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
@@ -97,6 +99,14 @@ Ethdebugger.prototype.switchProvider = function (type) {
       console.log('provider ' + type + ' not defined')
     } else {
       global.web3 = obj
+      executionContext.detectNetwork((error, network) => {
+        if (error || !network) {
+          global.web3Debug = obj
+        } else {
+          var webDebugNode = init.web3DebugNode(network.name)
+          global.web3Debug = !webDebugNode ? obj : webDebugNode
+        }
+      })
       self.event.trigger('providerChanged', [type])
     }
   })

remix-debugger/test-browser/test/vmdebugger.js

@@ -59,7 +59,6 @@ function loadTrace (browser) {
     .execute(function () {
       return document.querySelector('#txinfo .dropdownpanel .dropdownrawcontent').innerHTML
     }, [], function (result) {
-      console.log(result.value)
       if (result.value.indexOf('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51') === -1) {
         browser.assert.fail(' txinput panel does not contain 0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51 ', 'info about error', '')
       }