From edafdc6fe976242d4af25da9c7dd62b15c556584 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Aug 2018 12:36:50 +0200
Subject: [PATCH] fix standalone debugger

---
 src/app/debugger/remix-debugger/index.html    |  9 +++---
 src/app/debugger/remix-debugger/index.js      |  4 ++-
 .../remix-debugger/src/ui/EthdebuggerUI.js    | 30 -------------------
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/src/app/debugger/remix-debugger/index.html b/src/app/debugger/remix-debugger/index.html
index 5e3f491a5d..662ca02fb9 100644
--- a/src/app/debugger/remix-debugger/index.html
+++ b/src/app/debugger/remix-debugger/index.html
@@ -7,10 +7,11 @@
     <script type="text/javascript">
       function loadDebugger() {
         var container = document.getElementById('app')
-        container.debugger = new window.remix.ui.Debugger()
-        container.debugger.addProvider('INTERNAL')
-        container.debugger.switchProvider('INTERNAL')
-        container.appendChild(container.debugger_ui.render())
+        var debuggerBackend = new window.remix.ui.DebuggerBackend({})
+        container.debugger = new window.remix.ui.Debugger({debugger: debuggerBackend})
+        debuggerBackend.addProvider('INTERNAL')
+        debuggerBackend.switchProvider('INTERNAL')
+        container.appendChild(container.debugger.render())
       }
     </script>
     <div id="app"></div>
diff --git a/src/app/debugger/remix-debugger/index.js b/src/app/debugger/remix-debugger/index.js
index 77fbd14215..380808018f 100644
--- a/src/app/debugger/remix-debugger/index.js
+++ b/src/app/debugger/remix-debugger/index.js
@@ -1,6 +1,7 @@
 'use strict'
 var VMDebugger = require('./src/ui/VmDebugger')
 var Debugger = require('./src/ui/EthdebuggerUI')
+var DebuggerBackend = require('remix-debug').EthDebugger
 
 if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
   module.exports = modules()
@@ -14,7 +15,8 @@ function modules () {
   return {
     ui: {
       Debugger: Debugger,
-      VMdebugger: VMDebugger
+      VMdebugger: VMDebugger,
+      DebuggerBackend
     }
   }
 }
diff --git a/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js b/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js
index e6ffa2ff13..0f51c26c38 100644
--- a/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js
+++ b/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js
@@ -116,41 +116,11 @@ EthdebuggerUI.prototype.get_web3 = function () {
   return this.web3
 }
 
-EthdebuggerUI.prototype.addProvider = function (type, obj) {
-  this.web3Providers.addProvider(type, obj)
-  this.event.trigger('providerAdded', [type])
-}
-
 EthdebuggerUI.prototype.updateWeb3Reference = function () {
   if (!this.txBrowser) return
   this.txBrowser.web3 = this.debugger.web3
 }
 
-EthdebuggerUI.prototype.switchProvider = function (type) {
-  var self = this
-  this.web3Providers.get(type, function (error, obj) {
-    if (error) {
-      console.log('provider ' + type + ' not defined')
-    } else {
-      self.web3 = obj
-      // self.setManagers()
-      self.updateWeb3Reference()
-      executionContext.detectNetwork((error, network) => {
-        if (error || !network) {
-          self.web3Debug = obj
-          self.web3 = obj
-        } else {
-          var webDebugNode = init.web3DebugNode(network.name)
-          self.web3Debug = !webDebugNode ? obj : webDebugNode
-          self.web3 = !webDebugNode ? obj : webDebugNode
-        }
-        self.updateWeb3Reference()
-      })
-      self.event.trigger('providerChanged', [type])
-    }
-  })
-}
-
 EthdebuggerUI.prototype.setCompilationResult = function (compilationResult) {
   if (compilationResult && compilationResult.sources && compilationResult.contracts) {
     this.debugger.solidityProxy.reset(compilationResult)