move initializations of execution context

src/app/debugger/debuggerUI.js

@@ -2,7 +2,8 @@ var TxBrowser = require('./debuggerUI/TxBrowser')
 var StepManagerUI = require('./debuggerUI/StepManager')
 var VmDebugger = require('./debuggerUI/VmDebugger')
 
-var Debugger = require('./debugger/debugger')
+//var Debugger = require('./debugger/debugger')
+var Debugger = require('remix-debug').TransactionDebugger
 
 var SourceHighlighter = require('../editor/sourceHighlighter')
 
@@ -11,8 +12,9 @@ var EventManager = require('../../lib/events')
 var executionContext = require('../../execution-context')
 var globalRegistry = require('../../global/registry')
 
-var executionContext = require('../../execution-context')
-var globalRegistry = require('../../global/registry')
+var remixLib = require('remix-lib')
+var Web3Providers = remixLib.vm.Web3Providers
+var DummyProvider = remixLib.vm.DummyProvider
 
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
@@ -27,19 +29,38 @@ var css = csjs`
   }
 `
 
+class ContextManager {
+  constructor () {
+    this.web3 = executionContext.web3()
+    this.event = new EventManager()
+  }
+}
+
 class DebuggerUI {
 
   constructor (container) {
     this.registry = globalRegistry
     this.event = new EventManager()
 
+    this.executionContext = executionContext
+
     this.debugger = new Debugger({
-      executionContext: executionContext,
+      web3: executionContext.web3(),
       offsetToLineColumnConverter: this.registry.get('offsettolinecolumnconverter').api,
       compiler: this.registry.get('compiler').api,
       compilersArtefacts: this.registry.get('compilersartefacts').api
     })
 
+    this.debugger.web3Providers = new Web3Providers()
+    this.debugger.executionContext = this.executionContext
+    this.debugger.addProvider('DUMMYWEB3', new DummyProvider())
+    this.debugger.switchProvider('DUMMYWEB3')
+
+    this.debugger.addProvider('vm', this.executionContext.vm())
+    this.debugger.addProvider('injected', this.executionContext.internalWeb3())
+    this.debugger.addProvider('web3', this.executionContext.internalWeb3())
+    this.debugger.switchProvider(this.executionContext.getProvider())
+
     this.isActive = false
 
     this.sourceHighlighter = new SourceHighlighter()
@@ -122,6 +143,7 @@ class DebuggerUI {
   startDebugging (blockNumber, txNumber, tx) {
     const self = this
 
+    this.debugger.debugger.updateWeb3(this.executionContext.web3())
     this.debugger.debug(blockNumber, txNumber, tx, () => {
       self.stepManager = new StepManagerUI(this.debugger.step_manager)
       self.vmDebugger = new VmDebugger(this.debugger.vmDebuggerLogic)